[Scummvm-cvs-logs] CVS: scummvm/saga interface.cpp,1.65,1.66 interface.h,1.32,1.33 saga.cpp,1.92,1.93
Eugene Sandulenko
sev at users.sourceforge.net
Tue Jan 18 02:46:25 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm TODO,1.223,1.224
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.95,1.96 interface.cpp,1.66,1.67 objectmap.cpp,1.34,1.35 objectmap.h,1.18,1.19 render.cpp,1.49,1.50 saga.cpp,1.93,1.94 saga.h,1.77,1.78 scene.cpp,1.85,1.86 scene.h,1.42,1.43 sthread.cpp,1.61,1.62
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29176
Modified Files:
interface.cpp interface.h saga.cpp
Log Message:
Initialize converse properly.
Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- interface.cpp 17 Jan 2005 23:11:18 -0000 1.65
+++ interface.cpp 18 Jan 2005 10:45:36 -0000 1.66
@@ -738,8 +738,14 @@
_vm->_font->draw(SMALL_FONT_ID, ds, text, 0, point.x , point.y, textColor, textShadowColor, (textShadowColor != 0) ? FONT_SHADOW : 0);
}
+
// Converse stuff
+void Interface::converseInit(void) {
+ for (int i = 0; i < CONVERSE_MAX_TEXTS; i++)
+ _converseText[i].text = NULL;
+ converseClear();
+}
void Interface::converseClear(void) {
for (int i = 0; i < CONVERSE_MAX_TEXTS; i++) {
if (_converseText[i].text)
Index: interface.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- interface.h 17 Jan 2005 20:17:01 -0000 1.32
+++ interface.h 18 Jan 2005 10:45:36 -0000 1.33
@@ -131,7 +131,9 @@
void unlockMode() { _panelMode = _lockedMode; }
void drawPanelButtonText(SURFACE *ds, InterfacePanel *panel, PanelButton *panelButton, int textColor, int textShadowColor);
+
public:
+ void converseInit(void);
void converseClear(void);
bool converseAddText(const char *text, int replyId, byte replyFlags, int replyBit);
void converseDisplayText(int pos);
Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- saga.cpp 17 Jan 2005 20:17:01 -0000 1.92
+++ saga.cpp 18 Jan 2005 10:45:36 -0000 1.93
@@ -262,7 +262,7 @@
debug(0, "Sound disabled.");
}
- _interface->converseClear();
+ _interface->converseInit();
return 0;
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm TODO,1.223,1.224
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.95,1.96 interface.cpp,1.66,1.67 objectmap.cpp,1.34,1.35 objectmap.h,1.18,1.19 render.cpp,1.49,1.50 saga.cpp,1.93,1.94 saga.h,1.77,1.78 scene.cpp,1.85,1.86 scene.h,1.42,1.43 sthread.cpp,1.61,1.62
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list