[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.379.2.8,1.379.2.9 intern.h,2.529.2.8,2.529.2.9 scumm.cpp,1.603.2.32,1.603.2.33 vars.cpp,1.150.2.7,1.150.2.8
kirben
kirben at users.sourceforge.net
Tue Jan 17 05:04:04 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12694/scumm
Modified Files:
Tag: branch-0-8-0
actor.cpp intern.h scumm.cpp vars.cpp
Log Message:
Backport more bug fixes for HE games.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.379.2.8
retrieving revision 1.379.2.9
diff -u -d -r1.379.2.8 -r1.379.2.9
--- actor.cpp 15 Jan 2006 06:45:14 -0000 1.379.2.8
+++ actor.cpp 17 Jan 2006 13:03:39 -0000 1.379.2.9
@@ -1315,22 +1315,20 @@
#ifndef DISABLE_HE
int ScummEngine_v70he::getActorFromPos(int x, int y) {
- int i;
- int result = 0;
+ int curActor, i;
if (!testGfxAnyUsageBits(x / 8))
return 0;
+ curActor = 0;
for (i = 1; i < _numActors; i++) {
if (testGfxUsageBit(x / 8, i) && !getClass(i, kObjectClassUntouchable)
- && y >= _actors[i]._top && y <= _actors[i]._bottom && _actors[i]._pos.y > _actors[result]._pos.y) {
- if (_version > 2 || i != VAR(VAR_EGO)) {
- result = i;
- }
- }
+ && y >= _actors[i]._top && y <= _actors[i]._bottom
+ && (_actors[i]._pos.y > _actors[curActor]._pos.y || curActor == 0))
+ curActor = i;
}
- return result;
+ return curActor;
}
#endif
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.529.2.8
retrieving revision 2.529.2.9
diff -u -d -r2.529.2.8 -r2.529.2.9
--- intern.h 16 Jan 2006 09:54:07 -0000 2.529.2.8
+++ intern.h 17 Jan 2006 13:03:39 -0000 2.529.2.9
@@ -1061,6 +1061,7 @@
byte VAR_PLATFORM;
byte VAR_WINDOWS_VERSION;
byte VAR_CURRENT_CHARSET;
+ byte VAR_COLOR_DEPTH;
byte VAR_U32_VERSION;
byte VAR_U32_ARRAY_UNK;
};
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.603.2.32
retrieving revision 1.603.2.33
diff -u -d -r1.603.2.32 -r1.603.2.33
--- scumm.cpp 16 Jan 2006 09:54:07 -0000 1.603.2.32
+++ scumm.cpp 17 Jan 2006 13:03:40 -0000 1.603.2.33
@@ -1614,6 +1614,7 @@
VAR_PLATFORM = 0xFF;
VAR_WINDOWS_VERSION = 0xFF;
VAR_CURRENT_CHARSET = 0xFF;
+ VAR_COLOR_DEPTH = 0xFF;
VAR_U32_VERSION = 0xFF;
}
Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.150.2.7
retrieving revision 1.150.2.8
diff -u -d -r1.150.2.7 -r1.150.2.8
--- vars.cpp 16 Jan 2006 09:54:08 -0000 1.150.2.7
+++ vars.cpp 17 Jan 2006 13:03:40 -0000 1.150.2.8
@@ -302,6 +302,7 @@
VAR_SOUNDCODE_TMR = 84;
VAR_KEY_STATE = 86;
VAR_NUM_SOUND_CHANNELS = 88;
+ VAR_COLOR_DEPTH = 89;
VAR_REDRAW_ALL_ACTORS = 95;
if (_heversion >= 90) {
VAR_SCRIPT_CYCLE = 103;
@@ -603,6 +604,7 @@
VAR(VAR_PLATFORM) = 1;
VAR(VAR_WINDOWS_VERSION) = 40;
+ VAR(VAR_COLOR_DEPTH) = 256;
}
void ScummEngine_v90he::initScummVars() {
@@ -615,8 +617,8 @@
VAR(VAR_NUM_SPRITE_GROUPS) = MAX(64, _numSprites / 4) - 1;
VAR(VAR_NUM_SPRITES) = _numSprites - 1;
VAR(VAR_WIZ_TCOLOR) = 5;
+ VAR(VAR_RESERVED_SOUND_CHANNELS) = 9;
}
-
if (_heversion >= 98) {
VAR(VAR_U32_VERSION) = _logicHE->versionID();
VAR(VAR_U32_ARRAY_UNK) = 0;
More information about the Scummvm-git-logs
mailing list