diff options
| author | Thanasis Antoniou | 2019-04-10 15:21:20 +0300 |
|---|---|---|
| committer | Thanasis Antoniou | 2019-04-10 19:00:14 +0300 |
| commit | c99fbcd53b10261fb193f056ba544df81bb401e3 (patch) | |
| tree | 6b75099825e33bdacf49f517e0e2d42f8cdf81a9 | |
| parent | acb3edb601f6e343649cb7d9932dace86d445a43 (diff) | |
| download | scummvm-rg350-c99fbcd53b10261fb193f056ba544df81bb401e3.tar.gz scummvm-rg350-c99fbcd53b10261fb193f056ba544df81bb401e3.tar.bz2 scummvm-rg350-c99fbcd53b10261fb193f056ba544df81bb401e3.zip | |
BLADERUNNER: Fix compilation when enabling some macros
Compilation was broken for BLADERUNNER_ORIGINAL_SETTINGS(1) and BLADERUNNER_ORIGINAL_BUGS(1)
| -rw-r--r-- | engines/bladerunner/game_constants.h | 3 | ||||
| -rw-r--r-- | engines/bladerunner/script/scene/ps11.cpp | 2 | ||||
| -rw-r--r-- | engines/bladerunner/ui/kia_section_settings.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h index 5f60739a11..9da269b23b 100644 --- a/engines/bladerunner/game_constants.h +++ b/engines/bladerunner/game_constants.h @@ -2193,9 +2193,10 @@ enum GoalZuben { enum GoalOfficerLeary { kGoalOfficerLearyDefault = 0, kGoalOfficerLearyRC01WalkToCrowd = 1, - kGoalOfficerLearyRC01CrowdInterrogation = 2, #if BLADERUNNER_ORIGINAL_BUGS + kGoalOfficerLearyRC01CrowdInterrogation = 2 #else + kGoalOfficerLearyRC01CrowdInterrogation = 2, kGoalOfficerLearyRC01ResumeWalkToCrowd = 4 #endif // BLADERUNNER_ORIGINAL_BUGS }; diff --git a/engines/bladerunner/script/scene/ps11.cpp b/engines/bladerunner/script/scene/ps11.cpp index 97b4615ec5..03c3b0906b 100644 --- a/engines/bladerunner/script/scene/ps11.cpp +++ b/engines/bladerunner/script/scene/ps11.cpp @@ -268,7 +268,7 @@ static const int *getPoliceMazePS11TrackData14() { // Enemy (kItemPS11Target6) kPMTIRotate, 644, 80, kPMTIWait, 0, #if BLADERUNNER_ORIGINAL_BUGS -1 kPMTIRotate, 388, 80, // orientation is wrong here + kPMTIRotate, 388, 80, // orientation is wrong here #else kPMTIRotate, 260, 80, // corrected orientation - face towards McCoy #endif // BLADERUNNER_ORIGINAL_BUGS diff --git a/engines/bladerunner/ui/kia_section_settings.h b/engines/bladerunner/ui/kia_section_settings.h index 5252ad7163..ffb408e33f 100644 --- a/engines/bladerunner/ui/kia_section_settings.h +++ b/engines/bladerunner/ui/kia_section_settings.h @@ -23,6 +23,7 @@ #ifndef BLADERUNNER_KIA_SECTION_SETTINGS_H #define BLADERUNNER_KIA_SECTION_SETTINGS_H +#include "bladerunner/bladerunner.h" // for BLADERUNNER_ORIGINAL_SETTINGS macro #include "bladerunner/ui/kia_section_base.h" #include "common/config-manager.h" |