[Scummvm-cvs-logs] SF.net SVN: scummvm: [26912] scummvm/trunk/engines/agos
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Tue May 22 13:31:31 CEST 2007
Revision: 26912
http://scummvm.svn.sourceforge.net/scummvm/?rev=26912&view=rev
Author: kirben
Date: 2007-05-22 04:31:31 -0700 (Tue, 22 May 2007)
Log Message:
-----------
Move code to correct position.
Modified Paths:
--------------
scummvm/trunk/engines/agos/charset.cpp
scummvm/trunk/engines/agos/window.cpp
Modified: scummvm/trunk/engines/agos/charset.cpp
===================================================================
--- scummvm/trunk/engines/agos/charset.cpp 2007-05-22 11:22:59 UTC (rev 26911)
+++ scummvm/trunk/engines/agos/charset.cpp 2007-05-22 11:31:31 UTC (rev 26912)
@@ -602,12 +602,6 @@
void AGOSEngine::windowPutChar(WindowBlock *window, byte c, byte b) {
byte width = 6;
- if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2 || getGameType() == GType_WW) {
- if (!(window->flags & 1)) {
- haltAnimation();
- }
- }
-
if (c == 12) {
clearWindow(window);
} else if (c == 13 || c == 10) {
Modified: scummvm/trunk/engines/agos/window.cpp
===================================================================
--- scummvm/trunk/engines/agos/window.cpp 2007-05-22 11:22:59 UTC (rev 26911)
+++ scummvm/trunk/engines/agos/window.cpp 2007-05-22 11:31:31 UTC (rev 26912)
@@ -214,8 +214,15 @@
}
void AGOSEngine::windowPutChar(uint a) {
- if (_textWindow != _windowArray[0])
+ if (_textWindow != _windowArray[0]) {
+ if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2 || getGameType() == GType_WW) {
+ if (!(_textWindow->flags & 1)) {
+ haltAnimation();
+ }
+ }
+
windowPutChar(_textWindow, a);
+ }
}
void AGOSEngine::waitWindow(WindowBlock *window) {
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