libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-09 20:34:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SWORD1: Improve struct copying. PVS-Studio V512

Browse Source 
This code copied structs by taking the address of the struct's
first field instead of the struct itself
This commit is contained in:
sluicebox 2023-11-21 22:02:55 -08:00
parent 62a5b6dc95
commit f5c2be5983
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/sword1/logic.cpp
View File

@ -243,7 +243,7 @@ void Logic::processLogic(Object *compact, uint32 id) {
logicRet = 1;
break;
case LOGIC_bookmark:
memcpy(&(compact->o_tree.o_script_level), &(compact->o_bookmark.o_script_level), sizeof(ScriptTree));
memcpy(&(compact->o_tree), &(compact->o_bookmark), sizeof(ScriptTree));
if (id == GMASTER_79) {
// workaround for ending script.
// GMASTER_79 is not prepared for mega_interact receiving INS_quit
@ -1101,7 +1101,7 @@ int Logic::fnRestartScript(Object *cpt, int32 id, int32 c, int32 d, int32 e, int
}
int Logic::fnSetBookmark(Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x) {
memcpy(&cpt->o_bookmark.o_script_level, &cpt->o_tree.o_script_level, sizeof(ScriptTree));
memcpy(&cpt->o_bookmark, &cpt->o_tree, sizeof(ScriptTree));
return SCRIPT_CONT;
}