[Scummvm-cvs-logs] SF.net SVN: scummvm:[53692] scummvm/trunk/engines/lastexpress/entities
littleboy at users.sourceforge.net
littleboy at users.sourceforge.net
Fri Oct 22 01:46:01 CEST 2010
Revision: 53692
http://scummvm.svn.sourceforge.net/scummvm/?rev=53692&view=rev
Author: littleboy
Date: 2010-10-21 23:46:00 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
LASTEXPRESS: Merge several TIME_CHECK* macros together
Modified Paths:
--------------
scummvm/trunk/engines/lastexpress/entities/alexei.cpp
scummvm/trunk/engines/lastexpress/entities/alouan.cpp
scummvm/trunk/engines/lastexpress/entities/anna.cpp
scummvm/trunk/engines/lastexpress/entities/august.cpp
scummvm/trunk/engines/lastexpress/entities/boutarel.cpp
scummvm/trunk/engines/lastexpress/entities/chapters.cpp
scummvm/trunk/engines/lastexpress/entities/cooks.cpp
scummvm/trunk/engines/lastexpress/entities/entity_intern.h
scummvm/trunk/engines/lastexpress/entities/francois.cpp
scummvm/trunk/engines/lastexpress/entities/gendarmes.cpp
scummvm/trunk/engines/lastexpress/entities/hadija.cpp
scummvm/trunk/engines/lastexpress/entities/ivo.cpp
scummvm/trunk/engines/lastexpress/entities/kahina.cpp
scummvm/trunk/engines/lastexpress/entities/kronos.cpp
scummvm/trunk/engines/lastexpress/entities/mahmud.cpp
scummvm/trunk/engines/lastexpress/entities/max.cpp
scummvm/trunk/engines/lastexpress/entities/mertens.cpp
scummvm/trunk/engines/lastexpress/entities/milos.cpp
scummvm/trunk/engines/lastexpress/entities/mmeboutarel.cpp
scummvm/trunk/engines/lastexpress/entities/rebecca.cpp
scummvm/trunk/engines/lastexpress/entities/salko.cpp
scummvm/trunk/engines/lastexpress/entities/sophie.cpp
scummvm/trunk/engines/lastexpress/entities/tatiana.cpp
scummvm/trunk/engines/lastexpress/entities/vassili.cpp
scummvm/trunk/engines/lastexpress/entities/verges.cpp
scummvm/trunk/engines/lastexpress/entities/vesna.cpp
scummvm/trunk/engines/lastexpress/entities/yasmin.cpp
Modified: scummvm/trunk/engines/lastexpress/entities/alexei.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/alexei.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/alexei.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -450,7 +450,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler)
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler)
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/alouan.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/alouan.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/alouan.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -116,7 +116,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
@@ -293,7 +293,7 @@
TIME_CHECK_CAR(kTime2119500, params->param5, 5, setup_compartment8);
label_callback2:
- TIME_CHECK_PLAYSOUND(kTime2052000, params->param3, 3, "Har1005");
+ TIME_CHECK_CALLBACK_1(kTime2052000, params->param3, 3, setup_playSound, "Har1005");
label_callback3:
TIME_CHECK_CALLBACK(kTime2133000, params->param4, 4, setup_compartment6to8);
Modified: scummvm/trunk/engines/lastexpress/entities/anna.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/anna.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/anna.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -547,7 +547,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/august.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/august.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/august.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -754,7 +754,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/boutarel.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/boutarel.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/boutarel.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -616,7 +616,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/chapters.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/chapters.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/chapters.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -411,18 +411,28 @@
label_processStations:
// Process stations
- TIME_CHECK_SAVEGAME(kTime1039500, params->param7, 1, kSavegameTypeTime, kTimeNone);
+ TIME_CHECK_CALLBACK_2(kTime1039500, params->param7, 1, setup_savegame, kSavegameTypeTime, kTimeNone);
label_enter_epernay:
// Entering Epernay station
- TIME_CHECK_ENTERSTATION(kTimeEnterEpernay, params->param8, 1, "Epernay", kCityEpernay);
+ TIME_CHECK_CALLBACK_2(kTimeEnterEpernay, params->param8, 1, setup_enterStation, "Epernay", kCityEpernay);
label_exit_epernay:
// Exiting Epernay station
- TIME_CHECK_EXITSTATION_2(kTimeExitEpernay, CURRENT_PARAM(1, 1), params->param4, 3, "Epernay");
+ if (getState()->time > kTimeExitEpernay && !CURRENT_PARAM(1, 1)) {
+ CURRENT_PARAM(1, 1) = 1;
+ params->param4 = 1;
+ setCallback(3);
+ setup_exitStation("Epernay");
+ break;
+ }
label_epernay_police:
- TIME_CHECK_EXITSTATION_0(params->param5, ENTITY_PARAM(0, 2), 4, "Unschedu");
+ if (params->param5 && !ENTITY_PARAM(0, 2)) {
+ setCallback(4);
+ setup_exitStation("Unschedu");
+ break;
+ }
label_enter_chalons:
if (getState()->time > kTimeEnterChalons && !CURRENT_PARAM(1, 2)) {
@@ -435,19 +445,19 @@
goto label_exit_strasbourg;
// Entering Chalons station
- TIME_CHECK_ENTERSTATION(kTimeEnterChalons, CURRENT_PARAM(1, 3), 5, "Chalons", kCityChalons);
+ TIME_CHECK_CALLBACK_2(kTimeEnterChalons, CURRENT_PARAM(1, 3), 5, setup_enterStation, "Chalons", kCityChalons);
label_exit_chalons:
// Exiting Chalons station
- TIME_CHECK_EXITSTATION(kTimeExitChalons, CURRENT_PARAM(1, 4), 6, "Chalons");
+ TIME_CHECK_CALLBACK_1(kTimeExitChalons, CURRENT_PARAM(1, 4), 6, setup_exitStation, "Chalons");
label_enter_barleduc:
// Entering Bar-Le-Duc station
- TIME_CHECK_ENTERSTATION(kTimeCityBarLeDuc, CURRENT_PARAM(1, 5), 7, "BarLeDuc", kCityBarleduc);
+ TIME_CHECK_CALLBACK_2(kTimeCityBarLeDuc, CURRENT_PARAM(1, 5), 7, setup_enterStation, "BarLeDuc", kCityBarleduc);
label_exit_barleduc:
// Exiting Bar-Le-Duc station
- TIME_CHECK_EXITSTATION(kTimeExitBarLeDuc, CURRENT_PARAM(1, 6), 8, "BarLeDuc");
+ TIME_CHECK_CALLBACK_1(kTimeExitBarLeDuc, CURRENT_PARAM(1, 6), 8, setup_exitStation, "BarLeDuc");
label_enter_nancy:
if (getState()->time > kTime1260000 && !CURRENT_PARAM(1, 7)) {
@@ -456,50 +466,50 @@
}
// Entering Nancy station
- TIME_CHECK_ENTERSTATION(kTimeCityNancy, CURRENT_PARAM(1, 8), 9, "Nancy", kCityNancy);
+ TIME_CHECK_CALLBACK_2(kTimeCityNancy, CURRENT_PARAM(1, 8), 9, setup_enterStation, "Nancy", kCityNancy);
label_exit_nancy:
// Exiting Nancy station
- TIME_CHECK_EXITSTATION(kTimeExitNancy, CURRENT_PARAM(2, 1), 10, "Nancy");
+ TIME_CHECK_CALLBACK_1(kTimeExitNancy, CURRENT_PARAM(2, 1), 10, setup_exitStation, "Nancy");
label_enter_luneville:
// Entering Luneville station
- TIME_CHECK_ENTERSTATION(kTimeCityLuneville, CURRENT_PARAM(2, 2), 11, "Luneville", kCityLuneville);
+ TIME_CHECK_CALLBACK_2(kTimeCityLuneville, CURRENT_PARAM(2, 2), 11, setup_enterStation, "Luneville", kCityLuneville);
label_exit_luneville:
// Exiting Luneville station
- TIME_CHECK_EXITSTATION(kTimeExitLuneville, CURRENT_PARAM(2, 3), 12, "Luneville");
+ TIME_CHECK_CALLBACK_1(kTimeExitLuneville, CURRENT_PARAM(2, 3), 12, setup_exitStation, "Luneville");
label_enter_avricourt:
// Entering Avricourt station
- TIME_CHECK_ENTERSTATION(kTimeCityAvricourt, CURRENT_PARAM(2, 4), 13, "Avricourt", kCityAvricourt);
+ TIME_CHECK_CALLBACK_2(kTimeCityAvricourt, CURRENT_PARAM(2, 4), 13, setup_enterStation, "Avricourt", kCityAvricourt);
label_exit_avricourt:
// Exiting Avricourt station
- TIME_CHECK_EXITSTATION(kTimeExitAvricourt, CURRENT_PARAM(2, 5), 14, "Avricourt");
+ TIME_CHECK_CALLBACK_1(kTimeExitAvricourt, CURRENT_PARAM(2, 5), 14, setup_exitStation, "Avricourt");
label_enter_deutschavricourt:
// Entering Deutsch-Avricourt station
- TIME_CHECK_ENTERSTATION(kTimeCityDeutschAvricourt, CURRENT_PARAM(2, 6), 15, "DeutschA", kCityDeutschAvricourt);
+ TIME_CHECK_CALLBACK_2(kTimeCityDeutschAvricourt, CURRENT_PARAM(2, 6), 15, setup_enterStation, "DeutschA", kCityDeutschAvricourt);
label_exit_deutschavricourt:
// Exiting Avricourt station
- TIME_CHECK_EXITSTATION(kTimeExitDeutschAvricourt, CURRENT_PARAM(2, 7), 16, "DeutschA");
+ TIME_CHECK_CALLBACK_1(kTimeExitDeutschAvricourt, CURRENT_PARAM(2, 7), 16, setup_exitStation, "DeutschA");
label_enter_strasbourg:
- TIME_CHECK_SAVEGAME(kTimeCityStrasbourg, CURRENT_PARAM(2, 8), 17, kSavegameTypeTime, kTimeNone);
+ TIME_CHECK_CALLBACK_2(kTimeCityStrasbourg, CURRENT_PARAM(2, 8), 17, setup_savegame, kSavegameTypeTime, kTimeNone);
label_exit_strasbourg:
// Exiting Strasbourg station
- TIME_CHECK_EXITSTATION(kTimeExitStrasbourg, CURRENT_PARAM(3, 1), 19, "Strasbou");
+ TIME_CHECK_CALLBACK_1(kTimeExitStrasbourg, CURRENT_PARAM(3, 1), 19, setup_exitStation, "Strasbou");
label_enter_badenoos:
// Entering Baden Oos station
- TIME_CHECK_ENTERSTATION(kTimeCityBadenOos, CURRENT_PARAM(3, 2), 20, "BadenOos", kCityBadenOos);
+ TIME_CHECK_CALLBACK_2(kTimeCityBadenOos, CURRENT_PARAM(3, 2), 20, setup_enterStation, "BadenOos", kCityBadenOos);
label_exit_badenoos:
// Exiting Baden Oos station
- TIME_CHECK_EXITSTATION(kTimeExitBadenOos, CURRENT_PARAM(3, 3), 21, "BadenOos");
+ TIME_CHECK_CALLBACK_1(kTimeExitBadenOos, CURRENT_PARAM(3, 3), 21, setup_exitStation, "BadenOos");
label_chapter1_next:
if (getState()->time > kTimeChapter1End3 && ! CURRENT_PARAM(3, 4)) {
@@ -919,28 +929,28 @@
params->param5 = 0;
UPDATE_PARAM_PROC_END
- TIME_CHECK_ENTERSTATION(kTimeEnterSalzbourg, params->param6, 1, "Salzburg", kCitySalzbourg);
+ TIME_CHECK_CALLBACK_2(kTimeEnterSalzbourg, params->param6, 1, setup_enterStation, "Salzburg", kCitySalzbourg);
label_callback_1:
- TIME_CHECK_EXITSTATION(kTimeExitSalzbourg, params->param7, 2, "Salzburg");
+ TIME_CHECK_CALLBACK_1(kTimeExitSalzbourg, params->param7, 2, setup_exitStation, "Salzburg");
label_callback_2:
- TIME_CHECK_ENTERSTATION(kTimeEnterAttnangPuchheim, params->param8, 3, "Attnang", kCityAttnangPuchheim);
+ TIME_CHECK_CALLBACK_2(kTimeEnterAttnangPuchheim, params->param8, 3, setup_enterStation, "Attnang", kCityAttnangPuchheim);
label_callback_3:
- TIME_CHECK_EXITSTATION(kTimeExitAttnangPuchheim, CURRENT_PARAM(1, 1), 4, "Attnang");
+ TIME_CHECK_CALLBACK_1(kTimeExitAttnangPuchheim, CURRENT_PARAM(1, 1), 4, setup_exitStation, "Attnang");
label_callback_4:
- TIME_CHECK_ENTERSTATION(kTimeEnterWels, CURRENT_PARAM(1, 2), 5, "Wels", kCityWels);
+ TIME_CHECK_CALLBACK_2(kTimeEnterWels, CURRENT_PARAM(1, 2), 5, setup_enterStation, "Wels", kCityWels);
label_callback_5:
- TIME_CHECK_EXITSTATION(kTimeEnterWels, CURRENT_PARAM(1, 3), 6, "Wels");
+ TIME_CHECK_CALLBACK_1(kTimeEnterWels, CURRENT_PARAM(1, 3), 6, setup_exitStation, "Wels");
label_callback_6:
- TIME_CHECK_ENTERSTATION(kTimeEnterLinz, CURRENT_PARAM(1, 4), 7, "Linz", kCityLinz);
+ TIME_CHECK_CALLBACK_2(kTimeEnterLinz, CURRENT_PARAM(1, 4), 7, setup_enterStation, "Linz", kCityLinz);
label_callback_7:
- TIME_CHECK_EXITSTATION(kTimeCityLinz, CURRENT_PARAM(1, 5), 8, "Linz");
+ TIME_CHECK_CALLBACK_1(kTimeCityLinz, CURRENT_PARAM(1, 5), 8, setup_exitStation, "Linz");
label_callback_8:
if (getState()->time > kTime2187000 && !CURRENT_PARAM(1, 6)) {
@@ -948,7 +958,7 @@
getState()->timeDelta = 5;
}
- TIME_CHECK_ENTERSTATION(kTimeCityVienna, CURRENT_PARAM(1, 7), 9, "Vienna", kCityVienna);
+ TIME_CHECK_CALLBACK_2(kTimeCityVienna, CURRENT_PARAM(1, 7), 9, setup_enterStation, "Vienna", kCityVienna);
break;
case kActionEndSound:
@@ -1217,10 +1227,10 @@
params->param7 = 0;
UPDATE_PARAM_PROC_END
- TIME_CHECK_ENTERSTATION(kTimeEnterPoszony, params->param8, 1, "Pozsony", kCityPoszony);
+ TIME_CHECK_CALLBACK_2(kTimeEnterPoszony, params->param8, 1, setup_enterStation, "Pozsony", kCityPoszony);
label_exitPozsony:
- TIME_CHECK_EXITSTATION(kTimeExitPoszony, CURRENT_PARAM(1, 1), 2, "Pozsony");
+ TIME_CHECK_CALLBACK_1(kTimeExitPoszony, CURRENT_PARAM(1, 1), 2, setup_exitStation, "Pozsony");
label_enterGalanta:
if (getObjects()->get(kObjectCompartment1).location2 == kObjectLocation1) {
@@ -1233,10 +1243,10 @@
if (params->param1)
goto label_callback_4;
- TIME_CHECK_ENTERSTATION(kTimeEnterGalanta, CURRENT_PARAM(1, 3), 3, "Galanta", kCityGalanta);
+ TIME_CHECK_CALLBACK_2(kTimeEnterGalanta, CURRENT_PARAM(1, 3), 3, setup_enterStation, "Galanta", kCityGalanta);
label_exitGalanta:
- TIME_CHECK_EXITSTATION(kTimeExitGalanta, CURRENT_PARAM(1, 4), 4, "Galanta");
+ TIME_CHECK_CALLBACK_1(kTimeExitGalanta, CURRENT_PARAM(1, 4), 4, setup_exitStation, "Galanta");
label_callback_4:
if (getState()->time > kTime2470500 && !CURRENT_PARAM(1, 5)) {
Modified: scummvm/trunk/engines/lastexpress/entities/cooks.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/cooks.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/cooks.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -242,7 +242,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/entity_intern.h
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/entity_intern.h 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/entity_intern.h 2010-10-21 23:46:00 UTC (rev 53692)
@@ -322,9 +322,6 @@
//////////////////////////////////////////////////////////////////////////
// Time check macros
//////////////////////////////////////////////////////////////////////////
-#define TIME_CHECK_CHAPTER1(function) \
- TIME_CHECK(kTimeChapter1, params->param1, function)
-
#define TIME_CHECK(timeValue, parameter, function) \
if (getState()->time > timeValue && !parameter) { \
parameter = 1; \
@@ -386,54 +383,6 @@
break; \
}
-#define TIME_CHECK_SAVEGAME(timeValue, parameter, callback, type, event) \
- if (getState()->time > timeValue && !parameter) { \
- parameter = 1; \
- setCallback(callback); \
- setup_savegame(type, event); \
- break; \
- }
-
-#define TIME_CHECK_ENTERSTATION(timeValue, parameter, callback, name, param2) \
- if (getState()->time > timeValue && !parameter) { \
- parameter = 1; \
- setCallback(callback); \
- setup_enterStation(name, param2); \
- break; \
- }
-
-#define TIME_CHECK_EXITSTATION(timeValue, parameter, callback, name) \
- if (getState()->time > timeValue && !parameter) { \
- parameter = 1; \
- setCallback(callback); \
- setup_exitStation(name); \
- break; \
- }
-
-#define TIME_CHECK_EXITSTATION_2(timeValue, parameter1, parameter2, callback, name) \
- if (getState()->time > timeValue && !parameter1) { \
- parameter1 = 1; \
- parameter2 = 1; \
- setCallback(callback); \
- setup_exitStation(name); \
- break; \
- }
-
-#define TIME_CHECK_EXITSTATION_0(parameter1, parameter2, callback, name) \
- if (parameter1 && !parameter2) { \
- setCallback(callback); \
- setup_exitStation(name); \
- break; \
- }
-
-#define TIME_CHECK_PLAYSOUND(timeValue, parameter, callback, sound) \
- if (getState()->time > timeValue && !parameter) { \
- parameter = 1; \
- setCallback(callback); \
- setup_playSound(sound); \
- break; \
- }
-
#define TIME_CHECK_PLAYSOUND_UPDATEPOSITION(timeValue, parameter, callback, sound, position) \
if (getState()->time > timeValue && !parameter) { \
parameter = 1; \
@@ -449,12 +398,6 @@
getObjects()->updateLocation2(object, location); \
}
-#define TIME_CHECK_POSITION(timeValue, parameter, position) \
- if (getState()->time > timeValue && !parameter) { \
- parameter = 1; \
- getData()->entityPosition = position; \
- }
-
#define TIME_CHECK_CAR(timeValue, parameter, callback, function) {\
if ((getState()->time <= timeValue && !getEntities()->isPlayerInCar(kCarGreenSleeping)) || !parameter) \
parameter = getState()->time + 75; \
Modified: scummvm/trunk/engines/lastexpress/entities/francois.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/francois.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/francois.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -850,7 +850,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/gendarmes.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/gendarmes.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/gendarmes.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -70,7 +70,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/hadija.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/hadija.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/hadija.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -116,7 +116,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
@@ -250,7 +250,10 @@
break;
case kActionNone:
- TIME_CHECK_POSITION(kTime1782000, params->param1, kPosition_2740);
+ if (getState()->time > kTime1782000 && !params->param1) { \
+ params->param1 = 1;
+ getData()->entityPosition = kPosition_2740;
+ }
if (params->param2 == kTimeInvalid || getState()->time <= kTime1786500) {
TIME_CHECK_CALLBACK(kTime1822500, params->param3, 2, setup_compartment8to6);
Modified: scummvm/trunk/engines/lastexpress/entities/ivo.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/ivo.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/ivo.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -250,7 +250,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/kahina.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/kahina.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/kahina.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -250,7 +250,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/kronos.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/kronos.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/kronos.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -129,7 +129,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/mahmud.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/mahmud.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/mahmud.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -733,7 +733,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chaptersHandler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chaptersHandler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/max.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/max.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/max.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -324,7 +324,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter12_handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter12_handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/mertens.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/mertens.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/mertens.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -2514,7 +2514,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/milos.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/milos.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/milos.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -364,7 +364,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/mmeboutarel.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/mmeboutarel.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/mmeboutarel.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -247,7 +247,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/rebecca.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/rebecca.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/rebecca.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -658,7 +658,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
@@ -686,7 +686,7 @@
break;
case kActionNone:
- TIME_CHECK_PLAYSOUND(kTime1084500, params->param3, 1, "REB1015");
+ TIME_CHECK_CALLBACK_1(kTime1084500, params->param3, 1, setup_playSound, "REB1015");
if (params->param4 == kTimeInvalid)
goto label_callback_4;
Modified: scummvm/trunk/engines/lastexpress/entities/salko.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/salko.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/salko.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -158,7 +158,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/sophie.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/sophie.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/sophie.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -209,7 +209,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chaptersHandler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chaptersHandler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/tatiana.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/tatiana.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/tatiana.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -343,7 +343,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/vassili.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/vassili.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/vassili.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -86,7 +86,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/verges.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/verges.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/verges.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -574,7 +574,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/vesna.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/vesna.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/vesna.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -258,7 +258,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
Modified: scummvm/trunk/engines/lastexpress/entities/yasmin.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/entities/yasmin.cpp 2010-10-21 23:44:59 UTC (rev 53691)
+++ scummvm/trunk/engines/lastexpress/entities/yasmin.cpp 2010-10-21 23:46:00 UTC (rev 53692)
@@ -188,7 +188,7 @@
break;
case kActionNone:
- TIME_CHECK_CHAPTER1(setup_chapter1Handler);
+ TIME_CHECK(kTimeChapter1, params->param1, setup_chapter1Handler);
break;
case kActionDefault:
@@ -209,8 +209,8 @@
TIME_CHECK_CALLBACK(kTime1093500, params->param1, 1, setup_function6);
TIME_CHECK_CALLBACK(kTime1161000, params->param2, 3, setup_function7);
TIME_CHECK_PLAYSOUND_UPDATEPOSITION(kTime1162800, params->param3, 4, "Har1102", kPosition_4070);
- TIME_CHECK_PLAYSOUND(kTime1165500, params->param4, 5, "Har1104");
- TIME_CHECK_PLAYSOUND(kTime1174500, params->param5, 6, "Har1106");
+ TIME_CHECK_CALLBACK_1(kTime1165500, params->param4, 5, setup_playSound, "Har1104");
+ TIME_CHECK_CALLBACK_1(kTime1174500, params->param5, 6, setup_playSound, "Har1106");
TIME_CHECK_CALLBACK(kTime1183500, params->param6, 7, setup_function6);
break;
@@ -234,11 +234,11 @@
// Fallback to case 4
case 4:
- TIME_CHECK_PLAYSOUND(kTime1165500, params->param4, 5, "Har1104");
+ TIME_CHECK_CALLBACK_1(kTime1165500, params->param4, 5, setup_playSound, "Har1104");
// Fallback to case 5
case 5:
- TIME_CHECK_PLAYSOUND(kTime1174500, params->param5, 6, "Har1106");
+ TIME_CHECK_CALLBACK_1(kTime1174500, params->param5, 6, setup_playSound, "Har1106");
// Fallback to case 6
case 6:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list