libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 12:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FULLPIPE: Read signed values where potentially negative values could appear

Browse Source
This commit is contained in:
Eugene Sandulenko 2016-08-29 22:06:02 +02:00
parent e13cee4be0
commit 5283612a7f
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/fullpipe/gfx.cpp
View File

@ -290,8 +290,8 @@ bool GameObject::load(MfcArchive &file) {
_id = file.readUint16LE();
_objectName = file.readPascalString();
_ox = file.readUint32LE();
_oy = file.readUint32LE();
_ox = file.readSint32LE();
_oy = file.readSint32LE();
_priority = file.readUint16LE();
if (g_fp->_gameProjectVersion >= 11) {

4
engines/fullpipe/interaction.cpp
View File

@ -450,8 +450,8 @@ bool Interaction::load(MfcArchive &file) {
_objectId3 = file.readUint16LE();
_objectState2 = file.readUint32LE();
_objectState1 = file.readUint32LE();
_xOffs = file.readUint32LE();
_yOffs = file.readUint32LE();
_xOffs = file.readSint32LE();
_yOffs = file.readSint32LE();
_sceneId = file.readUint32LE();
_flags = file.readUint32LE();
_actionName = file.readPascalString();

24
engines/fullpipe/statics.cpp
View File

@ -1703,8 +1703,8 @@ bool Movement::load(MfcArchive &file, StaticANIObject *ani) {
_staticsObj1 = ani->addReverseStatics(s);
}
_mx = file.readUint32LE();
_my = file.readUint32LE();
_mx = file.readSint32LE();
_my = file.readSint32LE();
staticsid = file.readUint16LE();
@ -1715,8 +1715,8 @@ bool Movement::load(MfcArchive &file, StaticANIObject *ani) {
_staticsObj2 = ani->addReverseStatics(s);
}
_m2x = file.readUint32LE();
_m2y = file.readUint32LE();
_m2x = file.readSint32LE();
_m2y = file.readSint32LE();
if (_staticsObj2) {
_dynamicPhases.push_back(_staticsObj2);
@ -2273,17 +2273,17 @@ bool DynamicPhase::load(MfcArchive &file) {
_field_7C = file.readUint16LE();
_rect = new Common::Rect();
_rect->left = file.readUint32LE();
_rect->top = file.readUint32LE();
_rect->right = file.readUint32LE();
_rect->bottom = file.readUint32LE();
_rect->left = file.readSint32LE();
_rect->top = file.readSint32LE();
_rect->right = file.readSint32LE();
_rect->bottom = file.readSint32LE();
assert (g_fp->_gameProjectVersion >= 1);
assert(g_fp->_gameProjectVersion >= 1);
_someX = file.readUint32LE();
_someY = file.readUint32LE();
_someX = file.readSint32LE();
_someY = file.readSint32LE();
assert (g_fp->_gameProjectVersion >= 12);
assert(g_fp->_gameProjectVersion >= 12);
_dynFlags = file.readUint32LE();

2
engines/fullpipe/utils.cpp
View File

@ -84,7 +84,7 @@ bool DWordArray::load(MfcArchive &file) {
resize(count);
for (int i = 0; i < count; i++) {
int32 t = file.readUint32LE();
int32 t = file.readSint32LE();
push_back(t);
}