diff options
| author | Johannes Schickel | 2011-11-04 20:12:23 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-11-04 20:15:05 +0100 |
| commit | 6a3a14ab6be52c54bec50e17004902a246c36d6a (patch) | |
| tree | 178dcaee9c7c190d6b9a13a278b9d3ac75907a9e /engines/kyra | |
| parent | 3c4bb827996e28504f9744a501295b17bef7e32d (diff) | |
| download | scummvm-rg350-6a3a14ab6be52c54bec50e17004902a246c36d6a.tar.gz scummvm-rg350-6a3a14ab6be52c54bec50e17004902a246c36d6a.tar.bz2 scummvm-rg350-6a3a14ab6be52c54bec50e17004902a246c36d6a.zip | |
KYRA: Reduce size of KyraEngine_LoK::_entranceMouseCursorTracks.
Also clear the whole array in enterNewScene. This is not needed since the last
value is only used when the first four values are set up valid, but it removes
an annoying warning in PVS-Studio and makes the code a bit clearer.
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra_lok.h | 2 | ||||
| -rw-r--r-- | engines/kyra/scene_lok.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h index 57e6bd39ab..db70d193ff 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/kyra_lok.h @@ -416,7 +416,7 @@ protected: Movie *_movieObjects[10]; - uint16 _entranceMouseCursorTracks[8]; + uint16 _entranceMouseCursorTracks[5]; uint16 _walkBlockNorth; uint16 _walkBlockEast; uint16 _walkBlockSouth; diff --git a/engines/kyra/scene_lok.cpp b/engines/kyra/scene_lok.cpp index 3d6aefca6a..ab1670ea6e 100644 --- a/engines/kyra/scene_lok.cpp +++ b/engines/kyra/scene_lok.cpp @@ -131,7 +131,7 @@ void KyraEngine_LoK::enterNewScene(int sceneId, int facing, int unk1, int unk2, _emc->run(&_scriptClick); } - memset(_entranceMouseCursorTracks, 0xFF, sizeof(uint16)*4); + memset(_entranceMouseCursorTracks, 0xFF, sizeof(_entranceMouseCursorTracks)); _currentCharacter->sceneId = sceneId; assert(sceneId < _roomTableSize); |