[Scummvm-cvs-logs] SF.net SVN: scummvm: [31134] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat Mar 15 22:11:22 CET 2008
Revision: 31134
http://scummvm.svn.sourceforge.net/scummvm/?rev=31134&view=rev
Author: lordhoto
Date: 2008-03-15 14:11:22 -0700 (Sat, 15 Mar 2008)
Log Message:
-----------
- cleanup
- enabled some chat related code in KyraEngine_v2::runLoop and KyraEngine_v2::handleInputUnkSub
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra_v2.cpp
scummvm/trunk/engines/kyra/kyra_v2.h
Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp 2008-03-15 21:03:35 UTC (rev 31133)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp 2008-03-15 21:11:22 UTC (rev 31134)
@@ -318,7 +318,6 @@
for (int i = 0; i < ARRAYSIZE(_wsaSlots); ++i)
_wsaSlots[i] = new WSAMovieV2(this);
- _maskPage = 0;//_screen->getPagePtr(5);
_screen->_curPage = 0;
_talkObjectList = new TalkObject[72];
@@ -406,22 +405,22 @@
enterNewScene(39, -1, 0, 0, 0);
}
- //if (queryGameFlag(0xD8)) {
- // resetGameFlag(0xD8);
- // if (_mainCharacter.sceneId == 34) {
- // if (queryGameFlag(0xD1) {
- // initObject(28);
- // sub_2741F(getTableString(0xFA, _cCodeBuffer, 1), 28, 0x83, 0xFA);
- // deinitObject(28);
- // enterNewScene(35, 4, 0, 0, 0);
- // } else if (queryGameFlag(0xD0) {
- // initObject(29);
- // sub_2741F(getTableString(0xFB, _ccodeBuffer, 1), 29, 0x83, 0xFB);
- // deinitObject(29);
- // enterNewScene(33, 6, 0, 0, 0);
- // }
- // }
- //}
+ if (queryGameFlag(0xD8)) {
+ resetGameFlag(0xD8);
+ if (_mainCharacter.sceneId == 34) {
+ if (queryGameFlag(0xD1)) {
+ initTalkObject(28);
+ npcChatSequence(getTableString(0xFA, _cCodeBuffer, 1), 28, 0x83, 0xFA);
+ deinitTalkObject(28);
+ enterNewScene(35, 4, 0, 0, 0);
+ } else if (queryGameFlag(0xD0)) {
+ initTalkObject(29);
+ npcChatSequence(getTableString(0xFB, _cCodeBuffer, 1), 29, 0x83, 0xFB);
+ deinitTalkObject(29);
+ enterNewScene(33, 6, 0, 0, 0);
+ }
+ }
+ }
int inputFlag = checkInput(_buttonList);
removeInputTop();
@@ -548,7 +547,7 @@
if (_handItemSet <= -3 && findItem(_mainCharacter.sceneId, 13) >= 0) {
updateCharFacing();
- //objectChat(getTableString(0xFC, _cCodeBuffer, 1), 0, 0x83, 0xFC);
+ objectChat(getTableString(0xFC, _cCodeBuffer, 1), 0, 0x83, 0xFC);
return true;
} else {
_scriptInterpreter->initScript(&_sceneScriptState, &_sceneScriptData);
Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h 2008-03-15 21:03:35 UTC (rev 31133)
+++ scummvm/trunk/engines/kyra/kyra_v2.h 2008-03-15 21:11:22 UTC (rev 31134)
@@ -330,7 +330,6 @@
void backUpPage0();
void restorePage0();
- uint8 *_maskPage;
uint8 *_gfxBackUpRect;
void backUpGfxRect24x24(int x, int y);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list