1 | diff -urN /home/khalek/cvs/scummvm/gameDetector.cpp scummvm/gameDetector.cpp
|
---|
2 | --- /home/khalek/cvs/scummvm/gameDetector.cpp Thu Jul 18 11:31:20 2002
|
---|
3 | +++ scummvm/gameDetector.cpp Fri Jul 19 16:37:27 2002
|
---|
4 | @@ -44,26 +44,27 @@
|
---|
5 | "Syntax:\n"
|
---|
6 | "\tscummvm [-v] [-d[<num>]] [-n] [-b<num>] [-t<num>] [-s<num>] [-p<path>] [-m<num>] [-f] game\n"
|
---|
7 | "Flags:\n"
|
---|
8 | - "\t-v - show version info and exit\n"
|
---|
9 | + "\t-a - specify game is amiga version\n"
|
---|
10 | + "\t-b<num> - start in room <num>\n"
|
---|
11 | "\t-c<num> - use cdrom <num> for cd audio\n"
|
---|
12 | "\t-d[<num>] - enable debug output (debug level [1])\n"
|
---|
13 | - "\t-n - no subtitles for speech\n"
|
---|
14 | - "\t-y - set text speed (default: 60)\n"
|
---|
15 | - "\t-b<num> - start in room <num>\n"
|
---|
16 | - "\t-t<num> - set music tempo (default- adlib: 0x1F0000, midi: 0x460000)\n"
|
---|
17 | - "\t-p<path> - look for game in <path>\n"
|
---|
18 | - "\t-m<num> - set music volume to <num> (0-100)\n"
|
---|
19 | - "\t-s<num> - set sfx volume to <num> (0-255)\n"
|
---|
20 | "\t-e<mode> - set music engine (see readme.txt for details)\n"
|
---|
21 | "\t-f - fullscreen mode\n"
|
---|
22 | "\t-g<mode> - graphics mode (normal,2x,3x,2xsai,super2xsai,supereagle,advmame2x)\n"
|
---|
23 | - "\t-a - specify game is amiga version\n"
|
---|
24 | + "\t-l<file> - load config file instead of default\n"
|
---|
25 | + "\t-m<num> - set music volume to <num> (0-100)\n"
|
---|
26 | + "\t-n - no subtitles for speech\n"
|
---|
27 | + "\t-p<path> - look for game in <path>\n"
|
---|
28 | + "\t-s<num> - set sfx volume to <num> (0-255)\n"
|
---|
29 | + "\t-t<num> - set music tempo (default- adlib: 0x1F0000, midi: 0x460000)\n"
|
---|
30 | + "\t-v - show version info and exit\n"
|
---|
31 | #if defined(UNIX) || defined(UNIX_X11)
|
---|
32 | "\t-w[<file>] - write to config file [~/.scummvmrc]\n"
|
---|
33 | #else
|
---|
34 | "\t-w[<file>] - write to config file [scummvm.ini]\n"
|
---|
35 | #endif
|
---|
36 | - "\t-l<file> - load config file instead of default\n"
|
---|
37 | + "\t-x[<num>] - save game slot to load (default: autosave)\n"
|
---|
38 | + "\t-y - set text speed (default: 60)\n"
|
---|
39 | ;
|
---|
40 |
|
---|
41 | void GameDetector::updateconfig()
|
---|
42 | @@ -75,6 +76,8 @@
|
---|
43 | _amiga = true;
|
---|
44 | else
|
---|
45 | _amiga = false;
|
---|
46 | + if ((val = scummcfg->get("save_slot")))
|
---|
47 | + _save_slot = atoi(val);
|
---|
48 |
|
---|
49 | if ((val = scummcfg->get("cdrom")))
|
---|
50 | _cdrom = atoi(val);
|
---|
51 | @@ -128,6 +131,7 @@
|
---|
52 | char *s;
|
---|
53 | char *current_option = NULL;
|
---|
54 | char *option = NULL;
|
---|
55 | + _save_slot = -1;
|
---|
56 |
|
---|
57 | // check for arguments
|
---|
58 | if (argc < 2) {
|
---|
59 | @@ -235,6 +239,14 @@
|
---|
60 | HANDLE_OPT_OPTION();
|
---|
61 | if (option != NULL)
|
---|
62 | scummcfg->change_filename(option);
|
---|
63 | + break;
|
---|
64 | + case 'x':
|
---|
65 | + _save_slot = 0;
|
---|
66 | + HANDLE_OPT_OPTION();
|
---|
67 | + if (option != NULL) {
|
---|
68 | + _save_slot = atoi(option);
|
---|
69 | + scummcfg->set("save_slot", _save_slot);
|
---|
70 | + }
|
---|
71 | break;
|
---|
72 | case 'y':
|
---|
73 | HANDLE_OPTION();
|
---|
74 | diff -urN /home/khalek/cvs/scummvm/gameDetector.h scummvm/gameDetector.h
|
---|
75 | --- /home/khalek/cvs/scummvm/gameDetector.h Mon May 6 21:18:09 2002
|
---|
76 | +++ scummvm/gameDetector.h Fri Jul 19 16:36:38 2002
|
---|
77 | @@ -28,7 +28,6 @@
|
---|
78 | char *getGameName(void);
|
---|
79 |
|
---|
80 | bool _fullScreen;
|
---|
81 | - bool _restore;
|
---|
82 | byte _gameId;
|
---|
83 | bool _simon;
|
---|
84 |
|
---|
85 | @@ -56,6 +55,7 @@
|
---|
86 |
|
---|
87 | int _scummVersion;
|
---|
88 | int _cdrom;
|
---|
89 | + int _save_slot;
|
---|
90 |
|
---|
91 | bool _saveconfig;
|
---|
92 |
|
---|
93 | diff -urN /home/khalek/cvs/scummvm/scummvm.cpp scummvm/scummvm.cpp
|
---|
94 | --- /home/khalek/cvs/scummvm/scummvm.cpp Fri Jul 19 10:42:09 2002
|
---|
95 | +++ scummvm/scummvm.cpp Fri Jul 19 16:37:47 2002
|
---|
96 | @@ -1540,8 +1540,8 @@
|
---|
97 | scumm->_imuse = imuse;
|
---|
98 | }
|
---|
99 |
|
---|
100 | - if (detector->_restore) {
|
---|
101 | - scumm->_saveLoadSlot = 0;
|
---|
102 | + if (detector->_save_slot != -1) {
|
---|
103 | + scumm->_saveLoadSlot = detector->_save_slot;
|
---|
104 | scumm->_saveLoadFlag = 2;
|
---|
105 | scumm->_saveLoadCompatible = false;
|
---|
106 | }
|
---|