diff options
| -rw-r--r-- | README | 6 | ||||
| -rw-r--r-- | doc/05_01.tex | 2 | ||||
| -rw-r--r-- | doc/08.tex | 4 | ||||
| -rw-r--r-- | scumm/actor.cpp | 4 | ||||
| -rw-r--r-- | scumm/saveload.cpp | 5 | ||||
| -rw-r--r-- | scumm/saveload.h | 2 | ||||
| -rw-r--r-- | scumm/script.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v8.cpp | 4 |
8 files changed, 13 insertions, 18 deletions
@@ -339,7 +339,7 @@ arguments - see the next section. --demo-mode Start demo mode of Maniac Mansion (Classic version) --tempo=NUM Set music tempo (in percent, 50-200) for SCUMM games (default: 100) - --talkspeed=NUM Set talk speed for SCUMM games (default: 60) + --talkspeed=NUM Set talk speed for SCUMM games The meaning of most long options can be inverted by prefixing them with "no-", @@ -904,7 +904,7 @@ An example config file looks as follows: [loomcd] cdrom=1 path=C:\loom\ - talkspeed=55 + talkspeed=5 savepath=C:\loom\saves\ [monkey2] @@ -933,7 +933,7 @@ The following keywords are recognized: language string Specify language (en, de, fr, it, pt, es, jp, zh, kr,se, gb, hb, cz, ru) subtitles bool Set to true to enable subtitles. - talkspeed number Text speed (default: 60) + talkspeed number Text speed fullscreen bool Fullscreen mode aspect_ratio bool Enable aspect ratio correction diff --git a/doc/05_01.tex b/doc/05_01.tex index 229a916447..25a37f7abb 100644 --- a/doc/05_01.tex +++ b/doc/05_01.tex @@ -46,7 +46,7 @@ Usage: scummvm [OPTIONS]... [GAME]\\ --demo-mode &Start demo mode of Maniac Mansion (Classic version)\\ --tempo=NUM &Set music tempo (in percent, 50-200) for SCUMM\\ &games (default: 100)\\ - --talkspeed=NUM &Set talk speed for SCUMM games (default: 60)\\ + --talkspeed=NUM &Set talk speed for SCUMM games\\ \end{tabular} The meaning of most long options can be inverted by prefixing them with "no-", diff --git a/doc/08.tex b/doc/08.tex index 4ae64fc11f..0fd6dd7a6b 100644 --- a/doc/08.tex +++ b/doc/08.tex @@ -48,7 +48,7 @@ An example config file looks as follows: [loomcd] cdrom=1 path=C:\loom\ - talkspeed=55 + talkspeed=5 savepath=C:\loom\saves\ [monkey2] @@ -79,7 +79,7 @@ The following keywords are recognized: language &string Specify language (en, de, fr, it, pt, es, jp,\\ & zh, kr, se, gb, hb, cz, ru)\\ subtitles &bool Set to true to enable subtitles.\\ - talkspeed &number Text speed (default: 60)\\ + talkspeed &number Text speed\\ \\ fullscreen &bool Fullscreen mode\\ aspect\_ratio &bool Enable aspect ratio correction\\ diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 5a5b780ded..095b8535cc 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1746,6 +1746,8 @@ const SaveLoadEntry *Actor::getSaveLoadEntries() { static const SaveLoadEntry actorEntries[] = { MKLINE(Actor, _pos.x, sleInt16, VER(8)), MKLINE(Actor, _pos.y, sleInt16, VER(8)), + MKLINE(Actor, offs_x, sleInt16, VER(32)), + MKLINE(Actor, offs_y, sleInt16, VER(32)), MKLINE(Actor, top, sleInt16, VER(8)), MKLINE(Actor, bottom, sleInt16, VER(8)), MKLINE(Actor, elevation, sleInt16, VER(8)), @@ -1775,11 +1777,9 @@ const SaveLoadEntry *Actor::getSaveLoadEntries() { MKLINE(Actor, speedy, sleUint16, VER(8)), MKLINE(Actor, cost.animCounter, sleUint16, VER(8)), MKLINE(Actor, cost.soundCounter, sleByte, VER(8)), -/* MKLINE(Actor, actorDrawVirScr, sleByte, VER(32)), MKLINE(Actor, flip, sleByte, VER(32)), MKLINE(Actor, skipLimb, sleByte, VER(32)), -*/ // Actor palette grew from 64 to 256 bytes MKARRAY_OLD(Actor, palette[0], sleByte, 64, VER(8), VER(9)), diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index aa07434dad..b2e806732b 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -183,7 +183,6 @@ bool ScummEngine::loadState(int slot, bool compat) { if (_screenTop < 0) _screenTop = 0; -/* if (hdr.ver < VER(32) && _heversion == 70) { roomptr = getResourceAddress(rtRoom, _roomResource); const byte *ptr = findResourceData(MKID('REMP'), roomptr); @@ -196,8 +195,6 @@ bool ScummEngine::loadState(int slot, bool compat) { } } -*/ - if (hdr.ver < VER(30)) { // For a long time, we used incorrect location, causing it to default to zero. if (_version == 8) @@ -737,10 +734,8 @@ void ScummEngine::saveOrLoad(Serializer *s, uint32 savegameVersion) { s->saveLoadArrayOf(_roomPalette, sizeof(_roomPalette), 1, sleByte); } -/* if (savegameVersion >= VER(32) && _heversion == 70) s->saveLoadArrayOf(_HEV7ActorPalette, sizeof(_HEV7ActorPalette), 1, sleByte); -*/ // PalManip data was not saved before V10 save games if (savegameVersion < VER(10)) diff --git a/scumm/saveload.h b/scumm/saveload.h index 4b0b6146c8..389a215a9e 100644 --- a/scumm/saveload.h +++ b/scumm/saveload.h @@ -32,7 +32,7 @@ namespace Scumm { // Can be useful for other ports too :) #define VER(x) x -#define CURRENT_VER 31 +#define CURRENT_VER 32 // To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types, // we use a small trick: instead of 0 we use 42. Why? Well, it seems newer GCC diff --git a/scumm/script.cpp b/scumm/script.cpp index 8d1f353c49..56ad1ae5b1 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -552,8 +552,8 @@ void ScummEngine::writeVar(uint var, int value) { // FIXME: Find some better place to put this. if (var == VAR_CHARINC && ConfMan.hasKey("talkspeed")) { - int talkspeed = ConfMan.getInt("talkspeed") / 20; - if (talkspeed >= 0 && talkspeed <= 180) + uint talkspeed = ConfMan.getInt("talkspeed"); + if (talkspeed <= 9) VAR(VAR_CHARINC) = talkspeed; } else _scummVars[var] = value; diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index 0d09074430..500ad1b913 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -426,8 +426,8 @@ void ScummEngine_v8::writeVar(uint var, int value) { if (var == VAR_CHARINC) { if (ConfMan.hasKey("talkspeed")) { - int talkspeed = ConfMan.getInt("talkspeed") / 20; - if (talkspeed >= 0 && talkspeed <= 9) + uint talkspeed = ConfMan.getInt("talkspeed"); + if (talkspeed <= 9) VAR(VAR_CHARINC) = talkspeed; } else VAR(VAR_CHARINC) = (_features & GF_DEMO) ? value : (9 - value); |