[Scummvm-cvs-logs] SF.net SVN: scummvm:[41956] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Mon Jun 29 19:06:17 CEST 2009
Revision: 41956
http://scummvm.svn.sourceforge.net/scummvm/?rev=41956&view=rev
Author: lordhoto
Date: 2009-06-29 17:06:17 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
Removed more obsolete TODO messages.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui_lok.cpp
scummvm/trunk/engines/kyra/kyra_hof.cpp
scummvm/trunk/engines/kyra/kyra_lok.h
scummvm/trunk/engines/kyra/kyra_mr.h
scummvm/trunk/engines/kyra/script_mr.cpp
scummvm/trunk/engines/kyra/sound_midi.cpp
scummvm/trunk/engines/kyra/text_lok.cpp
Modified: scummvm/trunk/engines/kyra/gui_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lok.cpp 2009-06-29 17:06:00 UTC (rev 41955)
+++ scummvm/trunk/engines/kyra/gui_lok.cpp 2009-06-29 17:06:17 UTC (rev 41956)
@@ -87,7 +87,6 @@
}
}
_screen->updateScreen();
- // XXX clearKyrandiaButtonIO
return 0;
}
@@ -183,7 +182,6 @@
break;
}
_unkAmuletVar = 0;
- // XXX clearKyrandiaButtonIO (!used before every return in this function!)
return 1;
}
Modified: scummvm/trunk/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.cpp 2009-06-29 17:06:00 UTC (rev 41955)
+++ scummvm/trunk/engines/kyra/kyra_hof.cpp 2009-06-29 17:06:17 UTC (rev 41956)
@@ -643,8 +643,6 @@
while (_emc->isValid(&_sceneScriptState))
_emc->run(&_sceneScriptState);
- //XXXsys_unkKeyboad (flush? wait? whatever...)
-
if (queryGameFlag(0x1ED)) {
_sound->beginFadeOut();
_screen->fadeToBlack();
Modified: scummvm/trunk/engines/kyra/kyra_lok.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.h 2009-06-29 17:06:00 UTC (rev 41955)
+++ scummvm/trunk/engines/kyra/kyra_lok.h 2009-06-29 17:06:17 UTC (rev 41956)
@@ -113,7 +113,6 @@
KyraEngine_LoK(OSystem *system, const GameFlags &flags);
~KyraEngine_LoK();
- //TODO: proper extended implementation of KyraEngine_v1::pauseEngineIntern.
// _sprites and _seqplayer should be paused here too, to avoid some animation glitches,
// also parts of the hardcoded Malcolm fight might need some special handling.
Modified: scummvm/trunk/engines/kyra/kyra_mr.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.h 2009-06-29 17:06:00 UTC (rev 41955)
+++ scummvm/trunk/engines/kyra/kyra_mr.h 2009-06-29 17:06:17 UTC (rev 41956)
@@ -50,7 +50,6 @@
KyraEngine_MR(OSystem *system, const GameFlags &flags);
~KyraEngine_MR();
- //TODO: proper extended implementation of KyraEngine_v2::pauseEngineIntern.
// Idle animation time, item animations and album animations should be taken
// care of, but since those would just produce minor glitches it's not that
// important.
Modified: scummvm/trunk/engines/kyra/script_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_mr.cpp 2009-06-29 17:06:00 UTC (rev 41955)
+++ scummvm/trunk/engines/kyra/script_mr.cpp 2009-06-29 17:06:17 UTC (rev 41956)
@@ -381,13 +381,10 @@
y += desc[1];
}
- if (x >= x1 && x <= x2 && y >= y1 && y <= y2) {
- //XXX
+ if (x >= x1 && x <= x2 && y >= y1 && y <= y2)
return 1;
- } else {
- //XXX
+ else
return 0;
- }
}
int KyraEngine_MR::o3_updateConversations(EMCState *script) {
Modified: scummvm/trunk/engines/kyra/sound_midi.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_midi.cpp 2009-06-29 17:06:00 UTC (rev 41955)
+++ scummvm/trunk/engines/kyra/sound_midi.cpp 2009-06-29 17:06:17 UTC (rev 41956)
@@ -311,10 +311,8 @@
}
void MidiOutput::metaEvent(byte type, byte *data, uint16 length) {
- if (type == 0x2F) { // End of Track
+ if (type == 0x2F) // End of Track
deinitSource(_curSource);
- //XXX
- }
_output->metaEvent(type, data, length);
}
Modified: scummvm/trunk/engines/kyra/text_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_lok.cpp 2009-06-29 17:06:00 UTC (rev 41955)
+++ scummvm/trunk/engines/kyra/text_lok.cpp 2009-06-29 17:06:17 UTC (rev 41956)
@@ -39,9 +39,6 @@
uint8 currPage;
Common::Event event;
- //while (towns_isEscKeyPressed() )
- //towns_getKey();
-
uint32 timeToEnd = strlen(chatStr) * 8 * _tickLength + _system->getMillis();
if (textEnabled() && !speechEnabled() && chatDuration != -1) {
@@ -136,7 +133,6 @@
_timer->enable(15);
_timer->enable(18);
_timer->enable(19);
- //clearKyrandiaButtonIO();
}
void KyraEngine_LoK::endCharacterChat(int8 charNum, int16 convoInitialized) {
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