libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-22 01:57:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: Moved Actor::drawActorToBackBuf to class ActorHE

Browse Source 
svn-id: r34647
This commit is contained in:
Max Horn 2008-09-25 08:19:51 +00:00
parent 8d16a42c93
commit c41480bfd4
9 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/scumm/actor.cpp
View File

@ -1798,7 +1798,7 @@ void ScummEngine::resetActorBgs() {
}
// HE specific
void Actor::drawActorToBackBuf(int x, int y) {
void ActorHE::drawActorToBackBuf(int x, int y) {
int curTop = _top;
int curBottom = _bottom;

2
engines/scumm/actor.h
View File

@ -224,7 +224,6 @@ public:
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 @@ public:
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);

6
engines/scumm/he/script_v100he.cpp
View File

@ -23,8 +23,6 @@
*
*/
#include "common/system.h"
#include "scumm/actor.h"
@ -381,7 +379,7 @@ const char *ScummEngine_v100he::getOpcodeDesc(byte i) {
}
void ScummEngine_v100he::o100_actorOps() {
Actor *a;
ActorHE *a;
int i, j, k;
int args[32];
byte string[256];
@ -392,7 +390,7 @@ void ScummEngine_v100he::o100_actorOps() {
return;
}
a = derefActorSafe(_curActor, "o100_actorOps");
a = (ActorHE *)derefActorSafe(_curActor, "o100_actorOps");
if (!a)
return;

5
engines/scumm/he/script_v60he.cpp
View File

@ -23,7 +23,6 @@
*
*/
#include "common/savefile.h"
#include "scumm/actor.h"
@ -623,7 +622,7 @@ void ScummEngine_v60he::swapObjects(int object1, int object2) {
}
void ScummEngine_v60he::o60_actorOps() {
Actor *a;
ActorHE *a;
int i, j, k;
int args[8];
@ -633,7 +632,7 @@ void ScummEngine_v60he::o60_actorOps() {
return;
}
a = derefActorSafe(_curActor, "o60_actorOps");
a = (ActorHE *)derefActorSafe(_curActor, "o60_actorOps");
if (!a)
return;

2
engines/scumm/he/script_v70he.cpp
View File

@ -23,8 +23,6 @@
*
*/
#include "common/config-manager.h"
#include "common/system.h"

2
engines/scumm/he/script_v71he.cpp
View File

@ -23,8 +23,6 @@
*
*/
#include "scumm/actor.h"
#include "scumm/he/intern_he.h"
#include "scumm/scumm.h"

6
engines/scumm/he/script_v72he.cpp
View File

@ -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_roomOps() {
}
void ScummEngine_v72he::o72_actorOps() {
Actor *a;
ActorHE *a;
int i, j, k;
int args[32];
byte string[256];
@ -1032,7 +1030,7 @@ void ScummEngine_v72he::o72_actorOps() {
return;
}
a = derefActorSafe(_curActor, "o72_actorOps");
a = (ActorHE *)derefActorSafe(_curActor, "o72_actorOps");
if (!a)
return;

6
engines/scumm/he/script_v80he.cpp
View File

@ -23,8 +23,6 @@
*
*/
#include "common/config-file.h"
#include "common/config-manager.h"
#include "common/savefile.h"
@ -646,7 +644,7 @@ void ScummEngine_v80he::drawLine(int x1, int y1, int x, int y, int step, int typ
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 @@ void ScummEngine_v80he::drawLine(int x1, int y1, int x, int y, int step, int typ
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;

2
engines/scumm/he/script_v90he.cpp
View File

@ -23,8 +23,6 @@
*
*/
#include "scumm/actor.h"
#include "scumm/charset.h"
#include "scumm/he/animation_he.h"