aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.h
diff options
context:
space:
mode:
authorMax Horn2003-05-13 23:42:41 +0000
committerMax Horn2003-05-13 23:42:41 +0000
commit08f7ec192ea6694e2fc0ab0efb6bec5ef5a4b5d2 (patch)
tree07bcc328f550214473dc89f93310370be672d1e8 /scumm/scumm.h
parent0ee0e7f6347def3b9b32f62f37584a3a19131913 (diff)
downloadscummvm-rg350-08f7ec192ea6694e2fc0ab0efb6bec5ef5a4b5d2.tar.gz
scummvm-rg350-08f7ec192ea6694e2fc0ab0efb6bec5ef5a4b5d2.tar.bz2
scummvm-rg350-08f7ec192ea6694e2fc0ab0efb6bec5ef5a4b5d2.zip
NUM_ACTORS -> _numActors (for consistency)
svn-id: r7489
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r--scumm/scumm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 28e40ec4a7..37b5a95f17 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -379,7 +379,7 @@ public:
Gdi gdi;
protected:
- Actor *_actors; // Has NUM_ACTORS elements
+ Actor *_actors; // Has _numActors elements
uint16 *_inventory;
byte *_arrays;
@@ -411,7 +411,7 @@ protected:
int _numGlobalObjects, _numArray, _numVerbs, _numFlObject;
int _numInventory, _numRooms, _numScripts, _numSounds;
int _numCharsets, _numNewNames, _numGlobalScripts;
- int NUM_ACTORS;
+ int _numActors;
public:
int _numCostumes; // FIXME - should be protected, used by Actor::remapActorPalette