libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

patch by khalek, Added -x parameter that loads from a slot (defaults to 0). Also removes _restore, and alphabetizes the scummvm help optionlist.

Browse Source 
svn-id: r4601
This commit is contained in:
Ralph Brorsen 2002-07-19 12:06:45 +00:00
parent 6d68c4a545
commit 4128a0e2cf
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gameDetector.cpp
View File

@ -44,26 +44,27 @@ static const char USAGE_STRING[] =
"Syntax:\n"
"\tscummvm [-v] [-d[<num>]] [-n] [-b<num>] [-t<num>] [-s<num>] [-p<path>] [-m<num>] [-f] game\n"
"Flags:\n"
"\t-v - show version info and exit\n"
"\t-a - specify game is amiga version\n"
"\t-b<num> - start in room <num>\n"
"\t-c<num> - use cdrom <num> for cd audio\n"
"\t-d[<num>] - enable debug output (debug level [1])\n"
"\t-n - no subtitles for speech\n"
"\t-y - set text speed (default: 60)\n"
"\t-b<num> - start in room <num>\n"
"\t-t<num> - set music tempo (default- adlib: 0x1F0000, midi: 0x460000)\n"
"\t-p<path> - look for game in <path>\n"
"\t-m<num> - set music volume to <num> (0-100)\n"
"\t-s<num> - set sfx volume to <num> (0-255)\n"
"\t-e<mode> - set music engine (see readme.txt for details)\n"
"\t-f - fullscreen mode\n"
"\t-g<mode> - graphics mode (normal,2x,3x,2xsai,super2xsai,supereagle,advmame2x)\n"
"\t-a - specify game is amiga version\n"
"\t-l<file> - load config file instead of default\n"
"\t-m<num> - set music volume to <num> (0-100)\n"
"\t-n - no subtitles for speech\n"
"\t-p<path> - look for game in <path>\n"
"\t-s<num> - set sfx volume to <num> (0-255)\n"
"\t-t<num> - set music tempo (default- adlib: 0x1F0000, midi: 0x460000)\n"
"\t-v - show version info and exit\n"
#if defined(UNIX) || defined(UNIX_X11)
"\t-w[<file>] - write to config file [~/.scummvmrc]\n"
#else
"\t-w[<file>] - write to config file [scummvm.ini]\n"
#endif
"\t-l<file> - load config file instead of default\n"
"\t-x[<num>] - save game slot to load (default: autosave)\n"
"\t-y - set text speed (default: 60)\n"
;
void GameDetector::updateconfig()
@ -75,6 +76,8 @@ void GameDetector::updateconfig()
_amiga = true;
else
_amiga = false;
if ((val = scummcfg->get("save_slot")))
_save_slot = atoi(val);
if ((val = scummcfg->get("cdrom")))
_cdrom = atoi(val);
@ -128,6 +131,7 @@ void GameDetector::parseCommandLine(int argc, char **argv)
char *s;
char *current_option = NULL;
char *option = NULL;
_save_slot = -1;
// check for arguments
if (argc < 2) {
@ -236,6 +240,14 @@ void GameDetector::parseCommandLine(int argc, char **argv)
if (option != NULL)
scummcfg->change_filename(option);
break;
case 'x':
_save_slot = 0;
HANDLE_OPT_OPTION();
if (option != NULL) {
_save_slot = atoi(option);
scummcfg->set("save_slot", _save_slot);
}
break;
case 'y':
HANDLE_OPTION();
_talkSpeed = atoi(option);

2
gameDetector.h
View File

@ -28,7 +28,6 @@ public:
char *getGameName(void);
bool _fullScreen;
bool _restore;
byte _gameId;
bool _simon;
@ -56,6 +55,7 @@ public:
int _scummVersion;
int _cdrom;
int _save_slot;
bool _saveconfig;

4
scummvm.cpp
View File

@ -1544,8 +1544,8 @@ Scumm *Scumm::createFromDetector(GameDetector *detector, OSystem *syst)
scumm->_imuse = imuse;
}
if (detector->_restore) {
scumm->_saveLoadSlot = 0;
if (detector->_save_slot != -1) {
scumm->_saveLoadSlot = detector->_save_slot;
scumm->_saveLoadFlag = 2;
scumm->_saveLoadCompatible = false;
}