thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compilation for now.

Browse source 
svn-id: r36179
This commit is contained in:
Johannes Schickel 2009-02-01 19:53:12 +00:00
parent 784c99b3da
commit dda109ead3
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/kyra/script_tim.cpp
View file

@ -149,6 +149,10 @@ TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpc
if (!_vm->resource()->exists(filename)) if (!_vm->resource()->exists(filename))
return 0; return 0;
for (int i = 0; i < ARRAYSIZE(_animations); ++i)
delete _animations[i].wsa;
memset(_animations, 0, sizeof(_animations));
ScriptFileParser file(filename, _vm->resource()); ScriptFileParser file(filename, _vm->resource());
if (!file) if (!file)
error("Couldn't open TIM file '%s'", filename); error("Couldn't open TIM file '%s'", filename);

6
engines/kyra/text_lol.cpp
View file

@ -40,7 +40,7 @@ TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *vm, Screen_LoL *screen) : _vm(vm
_out = new char[1024]; _out = new char[1024];
memset(_out, 0, 1024); memset(_out, 0, 1024);
_backupBuffer = new char[40]; _backupBuffer = new byte[40];
memset(_out, 0, 40); memset(_out, 0, 40);
_currentLine = new char[85]; _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) { void TextDisplayer_LoL::play(int dim, char *str, EMCState *script, int16 *paramList, int16 paramIndex) {
memcpy(_curPara, _stringParameters, 15 * sizeof(char*)); memcpy(_curPara, _stringParameters, 15 * sizeof(char*));
char *cmds = _curPara[0]; //char *cmds = _curPara[0];
if (dim == 3) { if (dim == 3) {
if (_vm->_updateFlags & 2) { if (_vm->_updateFlags & 2) {
@ -169,7 +169,7 @@ void TextDisplayer_LoL::play(int dim, char *str, EMCState *script, int16 *paramL
memset(_backupBuffer, 0, 40); memset(_backupBuffer, 0, 40);
if (preprocessString(str, script, paramList, paramIndex)) { if (preprocessString(str, script, paramList, paramIndex)) {
vsnprintf(_out, 1024, str, cmds); //vsnprintf(_out, 1024, str, cmds);
_stringLength = strlen(_out); _stringLength = strlen(_out);
displayText(_out); displayText(_out);
} else { } else {

2
engines/kyra/text_lol.h
View file

@ -65,7 +65,7 @@ private:
char *_curPara[15]; char *_curPara[15];
char *_buffer; char *_buffer;
char *_out; char *_out;
char *_backupBuffer; byte *_backupBuffer;
char *_tempString1; char *_tempString1;
char *_tempString2; char *_tempString2;
char *_currentLine; char *_currentLine;