diff options
| author | Travis Howell | 2005-04-27 14:30:32 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-04-27 14:30:32 +0000 |
| commit | 8545634aaa684847036e040401e4770dafd0c091 (patch) | |
| tree | 2729f69c5a517b2dbc989ceea6326275a71c4621 | |
| parent | f5189c323b1ce0ae8f713d4799a7fc6b77cc1efc (diff) | |
| download | scummvm-rg350-8545634aaa684847036e040401e4770dafd0c091.tar.gz scummvm-rg350-8545634aaa684847036e040401e4770dafd0c091.tar.bz2 scummvm-rg350-8545634aaa684847036e040401e4770dafd0c091.zip | |
Rename function.
svn-id: r17839
| -rw-r--r-- | scumm/object.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 2120f27f63..a3ba541004 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -815,7 +815,7 @@ void ScummEngine::setupRoomObject(ObjectData *od, const byte *room, const byte * od->fl_object_index = 0; } -void ScummEngine::fixObjectFlags() { +void ScummEngine::updateObjectStates() { int i; ObjectData *od = &_objs[1]; for (i = 1; i < _numLocalObjects; i++, od++) { diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index e81deb263c..ac1ead9617 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -2088,7 +2088,7 @@ load_game: } else { walkActors(); moveCamera(); - fixObjectFlags(); + updateObjectStates(); if (_version > 3) CHARSET_1(); diff --git a/scumm/scumm.h b/scumm/scumm.h index e3d9fbf15b..ce963d25c1 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -744,7 +744,7 @@ protected: int findFlObjectSlot(); int findLocalObjectSlot(); void addObjectToInventory(uint obj, uint room); - void fixObjectFlags(); + void updateObjectStates(); public: bool getClass(int obj, int cls) const; // Used in actor.cpp, hence public protected: |