diff options
| author | Max Horn | 2003-10-04 11:50:21 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-04 11:50:21 +0000 |
| commit | d4734bd4f2963168f794691a618869ba4e558aaa (patch) | |
| tree | 6881cb61298534a4966533289bb81a2f0332a4c3 /scumm | |
| parent | 91da08e1f3f836442c9c2ff39a9d1570f49df24d (diff) | |
| download | scummvm-rg350-d4734bd4f2963168f794691a618869ba4e558aaa.tar.gz scummvm-rg350-d4734bd4f2963168f794691a618869ba4e558aaa.tar.bz2 scummvm-rg350-d4734bd4f2963168f794691a618869ba4e558aaa.zip | |
use namespace Common a bit more; don't zero the RNG in scumm (else the seed gets reset); remove obsolete 256 color blending code
svn-id: r10592
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v5.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index b06830ce08..857883cfa2 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -907,7 +907,7 @@ void ScummEngine_v5::saveVars() { void ScummEngine_v5::loadVars() { int a, b; - hexdump(_scriptPointer, 64); +// Common::hexdump(_scriptPointer, 64); while ((_opcode = fetchScriptByte()) != 0) { switch (_opcode & 0x1F) { case 0x01: // read a range of variables diff --git a/scumm/scumm.h b/scumm/scumm.h index 56fded1b2b..d6664263e9 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -362,7 +362,7 @@ protected: public: /* Random number generation */ - RandomSource _rnd; + Common::RandomSource _rnd; /* Core variable definitions */ byte _gameId; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 9a23af9d6d..9bf268886c 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -296,7 +296,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst) _confirmExitDialog = NULL; _debuggerDialog = NULL; _fastMode = 0; - memset(&_rnd, 0, sizeof(RandomSource)); _gameId = 0; memset(&gdi, 0, sizeof(Gdi)); _actors = NULL; |