[Scummvm-cvs-logs] SF.net SVN: scummvm:[34647] scummvm/trunk/engines/scumm
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Sep 25 10:19:52 CEST 2008
Revision: 34647
http://scummvm.svn.sourceforge.net/scummvm/?rev=34647&view=rev
Author: fingolfin
Date: 2008-09-25 08:19:51 +0000 (Thu, 25 Sep 2008)
Log Message:
-----------
SCUMM: Moved Actor::drawActorToBackBuf to class ActorHE
Modified Paths:
--------------
scummvm/trunk/engines/scumm/actor.cpp
scummvm/trunk/engines/scumm/actor.h
scummvm/trunk/engines/scumm/he/script_v100he.cpp
scummvm/trunk/engines/scumm/he/script_v60he.cpp
scummvm/trunk/engines/scumm/he/script_v70he.cpp
scummvm/trunk/engines/scumm/he/script_v71he.cpp
scummvm/trunk/engines/scumm/he/script_v72he.cpp
scummvm/trunk/engines/scumm/he/script_v80he.cpp
scummvm/trunk/engines/scumm/he/script_v90he.cpp
Modified: scummvm/trunk/engines/scumm/actor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/actor.cpp 2008-09-25 08:06:18 UTC (rev 34646)
+++ scummvm/trunk/engines/scumm/actor.cpp 2008-09-25 08:19:51 UTC (rev 34647)
@@ -1798,7 +1798,7 @@
}
// HE specific
-void Actor::drawActorToBackBuf(int x, int y) {
+void ActorHE::drawActorToBackBuf(int x, int y) {
int curTop = _top;
int curBottom = _bottom;
Modified: scummvm/trunk/engines/scumm/actor.h
===================================================================
--- scummvm/trunk/engines/scumm/actor.h 2008-09-25 08:06:18 UTC (rev 34646)
+++ scummvm/trunk/engines/scumm/actor.h 2008-09-25 08:19:51 UTC (rev 34647)
@@ -224,7 +224,6 @@
void faceToObject(int obj);
void turnToDirection(int newdir);
virtual void walkActor();
- void drawActorToBackBuf(int x, int y);
void drawActorCostume(bool hitTestMode = false);
virtual void prepareDrawActorCostume(BaseCostumeRenderer *bcr);
void animateCostume();
@@ -343,6 +342,7 @@
ActorHE(ScummEngine *scumm, int id) : Actor(scumm, id) {}
virtual void initActor(int mode);
+ void drawActorToBackBuf(int x, int y);
protected:
virtual void prepareDrawActorCostume(BaseCostumeRenderer *bcr);
Modified: scummvm/trunk/engines/scumm/he/script_v100he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v100he.cpp 2008-09-25 08:06:18 UTC (rev 34646)
+++ scummvm/trunk/engines/scumm/he/script_v100he.cpp 2008-09-25 08:19:51 UTC (rev 34647)
@@ -23,8 +23,6 @@
*
*/
-
-
#include "common/system.h"
#include "scumm/actor.h"
@@ -381,7 +379,7 @@
}
void ScummEngine_v100he::o100_actorOps() {
- Actor *a;
+ ActorHE *a;
int i, j, k;
int args[32];
byte string[256];
@@ -392,7 +390,7 @@
return;
}
- a = derefActorSafe(_curActor, "o100_actorOps");
+ a = (ActorHE *)derefActorSafe(_curActor, "o100_actorOps");
if (!a)
return;
Modified: scummvm/trunk/engines/scumm/he/script_v60he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v60he.cpp 2008-09-25 08:06:18 UTC (rev 34646)
+++ scummvm/trunk/engines/scumm/he/script_v60he.cpp 2008-09-25 08:19:51 UTC (rev 34647)
@@ -23,7 +23,6 @@
*
*/
-
#include "common/savefile.h"
#include "scumm/actor.h"
@@ -623,7 +622,7 @@
}
void ScummEngine_v60he::o60_actorOps() {
- Actor *a;
+ ActorHE *a;
int i, j, k;
int args[8];
@@ -633,7 +632,7 @@
return;
}
- a = derefActorSafe(_curActor, "o60_actorOps");
+ a = (ActorHE *)derefActorSafe(_curActor, "o60_actorOps");
if (!a)
return;
Modified: scummvm/trunk/engines/scumm/he/script_v70he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v70he.cpp 2008-09-25 08:06:18 UTC (rev 34646)
+++ scummvm/trunk/engines/scumm/he/script_v70he.cpp 2008-09-25 08:19:51 UTC (rev 34647)
@@ -23,8 +23,6 @@
*
*/
-
-
#include "common/config-manager.h"
#include "common/system.h"
Modified: scummvm/trunk/engines/scumm/he/script_v71he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v71he.cpp 2008-09-25 08:06:18 UTC (rev 34646)
+++ scummvm/trunk/engines/scumm/he/script_v71he.cpp 2008-09-25 08:19:51 UTC (rev 34647)
@@ -23,8 +23,6 @@
*
*/
-
-
#include "scumm/actor.h"
#include "scumm/he/intern_he.h"
#include "scumm/scumm.h"
Modified: scummvm/trunk/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v72he.cpp 2008-09-25 08:06:18 UTC (rev 34646)
+++ scummvm/trunk/engines/scumm/he/script_v72he.cpp 2008-09-25 08:19:51 UTC (rev 34647)
@@ -23,8 +23,6 @@
*
*/
-
-
#include "common/config-manager.h"
#include "common/savefile.h"
#include "common/system.h"
@@ -1021,7 +1019,7 @@
}
void ScummEngine_v72he::o72_actorOps() {
- Actor *a;
+ ActorHE *a;
int i, j, k;
int args[32];
byte string[256];
@@ -1032,7 +1030,7 @@
return;
}
- a = derefActorSafe(_curActor, "o72_actorOps");
+ a = (ActorHE *)derefActorSafe(_curActor, "o72_actorOps");
if (!a)
return;
Modified: scummvm/trunk/engines/scumm/he/script_v80he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v80he.cpp 2008-09-25 08:06:18 UTC (rev 34646)
+++ scummvm/trunk/engines/scumm/he/script_v80he.cpp 2008-09-25 08:19:51 UTC (rev 34647)
@@ -23,8 +23,6 @@
*
*/
-
-
#include "common/config-file.h"
#include "common/config-manager.h"
#include "common/savefile.h"
@@ -646,7 +644,7 @@
if (type == 2) {
- Actor *a = derefActor(id, "drawLine");
+ ActorHE *a = (ActorHE *)derefActor(id, "drawLine");
a->drawActorToBackBuf(x, y);
} else if (type == 3) {
WizImage wi;
@@ -697,7 +695,7 @@
continue;
if (type == 2) {
- Actor *a = derefActor(id, "drawLine");
+ ActorHE *a = (ActorHE *)derefActor(id, "drawLine");
a->drawActorToBackBuf(x, y);
} else if (type == 3) {
WizImage wi;
Modified: scummvm/trunk/engines/scumm/he/script_v90he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v90he.cpp 2008-09-25 08:06:18 UTC (rev 34646)
+++ scummvm/trunk/engines/scumm/he/script_v90he.cpp 2008-09-25 08:19:51 UTC (rev 34647)
@@ -23,8 +23,6 @@
*
*/
-
-
#include "scumm/actor.h"
#include "scumm/charset.h"
#include "scumm/he/animation_he.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list