LASTEXPRESS: Add some missing casts and const qualifiers

svn-id: r53880

9 files changed, 29 insertions, 29 deletions

diff --git a/engines/lastexpress/game/action.cpp b/engines/lastexpress/game/action.cpp
index 139033b6c8..84f406931d 100644
--- a/engines/lastexpress/game/action.cpp
+++ b/engines/lastexpress/game/action.cpp
@@ -1960,7 +1960,7 @@ void Action::playAnimation(EventIndex index, bool debugMode) const {
 
 	// Adjust game time
 	getState()->timeTicks += _animationList[index].time;
-	getState()->time = (TimeValue)(getState()->time + _animationList[index].time * getState()->timeDelta);
+	getState()->time = (TimeValue)(getState()->time + (TimeValue)(_animationList[index].time * getState()->timeDelta));
 }
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/game/entities.cpp b/engines/lastexpress/game/entities.cpp
index feb9057161..40fae3ae9b 100644
--- a/engines/lastexpress/game/entities.cpp
+++ b/engines/lastexpress/game/entities.cpp
@@ -215,7 +215,7 @@ EntityData::EntityCallData *Entities::getData(EntityIndex entity) const {
 	return _entities[entity]->getData();
 }
 
-int Entities::getPosition(CarIndex car, Position position) {
+int Entities::getPosition(CarIndex car, Position position) const {
 	int index = 100 * car + position;
 
 	if (car > 10)
@@ -227,14 +227,14 @@ int Entities::getPosition(CarIndex car, Position position) {
 	return _positions[index];
 }
 
-int Entities::getCompartments(int index) {
+int Entities::getCompartments(int index) const {
 	if (index >= _compartmentsCount)
 		error("Entities::getCompartments: trying to access an invalid compartment (was: %d, valid:0-15)", index);
 
 	return _compartments[index];
 }
 
-int Entities::getCompartments1(int index) {
+int Entities::getCompartments1(int index) const {
 	if (index >= _compartmentsCount)
 		error("Entities::getCompartments: trying to access an invalid compartment (was: %d, valid:0-15)", index);
 
@@ -1993,7 +1993,7 @@ bool Entities::hasValidFrame(EntityIndex entity) const {
 	return (getData(entity)->frame && (getData(entity)->frame->getInfo()->subType != kFrameType3));
 }
 
-bool Entities::compare(EntityIndex entity1, EntityIndex entity2) {
+bool Entities::compare(EntityIndex entity1, EntityIndex entity2) const {
 	EntityData::EntityCallData *data1 = getData(entity1);
 	EntityData::EntityCallData *data2 = getData(entity2);
 
@@ -2051,7 +2051,7 @@ bool Entities::compare(EntityIndex entity1, EntityIndex entity2) {
 	return false;
 }
 
-bool Entities::updateEntity(EntityIndex entity, CarIndex car, EntityPosition position) {
+bool Entities::updateEntity(EntityIndex entity, CarIndex car, EntityPosition position) const {
 	EntityData::EntityCallData *data = getData(entity);
 	EntityDirection direction = kDirectionNone;
 	int delta = 0;
diff --git a/engines/lastexpress/game/entities.h b/engines/lastexpress/game/entities.h
index 731577d356..8cc2072c42 100644
--- a/engines/lastexpress/game/entities.h
+++ b/engines/lastexpress/game/entities.h
@@ -74,7 +74,7 @@ public:
 	void updateCallbacks();
 
 	EntityIndex canInteractWith(const Common::Point &point) const;
-	bool compare(EntityIndex entity1, EntityIndex entity2);
+	bool compare(EntityIndex entity1, EntityIndex entity2) const;
 
 	/**
 	 * Update an entity current sequence frame (and related fields)
@@ -92,15 +92,15 @@ public:
 	void drawSequenceRight(EntityIndex index, const char *sequence) const;
 	void clearSequences(EntityIndex index) const;
 
-	bool updateEntity(EntityIndex entity, CarIndex car, EntityPosition position);
+	bool updateEntity(EntityIndex entity, CarIndex car, EntityPosition position) const;
 	bool hasValidFrame(EntityIndex entity) const;
 
 	// Accessors
 	Entity *get(EntityIndex entity);
 	EntityData::EntityCallData *getData(EntityIndex entity) const;
-	int getPosition(CarIndex car, Position position);
-	int getCompartments(int index);
-	int getCompartments1(int index);
+	int getPosition(CarIndex car, Position position) const;
+	int getCompartments(int index) const;
+	int getCompartments1(int index) const;
 
 	// Scene
 	void loadSceneFromEntityPosition(CarIndex car, EntityPosition position, bool alternate = false) const;
diff --git a/engines/lastexpress/game/logic.cpp b/engines/lastexpress/game/logic.cpp
index 75e237df4a..3ef710a324 100644
--- a/engines/lastexpress/game/logic.cpp
+++ b/engines/lastexpress/game/logic.cpp
@@ -316,7 +316,7 @@ void Logic::eventTick(const Common::Event &) {
 	// Adjust time and save game if needed
 	if (getFlags()->isGameRunning) {
 		getState()->timeTicks += ticks;
-		getState()->time = (TimeValue)(getState()->time + ticks * getState()->timeDelta);
+		getState()->time = (TimeValue)(getState()->time + (TimeValue)(ticks * getState()->timeDelta));
 
 		if (getState()->timeDelta) {
 
diff --git a/engines/lastexpress/game/menu.cpp b/engines/lastexpress/game/menu.cpp
index a3604acf5a..a0d498fa1d 100644
--- a/engines/lastexpress/game/menu.cpp
+++ b/engines/lastexpress/game/menu.cpp
@@ -360,7 +360,7 @@ Menu::Menu(LastExpressEngine *engine) : _engine(engine),
 	_gameId(kGameBlue), _hasShownStartScreen(false), _hasShownIntro(false),
 	_isShowingCredits(false), _isGameStarted(false), _isShowingMenu(false),
 	_creditsSequenceIndex(0), _checkHotspotsTicks(15),  _mouseFlags(Common::EVENT_INVALID), _lastHotspot(NULL),
-	_currentIndex(0), _currentTime(0), _lowerTime(0), _index(0), _savegameIndex(0), _time(0), _delta(0), _handleTimeDelta(false) {
+	_currentTime(kTimeNone), _lowerTime(kTimeNone), _time(kTimeNone), _currentIndex(0), _index(0), _savegameIndex(0), _delta(0), _handleTimeDelta(false) {
 
 	_clock = new Clock(_engine);
 	_trainLine = new TrainLine(_engine);
@@ -1097,12 +1097,12 @@ void Menu::init(bool doSavegame, SavegameType type, uint32 value) {
 	if (!getProgress().chapter)
 		getProgress().chapter = kChapter1;
 
-	getState()->time = getSaveLoad()->getTime(_index);
+	getState()->time = (TimeValue)getSaveLoad()->getTime(_index);
 	getProgress().chapter = getSaveLoad()->getChapter(_index);
 
 	if (_lowerTime >= kTimeStartGame) {
-		_currentTime = getState()->time;
-		_time = getState()->time;
+		_currentTime = (uint32)getState()->time;
+		_time = (uint32)getState()->time;
 		_clock->draw(_time);
 		_trainLine->draw(_time);
 
@@ -1348,7 +1348,7 @@ void Menu::adjustIndex(uint32 time1, uint32 time2, bool searchEntry) {
 				if ((int32)_index >= 0) {
 					do {
 						// Calculate new delta
-						int32 newDelta = time1 - getSaveLoad()->getTime(currentIndex);
+						int32 newDelta = time1 - (uint32)getSaveLoad()->getTime(currentIndex);
 
 						if (newDelta >= 0 && timeDelta >= newDelta) {
 							timeDelta = newDelta;
@@ -1368,7 +1368,7 @@ void Menu::adjustIndex(uint32 time1, uint32 time2, bool searchEntry) {
 				if (_savegameIndex >= _index) {
 					do {
 						// Calculate new delta
-						int32 newDelta = getSaveLoad()->getTime(currentIndex) - time1;
+						int32 newDelta = (uint32)getSaveLoad()->getTime(currentIndex) - time1;
 
 						if (newDelta >= 0 && timeDelta > newDelta) {
 							timeDelta = newDelta;
diff --git a/engines/lastexpress/game/menu.h b/engines/lastexpress/game/menu.h
index f6bcb05959..086e7fd5df 100644
--- a/engines/lastexpress/game/menu.h
+++ b/engines/lastexpress/game/menu.h
@@ -177,17 +177,17 @@ private:
 
 	//////////////////////////////////////////////////////////////////////////
 	// Time
-	uint32 _currentIndex; // current savegame entry
 	uint32 _currentTime;  // current game time
 	uint32 _lowerTime;    // lower time value
+	uint32 _time;
 
+	uint32 _currentIndex; // current savegame entry
 	uint32 _index;
 	uint32 _savegameIndex;
-	uint32 _time;
 	uint32 _delta;
 	bool _handleTimeDelta;
 
-	void initTime(SavegameType type, uint32 time);
+	void initTime(SavegameType type, uint32 val);
 	void updateTime(uint32 time);
 	void adjustTime();
 	void adjustIndex(uint32 time1, uint32 time2, bool searchEntry);
diff --git a/engines/lastexpress/game/savegame.h b/engines/lastexpress/game/savegame.h
index e5cb940c0b..01b2542d12 100644
--- a/engines/lastexpress/game/savegame.h
+++ b/engines/lastexpress/game/savegame.h
@@ -111,7 +111,7 @@ public:
 	bool isGameFinished(uint32 menuIndex, uint32 savegameIndex);
 
 	// Accessors
- 	TimeValue    getTime(uint32 index) { return getEntry(index)->time; }
+ 	uint32       getTime(uint32 index) { return getEntry(index)->time; }
 	ChapterIndex getChapter(uint32 index) { return getEntry(index)->chapter; }
 	uint32       getValue(uint32 index) { return getEntry(index)->value; }
 	uint32       getLastSavegameTicks() const { return _gameTicksLastSavegame; }
@@ -208,7 +208,7 @@ private:
 	struct SavegameEntryHeader : Common::Serializable {
 		uint32 signature;
 		SavegameType type;
-		TimeValue time;
+		uint32 time;
 		int offset;
 		ChapterIndex chapter;
 		uint32 value;
diff --git a/engines/lastexpress/game/scenes.cpp b/engines/lastexpress/game/scenes.cpp
index 7a601b504b..7fd0a3f0ac 100644
--- a/engines/lastexpress/game/scenes.cpp
+++ b/engines/lastexpress/game/scenes.cpp
@@ -612,9 +612,9 @@ void SceneManager::updateDoorsAndClock() {
 		Sequence *sequenceMinutes = loadSequence1("SCLKM-81.seq", 255);
 
 		// Compute hours and minutes indexes
-		uint16 hoursIndex = getState()->time % 1296000 % 54000 / 900;
+		uint16 hoursIndex = (uint)getState()->time % 1296000 % 54000 / 900;
 
-		uint hours = (getState()->time % 1296000) / 54000;
+		uint hours = ((uint)getState()->time % 1296000) / 54000;
 		if (hours >= 12)
 			hours -= 12;
 
@@ -1077,7 +1077,7 @@ void SceneManager::postProcessScene() {
 	case Scene::kTypeList: {
 
 		// Adjust time
-		getState()->time = (TimeValue)(getState()->time + (scene->param1 + 10) * getState()->timeDelta);
+		getState()->time = (TimeValue)(getState()->time + (TimeValue)((scene->param1 + 10) * getState()->timeDelta));
 		getState()->timeTicks += (scene->param1 + 10);
 
 		// Wait for a number of frames unless right mouse is clicked
diff --git a/engines/lastexpress/game/sound.cpp b/engines/lastexpress/game/sound.cpp
index 50004bc001..1bfba0ca4b 100644
--- a/engines/lastexpress/game/sound.cpp
+++ b/engines/lastexpress/game/sound.cpp
@@ -187,10 +187,10 @@ void SoundManager::clearQueue() {
 	for (Common::List<SoundEntry *>::iterator i = _cache.begin(); i != _cache.end(); ++i) {
 		SoundEntry *entry = (*i);
 
+		// Delete entry
 		removeEntry(entry);
+		delete entry;
 
-		// Delete entry
-		SAFE_DELETE(entry);
 		i = _cache.reverse_erase(i);
 	}
 
@@ -530,7 +530,7 @@ void SoundManager::saveLoadWithSerializer(Common::Serializer &s) {
 				s.syncAsUint32LE(entry->field_38); // field_14;
 				s.syncAsUint32LE(entry->entity); // entity;
 
-				uint32 field_1C = entry->field_48 - _data2;
+				uint32 field_1C = (uint32)entry->field_48 - _data2;
 				if (field_1C > kFlag8)
 					field_1C = 0;
 				s.syncAsUint32LE(field_1C); // field_1C;