diff options
Diffstat (limited to 'engines/agos/agos.h')
| -rw-r--r-- | engines/agos/agos.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/engines/agos/agos.h b/engines/agos/agos.h index ac1f33428b..f279a6dba3 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -34,14 +34,13 @@ #include "common/stack.h" #include "common/util.h" +#ifdef ENABLE_AGOS2 #include "agos/animation.h" +#endif #include "agos/midi.h" #include "agos/sound.h" #include "agos/vga.h" -// TODO: Replace with more portable code -#include <setjmp.h> - namespace AGOS { uint fileReadItemID(Common::SeekableReadStream *in); @@ -892,6 +891,7 @@ public: void vc19_loop(); void vc20_setRepeat(); void vc21_endRepeat(); + virtual void vc22_setPalette(); void vc23_setPriority(); void vc24_setSpriteXY(); void vc25_halt_sprite(); @@ -904,7 +904,7 @@ public: void vc33_setMouseOn(); void vc34_setMouseOff(); void vc35_clearWindow(); - void vc36_setWindowImage(); + virtual void vc36_setWindowImage(); void vc38_ifVarNotZero(); void vc39_setVar(); void vc40_scrollRight(); @@ -924,7 +924,6 @@ public: // Video Script Opcodes, Elvira 1 void vc17_waitEnd(); - void vc22_setPaletteOld(); void vc32_saveScreen(); void vc37_pokePalette(); @@ -962,10 +961,9 @@ public: void vc45_setSpriteX(); void vc46_setSpriteY(); void vc47_addToVar(); - void vc48_setPathFinder(); + virtual void vc48_setPathFinder(); void vc59_ifSpeech(); void vc61_setMaskImage(); - void vc22_setPaletteNew(); // Video Script Opcodes, Simon 2 void vc56_delayLong(); @@ -1771,6 +1769,8 @@ public: virtual void executeOpcode(int opcode); + virtual void vc22_setPalette(); + // Opcodes, Simon 1 void os1_animate(); void os1_pauseGame(); @@ -1875,6 +1875,7 @@ protected: virtual char *genSaveName(int slot); }; +#ifdef ENABLE_AGOS2 class AGOSEngine_Feeble : public AGOSEngine_Simon2 { public: AGOSEngine_Feeble(OSystem *system); @@ -1886,6 +1887,9 @@ public: virtual void executeOpcode(int opcode); + virtual void vc36_setWindowImage(); + virtual void vc48_setPathFinder(); + void off_chance(); void off_jumpOut(); void off_addTextBox(); @@ -2092,6 +2096,7 @@ protected: virtual char *genSaveName(int slot); }; +#endif } // End of namespace AGOS |