[Scummvm-cvs-logs] scummvm master -> 370107c95326a8fafd816aed741e7842355c573e
DrMcCoy
drmccoy at drmccoy.de
Mon Aug 3 16:02:26 CEST 2015
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
370107c953 GOB: Remove a useless call to Variables::getAddressOff8()
Commit: 370107c95326a8fafd816aed741e7842355c573e
https://github.com/scummvm/scummvm/commit/370107c95326a8fafd816aed741e7842355c573e
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2015-08-03T15:56:43+02:00
Commit Message:
GOB: Remove a useless call to Variables::getAddressOff8()
This is a left-over vestige of when the gob engine recorded the size
of each variable currently in use, because it byte-swapped all
variables on save/load depending on the machine ScummVM ran on.
The gob engine doesn't do that all anymore (instead, the variables are
always stored in the endianness of the original game), so
getAddressOff8() doesn't store "this is an 8-bit variable" anymore,
making the call a NOP.
This fixes Coverity Scan issue #1267142.
Changed paths:
engines/gob/map_v2.cpp
diff --git a/engines/gob/map_v2.cpp b/engines/gob/map_v2.cpp
index cb5abe9..370e62c 100644
--- a/engines/gob/map_v2.cpp
+++ b/engines/gob/map_v2.cpp
@@ -163,11 +163,9 @@ void Map_v2::loadMapObjects(const char *avjFile) {
mapHeight = _screenHeight / _tilesHeight;
mapWidth = _screenWidth / _tilesWidth;
- for (int i = 0; i < mapHeight; i++) {
+ for (int i = 0; i < mapHeight; i++)
for (int j = 0; j < mapWidth; j++)
setPass(j, i, mapData.readSByte());
- _vm->_inter->_variables->getAddressOff8(var + i * _passWidth);
- }
}
mapData.seek(tmpPos);
More information about the Scummvm-git-logs
mailing list