libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TOON: Fix CID 1002425, 1002426, 1003214

Browse Source
This commit is contained in:
Strangerke 2013-10-30 00:27:10 +01:00
parent 706d1f9f81
commit 0898bfd977
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/toon/script_func.cpp
View File

@ -1060,9 +1060,9 @@ int32 ScriptFunc::sys_Cmd_Set_Location_Data(EMCState *state) {
// initial setup of locations
int32 locationId = stackPos(0);
debugC(0, 0, "setlocationdata(%d) %s %x %s %s %d %d", locationId, GetText(1, state), stackPos(2), GetText(3, state), GetText(4, state), stackPos(5), stackPos(6));
strcpy(_vm->state()->_locations[locationId]._name, GetText(1, state));
strcpy(_vm->state()->_locations[locationId]._music, GetText(3, state));
strcpy(_vm->state()->_locations[locationId]._cutaway, GetText(4, state));
strncpy(_vm->state()->_locations[locationId]._name, GetText(1, state), 64);
strncpy(_vm->state()->_locations[locationId]._music, GetText(3, state), 64);
strncpy(_vm->state()->_locations[locationId]._cutaway, GetText(4, state), 64);
_vm->state()->_locations[locationId]._flags = stackPos(2);
_vm->state()->_locations[locationId]._visited = false;
_vm->state()->_locations[locationId]._numSceneAnimations = stackPos(5);

4
engines/toon/state.cpp
View File

@ -115,6 +115,10 @@ State::State(void) {
#endif
memset(_conversationState, 0, sizeof(Conversation) * 60);
_conversationData = nullptr;
_currentConversationId = -1;
_exitConversation = true;
}
State::~State(void) {

7
engines/toon/tools.cpp
View File

@ -136,6 +136,13 @@ uint32 decompressSPCN(byte *src, byte *dst, uint32 dstsize) {
RncDecoder::RncDecoder() {
initCrc();
_bitBuffl = 0;
_bitBuffh = 0;
_bitCount = 0;
_srcPtr = nullptr;
_dstPtr = nullptr;
_inputByteLeft = 0;
}
RncDecoder::~RncDecoder() { }