[Scummvm-cvs-logs] CVS: scummvm/saga isomap.cpp,1.39,1.40 script.h,1.68,1.69
Andrew Kurushin
h00ligan at users.sourceforge.net
Fri Mar 25 09:48:53 CET 2005
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16809
Modified Files:
isomap.cpp script.h
Log Message:
fix wrong multitile offset calculation
Index: isomap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/isomap.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- isomap.cpp 18 Mar 2005 17:11:35 -0000 1.39
+++ isomap.cpp 25 Mar 2005 17:48:17 -0000 1.40
@@ -218,6 +218,7 @@
void IsoMap::loadMulti(const byte * resourcePointer, size_t resourceLength) {
MultiTileEntryData *multiTileEntryData;
uint16 i;
+ int16 offsetDiff;
if (resourceLength < 2) {
error("IsoMap::loadMetaTiles wrong resourceLength");
@@ -243,8 +244,11 @@
multiTileEntryData->currentState = readS.readByte();
readS.readByte();//skip
}
+
+ offsetDiff = (readS.pos() - 2);
+
for (i = 0; i < _multiCount; i++) {
- _multiTable[i].offset -= readS.pos();
+ _multiTable[i].offset -= offsetDiff;
}
_multiDataCount = (readS.size() - readS.pos()) / 2;
@@ -367,8 +371,7 @@
return tileIndex;
}
}
-
- warning("something terrible happened");
+
return 1;
}
Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- script.h 28 Jan 2005 19:25:41 -0000 1.68
+++ script.h 25 Mar 2005 17:48:17 -0000 1.69
@@ -61,7 +61,6 @@
};
enum VerbTypes {
-//todo: LUT for drawing
kVerbNone = 0,
kVerbPickUp = 1,
kVerbLookAt = 2,
More information about the Scummvm-git-logs
mailing list