diff options
| author | Kamil Zbróg | 2013-11-04 11:40:22 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2013-11-04 11:40:22 +0000 |
| commit | 85694ec1f5793eb4025f4153ef4bf71d3769d699 (patch) | |
| tree | c93fab58eb2f52eca244895a9867d28134dbd7f5 /engines/tsage/blue_force/blueforce_scenes4.h | |
| parent | 026390145b0e947be7cccf3d9ba329eb2270a2ed (diff) | |
| parent | 9dc35033f523c9c694f24e15ed45ba6194786a25 (diff) | |
| download | scummvm-rg350-85694ec1f5793eb4025f4153ef4bf71d3769d699.tar.gz scummvm-rg350-85694ec1f5793eb4025f4153ef4bf71d3769d699.tar.bz2 scummvm-rg350-85694ec1f5793eb4025f4153ef4bf71d3769d699.zip | |
Merge remote-tracking branch 'own/prince' into prince-malik
Conflicts:
engines/prince/debugger.cpp
engines/prince/debugger.h
engines/prince/detection.cpp
engines/prince/font.cpp
engines/prince/graphics.cpp
engines/prince/prince.cpp
engines/prince/prince.h
engines/prince/script.cpp
engines/prince/script.h
Diffstat (limited to 'engines/tsage/blue_force/blueforce_scenes4.h')
| -rw-r--r-- | engines/tsage/blue_force/blueforce_scenes4.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes4.h b/engines/tsage/blue_force/blueforce_scenes4.h index 937c015a4c..d6d795a44e 100644 --- a/engines/tsage/blue_force/blueforce_scenes4.h +++ b/engines/tsage/blue_force/blueforce_scenes4.h @@ -116,9 +116,10 @@ public: SpeakerDriver _driverSpeaker; SpeakerShooter _shooterSpeaker; ASoundExt _sound1; - int _field1FB6, _talkCount, _field1FBA; - int _field1FBC, _field1FBE; - int _field1FC0, _field1FC2, _field1FC4; + int _action1Count, _talkCount, _field1FBA; + int _cuffedDriverFl, _field1FBE; + int _field1FC0; + int _field1FC2, _harrisonMovedFl; Scene410(); virtual void postInit(SceneObjectList *OwnerList = NULL); |