[Scummvm-cvs-logs] SF.net SVN: scummvm: [21751] scummvm/trunk/engines/simon

[eriktorbjorn at users.sourceforge.net]

Revision: 21751
Author:   eriktorbjorn
Date:     2006-04-10 00:48:58 -0700 (Mon, 10 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21751&view=rev

Log Message:
-----------
Merged o_playSFX() into o1_playEffect().

Modified Paths:
--------------
    scummvm/trunk/engines/simon/items.cpp
    scummvm/trunk/engines/simon/simon.h
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-04-10 07:21:44 UTC (rev 21750)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-10 07:48:58 UTC (rev 21751)
@@ -1280,7 +1280,12 @@
 
 void SimonEngine::o1_playEffect() {
 	// 163: play sound
-	o_playSFX(getVarOrWord());
+	uint sound_id = getVarOrWord();
+
+	if (getGameId() == GID_SIMON1DOS)
+		playSting(sound_id);
+	else
+		_sound->playEffects(sound_id);
 }
 
 void SimonEngine::o1_getDollar2() {
@@ -1974,13 +1979,6 @@
 	_lockWord &= ~0x8000;
 }
 
-void SimonEngine::o_playSFX(uint sound_id) {
-	if (getGameId() == GID_SIMON1DOS)
-		playSting(sound_id);
-	else
-		_sound->playEffects(sound_id);
-}
-
 void SimonEngine::o_setTextColor(uint color) {
 	WindowBlock *window;
 

Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h	2006-04-10 07:21:44 UTC (rev 21750)
+++ scummvm/trunk/engines/simon/simon.h	2006-04-10 07:48:58 UTC (rev 21751)
@@ -583,7 +583,6 @@
 
 	uint getOffsetOfChild2Param(SubObject *child, uint prop);
 	void o_setTextColor(uint color);
-	void o_playSFX(uint a);
 	void o_pathfind(int x, int y, uint var_1, uint var_2);
 	void o_mouseOn();
 	void o_mouseOff();


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