[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.188,1.189 animation.h,1.34,1.35

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Fri Sep 30 02:16:32 CEST 2005


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27577

Modified Files:
	actor.cpp animation.h 
Log Message:
Don't draw actors during cutaways. (Not that it makes any difference at
this point. :-)


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- actor.cpp	29 Sep 2005 15:57:41 -0000	1.188
+++ actor.cpp	30 Sep 2005 09:14:21 -0000	1.189
@@ -24,6 +24,7 @@
 #include "saga/saga.h"
 #include "saga/gfx.h"
 
+#include "saga/animation.h"
 #include "saga/console.h"
 #include "saga/script.h"
 #include "saga/sndres.h"
@@ -1575,6 +1576,10 @@
 }
 
 void Actor::drawActors() {
+	if (_vm->_anim->hasCutaway()) {
+		return;
+	}
+
 	if (_vm->_scene->currentSceneNumber() <= 0) {
 		return;
 	}

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- animation.h	27 Sep 2005 06:16:16 -0000	1.34
+++ animation.h	30 Sep 2005 09:14:21 -0000	1.35
@@ -127,6 +127,9 @@
 	void finish(uint16 animId);
 	void resume(uint16 animId, int cycles);
 	int16 getCurrentFrame(uint16 animId);
+	bool hasCutaway(void) {
+		return _cutawayActive;
+	}
 	bool hasAnimation(uint16 animId) {
 		if (animId >= MAX_ANIMATIONS) {
 			if (animId < MAX_ANIMATIONS + ARRAYSIZE(_cutawayAnimations))





More information about the Scummvm-git-logs mailing list