diff options
| author | Paul Gilbert | 2012-10-30 08:57:47 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2012-10-30 08:57:47 +1100 |
| commit | db12a8fb6ed9e8a7760e6d588e4f9b1d06228c46 (patch) | |
| tree | 40ec4db6fb4e561df66f3b9d6276909cacb398f1 | |
| parent | c078f3d3a74f2ce26e129a225a07713614a70bf0 (diff) | |
| download | scummvm-rg350-db12a8fb6ed9e8a7760e6d588e4f9b1d06228c46.tar.gz scummvm-rg350-db12a8fb6ed9e8a7760e6d588e4f9b1d06228c46.tar.bz2 scummvm-rg350-db12a8fb6ed9e8a7760e6d588e4f9b1d06228c46.zip | |
HOPKINS: Renamed fields of Tri structure
| -rw-r--r-- | engines/hopkins/globals.h | 4 | ||||
| -rw-r--r-- | engines/hopkins/objects.cpp | 10 | ||||
| -rw-r--r-- | engines/hopkins/objects.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h index 5bfbd49958..a88139dc5a 100644 --- a/engines/hopkins/globals.h +++ b/engines/hopkins/globals.h @@ -176,8 +176,8 @@ enum TriMode { TRI_NONE = 0, TRI_BOB = 1, TRI_SPRITE = 2, TRI_CACHE = 3 }; struct TriItem { TriMode triMode; int index; - int field4; - int field6; + int priority; + int unused; }; struct CacheItem { diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index 1896aa7f3f..acbc4acfe3 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -421,7 +421,7 @@ void ObjectsManager::AFF_SPRITES() { do { v11 = arr[v34]; v12 = &arr[v34 + 1]; - if (_vm->_globals.Tri[arr[v34]].field4 > _vm->_globals.Tri[*v12].field4) { + if (_vm->_globals.Tri[arr[v34]].priority > _vm->_globals.Tri[*v12].priority) { arr[v34] = *v12; *v12 = v11; ++v27; @@ -477,8 +477,8 @@ void ObjectsManager::AFF_SPRITES() { for (int idx = 0; idx < 50; ++idx) { _vm->_globals.Tri[idx].triMode = TRI_NONE; _vm->_globals.Tri[idx].index = 0; - _vm->_globals.Tri[idx].field4 = 0; - _vm->_globals.Tri[idx].field6 = 0; + _vm->_globals.Tri[idx].priority = 0; + _vm->_globals.Tri[idx].unused = 0; } _vm->_globals.NBTRI = 0; @@ -1213,7 +1213,7 @@ void ObjectsManager::CALCUL_SPRITE(int idx) { } // Before Sort -int ObjectsManager::AvantTri(TriMode triMode, int index, int a3) { +int ObjectsManager::AvantTri(TriMode triMode, int index, int priority) { int result; ++_vm->_globals.NBTRI; @@ -1223,7 +1223,7 @@ int ObjectsManager::AvantTri(TriMode triMode, int index, int a3) { result = _vm->_globals.NBTRI; _vm->_globals.Tri[result].triMode = triMode; _vm->_globals.Tri[result].index = index; - _vm->_globals.Tri[result].field4 = a3; + _vm->_globals.Tri[result].priority = priority; return result; } diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h index 3140674e5c..17b41c4b0b 100644 --- a/engines/hopkins/objects.h +++ b/engines/hopkins/objects.h @@ -154,7 +154,7 @@ public: void DEF_SPRITE(int idx); void DEF_CACHE(int idx); void CALCUL_SPRITE(int idx); - int AvantTri(TriMode triMode, int index, int a3); + int AvantTri(TriMode triMode, int index, int priority); void AFF_BOB_ANIM(); void AFF_VBOB(); |