diff options
| -rw-r--r-- | engines/gob/gob.cpp | 2 | ||||
| -rw-r--r-- | engines/gob/gob.h | 2 | ||||
| -rw-r--r-- | engines/gob/inter.h | 6 | ||||
| -rw-r--r-- | engines/gob/inter_v2.cpp | 8 | ||||
| -rw-r--r-- | engines/gob/inter_v6.cpp | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index 35b3c0d662..8605dfbd52 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -126,7 +126,7 @@ GobEngine::GobEngine(OSystem *syst) : Engine(syst) { Common::addDebugChannel(kDebugSaveLoad, "SaveLoad", "Saving/Loading debug level"); Common::addDebugChannel(kDebugGraphics, "Graphics", "Graphics debug level"); Common::addDebugChannel(kDebugVideo, "Video", "IMD/VMD video debug level"); - Common::addDebugChannel(kDebugCollisions, "Collisions", "Collisions debug level"); + Common::addDebugChannel(kDebugHotspots, "Hotspots", "Hotspots debug level"); Common::addDebugChannel(kDebugDemo, "Demo", "Demo script debug level"); syst->getEventManager()->registerRandomSource(_rnd, "gob"); diff --git a/engines/gob/gob.h b/engines/gob/gob.h index 5d1cb3ecf2..5047382316 100644 --- a/engines/gob/gob.h +++ b/engines/gob/gob.h @@ -133,7 +133,7 @@ enum { kDebugSaveLoad = 1 << 7, kDebugGraphics = 1 << 8, kDebugVideo = 1 << 9, - kDebugCollisions = 1 << 10, + kDebugHotspots = 1 << 10, kDebugDemo = 1 << 11 }; diff --git a/engines/gob/inter.h b/engines/gob/inter.h index 9d983f4fe7..a31860885f 100644 --- a/engines/gob/inter.h +++ b/engines/gob/inter.h @@ -380,8 +380,8 @@ protected: bool o2_assign(OpFuncParams ¶ms); bool o2_printText(OpFuncParams ¶ms); bool o2_animPalInit(OpFuncParams ¶ms); - bool o2_addCollision(OpFuncParams ¶ms); - bool o2_freeCollision(OpFuncParams ¶ms); + bool o2_addHotspot(OpFuncParams ¶ms); + bool o2_removeHotspot(OpFuncParams ¶ms); bool o2_goblinFunc(OpFuncParams ¶ms); bool o2_stopSound(OpFuncParams ¶ms); bool o2_loadSound(OpFuncParams ¶ms); @@ -541,7 +541,7 @@ protected: bool o6_loadCursor(OpFuncParams ¶ms); bool o6_assign(OpFuncParams ¶ms); bool o6_palLoad(OpFuncParams ¶ms); - bool o6_freeCollision(OpFuncParams ¶ms); + bool o6_removeHotspot(OpFuncParams ¶ms); bool o6_fillRect(OpFuncParams ¶ms); void probe16bitMusic(char *fileName); diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp index e82448c12c..746816303c 100644 --- a/engines/gob/inter_v2.cpp +++ b/engines/gob/inter_v2.cpp @@ -122,8 +122,8 @@ void Inter_v2::setupOpcodesFunc() { OPCODEFUNC(0x17, o2_animPalInit); - OPCODEFUNC(0x18, o2_addCollision); - OPCODEFUNC(0x19, o2_freeCollision); + OPCODEFUNC(0x18, o2_addHotspot); + OPCODEFUNC(0x19, o2_removeHotspot); OPCODEFUNC(0x25, o2_goblinFunc); @@ -1177,7 +1177,7 @@ bool Inter_v2::o2_animPalInit(OpFuncParams ¶ms) { return false; } -bool Inter_v2::o2_addCollision(OpFuncParams ¶ms) { +bool Inter_v2::o2_addHotspot(OpFuncParams ¶ms) { int16 id = _vm->_game->_script->readValExpr(); uint16 funcPos = _vm->_game->_script->pos(); int16 left = _vm->_game->_script->readValExpr(); @@ -1211,7 +1211,7 @@ bool Inter_v2::o2_addCollision(OpFuncParams ¶ms) { return false; } -bool Inter_v2::o2_freeCollision(OpFuncParams ¶ms) { +bool Inter_v2::o2_removeHotspot(OpFuncParams ¶ms) { int16 id = _vm->_game->_script->readValExpr(); if (id == -2) diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp index 15e2cc9481..67bf87a7da 100644 --- a/engines/gob/inter_v6.cpp +++ b/engines/gob/inter_v6.cpp @@ -66,7 +66,7 @@ void Inter_v6::setupOpcodesFunc() { OPCODEFUNC(0x03, o6_loadCursor); OPCODEFUNC(0x09, o6_assign); OPCODEFUNC(0x13, o6_palLoad); - OPCODEFUNC(0x19, o6_freeCollision); + OPCODEFUNC(0x19, o6_removeHotspot); OPCODEFUNC(0x33, o6_fillRect); } @@ -353,7 +353,7 @@ bool Inter_v6::o6_palLoad(OpFuncParams ¶ms) { return false; } -bool Inter_v6::o6_freeCollision(OpFuncParams ¶ms) { +bool Inter_v6::o6_removeHotspot(OpFuncParams ¶ms) { int16 id; id = _vm->_game->_script->readValExpr(); |