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 2019-04-06 10:50:32 +02:00
parent 8fe00ff523 8c3741fc97
commit b62a33607c
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/PKeyboardHandler.cxx
View File

@ -610,4 +610,4 @@ bool PhysicalKeyboardHandler::handleControlEvent(StellaKey key, StellaMod mod, b
handled = false; handled = false;
return handled; return handled;
} }

3
src/common/PKeyboardHandler.hxx
View File

@ -75,7 +75,8 @@ class PhysicalKeyboardHandler
// Array of key events, indexed by StellaKey // Array of key events, indexed by StellaKey
Event::Type myKeyTable[KBDK_LAST][kNumModes]; Event::Type myKeyTable[KBDK_LAST][kNumModes];
// Array of mod keys, indexed by StellaKey // Array of mod keys, indexed by StellaKey
StellaMod myModKeyTable[KBDK_LAST][kNumModes]; // TODO - uncomment when this is ready
//StellaMod myModKeyTable[KBDK_LAST][kNumModes];
// Sometimes key combos with the Alt key become 'stuck' after the // Sometimes key combos with the Alt key become 'stuck' after the
// window changes state, and we want to ignore that event // window changes state, and we want to ignore that event

4
src/common/bspf.hxx
View File

@ -111,6 +111,10 @@ namespace BSPF
static const string ARCH = "x86_64"; static const string ARCH = "x86_64";
#elif defined(__powerpc__) || defined(__ppc__) #elif defined(__powerpc__) || defined(__ppc__)
static const string ARCH = "ppc"; static const string ARCH = "ppc";
#elif defined(__arm__) || defined(__thumb__)
static const string ARCH = "arm32";
#elif defined(__aarch64__)
static const string ARCH = "arm64";
#else #else
static const string ARCH = "NOARCH"; static const string ARCH = "NOARCH";
#endif #endif

2
src/emucore/DefProps.hxx
View File

@ -1649,7 +1649,7 @@ static const char* const DefProps[DEF_PROPS_SIZE][21] = {
{ "76f66ce3b83d7a104a899b4b3354a2f2", "UA Limited", "", "Cat Trax (1983) (UA Limited) (1)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, { "76f66ce3b83d7a104a899b4b3354a2f2", "UA Limited", "", "Cat Trax (1983) (UA Limited) (1)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" },
{ "77057d9d14b99e465ea9e29783af0ae3", "Activision, David Crane", "AG-001", "Dragster (1980) (Activision)", "AKA Drag Strip", "", "", "", "", "", "", "", "", "", "", "", "", "", "20", "", "" }, { "77057d9d14b99e465ea9e29783af0ae3", "Activision, David Crane", "AG-001", "Dragster (1980) (Activision)", "AKA Drag Strip", "", "", "", "", "", "", "", "", "", "", "", "", "", "20", "", "" },
{ "7732e4e4cc2644f163d6650ddcc9d9df", "HES", "771-333", "2 Pak Special - Challenge, Surfing (1990) (HES) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "7732e4e4cc2644f163d6650ddcc9d9df", "HES", "771-333", "2 Pak Special - Challenge, Surfing (1990) (HES) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "7761418d46af069b8cd80c29fe6cd814", "Dion Olsthoorn", "RetroN 77 edition", "Amoeba Jump (DionoiD)", "", "Homebrew", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "7761418d46af069b8cd80c29fe6cd814", "Dion Olsthoorn", "RetroN 77 edition", "Amoeba Jump (R77) (DionoiD)", "", "Homebrew", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "7778ac65d775a079f537e97cbdad541c", "", "", "Spider Fighter (Unknown) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "7778ac65d775a079f537e97cbdad541c", "", "", "Spider Fighter (Unknown) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "777aece98d7373998ffb8bc0b5eff1a2", "", "", "2600 Collison Demo 2 (Piero Cavina) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "777aece98d7373998ffb8bc0b5eff1a2", "", "", "2600 Collison Demo 2 (Piero Cavina) (PD)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },
{ "77887e4192a6b0a781530e6cf9be7199", "Atari", "CX2604", "Space War (1978) (Atari) [b1]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "77887e4192a6b0a781530e6cf9be7199", "Atari", "CX2604", "Space War (1978) (Atari) [b1]", "", "Uncommon", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" },

4
src/emucore/Settings.cxx
View File

@ -42,8 +42,8 @@ Settings::Settings()
// TIA specific options // TIA specific options
setPermanent("tia.zoom", "3"); setPermanent("tia.zoom", "3");
setPermanent("tia.inter", "false"); setPermanent("tia.inter", "false");
setPermanent("tia.aspectn", "91"); setPermanent("tia.aspectn", "100");
setPermanent("tia.aspectp", "109"); setPermanent("tia.aspectp", "100");
setPermanent("tia.fsfill", "false"); setPermanent("tia.fsfill", "false");
setPermanent("tia.dbgcolors", "roygpb"); setPermanent("tia.dbgcolors", "roygpb");

2
src/emucore/stella.pro
View File

@ -21013,7 +21013,7 @@
"" ""
"Cartridge.MD5" "7761418d46af069b8cd80c29fe6cd814" "Cartridge.MD5" "7761418d46af069b8cd80c29fe6cd814"
"Cartridge.Name" "Amoeba Jump (DionoiD)" "Cartridge.Name" "Amoeba Jump (R77) (DionoiD)"
"Cartridge.ModelNo" "RetroN 77 edition" "Cartridge.ModelNo" "RetroN 77 edition"
"Cartridge.Manufacturer" "Dion Olsthoorn" "Cartridge.Manufacturer" "Dion Olsthoorn"
"Cartridge.Rarity" "Homebrew" "Cartridge.Rarity" "Homebrew"

6
src/unix/r77/SettingsR77.cxx
View File

@ -88,12 +88,12 @@ bool SettingsR77::saveConfigFile(const string& cfgfile) const
out << "fullscreen = " << getString("fullscreen") << endl; out << "fullscreen = " << getString("fullscreen") << endl;
out << "lastrom = " << getString("lastrom") << endl; out << "lastrom = " << getString("lastrom") << endl;
out << "keymap = " << getString("keymap") << endl; // out << "keymap = " << getString("keymap") << endl;
out << "joymap = " << getString("joymap") << endl; // out << "joymap = " << getString("joymap") << endl;
out.flush(); out.flush();
out.close(); out.close();
// FIXME system("/bin/fsync /mnt/stella/stellarc&"); system("/bin/fsync /mnt/stella/stellarc&");
return true; return true;
} }