[Scummvm-cvs-logs] SF.net SVN: scummvm:[36179] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sun Feb 1 20:53:12 CET 2009
Revision: 36179
http://scummvm.svn.sourceforge.net/scummvm/?rev=36179&view=rev
Author: lordhoto
Date: 2009-02-01 19:53:12 +0000 (Sun, 01 Feb 2009)
Log Message:
-----------
Fixed compilation for now.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/script_tim.cpp
scummvm/trunk/engines/kyra/text_lol.cpp
scummvm/trunk/engines/kyra/text_lol.h
Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp 2009-02-01 19:27:01 UTC (rev 36178)
+++ scummvm/trunk/engines/kyra/script_tim.cpp 2009-02-01 19:53:12 UTC (rev 36179)
@@ -149,6 +149,10 @@
if (!_vm->resource()->exists(filename))
return 0;
+ for (int i = 0; i < ARRAYSIZE(_animations); ++i)
+ delete _animations[i].wsa;
+ memset(_animations, 0, sizeof(_animations));
+
ScriptFileParser file(filename, _vm->resource());
if (!file)
error("Couldn't open TIM file '%s'", filename);
Modified: scummvm/trunk/engines/kyra/text_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_lol.cpp 2009-02-01 19:27:01 UTC (rev 36178)
+++ scummvm/trunk/engines/kyra/text_lol.cpp 2009-02-01 19:53:12 UTC (rev 36179)
@@ -40,7 +40,7 @@
_out = new char[1024];
memset(_out, 0, 1024);
- _backupBuffer = new char[40];
+ _backupBuffer = new byte[40];
memset(_out, 0, 40);
_currentLine = new char[85];
@@ -139,7 +139,7 @@
void TextDisplayer_LoL::play(int dim, char *str, EMCState *script, int16 *paramList, int16 paramIndex) {
memcpy(_curPara, _stringParameters, 15 * sizeof(char*));
- char *cmds = _curPara[0];
+ //char *cmds = _curPara[0];
if (dim == 3) {
if (_vm->_updateFlags & 2) {
@@ -169,7 +169,7 @@
memset(_backupBuffer, 0, 40);
if (preprocessString(str, script, paramList, paramIndex)) {
- vsnprintf(_out, 1024, str, cmds);
+ //vsnprintf(_out, 1024, str, cmds);
_stringLength = strlen(_out);
displayText(_out);
} else {
Modified: scummvm/trunk/engines/kyra/text_lol.h
===================================================================
--- scummvm/trunk/engines/kyra/text_lol.h 2009-02-01 19:27:01 UTC (rev 36178)
+++ scummvm/trunk/engines/kyra/text_lol.h 2009-02-01 19:53:12 UTC (rev 36179)
@@ -65,7 +65,7 @@
char *_curPara[15];
char *_buffer;
char *_out;
- char *_backupBuffer;
+ byte *_backupBuffer;
char *_tempString1;
char *_tempString2;
char *_currentLine;
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