From 275aded0b0e485eead8d5bdac48d9c8dc1a6ef9c Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Tue, 21 Aug 2012 23:16:52 -0400
Subject: LASTEXPRESS: Remove unnecessary casts

---
 engines/lastexpress/game/action.cpp    | 2 +-
 engines/lastexpress/game/entities.cpp  | 2 +-
 engines/lastexpress/game/inventory.cpp | 4 ++--
 engines/lastexpress/game/savepoint.cpp | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines/lastexpress/game')

diff --git a/engines/lastexpress/game/action.cpp b/engines/lastexpress/game/action.cpp
index 033fdfc2e8..796abf2ce7 100644
--- a/engines/lastexpress/game/action.cpp
+++ b/engines/lastexpress/game/action.cpp
@@ -394,7 +394,7 @@ Action::Action(LastExpressEngine *engine) : _engine(engine) {
 }
 
 Action::~Action() {
-	for (int i = 0; i < (int)_actions.size(); i++)
+	for (uint i = 0; i < _actions.size(); i++)
 		SAFE_DELETE(_actions[i]);
 
 	_actions.clear();
diff --git a/engines/lastexpress/game/entities.cpp b/engines/lastexpress/game/entities.cpp
index de30792405..fafbd7cb64 100644
--- a/engines/lastexpress/game/entities.cpp
+++ b/engines/lastexpress/game/entities.cpp
@@ -181,7 +181,7 @@ Entities::Entities(LastExpressEngine *engine) : _engine(engine) {
 Entities::~Entities() {
 	SAFE_DELETE(_header);
 
-	for (int i = 0; i < (int)_entities.size(); i++)
+	for (uint i = 0; i < _entities.size(); i++)
 		SAFE_DELETE(_entities[i]);
 
 	_entities.clear();
diff --git a/engines/lastexpress/game/inventory.cpp b/engines/lastexpress/game/inventory.cpp
index 9e0f583c63..11e7369ee1 100644
--- a/engines/lastexpress/game/inventory.cpp
+++ b/engines/lastexpress/game/inventory.cpp
@@ -619,7 +619,7 @@ void Inventory::drawEgg() const {
 
 // Blinking egg: we need to blink the egg for delta time, with the blinking getting faster until it's always lit.
 void Inventory::drawBlinkingEgg(uint ticks) {
-	uint globalTimer = getGlobalTimer();
+	uint globalTimer = (uint)getGlobalTimer();
 	uint timerValue = (getProgress().jacket == kJacketGreen) ? 450 : 225;
 
 	if (globalTimer == timerValue || globalTimer == 900) {
@@ -653,7 +653,7 @@ void Inventory::drawBlinkingEgg(uint ticks) {
 }
 
 void Inventory::blinkEgg() {
-	drawItem((CursorStyle)(getMenu()->getGameId() + 39), 608, 448, (_blinkingBrightness == 0) ? -1 : _blinkingBrightness);
+	drawItem((CursorStyle)(getMenu()->getGameId() + 39), 608, 448, (_blinkingBrightness == 0) ? -1 : (int16)_blinkingBrightness);
 
 	askForRedraw();
 
diff --git a/engines/lastexpress/game/savepoint.cpp b/engines/lastexpress/game/savepoint.cpp
index 6b2dfc5930..8d14ec386b 100644
--- a/engines/lastexpress/game/savepoint.cpp
+++ b/engines/lastexpress/game/savepoint.cpp
@@ -202,7 +202,7 @@ void SavePoints::callAndProcess() {
 // Misc
 //////////////////////////////////////////////////////////////////////////
 bool SavePoints::updateEntityFromData(const SavePoint &savepoint) {
-	for (int i = 0; i < (int)_data.size(); i++) {
+	for (uint i = 0; i < _data.size(); i++) {
 
 		// Not a data savepoint!
 		if (!_data[i].entity1)
@@ -210,7 +210,7 @@ bool SavePoints::updateEntityFromData(const SavePoint &savepoint) {
 
 		// Found our data!
 		if (_data[i].entity1 == savepoint.entity1 && _data[i].action == savepoint.action) {
-			debugC(8, kLastExpressDebugLogic, "Update entity from data: entity1=%s, action=%s, param=%d", ENTITY_NAME(_data[i].entity1), ACTION_NAME(_data[i].action), _data[i].param);
+			debugC(8, kLastExpressDebugLogic, "Update entity from data: entity1=%s, action=%s, param=%u", ENTITY_NAME(_data[i].entity1), ACTION_NAME(_data[i].action), _data[i].param);
 
 			// the SavePoint param value is the index of the entity call parameter to update
 			getEntities()->get(_data[i].entity1)->getParamData()->updateParameters(_data[i].param);
-- 
cgit v1.2.3