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/fight/fight.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines/lastexpress/fight/fight.cpp')

diff --git a/engines/lastexpress/fight/fight.cpp b/engines/lastexpress/fight/fight.cpp
index b832d46a60..be1653092f 100644
--- a/engines/lastexpress/fight/fight.cpp
+++ b/engines/lastexpress/fight/fight.cpp
@@ -40,7 +40,6 @@
 #include "lastexpress/sound/queue.h"
 
 #include "lastexpress/graphics.h"
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
-- 
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/fight/fight.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'engines/lastexpress/fight/fight.cpp')

diff --git a/engines/lastexpress/fight/fight.cpp b/engines/lastexpress/fight/fight.cpp
index be1653092f..22d9da80be 100644
--- a/engines/lastexpress/fight/fight.cpp
+++ b/engines/lastexpress/fight/fight.cpp
@@ -52,6 +52,8 @@ Fight::FightData::FightData() {
 	index = 0;
 
 	isFightRunning = false;
+
+	memset(&sequences, 0, sizeof(sequences));
 }
 
 Fight::FightData::~FightData() {
@@ -398,6 +400,9 @@ end_load:
 }
 
 void Fight::setOpponents() {
+	if (!_data)
+		error("[Fight::setOpponents] Data not initialized");
+
 	_data->player->setOpponent(_data->opponent);
 	_data->opponent->setOpponent(_data->player);
 
-- 
cgit v1.2.3


From 6aeda2638b9bdfbbef3b0fb89c1c776415e13c2c Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Fri, 27 Jul 2012 00:54:24 -0400
Subject: LASTEXPRESS: More include re-organization

---
 engines/lastexpress/fight/fight.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines/lastexpress/fight/fight.cpp')

diff --git a/engines/lastexpress/fight/fight.cpp b/engines/lastexpress/fight/fight.cpp
index 22d9da80be..b00c1732e7 100644
--- a/engines/lastexpress/fight/fight.cpp
+++ b/engines/lastexpress/fight/fight.cpp
@@ -31,6 +31,7 @@
 #include "lastexpress/data/cursor.h"
 #include "lastexpress/data/sequence.h"
 
+#include "lastexpress/game/entities.h"
 #include "lastexpress/game/inventory.h"
 #include "lastexpress/game/logic.h"
 #include "lastexpress/game/object.h"
@@ -38,8 +39,10 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
+#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/graphics.h"
+#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
-- 
cgit v1.2.3


From bc4e10dabca5b76283eb6fb431702ccd92a001c0 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Tue, 21 Aug 2012 23:02:39 -0400
Subject: LASTEXPRESS: Remove some unreachable code

---
 engines/lastexpress/fight/fight.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'engines/lastexpress/fight/fight.cpp')

diff --git a/engines/lastexpress/fight/fight.cpp b/engines/lastexpress/fight/fight.cpp
index b00c1732e7..49a9b85657 100644
--- a/engines/lastexpress/fight/fight.cpp
+++ b/engines/lastexpress/fight/fight.cpp
@@ -39,10 +39,8 @@
 #include "lastexpress/game/state.h"
 
 #include "lastexpress/sound/queue.h"
-#include "lastexpress/sound/sound.h"
 
 #include "lastexpress/graphics.h"
-#include "lastexpress/helpers.h"
 #include "lastexpress/lastexpress.h"
 #include "lastexpress/resource.h"
 
-- 
cgit v1.2.3