[Scummvm-cvs-logs] scummvm master -> 6a3a14ab6be52c54bec50e17004902a246c36d6a
lordhoto
lordhoto at gmail.com
Fri Nov 4 20:16:25 CET 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3c4bb82799 KYRA: Use "0xFF" instead of "0xFFFF" as memset's second parameter.
6a3a14ab6b KYRA: Reduce size of KyraEngine_LoK::_entranceMouseCursorTracks.
Commit: 3c4bb827996e28504f9744a501295b17bef7e32d
https://github.com/scummvm/scummvm/commit/3c4bb827996e28504f9744a501295b17bef7e32d
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-11-04T12:15:05-07:00
Commit Message:
KYRA: Use "0xFF" instead of "0xFFFF" as memset's second parameter.
Changed paths:
engines/kyra/gui_lol.cpp
engines/kyra/kyra_lok.cpp
engines/kyra/scene_lok.cpp
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index 3ab52b9..93a1138 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -184,7 +184,7 @@ void LoLEngine::gui_displayCharInventory(int charNum) {
static const uint16 statusFlags[] = { 0x0080, 0x0000, 0x1000, 0x0002, 0x100, 0x0001, 0x0000, 0x0000 };
- memset(_charStatusFlags, 0xffff, sizeof(_charStatusFlags));
+ memset(_charStatusFlags, 0xFF, sizeof(_charStatusFlags));
int x = 0;
int32 c = 0;
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index 27d0849..601ae8f 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -254,7 +254,7 @@ Common::Error KyraEngine_LoK::init() {
_poisonDeathCounter = 0;
memset(_itemHtDat, 0, sizeof(_itemHtDat));
- memset(_exitList, 0xFFFF, sizeof(_exitList));
+ memset(_exitList, 0xFF, sizeof(_exitList));
_exitListPtr = 0;
_pathfinderFlag = _pathfinderFlag2 = 0;
_lastFindWayRet = 0;
diff --git a/engines/kyra/scene_lok.cpp b/engines/kyra/scene_lok.cpp
index a926f84..3d6aefc 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, 0xFFFF, sizeof(uint16)*4);
+ memset(_entranceMouseCursorTracks, 0xFF, sizeof(uint16)*4);
_currentCharacter->sceneId = sceneId;
assert(sceneId < _roomTableSize);
Commit: 6a3a14ab6be52c54bec50e17004902a246c36d6a
https://github.com/scummvm/scummvm/commit/6a3a14ab6be52c54bec50e17004902a246c36d6a
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-11-04T12:15:05-07:00
Commit Message:
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.
Changed paths:
engines/kyra/kyra_lok.h
engines/kyra/scene_lok.cpp
diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h
index 57e6bd3..db70d19 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 3d6aefc..ab1670e 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);
More information about the Scummvm-git-logs
mailing list