ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
thrust26 2017-12-20 21:32:27 +01:00
parent e3baeb209e c6acb622cc
commit ff1911a85d
4 changed files with 516 additions and 461 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/StateManager.cxx
View File

@ -27,7 +27,7 @@
#include "StateManager.hxx" #include "StateManager.hxx"
#define STATE_HEADER "05000304state" #define STATE_HEADER "05009901state"
// #define MOVIE_HEADER "03030000movie" // #define MOVIE_HEADER "03030000movie"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

1
src/emucore/Cart.cxx
View File

@ -116,4 +116,3 @@ bool Cartridge::randomStartBank() const
{ {
return mySettings.getBool(mySettings.getBool("dev.settings") ? "dev.bankrandom" : "plr.bankrandom"); return mySettings.getBool(mySettings.getBool("dev.settings") ? "dev.bankrandom" : "plr.bankrandom");
} }

417
src/emucore/DefProps.hxx
View File

File diff suppressed because it is too large Load Diff

557
src/emucore/stella.pro
View File

File diff suppressed because it is too large Load Diff