From 732a2c80ddde4cf0ffd1b1742f514ae940c5301d Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Sat, 14 Jul 2012 13:23:54 -0400
Subject: LASTEXPRESS: Remove duplicated include statements

---
 engines/lastexpress/data/scene.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines/lastexpress/data/scene.cpp')

diff --git a/engines/lastexpress/data/scene.cpp b/engines/lastexpress/data/scene.cpp
index 8f279ffbb3..79683d8067 100644
--- a/engines/lastexpress/data/scene.cpp
+++ b/engines/lastexpress/data/scene.cpp
@@ -28,7 +28,6 @@
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
-#include "common/textconsole.h"
 #include "common/stream.h"
 
 namespace LastExpress {
-- 
cgit v1.2.3


From 0635d99ec74ad431146e14aba4ad07a5f9e7e221 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Sat, 14 Jul 2012 14:02:44 -0400
Subject: LASTEXPRESS: Cleanup

 - Add missing initializer/destructors
 - Add some const modifiers
 - Remove some unneeded casts
 - Use enumeration values in switch constructs
---
 engines/lastexpress/data/scene.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines/lastexpress/data/scene.cpp')

diff --git a/engines/lastexpress/data/scene.cpp b/engines/lastexpress/data/scene.cpp
index 79683d8067..fdb1ac6d46 100644
--- a/engines/lastexpress/data/scene.cpp
+++ b/engines/lastexpress/data/scene.cpp
@@ -121,7 +121,7 @@ bool SceneHotspot::isInside(const Common::Point &point) {
 // Scene
 Scene::~Scene() {
 	// Free the hotspots
-	for (int i = 0; i < (int)_hotspots.size(); i++)
+	for (uint i = 0; i < _hotspots.size(); i++)
 		delete _hotspots[i];
 }
 
@@ -171,7 +171,7 @@ bool Scene::checkHotSpot(const Common::Point &coord, SceneHotspot **hotspot) {
 	bool found = false;
 	int _location = 0;
 
-	for (int i = 0; i < (int)_hotspots.size(); i++) {
+	for (uint i = 0; i < _hotspots.size(); i++) {
 		if (_hotspots[i]->isInside(coord)) {
 			if (_location <= _hotspots[i]->location) {
 				_location = _hotspots[i]->location;
@@ -223,7 +223,7 @@ Common::String Scene::toString() {
 	// Hotspots
 	if (_hotspots.size() != 0) {
 		output += "\nHotspots:\n";
-		for (int i = 0; i < (int)_hotspots.size(); i++)
+		for (uint i = 0; i < _hotspots.size(); i++)
 			output += _hotspots[i]->toString() + "\n";
 	}
 
@@ -240,7 +240,7 @@ SceneLoader::~SceneLoader() {
 
 void SceneLoader::clear() {
 	// Remove all scenes
-	for (int i = 0; i < (int)_scenes.size(); i++)
+	for (uint i = 0; i < _scenes.size(); i++)
 		delete _scenes[i];
 
 	_scenes.clear();
@@ -291,9 +291,9 @@ Scene *SceneLoader::get(SceneIndex index) {
 		return NULL;
 
 	// Load the hotspots if needed
-	_scenes[(int)index]->loadHotspots(_stream);
+	_scenes[(uint)index]->loadHotspots(_stream);
 
-	return _scenes[(int)index];
+	return _scenes[(uint)index];
 }
 
 } // End of namespace LastExpress
-- 
cgit v1.2.3