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

LASTEXPRESS: Fix GCC errors & warnings (missing stricmp & parentheses)

Browse Source 
svn-id: r53693
This commit is contained in:
Julien Templier 2010-10-22 00:35:37 +00:00
parent a54783c414
commit 06d9de0a9b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/lastexpress/entities/anna.cpp
View File

@ -2880,9 +2880,9 @@ IMPLEMENT_FUNCTION(59, Anna, function59)
}
if (!params->param3
|| !getEntities()->isPlayerInCar(kCarRedSleeping)
|| (!getEntities()->isPlayerInCar(kCarRedSleeping)
&& !getEntities()->isInSalon(kEntityPlayer)
&& !getEntities()->isInRestaurant(kEntityPlayer)
&& !getEntities()->isInRestaurant(kEntityPlayer))
|| !params->param4)
params->param4 = getState()->time;

8
engines/lastexpress/entities/kronos.cpp
View File

@ -49,7 +49,7 @@ namespace LastExpress {
static const struct {
uint32 time;
char *sequence;
const char *sequence;
} concertData[54] = {
{735, "201d"}, {1395, "201a"}, {1965, "201d"}, {2205, "201a"}, {3405, "201d"},
{3750, "201a"}, {3975, "201d"}, {4365, "201a"}, {4650, "201d"}, {4770, "201a"},
@ -489,11 +489,11 @@ IMPLEMENT_FUNCTION(20, Kronos, function20)
getEntities()->drawSequenceLeft(kEntityKronos, (char *)&concertData[params->param6].sequence);
if (stricmp((char *)&concertData[params->param6].sequence, "201e")) {
if (scumm_stricmp((char *)&concertData[params->param6].sequence, "201e")) {
if (stricmp((char *)&concertData[params->param6].sequence, "201c")) {
if (scumm_stricmp((char *)&concertData[params->param6].sequence, "201c")) {
if (!stricmp((char *)&concertData[params->param6].sequence, "201d")) {
if (!scumm_stricmp((char *)&concertData[params->param6].sequence, "201d")) {
if (getEntities()->isPlayerPosition(kCarKronos, 86))
getScenes()->loadSceneFromPosition(kCarKronos, 83);

2
engines/lastexpress/entities/tatiana.cpp
View File

@ -615,7 +615,7 @@ IMPLEMENT_FUNCTION(22, Tatiana, function22)
if (params->param1 == kTimeInvalid || getState()->time <= kTime1179000)
goto label_update;
UPDATE_PARAM_PROC_TIME(kTime1233000, (!getEvent(kEventTatianaAskMatchSpeakRussian) && !getEvent(kEventTatianaAskMatch) || getEntities()->isInGreenCarEntrance(kEntityPlayer)), params->param1, 0)
UPDATE_PARAM_PROC_TIME(kTime1233000, ((!getEvent(kEventTatianaAskMatchSpeakRussian) && !getEvent(kEventTatianaAskMatch)) || getEntities()->isInGreenCarEntrance(kEntityPlayer)), params->param1, 0)
label_update:
if (!getEvent(kEventTatianaAskMatchSpeakRussian)
&& !getEvent(kEventTatianaAskMatch)