[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.33,1.34 debug.cpp,1.20,1.21 gfx.cpp,1.42,1.43 script.cpp,1.31,1.32 script_v1.cpp,1.40,1.41 scumm.h,1.73,1.74 scummvm.cpp,1.70,1.71
James Brown
ender at users.sourceforge.net
Fri Mar 8 16:57:03 CET 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv24546
Modified Files:
actor.cpp debug.cpp gfx.cpp script.cpp script_v1.cpp scumm.h
scummvm.cpp
Log Message:
Fixed NUM_aCTORS for MI2/Indy4, etc.
Probably broke some saved games again.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** actor.cpp 6 Mar 2002 12:28:29 -0000 1.33
--- actor.cpp 9 Mar 2002 00:56:21 -0000 1.34
***************
*** 786,790 ****
void Scumm::processActors() {
int i;
! Actor *actors[NUM_ACTORS],*a,**ac,**ac2,*tmp;
int numactors = 0, cnt,cnt2;
--- 786,790 ----
void Scumm::processActors() {
int i;
! Actor *actors[MAX_ACTORS], *a,**ac,**ac2,*tmp;
int numactors = 0, cnt,cnt2;
***************
*** 939,943 ****
void Scumm::setActorRedrawFlags() {
! uint i,j;
uint32 bits;
--- 939,943 ----
void Scumm::setActorRedrawFlags() {
! int i,j;
uint32 bits;
Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/debug.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** debug.cpp 8 Mar 2002 13:31:29 -0000 1.20
--- debug.cpp 9 Mar 2002 00:56:21 -0000 1.21
***************
*** 271,275 ****
printf("|# |room| x y |elev|cos|width|box|mov|zp|frame|scale|spd|dir|\n");
printf("+--+----+--------+----+---+-----+---+---+--+-----+-----+---+---+\n");
! for(i=1; i<NUM_ACTORS; i++) {
if (act==-1 || act==i) {
a = &_s->actor[i];
--- 271,275 ----
printf("|# |room| x y |elev|cos|width|box|mov|zp|frame|scale|spd|dir|\n");
printf("+--+----+--------+----+---+-----+---+---+--+-----+-----+---+---+\n");
! for(i=1; i<_s->NUM_ACTORS; i++) {
if (act==-1 || act==i) {
a = &_s->actor[i];
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** gfx.cpp 8 Mar 2002 17:04:24 -0000 1.42
--- gfx.cpp 9 Mar 2002 00:56:21 -0000 1.43
***************
*** 534,539 ****
break;
case 129:
! // setDirtyRange(0, 0, vs->height);
! // updateDirtyScreen(0);
/* XXX: EGA_proc4(0); */
warning("EGA_proc4"); /* FIXME */
--- 534,539 ----
break;
case 129:
! setDirtyRange(0, 0, vs->height);
! updateDirtyScreen(0);
/* XXX: EGA_proc4(0); */
warning("EGA_proc4"); /* FIXME */
***************
*** 546,550 ****
break;
default:
! error("unkVirtScreen4: default case %d", a);
}
}
--- 546,550 ----
break;
default:
! warning("unkVirtScreen4: default case %d", a);
}
}
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** script.cpp 8 Mar 2002 13:31:29 -0000 1.31
--- script.cpp 9 Mar 2002 00:56:21 -0000 1.32
***************
*** 255,259 ****
_scriptPointerStart = _scriptPointer;
vm.slot[_currentScript].didexec = 1;
! // debug(1, "[%X] %s()", _opcode, _opcodes_lookup[_opcode]);
op = getOpcode(_opcode);
(this->*op)();
--- 255,259 ----
_scriptPointerStart = _scriptPointer;
vm.slot[_currentScript].didexec = 1;
! //debug(1, "[%X] %s()", _opcode, _opcodes_lookup[_opcode]);
op = getOpcode(_opcode);
(this->*op)();
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** script_v1.cpp 8 Mar 2002 23:47:38 -0000 1.40
--- script_v1.cpp 9 Mar 2002 00:56:21 -0000 1.41
***************
*** 1939,1943 ****
int i;
byte *name;
!
if (obj < NUM_ACTORS)
error("Can't set actor %d name with new-name-of", obj);
--- 1939,1943 ----
int i;
byte *name;
!
if (obj < NUM_ACTORS)
error("Can't set actor %d name with new-name-of", obj);
***************
*** 1946,1952 ****
error("Can't set name of object %d", obj);
! name = getObjOrActorName(obj);
size = getResourceDataSize(name);
! i = 0;
while ((a = fetchScriptByte()) != 0) {
--- 1946,1952 ----
error("Can't set name of object %d", obj);
! name = getObjOrActorName(obj);
size = getResourceDataSize(name);
! i = 0;
while ((a = fetchScriptByte()) != 0) {
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** scumm.h 8 Mar 2002 23:55:47 -0000 1.73
--- scumm.h 9 Mar 2002 00:56:21 -0000 1.74
***************
*** 49,55 ****
NUM_LOCALSCRIPT = 60,
NUM_SHADOW_PALETTE = 8,
! NUM_ACTORS = 30
};
const uint16 many_direction_tab[18] = {
4,
--- 49,56 ----
NUM_LOCALSCRIPT = 60,
NUM_SHADOW_PALETTE = 8,
! MAX_ACTORS = 30
};
+
const uint16 many_direction_tab[18] = {
4,
***************
*** 808,814 ****
GF_SMALL_HEADER = 32,
! GF_EXTERNAL_CHARSET = GF_SMALL_HEADER,
! GF_SMALL_NAMES = 64,
! GF_OLD_BUNDLE = 128,
GF_16COLOR = 256,
GF_OLD256 = 512,
--- 809,815 ----
GF_SMALL_HEADER = 32,
! GF_EXTERNAL_CHARSET = GF_SMALL_HEADER,
! GF_SMALL_NAMES = 64,
! GF_OLD_BUNDLE = 128,
GF_16COLOR = 256,
GF_OLD256 = 512,
***************
*** 862,868 ****
byte OF_OWNER_ROOM;
! int _gameTempo, _saveSound;
int _lastLoadedRoom;
int _roomResource;
byte _encbyte;
void *_fileHandle;
--- 863,870 ----
byte OF_OWNER_ROOM;
! int _gameTempo, _saveSound;
int _lastLoadedRoom;
int _roomResource;
+
byte _encbyte;
void *_fileHandle;
***************
*** 1077,1081 ****
} mouse;
! Actor actor[NUM_ACTORS];
uint32 gfxUsageBits[200];
--- 1079,1083 ----
} mouse;
! Actor actor[MAX_ACTORS];
uint32 gfxUsageBits[200];
***************
*** 2117,2120 ****
--- 2119,2124 ----
byte VAR_CHARSET_MASK;
+ int NUM_ACTORS;
+
byte _videoPath[50];
};
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** scummvm.cpp 8 Mar 2002 21:40:50 -0000 1.70
--- scummvm.cpp 9 Mar 2002 00:56:22 -0000 1.71
***************
*** 223,226 ****
--- 223,232 ----
setupScummVarsOld();
+
+ if (_features & GF_AFTER_V6)
+ NUM_ACTORS = 30;
+ else
+ NUM_ACTORS = 13;
+
if(_features & GF_AFTER_V7)
OF_OWNER_ROOM = 0xFF;
More information about the Scummvm-git-logs
mailing list