[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.143,2.144 script_v72he.cpp,2.277,2.278 script_v80he.cpp,2.104,2.105 script_v90he.cpp,2.241,2.242
kirben
kirben at users.sourceforge.net
Sat Apr 30 18:30:55 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.142,2.143 script_v72he.cpp,2.276,2.277
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v90he.cpp,2.242,2.243 sound.cpp,1.451,1.452 wiz_he.cpp,2.69,2.70
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11716/scumm
Modified Files:
script_v100he.cpp script_v72he.cpp script_v80he.cpp
script_v90he.cpp
Log Message:
Use correct safety check.
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.143
retrieving revision 2.144
diff -u -d -r2.143 -r2.144
--- script_v100he.cpp 1 May 2005 01:02:34 -0000 2.143
+++ script_v100he.cpp 1 May 2005 01:30:19 -0000 2.144
@@ -2780,7 +2780,7 @@
if (n) {
_actorToPrintStrFor = pop();
if (_actorToPrintStrFor != 0xFF) {
- a = derefActorSafe(_actorToPrintStrFor, "decodeParseString");
+ a = derefActor(_actorToPrintStrFor, "decodeParseString");
_string[0].color = a->_talkColor;
}
}
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.277
retrieving revision 2.278
diff -u -d -r2.277 -r2.278
--- script_v72he.cpp 1 May 2005 01:02:34 -0000 2.277
+++ script_v72he.cpp 1 May 2005 01:30:19 -0000 2.278
@@ -1573,7 +1573,7 @@
_string[0].loadDefault();
if (_actorToPrintStrFor != 0xFF) {
- a = derefActorSafe(_actorToPrintStrFor, "o72_talkActor");
+ a = derefActor(_actorToPrintStrFor, "o72_talkActor");
_string[0].color = a->_talkColor;
}
actorTalk(_scriptPointer);
@@ -2261,7 +2261,7 @@
if (n) {
_actorToPrintStrFor = pop();
if (_actorToPrintStrFor != 0xFF) {
- a = derefActorSafe(_actorToPrintStrFor, "decodeParseString");
+ a = derefActor(_actorToPrintStrFor, "decodeParseString");
_string[0].color = a->_talkColor;
}
}
Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.104
retrieving revision 2.105
diff -u -d -r2.104 -r2.105
--- script_v80he.cpp 27 Apr 2005 14:47:10 -0000 2.104
+++ script_v80he.cpp 1 May 2005 01:30:19 -0000 2.105
@@ -638,7 +638,7 @@
}
if (type == 2) {
- Actor *a = derefActorSafe(id, "unknownE0");
+ Actor *a = derefActor(id, "unknownE0");
a->drawActorToBackBuf(x1, y1);
} else if (type == 3) {
WizImage wi;
@@ -701,7 +701,7 @@
continue;
if (type == 2) {
- Actor *a = derefActorSafe(id, "unknownE0");
+ Actor *a = derefActor(id, "unknownE0");
a->drawActorToBackBuf(x, y);
} else if (type == 3) {
WizImage wi;
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.241
retrieving revision 2.242
diff -u -d -r2.241 -r2.242
--- script_v90he.cpp 30 Apr 2005 05:25:05 -0000 2.241
+++ script_v90he.cpp 1 May 2005 01:30:19 -0000 2.242
@@ -458,7 +458,7 @@
int val = pop();
int act = pop();
- a = derefActorSafe(act, "o90_getActorData");
+ a = derefActor(act, "o90_getActorData");
switch (subOp) {
case 1:
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.142,2.143 script_v72he.cpp,2.276,2.277
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v90he.cpp,2.242,2.243 sound.cpp,1.451,1.452 wiz_he.cpp,2.69,2.70
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list