diff options
| author | Paul Gilbert | 2011-06-27 19:03:50 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2011-06-27 19:03:50 +1000 |
| commit | af00b91111d4cbf6660879e924e06d542b8ebc3b (patch) | |
| tree | d282254bcb9feb9aaff40a18f43bdf68d136f808 /engines/cge/game.h | |
| parent | e13317baeab99f4868d49a89e110deda1d5ca5f4 (diff) | |
| parent | 083d6ff6122cb2faf0a4330eb480bb9f77afa255 (diff) | |
| download | scummvm-rg350-af00b91111d4cbf6660879e924e06d542b8ebc3b.tar.gz scummvm-rg350-af00b91111d4cbf6660879e924e06d542b8ebc3b.tar.bz2 scummvm-rg350-af00b91111d4cbf6660879e924e06d542b8ebc3b.zip | |
Merge branch 'soltys_wip2' of github.com:Strangerke/scummvm into cge
Conflicts:
engines/cge/cge_main.cpp
engines/cge/general.cpp
engines/cge/snail.cpp
engines/cge/vga13h.cpp
Diffstat (limited to 'engines/cge/game.h')
| -rw-r--r-- | engines/cge/game.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/cge/game.h b/engines/cge/game.h index 1d65d0c767..7892b1c93f 100644 --- a/engines/cge/game.h +++ b/engines/cge/game.h @@ -48,8 +48,10 @@ class FLY : public SPRITE { static int L, T, R, B; public: int Tx, Ty; - FLY(BITMAP **shpl); + FLY(CGEEngine *vm, BITMAP **shpl); void Tick(void); +private: + CGEEngine *_vm; }; } // End of namespace CGE |