[Scummvm-cvs-logs] scummvm master -> 115a4d36ba673579bd683cac90828f22606f7468

[Littleboy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
115a4d36ba LASTEXPRESS: Move includes to header for setup function templates


Commit: 115a4d36ba673579bd683cac90828f22606f7468
    https://github.com/scummvm/scummvm/commit/115a4d36ba673579bd683cac90828f22606f7468
Author: Julien (julien at powerinbox.com)
Date: 2012-07-26T21:32:10-07:00

Commit Message:
LASTEXPRESS: Move includes to header for setup function templates

Changed paths:
    engines/lastexpress/entities/entity.cpp
    engines/lastexpress/entities/entity.h



diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp
index 8595978..0282225 100644
--- a/engines/lastexpress/entities/entity.cpp
+++ b/engines/lastexpress/entities/entity.cpp
@@ -28,12 +28,9 @@
 #include "lastexpress/game/entities.h"
 #include "lastexpress/game/logic.h"
 #include "lastexpress/game/object.h"
-#include "lastexpress/game/scenes.h"
-#include "lastexpress/game/state.h"
 #include "lastexpress/game/savegame.h"
 #include "lastexpress/game/savepoint.h"
-
-#include "lastexpress/lastexpress.h"
+#include "lastexpress/game/scenes.h"
 
 namespace LastExpress {
 
diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h
index 18039e9..872eae1 100644
--- a/engines/lastexpress/entities/entity.h
+++ b/engines/lastexpress/entities/entity.h
@@ -26,7 +26,9 @@
 #include "lastexpress/shared.h"
 
 #include "lastexpress/sound/sound.h"
+#include "lastexpress/game/state.h"
 
+#include "lastexpress/lastexpress.h"
 #include "lastexpress/helpers.h"
 
 #include "common/array.h"