diff options
| author | johndoe123 | 2014-01-30 20:18:55 +0100 |
|---|---|---|
| committer | johndoe123 | 2014-01-30 20:18:55 +0100 |
| commit | cf51529cfd0fedb33b1b0c70beb59997b21cfc5b (patch) | |
| tree | 1df30e23c7f1eac7ca4a8ddfba40c89c2577dda7 /engines/parallaction/parallaction.h | |
| parent | 542197a891eac799855571fe2849e0dca43bdd2b (diff) | |
| parent | 462f7c1c24a48b7555316a3afae357bad14cc14b (diff) | |
| download | scummvm-rg350-cf51529cfd0fedb33b1b0c70beb59997b21cfc5b.tar.gz scummvm-rg350-cf51529cfd0fedb33b1b0c70beb59997b21cfc5b.tar.bz2 scummvm-rg350-cf51529cfd0fedb33b1b0c70beb59997b21cfc5b.zip | |
Merge remote-tracking branch 'origin/master' into bbvs
Diffstat (limited to 'engines/parallaction/parallaction.h')
| -rw-r--r-- | engines/parallaction/parallaction.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index 2dbb0227d6..203a0168ea 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -360,7 +360,7 @@ public: uint32 getLocationFlags(); bool checkSpecialZoneBox(ZonePtr z, uint32 type, uint x, uint y); bool checkZoneBox(ZonePtr z, uint32 type, uint x, uint y); - bool checkZoneType(ZonePtr z, uint32 type); + bool checkZoneType(ZonePtr z, uint32 type); bool checkLinkedAnimBox(ZonePtr z, uint32 type, uint x, uint y); ZonePtr hitZone(uint32 type, uint16 x, uint16 y); void runZone(ZonePtr z); @@ -579,7 +579,7 @@ private: void freeLocation(bool removeAll); void loadProgram(AnimationPtr a, const char *filename); void startGui(bool showSplash); - void startIngameMenu(); + void startIngameMenu(); void freeCharacter(); typedef void (Parallaction_br::*Callable)(void *); |