[Scummvm-cvs-logs] SF.net SVN: scummvm:[42153] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 42153
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42153&view=rev
Author:   drmccoy
Date:     2009-07-05 21:39:55 +0000 (Sun, 05 Jul 2009)

Log Message:
-----------
Renaming the last occurences of "Collision" to "Hotspot"

Modified Paths:
--------------
    scummvm/trunk/engines/gob/gob.cpp
    scummvm/trunk/engines/gob/gob.h
    scummvm/trunk/engines/gob/inter.h
    scummvm/trunk/engines/gob/inter_v2.cpp
    scummvm/trunk/engines/gob/inter_v6.cpp

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2009-07-05 21:28:35 UTC (rev 42152)
+++ scummvm/trunk/engines/gob/gob.cpp	2009-07-05 21:39:55 UTC (rev 42153)
@@ -126,7 +126,7 @@
 	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");

Modified: scummvm/trunk/engines/gob/gob.h
===================================================================
--- scummvm/trunk/engines/gob/gob.h	2009-07-05 21:28:35 UTC (rev 42152)
+++ scummvm/trunk/engines/gob/gob.h	2009-07-05 21:39:55 UTC (rev 42153)
@@ -133,7 +133,7 @@
 	kDebugSaveLoad   = 1 <<  7,
 	kDebugGraphics   = 1 <<  8,
 	kDebugVideo      = 1 <<  9,
-	kDebugCollisions = 1 << 10,
+	kDebugHotspots   = 1 << 10,
 	kDebugDemo       = 1 << 11
 };
 

Modified: scummvm/trunk/engines/gob/inter.h
===================================================================
--- scummvm/trunk/engines/gob/inter.h	2009-07-05 21:28:35 UTC (rev 42152)
+++ scummvm/trunk/engines/gob/inter.h	2009-07-05 21:39:55 UTC (rev 42153)
@@ -380,8 +380,8 @@
 	bool o2_assign(OpFuncParams &params);
 	bool o2_printText(OpFuncParams &params);
 	bool o2_animPalInit(OpFuncParams &params);
-	bool o2_addCollision(OpFuncParams &params);
-	bool o2_freeCollision(OpFuncParams &params);
+	bool o2_addHotspot(OpFuncParams &params);
+	bool o2_removeHotspot(OpFuncParams &params);
 	bool o2_goblinFunc(OpFuncParams &params);
 	bool o2_stopSound(OpFuncParams &params);
 	bool o2_loadSound(OpFuncParams &params);
@@ -541,7 +541,7 @@
 	bool o6_loadCursor(OpFuncParams &params);
 	bool o6_assign(OpFuncParams &params);
 	bool o6_palLoad(OpFuncParams &params);
-	bool o6_freeCollision(OpFuncParams &params);
+	bool o6_removeHotspot(OpFuncParams &params);
 	bool o6_fillRect(OpFuncParams &params);
 
 	void probe16bitMusic(char *fileName);

Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp	2009-07-05 21:28:35 UTC (rev 42152)
+++ scummvm/trunk/engines/gob/inter_v2.cpp	2009-07-05 21:39:55 UTC (rev 42153)
@@ -122,8 +122,8 @@
 
 	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 @@
 	return false;
 }
 
-bool Inter_v2::o2_addCollision(OpFuncParams &params) {
+bool Inter_v2::o2_addHotspot(OpFuncParams &params) {
 	int16 id       = _vm->_game->_script->readValExpr();
 	uint16 funcPos = _vm->_game->_script->pos();
 	int16 left     = _vm->_game->_script->readValExpr();
@@ -1211,7 +1211,7 @@
 	return false;
 }
 
-bool Inter_v2::o2_freeCollision(OpFuncParams &params) {
+bool Inter_v2::o2_removeHotspot(OpFuncParams &params) {
 	int16 id = _vm->_game->_script->readValExpr();
 
 	if (id == -2)

Modified: scummvm/trunk/engines/gob/inter_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v6.cpp	2009-07-05 21:28:35 UTC (rev 42152)
+++ scummvm/trunk/engines/gob/inter_v6.cpp	2009-07-05 21:39:55 UTC (rev 42153)
@@ -66,7 +66,7 @@
 	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 @@
 	return false;
 }
 
-bool Inter_v6::o6_freeCollision(OpFuncParams &params) {
+bool Inter_v6::o6_removeHotspot(OpFuncParams &params) {
 	int16 id;
 
 	id = _vm->_game->_script->readValExpr();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.