[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.4,1.5 struc.h,1.5,1.6

Max Horn fingolfin at users.sourceforge.net
Fri Apr 25 10:58:04 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv1286

Modified Files:
	logic.cpp struc.h 
Log Message:
changed turnProg from void* to uint16*

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- logic.cpp	25 Apr 2003 17:39:43 -0000	1.4
+++ logic.cpp	25 Apr 2003 17:57:03 -0000	1.5
@@ -144,10 +144,9 @@
 }
 
 void SkyLogic::arTurn() {
-	_compact->frame = *(uint16 *)(_compact->extCompact->turnProg);
-	((uint16 *)(_compact->extCompact->turnProg))++;
+	_compact->frame = *_compact->extCompact->turnProg++;
 
-	if (!*(uint16 *)(_compact->extCompact->turnProg)) { // turn done?
+	if (!*_compact->extCompact->turnProg) { // turn done?
 		// Back to ar mode
 		_compact->extCompact->arAnimIndex = 0;
 		_compact->logic = L_AR_ANIM;
@@ -170,9 +169,8 @@
 }
 
 void SkyLogic::turn() {
-	if (*(uint16 *)(_compact->extCompact->turnProg)) {
-		_compact->frame = *(uint16 *)(_compact->extCompact->turnProg);
-		((uint16 *)(_compact->extCompact->turnProg))++;
+	if (*_compact->extCompact->turnProg) {
+		_compact->frame = *_compact->extCompact->turnProg++;
 		return;
 	}
 

Index: struc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/struc.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- struc.h	25 Apr 2003 15:17:52 -0000	1.5
+++ struc.h	25 Apr 2003 17:57:04 -0000	1.6
@@ -66,7 +66,7 @@
 	uint16 spTime;
 
 	uint16 arAnimIndex;
-	void *turnProg;
+	uint16 *turnProg;
 
 	uint16 waitingFor;
 





More information about the Scummvm-git-logs mailing list