[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.110,1.111 script_v1.cpp,1.58,1.59
Johannes Schickel
lordhoto at users.sourceforge.net
Tue Jan 3 23:40:02 CET 2006
- Previous message: [Scummvm-cvs-logs] CVS: residual costume.cpp,1.35,1.36 costume.h,1.19,1.20 actor.cpp,1.59,1.60 actor.h,1.28,1.29
- Next message: [Scummvm-cvs-logs] CVS: scummvm/kyra script_v1.cpp,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29856
Modified Files:
kyra.cpp script_v1.cpp
Log Message:
Added a simple gui dialog if brandon dies (currently using scummvms gui system)
Implemented cmd_setDeathHandlerFlag and fixed debug call for cmd_drinkPotionAnimation.
Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- kyra.cpp 3 Jan 2006 23:41:52 -0000 1.110
+++ kyra.cpp 4 Jan 2006 07:39:16 -0000 1.111
@@ -37,6 +37,8 @@
#include "sound/voc.h"
#include "sound/audiostream.h"
+#include "gui/message.h"
+
#include "kyra/kyra.h"
#include "kyra/resource.h"
#include "kyra/screen.h"
@@ -395,6 +397,7 @@
_unkScreenVar1 = 1;
_unkScreenVar2 = 0;
_unkScreenVar3 = 0;
+ _unkAmuletVar = 0;
memset(_specialPalettes, 0, sizeof(_specialPalettes));
_mousePressFlag = false;
@@ -675,6 +678,13 @@
// XXX
}
+ if (_deathHandler != 0xFF) {
+ // this is only used until the original gui is implemented
+ GUI::MessageDialog dialog("Brandon is dead! Game over!", "Quit");
+ dialog.runModal();
+ break;
+ }
+
if (_brandonStatusBit & 2) {
if (_brandonStatusBit0x02Flag)
animRefreshNPC(0);
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script_v1.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- script_v1.cpp 4 Jan 2006 00:23:57 -0000 1.58
+++ script_v1.cpp 4 Jan 2006 07:39:16 -0000 1.59
@@ -1204,12 +1204,13 @@
}
int KyraEngine::cmd_setDeathHandlerFlag(ScriptState *script) {
- warning("STUB: cmd_setDeathHandlerFlag");
+ debug(3, "cmd_drinkPotionAnimation(0x%X) (%d)", script, stackPos(0));
+ _deathHandler = stackPos(0);
return 0;
}
int KyraEngine::cmd_drinkPotionAnimation(ScriptState *script) {
- debug(3, "cmd_drinkPotionAnimation(0x%X) (%d, %d, %d)", script);
+ debug(3, "cmd_drinkPotionAnimation(0x%X) (%d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2));
seq_playDrinkPotionAnim(stackPos(0), stackPos(1), stackPos(2));
return 0;
}
- Previous message: [Scummvm-cvs-logs] CVS: residual costume.cpp,1.35,1.36 costume.h,1.19,1.20 actor.cpp,1.59,1.60 actor.h,1.28,1.29
- Next message: [Scummvm-cvs-logs] CVS: scummvm/kyra script_v1.cpp,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list