diff options
| author | Strangerke | 2012-10-10 08:26:41 +0200 |
|---|---|---|
| committer | Strangerke | 2012-10-10 08:26:41 +0200 |
| commit | b164cbb571fc4e0f2a6f002760a851d8ac592540 (patch) | |
| tree | 4d25f2e1f8241f6f3352fd9fb1135f5faa36dfd4 /engines/agos/agos.h | |
| parent | b2f2f8d7b08b40e43702e8db325f8136066f10be (diff) | |
| parent | 1e200620d673af4acdd2d128ed6e390df001aacf (diff) | |
| download | scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.tar.gz scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.tar.bz2 scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.zip | |
Merge branch 'master' of github.com:scummvm/scummvm into mortevielle
Conflicts:
base/plugins.cpp
configure
Diffstat (limited to 'engines/agos/agos.h')
| -rw-r--r-- | engines/agos/agos.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/agos/agos.h b/engines/agos/agos.h index d9f982a0fa..65f8dd1420 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -1265,7 +1265,7 @@ protected: virtual void doOutput(const byte *src, uint len); void clsCheck(WindowBlock *window); - void quickLoadOrSave(); + virtual void quickLoadOrSave(); byte *vc10_uncompressFlip(const byte *src, uint16 w, uint16 h); byte *vc10_flip(const byte *src, uint16 w, uint16 h); @@ -2060,6 +2060,7 @@ protected: void windowBackSpace(WindowBlock *window); virtual char *genSaveName(int slot); + virtual void quickLoadOrSave(); }; class AGOSEngine_FeebleDemo : public AGOSEngine_Feeble { |