[Scummvm-cvs-logs] scummvm master -> 3062bc1df6c1dd9f39c2f4415f7ea0a49068466a

DrMcCoy drmccoy at drmccoy.de
Fri Aug 26 08:24:16 CEST 2011


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6a9271b6cf GOB: Oops, don't skip vital parts of the script
e05e18d8bd GOB: Stub the Geisha minigame "Penetration"
3062bc1df6 GOB: Stub the Geisha minigame "Diving"


Commit: 6a9271b6cf2c8b4d67e0f8b94d569890b5002752
    https://github.com/scummvm/scummvm/commit/6a9271b6cf2c8b4d67e0f8b94d569890b5002752
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2011-08-25T23:11:24-07:00

Commit Message:
GOB: Oops, don't skip vital parts of the script

The paramater count is already read in oGeisha_goblinFunc...

Changed paths:
    engines/gob/inter_geisha.cpp



diff --git a/engines/gob/inter_geisha.cpp b/engines/gob/inter_geisha.cpp
index d4f92d9..b3a7be2 100644
--- a/engines/gob/inter_geisha.cpp
+++ b/engines/gob/inter_geisha.cpp
@@ -108,23 +108,17 @@ int16 Inter_Geisha::loadSound(int16 slot) {
 }
 
 void Inter_Geisha::oGeisha_loadTitleMusic(OpGobParams &params) {
-	_vm->_game->_script->skip(2);
-
 	_vm->_sound->adlibLoadTBR("geisha.tbr");
 	_vm->_sound->adlibLoadMDY("geisha.mdy");
 }
 
 void Inter_Geisha::oGeisha_playMusic(OpGobParams &params) {
-	_vm->_game->_script->skip(2);
-
 	// TODO: The MDYPlayer is still broken!
 	warning("Geisha Stub: oGeisha_playMusic");
 	// _vm->_sound->adlibPlay();
 }
 
 void Inter_Geisha::oGeisha_stopMusic(OpGobParams &params) {
-	_vm->_game->_script->skip(2);
-
 	_vm->_sound->adlibStop();
 	_vm->_sound->adlibUnload();
 }


Commit: e05e18d8bdeef49b82591d81805b2345ed761a78
    https://github.com/scummvm/scummvm/commit/e05e18d8bdeef49b82591d81805b2345ed761a78
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2011-08-25T23:15:47-07:00

Commit Message:
GOB: Stub the Geisha minigame "Penetration"

Changed paths:
    engines/gob/inter.h
    engines/gob/inter_geisha.cpp



diff --git a/engines/gob/inter.h b/engines/gob/inter.h
index 7946543..4932344 100644
--- a/engines/gob/inter.h
+++ b/engines/gob/inter.h
@@ -348,6 +348,7 @@ protected:
 	void oGeisha_goblinFunc(OpFuncParams &params);
 	void oGeisha_loadSound(OpFuncParams &params);
 
+	void oGeisha_gamePenetration(OpGobParams &params);
 	void oGeisha_loadTitleMusic(OpGobParams &params);
 	void oGeisha_playMusic(OpGobParams &params);
 	void oGeisha_stopMusic(OpGobParams &params);
diff --git a/engines/gob/inter_geisha.cpp b/engines/gob/inter_geisha.cpp
index b3a7be2..13bffa5 100644
--- a/engines/gob/inter_geisha.cpp
+++ b/engines/gob/inter_geisha.cpp
@@ -53,6 +53,7 @@ void Inter_Geisha::setupOpcodesFunc() {
 	OPCODEFUNC(0x25, oGeisha_goblinFunc);
 	OPCODEFUNC(0x3A, oGeisha_loadSound);
 
+	OPCODEGOB(0, oGeisha_gamePenetration);
 	OPCODEGOB(2, oGeisha_loadTitleMusic);
 	OPCODEGOB(3, oGeisha_playMusic);
 	OPCODEGOB(4, oGeisha_stopMusic);
@@ -107,6 +108,20 @@ int16 Inter_Geisha::loadSound(int16 slot) {
 	return 0;
 }
 
+void Inter_Geisha::oGeisha_gamePenetration(OpGobParams &params) {
+	uint16 var1 = _vm->_game->_script->readUint16();
+	uint16 var2 = _vm->_game->_script->readUint16();
+	uint16 var3 = _vm->_game->_script->readUint16();
+	uint16 var4 = _vm->_game->_script->readUint16();
+
+	WRITE_VAR_UINT32(var4, 0);
+
+	warning("Geisha Stub: Minigame \"Penetration\": %d, %d, %d, %d", var1, var2, var3, var4);
+
+	// Fudge a win for now
+	WRITE_VAR_UINT32(var4, 1);
+}
+
 void Inter_Geisha::oGeisha_loadTitleMusic(OpGobParams &params) {
 	_vm->_sound->adlibLoadTBR("geisha.tbr");
 	_vm->_sound->adlibLoadMDY("geisha.mdy");


Commit: 3062bc1df6c1dd9f39c2f4415f7ea0a49068466a
    https://github.com/scummvm/scummvm/commit/3062bc1df6c1dd9f39c2f4415f7ea0a49068466a
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2011-08-25T23:20:19-07:00

Commit Message:
GOB: Stub the Geisha minigame "Diving"

Changed paths:
    engines/gob/inter.h
    engines/gob/inter_geisha.cpp



diff --git a/engines/gob/inter.h b/engines/gob/inter.h
index 4932344..7198ec9 100644
--- a/engines/gob/inter.h
+++ b/engines/gob/inter.h
@@ -349,6 +349,7 @@ protected:
 	void oGeisha_loadSound(OpFuncParams &params);
 
 	void oGeisha_gamePenetration(OpGobParams &params);
+	void oGeisha_gameDiving(OpGobParams &params);
 	void oGeisha_loadTitleMusic(OpGobParams &params);
 	void oGeisha_playMusic(OpGobParams &params);
 	void oGeisha_stopMusic(OpGobParams &params);
diff --git a/engines/gob/inter_geisha.cpp b/engines/gob/inter_geisha.cpp
index 13bffa5..3b8747e 100644
--- a/engines/gob/inter_geisha.cpp
+++ b/engines/gob/inter_geisha.cpp
@@ -54,6 +54,7 @@ void Inter_Geisha::setupOpcodesFunc() {
 	OPCODEFUNC(0x3A, oGeisha_loadSound);
 
 	OPCODEGOB(0, oGeisha_gamePenetration);
+	OPCODEGOB(1, oGeisha_gameDiving);
 	OPCODEGOB(2, oGeisha_loadTitleMusic);
 	OPCODEGOB(3, oGeisha_playMusic);
 	OPCODEGOB(4, oGeisha_stopMusic);
@@ -122,6 +123,19 @@ void Inter_Geisha::oGeisha_gamePenetration(OpGobParams &params) {
 	WRITE_VAR_UINT32(var4, 1);
 }
 
+void Inter_Geisha::oGeisha_gameDiving(OpGobParams &params) {
+	uint16 var1 = _vm->_game->_script->readUint16();
+	uint16 var2 = _vm->_game->_script->readUint16();
+	uint16 var3 = _vm->_game->_script->readUint16();
+
+	WRITE_VAR_UINT32(var3, 1);
+
+	warning("Geisha Stub: Minigame \"Diving\": %d, %d, %d", var1, var2, var3);
+
+	// Fudge a win for now
+	WRITE_VAR_UINT32(var3, 0);
+}
+
 void Inter_Geisha::oGeisha_loadTitleMusic(OpGobParams &params) {
 	_vm->_sound->adlibLoadTBR("geisha.tbr");
 	_vm->_sound->adlibLoadMDY("geisha.mdy");






More information about the Scummvm-git-logs mailing list