[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.262,1.263 actor.h,1.55,1.56 saveload.cpp,1.164,1.165 saveload.h,1.37,1.38
Travis Howell
kirben at users.sourceforge.net
Wed Jul 28 04:58:00 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: web/news 20020501.xml,1.2,1.3 20021227.xml,1.2,1.3 20021230.xml,1.3,1.4 20030104.xml,1.2,1.3 20030106.xml,1.2,1.3 20030114.xml,1.1,1.2 20030128.xml,1.4,1.5 20040117.xml,1.1,1.2 20040118.xml,1.1,1.2 20040130.xml,1.1,1.2 20040401.xml,1.1,1.2 20040510.xml,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.165,1.166
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29022/scumm
Modified Files:
actor.cpp actor.h saveload.cpp saveload.h
Log Message:
Add patch from madm00se for:
#869003 MIVGA: Guybrush shrinks & grows near end of game
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -d -r1.262 -r1.263
--- actor.cpp 26 Jul 2004 15:14:10 -0000 1.262
+++ actor.cpp 28 Jul 2004 11:56:14 -0000 1.263
@@ -89,7 +89,7 @@
talkColor = 15;
talkPosX = 0;
talkPosY = -80;
- scaley = scalex = 0xFF;
+ boxscale = scaley = scalex = 0xFF;
charset = 0;
memset(sound, 0, sizeof(sound));
targetFacing = facing;
@@ -422,6 +422,8 @@
if (_vm->_version >= 6 && (_vm->getBoxFlags(walkbox) & kBoxIgnoreScale))
return;
+ boxscale = _vm->getBoxScale(walkbox);
+
uint16 scale = _vm->getScale(walkbox, _pos.x, _pos.y);
assert(scale <= 0xFF);
@@ -1005,8 +1007,12 @@
bcr->_actorX += 8;
}
- bcr->_scaleX = scalex;
- bcr->_scaleY = scaley;
+ if (_vm->_version == 4 && boxscale & 0x8000) {
+ bcr->_scaleX = bcr->_scaleY = _vm->getScale(walkbox, _pos.x, _pos.y);
+ } else {
+ bcr->_scaleX = scalex;
+ bcr->_scaleY = scaley;
+ }
bcr->_shadow_mode = shadow_mode;
if (_vm->_features & GF_SMALL_HEADER)
@@ -1798,6 +1804,7 @@
MKLINE(Actor, talkFrequency, sleInt16, VER(16)),
MKLINE(Actor, talkPan, sleInt16, VER(24)),
MKLINE(Actor, talkVolume, sleInt16, VER(29)),
+ MKLINE(Actor, boxscale, sleUint16, VER(34)),
MKLINE(Actor, scalex, sleByte, VER(8)),
MKLINE(Actor, scaley, sleByte, VER(8)),
MKLINE(Actor, charset, sleByte, VER(8)),
Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- actor.h 15 Jul 2004 12:26:10 -0000 1.55
+++ actor.h 28 Jul 2004 11:56:14 -0000 1.56
@@ -93,6 +93,7 @@
int talkFrequency;
byte talkPan;
byte talkVolume;
+ uint16 boxscale;
byte scalex, scaley;
byte charset;
byte moving;
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- saveload.cpp 26 Jul 2004 15:14:10 -0000 1.164
+++ saveload.cpp 28 Jul 2004 11:56:14 -0000 1.165
@@ -530,8 +530,8 @@
MKLINE(ScummEngine, gdi._transparentColor, sleByte, VER(8)),
MKARRAY(ScummEngine, _currentPalette[0], sleByte, 768, VER(8)),
- // Should be made obsolete in next save game version.
- MKARRAY(ScummEngine, _proc_special_palette[0], sleByte, 256, VER(8)),
+ // Sam & Max specific palette replaced by _shadowPalette now.
+ MK_OBSOLETE_ARRAY(ScummEngine, _proc_special_palette[0], sleByte, 256, VER(8), VER(34)),
MKARRAY(ScummEngine, _charsetBuffer[0], sleByte, 256, VER(8)),
Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- saveload.h 16 Jul 2004 14:41:05 -0000 1.37
+++ saveload.h 28 Jul 2004 11:56:14 -0000 1.38
@@ -32,7 +32,7 @@
// Can be useful for other ports too :)
#define VER(x) x
-#define CURRENT_VER 33
+#define CURRENT_VER 34
// To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types,
// we use a small trick: instead of 0 we use 42. Why? Well, it seems newer GCC
- Previous message: [Scummvm-cvs-logs] CVS: web/news 20020501.xml,1.2,1.3 20021227.xml,1.2,1.3 20021230.xml,1.3,1.4 20030104.xml,1.2,1.3 20030106.xml,1.2,1.3 20030114.xml,1.1,1.2 20030128.xml,1.4,1.5 20040117.xml,1.1,1.2 20040118.xml,1.1,1.2 20040130.xml,1.1,1.2 20040401.xml,1.1,1.2 20040510.xml,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.165,1.166
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list