diff options
| author | Alyssa Milburn | 2012-08-28 15:39:00 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2012-08-28 15:54:12 +0200 |
| commit | 31801137b5c6908edd76f357b3f29b07e9e3be84 (patch) | |
| tree | 33e973717545ae27da6ba4996d0d8fe1bcd437b3 /engines/lastexpress/fight/fight.cpp | |
| parent | 35fd91793b34b72624a89f2a76f45bc8e59020d2 (diff) | |
| parent | 6ab8db638e4a1d547ee67db067b5d6c3d6c940a4 (diff) | |
| download | scummvm-rg350-31801137b5c6908edd76f357b3f29b07e9e3be84.tar.gz scummvm-rg350-31801137b5c6908edd76f357b3f29b07e9e3be84.tar.bz2 scummvm-rg350-31801137b5c6908edd76f357b3f29b07e9e3be84.zip | |
Merge remote-tracking branch 'origin/master' into tony
Conflicts:
common/coroutines.cpp
common/coroutines.h
devtools/create_project/msbuild.cpp
devtools/create_project/visualstudio.cpp
Diffstat (limited to 'engines/lastexpress/fight/fight.cpp')
| -rw-r--r-- | engines/lastexpress/fight/fight.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/lastexpress/fight/fight.cpp b/engines/lastexpress/fight/fight.cpp index b832d46a60..49a9b85657 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" @@ -40,7 +41,6 @@ #include "lastexpress/sound/queue.h" #include "lastexpress/graphics.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" @@ -53,6 +53,8 @@ Fight::FightData::FightData() { index = 0; isFightRunning = false; + + memset(&sequences, 0, sizeof(sequences)); } Fight::FightData::~FightData() { @@ -399,6 +401,9 @@ end_load: } void Fight::setOpponents() { + if (!_data) + error("[Fight::setOpponents] Data not initialized"); + _data->player->setOpponent(_data->opponent); _data->opponent->setOpponent(_data->player); |