aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-02-01 19:53:12 +0000
committerJohannes Schickel2009-02-01 19:53:12 +0000
commitdda109ead30d3d97d1f69cb017d0a395dd2a9898 (patch)
treef73d2319c60196d83ddaa0d9f7cab48bf278d93b
parent784c99b3dac507c5ee0686cc314c96caa7349ef3 (diff)
downloadscummvm-rg350-dda109ead30d3d97d1f69cb017d0a395dd2a9898.tar.gz
scummvm-rg350-dda109ead30d3d97d1f69cb017d0a395dd2a9898.tar.bz2
scummvm-rg350-dda109ead30d3d97d1f69cb017d0a395dd2a9898.zip
Fixed compilation for now.
svn-id: r36179
-rw-r--r--engines/kyra/script_tim.cpp4
-rw-r--r--engines/kyra/text_lol.cpp6
-rw-r--r--engines/kyra/text_lol.h2
3 files changed, 8 insertions, 4 deletions
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index 3df1daf306..67e22b8abb 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -149,6 +149,10 @@ TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpc
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);
diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp
index fe7ac6d81d..e1e7dfd756 100644
--- a/engines/kyra/text_lol.cpp
+++ b/engines/kyra/text_lol.cpp
@@ -40,7 +40,7 @@ TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *vm, Screen_LoL *screen) : _vm(vm
_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::setAnimParameters(const char *str, int x, uint8 col1, ui
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 @@ void TextDisplayer_LoL::play(int dim, char *str, EMCState *script, int16 *paramL
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 {
diff --git a/engines/kyra/text_lol.h b/engines/kyra/text_lol.h
index 3d040dc82b..e88242a973 100644
--- a/engines/kyra/text_lol.h
+++ b/engines/kyra/text_lol.h
@@ -65,7 +65,7 @@ private:
char *_curPara[15];
char *_buffer;
char *_out;
- char *_backupBuffer;
+ byte *_backupBuffer;
char *_tempString1;
char *_tempString2;
char *_currentLine;