libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-21 01:05:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: Fix a couple of GCC warnings

Browse Source
This commit is contained in:
Torbjörn Andersson 2015-06-18 05:31:49 +02:00
parent c28cdf87bc
commit 6cd17ca9dd
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
engines/sherlock/tattoo/tattoo_talk.cpp
View File

@ -308,7 +308,8 @@ OpcodeReturn TattooTalk::cmdNPCLabelGoto(const byte *&str) {
TattooPerson &person = people[npcNum];
if (person._resetNPCPath) {
person._npcIndex = person._resetNPCPath = person._npcPause = 0;
person._npcIndex = person._npcPause = 0;
person._resetNPCPath = false;
memset(person._npcPath, 0, 100);
}
@ -326,7 +327,8 @@ OpcodeReturn TattooTalk::cmdNPCLabelIfFlagGoto(const byte *&str) {
TattooPerson &person = people[npcNum];
if (person._resetNPCPath) {
person._npcIndex = person._resetNPCPath = person._npcPause = 0;
person._npcIndex = person._npcPause = 0;
person._resetNPCPath = false;
memset(person._npcPath, 0, 100);
}
@ -346,7 +348,8 @@ OpcodeReturn TattooTalk::cmdNPCLabelSet(const byte *&str) {
TattooPerson &person = people[npcNum];
if (person._resetNPCPath) {
person._npcIndex = person._resetNPCPath = person._npcPause = 0;
person._npcIndex = person._npcPause = 0;
person._resetNPCPath = false;
memset(person._npcPath, 0, 100);
}
@ -439,7 +442,8 @@ OpcodeReturn TattooTalk::cmdSetNPCPathDest(const byte *&str) {
TattooPerson &person = people[npcNum];
if (person._resetNPCPath) {
person._npcIndex = person._resetNPCPath = person._npcPause = 0;
person._npcIndex = person._npcPause = 0;
person._resetNPCPath = false;
memset(person._npcPath, 0, 100);
}
@ -460,7 +464,8 @@ OpcodeReturn TattooTalk::cmdSetNPCPathPause(const byte *&str) {
TattooPerson &person = people[npcNum];
if (person._resetNPCPath) {
person._npcIndex = person._resetNPCPath = person._npcPause = 0;
person._npcIndex = person._npcPause = 0;
person._resetNPCPath = false;
memset(person._npcPath, 0, 100);
}
@ -480,7 +485,8 @@ OpcodeReturn TattooTalk::cmdSetNPCPathPauseTakingNotes(const byte *&str) {
TattooPerson &person = people[npcNum];
if (person._resetNPCPath) {
person._npcIndex = person._resetNPCPath = person._npcPause = 0;
person._npcIndex = person._npcPause = 0;
person._resetNPCPath = false;
memset(person._npcPath, 0, 100);
}
@ -500,7 +506,8 @@ OpcodeReturn TattooTalk::cmdSetNPCPathPauseLookingHolmes(const byte *&str) {
TattooPerson &person = people[npcNum];
if (person._resetNPCPath) {
person._npcIndex = person._resetNPCPath = person._npcPause = 0;
person._npcIndex = person._npcPause = 0;
person._resetNPCPath = false;
memset(person._npcPath, 0, 100);
}
@ -562,7 +569,8 @@ OpcodeReturn TattooTalk::cmdSetNPCTalkFile(const byte *&str) {
TattooPerson &person = people[npcNum];
if (person._resetNPCPath) {
person._npcIndex = person._resetNPCPath = person._npcPause = 0;
person._npcIndex = person._npcPause = 0;
person._resetNPCPath = false;
memset(person._npcPath, 0, 100);
}

1
engines/sherlock/tattoo/tattoo_user_interface.cpp
View File

@ -54,7 +54,6 @@ void TattooUserInterface::initScrollVars() {
}
void TattooUserInterface::lookAtObject() {
Events &events = *_vm->_events;
People &people = *_vm->_people;
Scene &scene = *_vm->_scene;
Sound &sound = *_vm->_sound;