From a1346b57f545b3ed441cbd75c894ce388dc07c39 Mon Sep 17 00:00:00 2001 From: Bart Trzynadlowski Date: Thu, 22 Sep 2011 17:28:49 +0000 Subject: [PATCH] - Changed spelling of some messages in drive board code. - Added an extra blank line after info display in CModel3. - Cleaned up comments in Main.cpp. - More document updates. Fixed '-no-music'->'-no-dsb', 'EmulateMusic'->'EmulateDSB'. --- Docs/README.txt | 7 ++++--- Src/Model3/DriveBoard.cpp | 4 ++-- Src/Model3/Model3.cpp | 1 + Src/OSD/SDL/Main.cpp | 21 ++------------------- 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/Docs/README.txt b/Docs/README.txt index af03b10..4596e52 100644 --- a/Docs/README.txt +++ b/Docs/README.txt @@ -1,3 +1,4 @@ +TODO: Proof source code, fix capitalization in config dialog! TODO: discussion of missing input settings in index: saturation, dead zone, analog/digital sensitivity, etc. All missing now. TODO: input stuff to be written in section 12 TODO: add a title to this document and LICENSE.txt (e.g. 'User Manual for Supermodel Version 0.2a', 'License Agreement for Supermodel v0.2a') @@ -946,7 +947,7 @@ not. All options are case sensitive. ---------------- - Option: -no-music + Option: -no-dsb Description: Disables Digital Sound Board (MPEG music) emulation. See the section on audio settings for more information. @@ -1090,14 +1091,14 @@ All settings are case sensitive. ---------------- - Name: EmulateMusic + Name: EmulateDSB Argument: Integer. Description: Emulates the Digital Sound Board if set to 1, disables it if set to 0. See the section on audio settings for more information. A setting of 0 is equivalent to the - '-no-music' command line option. + '-no-dsb' command line option. ---------------- diff --git a/Src/Model3/DriveBoard.cpp b/Src/Model3/DriveBoard.cpp index 80a00e1..69500b4 100644 --- a/Src/Model3/DriveBoard.cpp +++ b/Src/Model3/DriveBoard.cpp @@ -128,7 +128,7 @@ void CDriveBoard::LoadState(CBlockFile *SaveState) { if (SaveState->FindBlock("DriveBoard") != OKAY) { - ErrorLog("Unable to load DriveBoard state. Save state file is corrupt."); + ErrorLog("Unable to load drive board state. Save state file is corrupt."); return; } @@ -190,7 +190,7 @@ void CDriveBoard::LoadState(CBlockFile *SaveState) if (m_attached) { if (m_tmpDisabled) - printf("Disabled DriveBoard due to incompatible save state.\n"); + printf("Disabled drive board due to incompatible save state.\n"); SendStopAll(); } diff --git a/Src/Model3/Model3.cpp b/Src/Model3/Model3.cpp index 8d64b17..c926198 100644 --- a/Src/Model3/Model3.cpp +++ b/Src/Model3/Model3.cpp @@ -2862,6 +2862,7 @@ bool CModel3::LoadROMSet(const struct GameInfo *GameList, const char *zipFile) } else if (Game->driveBoard) printf(" Extra Hardware: Drive Board\n"); + printf("\n"); return OKAY; } diff --git a/Src/OSD/SDL/Main.cpp b/Src/OSD/SDL/Main.cpp index 005b842..8ab22f9 100644 --- a/Src/OSD/SDL/Main.cpp +++ b/Src/OSD/SDL/Main.cpp @@ -1,16 +1,3 @@ -//TODO before release: -// x VBL to 2.5% -// x Change EmulateSCSP -> EmulateSound -// x Map neutral gear to individual button -// x Re-do cursors, make them larger -// - Comment source code, clean up -// - Add option for building with /MD in MSVC Makefile -// x Remove SUPERMODEL_SOUND -// x Make dinput default for Windows -// x Make multi-threading the default -// x Export INI file -// TODO: test on Linux and make sure that no input system options besides SDL are available - /** ** Supermodel ** A Sega Model 3 Arcade Emulator. @@ -41,12 +28,8 @@ * -------------------- * - SUPERMODEL_WIN32: Define this if compiling on Windows. * - SUPERMODEL_OSX: Define this if compiling on Mac OS X. - * - * TO-DO List - * ---------- - * - A lot of this code is actually OS-independent! Should it be moved into the - * root of the source tree? Might not be worth it; eventually, OS-dependent - * UIs will be introduced. + * - SUPERMODEL_DEBUGGER: Enable the debugger. + * - DEBUG: Debug mode (use with caution, produces large logs of game behavior) */ #include