diff options
| author | Max Horn | 2007-09-08 11:18:35 +0000 |
|---|---|---|
| committer | Max Horn | 2007-09-08 11:18:35 +0000 |
| commit | efbef7880b147678f2bf76624988a32a06c1c449 (patch) | |
| tree | cee439b1f3f2a808307d380a2081605f42e57005 /engines/lure/res_struct.h | |
| parent | 127900b33c8e7c817e9b676064e832192d8e7bc7 (diff) | |
| download | scummvm-rg350-efbef7880b147678f2bf76624988a32a06c1c449.tar.gz scummvm-rg350-efbef7880b147678f2bf76624988a32a06c1c449.tar.bz2 scummvm-rg350-efbef7880b147678f2bf76624988a32a06c1c449.zip | |
Fixed code formatting (hanging braces); added static/const keywords to data tables; merged Hotspot::doLookAt and doLookThrough code
svn-id: r28880
Diffstat (limited to 'engines/lure/res_struct.h')
| -rw-r--r-- | engines/lure/res_struct.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/lure/res_struct.h b/engines/lure/res_struct.h index d5b80439cc..f6c1966a93 100644 --- a/engines/lure/res_struct.h +++ b/engines/lure/res_struct.h @@ -629,7 +629,7 @@ public: // The following classes holds the data for NPC schedules -extern int actionNumParams[NPC_JUMP_ADDRESS+1]; +extern const int actionNumParams[NPC_JUMP_ADDRESS+1]; class CharacterScheduleSet; @@ -741,13 +741,16 @@ struct BarEntry { uint16 roomNumber; uint16 barmanId; ServeEntry customers[NUM_SERVE_CUSTOMERS]; - uint16 *graphics[4]; + const uint16 *graphics[4]; uint16 gridLine; ServeEntry *currentCustomer; }; class BarmanLists { + BarEntry _barList[3]; public: + BarmanLists(); + BarEntry &getDetails(uint16 roomNumber); void saveToStream(Common::WriteStream *stream); void loadFromStream(Common::ReadStream *stream); @@ -760,7 +763,7 @@ struct RoomTranslationRecord { uint8 destRoom; }; -extern RoomTranslationRecord roomTranslations[]; +extern const RoomTranslationRecord roomTranslations[]; enum StringEnum {S_CREDITS = 25, S_RESTART_GAME = 26, S_SAVE_GAME = 27, S_RESTORE_GAME = 28, S_QUIT = 29, S_FAST_TEXT = 30, S_SLOW_TEXT = 31, S_SOUND_ON = 32, S_SOUND_OFF = 33, |