diff options
| author | Kamil Zbróg | 2013-11-26 18:53:03 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2013-11-26 18:53:03 +0000 |
| commit | 15bb1c61eda48f09253ccb8d2a42ccad59f3b00a (patch) | |
| tree | c2f5ac2907225730c6f1cdaa000f549ef7951183 /engines/fullpipe/fullpipe.h | |
| parent | 446c57d281e592653c9935c896d33334d23f0519 (diff) | |
| parent | e1afc7d0d777dad4b7ca0a58f0bb0324b24f9584 (diff) | |
| download | scummvm-rg350-15bb1c61eda48f09253ccb8d2a42ccad59f3b00a.tar.gz scummvm-rg350-15bb1c61eda48f09253ccb8d2a42ccad59f3b00a.tar.bz2 scummvm-rg350-15bb1c61eda48f09253ccb8d2a42ccad59f3b00a.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Conflicts:
engines/configure.engines
engines/engines.mk
engines/plugins_table.h
Diffstat (limited to 'engines/fullpipe/fullpipe.h')
| -rw-r--r-- | engines/fullpipe/fullpipe.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h index 2cd0f87d32..63dde5042b 100644 --- a/engines/fullpipe/fullpipe.h +++ b/engines/fullpipe/fullpipe.h @@ -52,6 +52,7 @@ class Inventory2; struct CursorInfo; struct EntranceInfo; class ExCommand; +class Floaters; class GameProject; class GameObject; class GlobalMessageQueueList; @@ -163,6 +164,8 @@ public: MovTable *_movTable; + Floaters *_floaters; + void initMap(); void updateMapPiece(int mapId, int update); void updateScreen(); @@ -227,10 +230,12 @@ public: void openHelp(); void openMainMenu(); + void initArcadeKeys(const char *varname); void winArcade(); void getAllInventory(); int lift_getButtonIdP(int objid); + void lift_setButton(const char *name, int state); void lift_sub5(Scene *sc, int qu1, int qu2); void lift_exitSeq(ExCommand *ex); void lift_closedoorSeq(); |