diff options
| author | Littleboy | 2012-08-21 22:49:38 -0400 |
|---|---|---|
| committer | Littleboy | 2012-08-27 21:49:37 -0400 |
| commit | cec57e091834567552658aacfa6561fe80e1a6f8 (patch) | |
| tree | 1e6538f1a7bdda5a1dac5e6a2ebd64f808c9360a /engines/lastexpress/entities | |
| parent | 86febf3d1dfd780c35c505accc55df28c1ac80c3 (diff) | |
| download | scummvm-rg350-cec57e091834567552658aacfa6561fe80e1a6f8.tar.gz scummvm-rg350-cec57e091834567552658aacfa6561fe80e1a6f8.tar.bz2 scummvm-rg350-cec57e091834567552658aacfa6561fe80e1a6f8.zip | |
LASTEXPRESS: Reduce header interdependency
Diffstat (limited to 'engines/lastexpress/entities')
| -rw-r--r-- | engines/lastexpress/entities/entity.cpp | 11 | ||||
| -rw-r--r-- | engines/lastexpress/entities/entity.h | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp index 2deca291f6..552e1a8a82 100644 --- a/engines/lastexpress/entities/entity.cpp +++ b/engines/lastexpress/entities/entity.cpp @@ -26,10 +26,15 @@ #include "lastexpress/game/action.h" #include "lastexpress/game/entities.h" +#include "lastexpress/game/logic.h" #include "lastexpress/game/object.h" #include "lastexpress/game/savegame.h" +#include "lastexpress/game/savepoint.h" +#include "lastexpress/game/state.h" #include "lastexpress/game/scenes.h" +#include "lastexpress/lastexpress.h" + namespace LastExpress { ////////////////////////////////////////////////////////////////////////// @@ -49,8 +54,10 @@ void EntityData::EntityCallData::syncString(Common::Serializer &s, Common::Strin char seqName[13]; memset(&seqName, 0, length); - if (s.isSaving()) strcpy((char *)&seqName, string.c_str()); - s.syncBytes((byte *)&seqName, length); + if (s.isSaving()) + strcpy((char *)&seqName, string.c_str()); + + s.syncBytes((byte *)&seqName, length); if (s.isLoading()) string = seqName; diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h index 3601f34f6f..e5c097b50a 100644 --- a/engines/lastexpress/entities/entity.h +++ b/engines/lastexpress/entities/entity.h @@ -25,13 +25,8 @@ #include "lastexpress/shared.h" -#include "lastexpress/game/logic.h" -#include "lastexpress/game/savepoint.h" -#include "lastexpress/game/state.h" - #include "lastexpress/sound/sound.h" -#include "lastexpress/lastexpress.h" #include "lastexpress/helpers.h" #include "common/array.h" |