aboutsummaryrefslogtreecommitdiff
path: root/saga/actor.h
diff options
context:
space:
mode:
authorAndrew Kurushin2004-12-18 16:08:59 +0000
committerAndrew Kurushin2004-12-18 16:08:59 +0000
commit1724d009628f169ccb9bbfc94bd72e5301169fc8 (patch)
tree7da64f4c668df500a3f26fb663d5376149440cb2 /saga/actor.h
parentc195ae0e74fee2d7e22b8df68eae20073abd139b (diff)
downloadscummvm-rg350-1724d009628f169ccb9bbfc94bd72e5301169fc8.tar.gz
scummvm-rg350-1724d009628f169ccb9bbfc94bd72e5301169fc8.tar.bz2
scummvm-rg350-1724d009628f169ccb9bbfc94bd72e5301169fc8.zip
sprite loading fix in win demo
svn-id: r16119
Diffstat (limited to 'saga/actor.h')
-rw-r--r--saga/actor.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/saga/actor.h b/saga/actor.h
index 3c06d47aca..922fecdd17 100644
--- a/saga/actor.h
+++ b/saga/actor.h
@@ -177,8 +177,9 @@ struct ACTORINTENT {
typedef Common::List<ACTORINTENT> ActorIntentList;
struct ActorData {
- int index; // Actor index
- uint16 actorId; // Actor id
+ bool _disabled;
+ int _index; // Actor index
+ uint16 _actorId; // Actor id
int name_i; // Actor's index in actor name string list
uint16 flags;
@@ -219,8 +220,9 @@ struct ActorData {
ActorData() {
- index = 0;
- actorId = 0;
+ _disabled = false;
+ _index = 0;
+ _actorId = 0;
name_i = 0;
flags = 0;
frames = NULL;
@@ -288,7 +290,7 @@ private:
ActorData *getActor(uint16 actorId);
- int loadActorResources(ActorData * actor);
+ bool loadActorResources(ActorData * actor);
ActorOrderList::iterator getActorOrderIterator(const ActorData *actor);
void reorderActorUp(ActorData *actor);