Cleanup.

svn-id: r31512

3 files changed, 20 insertions, 24 deletions

diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 284c61fdaf..baa67762b7 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -140,8 +140,8 @@ enum EventType {
 	ANIMATE_INT   = 1 << 1,
 	ANIMATE_EVENT = 1 << 2,
 	SCROLL_EVENT  = 1 << 3,
-	IMAGE_EVENT2  = 1 << 4,
-	IMAGE_EVENT3  = 1 << 5
+	PLAYER_DAMAGE_EVENT = 1 << 4,
+	MONSTER_DAMAGE_EVENT = 1 << 5
 };
 
 struct AGOSGameDescription;
@@ -1113,8 +1113,8 @@ protected:
 	void animateEvent(const byte *code_ptr, uint16 curZoneNum, uint16 cur_sprite);
 	void scrollEvent();
 	void drawStuff(const byte *src, uint offs);
-	void imageEvent2(VgaTimerEntry * vte, uint dx);
-	void imageEvent3(VgaTimerEntry * vte, uint dx);
+	void playerDamageEvent(VgaTimerEntry * vte, uint dx);
+	void monsterDamageEvent(VgaTimerEntry * vte, uint dx);
 
 	VgaSprite *findCurSprite();
 
@@ -1353,8 +1353,8 @@ public:
 	void oe2_playEffect();
 	void oe2_getDollar2();
 	void oe2_setSRExit();
-	void oe2_unk177();
-	void oe2_unk178();
+	void oe2_printPlayerDamage();
+	void oe2_printMonsterDamage();
 	void oe2_isAdjNoun();
 	void oe2_b2Set();
 	void oe2_b2Clear();
diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp
index 5303e6db45..250ff2fcfd 100644
--- a/engines/agos/event.cpp
+++ b/engines/agos/event.cpp
@@ -257,12 +257,12 @@ void AGOSEngine::processVgaEvents() {
 				scrollEvent();
 				vte = _nextVgaTimerToProcess;
 				break;
-			case IMAGE_EVENT2:
-				imageEvent2(vte, curZoneNum);
+			case PLAYER_DAMAGE_EVENT:
+				playerDamageEvent(vte, curZoneNum);
 				vte = _nextVgaTimerToProcess;
 				break;
-			case IMAGE_EVENT3:
-				imageEvent3(vte, curZoneNum);
+			case MONSTER_DAMAGE_EVENT:
+				monsterDamageEvent(vte, curZoneNum);
 				vte = _nextVgaTimerToProcess;
 				break;
 			default:
@@ -378,7 +378,7 @@ void AGOSEngine::drawStuff(const byte *src, uint xoffs) {
 	_system->unlockScreen();
 }
 
-void AGOSEngine::imageEvent2(VgaTimerEntry * vte, uint dx) {
+void AGOSEngine::playerDamageEvent(VgaTimerEntry * vte, uint dx) {
 	// Draws damage indicator gauge when player hit
 	_nextVgaTimerToProcess = vte + 1;
 
@@ -400,7 +400,7 @@ void AGOSEngine::imageEvent2(VgaTimerEntry * vte, uint dx) {
 	}
 }
 
-void AGOSEngine::imageEvent3(VgaTimerEntry * vte, uint dx) {
+void AGOSEngine::monsterDamageEvent(VgaTimerEntry * vte, uint dx) {
 	// Draws damage indicator gauge when monster hit
 	_nextVgaTimerToProcess = vte + 1;
 
diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp
index 9bbcbf15b3..7713a68141 100644
--- a/engines/agos/script_e2.cpp
+++ b/engines/agos/script_e2.cpp
@@ -255,8 +255,8 @@ void AGOSEngine_Elvira2::setupOpcodes() {
 		OPCODE(oe2_getDollar2),
 		/* 176 */
 		OPCODE(oe2_setSRExit),
-		OPCODE(oe2_unk177),
-		OPCODE(oe2_unk178),
+		OPCODE(oe2_printPlayerDamage),
+		OPCODE(oe2_printMonsterDamage),
 		OPCODE(oe2_isAdjNoun),
 		/* 180 */
 		OPCODE(oe2_b2Set),
@@ -624,28 +624,24 @@ void AGOSEngine_Elvira2::oe2_setSRExit() {
 	setSRExit(i, n, d, s);
 }
 
-void AGOSEngine_Elvira2::oe2_unk177() {
-	// 177: Set damage indicator event
+void AGOSEngine_Elvira2::oe2_printPlayerDamage() {
+	// 177: set player damage event
 	uint a = getVarOrByte();
 	if (_opcode177Var1 && !_opcode177Var2 && a != 0 && a <= 10) {
-		addVgaEvent(_vgaBaseDelay, IMAGE_EVENT2, NULL, 0, a);
+		addVgaEvent(_vgaBaseDelay, PLAYER_DAMAGE_EVENT, NULL, 0, a);
 		_opcode177Var2 = 0;
 		_opcode177Var1 = 0;
 	}
-
-	debug(0, "oe2_unk177: stub (%d)", a);
 }
 
-void AGOSEngine_Elvira2::oe2_unk178() {
-	// 178: set unknown vga event
+void AGOSEngine_Elvira2::oe2_printMonsterDamage() {
+	// 178: set monster damage event
 	uint a = getVarOrByte();
 	if (_opcode178Var1 && !_opcode178Var2 && a != 0 && a <= 10) {
-		addVgaEvent(_vgaBaseDelay, IMAGE_EVENT3, NULL, 0, a);
+		addVgaEvent(_vgaBaseDelay, MONSTER_DAMAGE_EVENT, NULL, 0, a);
 		_opcode178Var2 = 0;
 		_opcode178Var1 = 0;
 	}
-
-	debug(0, "oe2_unk178: stub (%d)", a);
 }
 
 void AGOSEngine_Elvira2::oe2_isAdjNoun() {