diff options
| author | Julien Templier | 2010-10-22 00:35:37 +0000 |
|---|---|---|
| committer | Julien Templier | 2010-10-22 00:35:37 +0000 |
| commit | 06d9de0a9bb20c4dd3dea2639ec452888f480a58 (patch) | |
| tree | 7abfd73727b49ef3ceb7ef24788512891e4bb77c /engines | |
| parent | a54783c41479d9bdb3fc9a7739bf97af29dc9bdb (diff) | |
| download | scummvm-rg350-06d9de0a9bb20c4dd3dea2639ec452888f480a58.tar.gz scummvm-rg350-06d9de0a9bb20c4dd3dea2639ec452888f480a58.tar.bz2 scummvm-rg350-06d9de0a9bb20c4dd3dea2639ec452888f480a58.zip | |
LASTEXPRESS: Fix GCC errors & warnings (missing stricmp & parentheses)
svn-id: r53693
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/lastexpress/entities/anna.cpp | 4 | ||||
| -rw-r--r-- | engines/lastexpress/entities/kronos.cpp | 8 | ||||
| -rw-r--r-- | engines/lastexpress/entities/tatiana.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/lastexpress/entities/anna.cpp b/engines/lastexpress/entities/anna.cpp index c8e7e28078..fb54009305 100644 --- a/engines/lastexpress/entities/anna.cpp +++ b/engines/lastexpress/entities/anna.cpp @@ -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; diff --git a/engines/lastexpress/entities/kronos.cpp b/engines/lastexpress/entities/kronos.cpp index 7e92aa6421..4488206e03 100644 --- a/engines/lastexpress/entities/kronos.cpp +++ b/engines/lastexpress/entities/kronos.cpp @@ -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); diff --git a/engines/lastexpress/entities/tatiana.cpp b/engines/lastexpress/entities/tatiana.cpp index 86af301a16..bd91525c22 100644 --- a/engines/lastexpress/entities/tatiana.cpp +++ b/engines/lastexpress/entities/tatiana.cpp @@ -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) |