diff --git a/editor/DallasMainDlg.cpp b/editor/DallasMainDlg.cpp index 2453d1eb3..f41741841 100644 --- a/editor/DallasMainDlg.cpp +++ b/editor/DallasMainDlg.cpp @@ -9694,7 +9694,7 @@ int CDallasMainDlg::CreateScriptFile(char *filename) { O(("class BaseScript {")); O(("public:")); O((" BaseScript();")); - O((" ~BaseScript();")); + O((" virtual ~BaseScript();")); O((" virtual int16_t CallEvent(int event, tOSIRISEventInfo *data);")); O(("};")); O(("")); diff --git a/scripts/AIGame.cpp b/scripts/AIGame.cpp index dfc24899b..3d074b99f 100644 --- a/scripts/AIGame.cpp +++ b/scripts/AIGame.cpp @@ -344,7 +344,7 @@ static int GetObjectType(int object); class BaseObjScript { public: BaseObjScript(); - ~BaseObjScript(); + virtual ~BaseObjScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/AIGame3.cpp b/scripts/AIGame3.cpp index b7374af2e..90879bc57 100644 --- a/scripts/AIGame3.cpp +++ b/scripts/AIGame3.cpp @@ -602,7 +602,7 @@ static tScriptInfo ScriptInfo[NUM_IDS] = { class BaseObjScript { public: BaseObjScript(); - ~BaseObjScript(); + virtual ~BaseObjScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/BatteriesIncluded.cpp b/scripts/BatteriesIncluded.cpp index 9a5746736..b7ee1450d 100644 --- a/scripts/BatteriesIncluded.cpp +++ b/scripts/BatteriesIncluded.cpp @@ -98,7 +98,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/BossCamera.cpp b/scripts/BossCamera.cpp index 4c467cd60..0419e9698 100644 --- a/scripts/BossCamera.cpp +++ b/scripts/BossCamera.cpp @@ -62,7 +62,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/CanyonsCTF.cpp b/scripts/CanyonsCTF.cpp index bc53160a0..c74df9fc7 100644 --- a/scripts/CanyonsCTF.cpp +++ b/scripts/CanyonsCTF.cpp @@ -60,7 +60,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/CellTestLevel.cpp b/scripts/CellTestLevel.cpp index 6d8628e69..6361b312f 100644 --- a/scripts/CellTestLevel.cpp +++ b/scripts/CellTestLevel.cpp @@ -60,7 +60,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/ChrisTest.cpp b/scripts/ChrisTest.cpp index 4fce894a9..b7460ad37 100644 --- a/scripts/ChrisTest.cpp +++ b/scripts/ChrisTest.cpp @@ -62,7 +62,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Geodomes.cpp b/scripts/Geodomes.cpp index 2802bed7b..16419adc8 100644 --- a/scripts/Geodomes.cpp +++ b/scripts/Geodomes.cpp @@ -65,7 +65,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/HalfPipe.cpp b/scripts/HalfPipe.cpp index a7cffd385..741b1965a 100644 --- a/scripts/HalfPipe.cpp +++ b/scripts/HalfPipe.cpp @@ -65,7 +65,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/InfernalBolt.cpp b/scripts/InfernalBolt.cpp index f9ff47c66..79cdd7d15 100644 --- a/scripts/InfernalBolt.cpp +++ b/scripts/InfernalBolt.cpp @@ -63,7 +63,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Inversion.cpp b/scripts/Inversion.cpp index 0864847ee..aac32243c 100644 --- a/scripts/Inversion.cpp +++ b/scripts/Inversion.cpp @@ -82,7 +82,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/LEVEL0.cpp b/scripts/LEVEL0.cpp index 71319b99a..e94f175c4 100644 --- a/scripts/LEVEL0.cpp +++ b/scripts/LEVEL0.cpp @@ -84,7 +84,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/LEVEL15.cpp b/scripts/LEVEL15.cpp index a16fe9859..8214dae50 100644 --- a/scripts/LEVEL15.cpp +++ b/scripts/LEVEL15.cpp @@ -118,7 +118,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Level12.cpp b/scripts/Level12.cpp index 264f193d7..b3b889c5a 100644 --- a/scripts/Level12.cpp +++ b/scripts/Level12.cpp @@ -175,7 +175,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Level16.cpp b/scripts/Level16.cpp index c3e9edd9f..b77adf3c2 100644 --- a/scripts/Level16.cpp +++ b/scripts/Level16.cpp @@ -68,7 +68,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Level6.cpp b/scripts/Level6.cpp index d3d1735d3..69fd719e2 100644 --- a/scripts/Level6.cpp +++ b/scripts/Level6.cpp @@ -118,7 +118,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Level9.cpp b/scripts/Level9.cpp index fc69d0e40..8bcf6621f 100644 --- a/scripts/Level9.cpp +++ b/scripts/Level9.cpp @@ -106,7 +106,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/LevelS1.cpp b/scripts/LevelS1.cpp index 25ab0f0e0..4fc227389 100644 --- a/scripts/LevelS1.cpp +++ b/scripts/LevelS1.cpp @@ -69,7 +69,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Merc02.cpp b/scripts/Merc02.cpp index bed94d7d2..0ef3758f5 100644 --- a/scripts/Merc02.cpp +++ b/scripts/Merc02.cpp @@ -124,7 +124,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Merc1.cpp b/scripts/Merc1.cpp index aee67bd18..a9afb13cf 100644 --- a/scripts/Merc1.cpp +++ b/scripts/Merc1.cpp @@ -174,7 +174,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Merc3.cpp b/scripts/Merc3.cpp index 97b1806e8..df86801c9 100644 --- a/scripts/Merc3.cpp +++ b/scripts/Merc3.cpp @@ -176,7 +176,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Merc4.cpp b/scripts/Merc4.cpp index e5bab276d..27a76d898 100644 --- a/scripts/Merc4.cpp +++ b/scripts/Merc4.cpp @@ -99,7 +99,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Merc6.cpp b/scripts/Merc6.cpp index b36f186a2..4401fc9ac 100644 --- a/scripts/Merc6.cpp +++ b/scripts/Merc6.cpp @@ -110,7 +110,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Merc7.cpp b/scripts/Merc7.cpp index 2005562a5..0d3c3a570 100644 --- a/scripts/Merc7.cpp +++ b/scripts/Merc7.cpp @@ -145,7 +145,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Mysterious_Isle.cpp b/scripts/Mysterious_Isle.cpp index e9e021aff..3dd7e05fb 100644 --- a/scripts/Mysterious_Isle.cpp +++ b/scripts/Mysterious_Isle.cpp @@ -72,7 +72,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Paranoia.cpp b/scripts/Paranoia.cpp index 99744bf1d..aab1bb4ba 100644 --- a/scripts/Paranoia.cpp +++ b/scripts/Paranoia.cpp @@ -60,7 +60,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/PiccuStation.cpp b/scripts/PiccuStation.cpp index 882771773..f435145c1 100644 --- a/scripts/PiccuStation.cpp +++ b/scripts/PiccuStation.cpp @@ -136,7 +136,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Polaris.cpp b/scripts/Polaris.cpp index f93387553..496b4bc8f 100644 --- a/scripts/Polaris.cpp +++ b/scripts/Polaris.cpp @@ -67,7 +67,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Quadsomniac.cpp b/scripts/Quadsomniac.cpp index d9269a9f0..f2e641496 100644 --- a/scripts/Quadsomniac.cpp +++ b/scripts/Quadsomniac.cpp @@ -69,7 +69,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/RudeAwakening.cpp b/scripts/RudeAwakening.cpp index b82c20db8..47904b139 100644 --- a/scripts/RudeAwakening.cpp +++ b/scripts/RudeAwakening.cpp @@ -69,7 +69,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/SewerRat.cpp b/scripts/SewerRat.cpp index 9bcea2729..4f6a4f1bb 100644 --- a/scripts/SewerRat.cpp +++ b/scripts/SewerRat.cpp @@ -60,7 +60,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/TrainingMission.cpp b/scripts/TrainingMission.cpp index 0fe1309f2..5acf13ca6 100644 --- a/scripts/TrainingMission.cpp +++ b/scripts/TrainingMission.cpp @@ -91,7 +91,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/Y2K.cpp b/scripts/Y2K.cpp index 38c1fee4f..decc150d0 100644 --- a/scripts/Y2K.cpp +++ b/scripts/Y2K.cpp @@ -60,7 +60,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/aigame2.cpp b/scripts/aigame2.cpp index e5008b73b..84a1a04a6 100644 --- a/scripts/aigame2.cpp +++ b/scripts/aigame2.cpp @@ -82,6 +82,7 @@ static const char *const Script_names[NUM_IDS] = {"Samir's Pest", "StormTrooperB // ai base class class aiObjScript { public: + virtual ~aiObjScript() = default; int16_t CallEvent(int event, tOSIRISEventInfo *data); protected: diff --git a/scripts/aigame4.cpp b/scripts/aigame4.cpp index 977d9dffd..bc3c18a0a 100644 --- a/scripts/aigame4.cpp +++ b/scripts/aigame4.cpp @@ -126,7 +126,7 @@ static int aigame_mod_id; class BaseObjScript { public: BaseObjScript(); - ~BaseObjScript(); + virtual ~BaseObjScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/barney.cpp b/scripts/barney.cpp index f55a39703..168aa2a39 100644 --- a/scripts/barney.cpp +++ b/scripts/barney.cpp @@ -60,7 +60,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/clutter.cpp b/scripts/clutter.cpp index bdf516b3a..586428e43 100644 --- a/scripts/clutter.cpp +++ b/scripts/clutter.cpp @@ -79,6 +79,7 @@ static int NumScriptIDs = sizeof(ScriptIDs) / sizeof(tScriptInfo); class ClutterScript { public: + virtual ~ClutterScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } }; diff --git a/scripts/generic.cpp b/scripts/generic.cpp index 291621a0c..77595e942 100644 --- a/scripts/generic.cpp +++ b/scripts/generic.cpp @@ -88,6 +88,7 @@ tScriptIDInfo ScriptIDInfo[NUM_IDS] = { class GenericScript { public: GenericScript() {} + virtual ~GenericScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); protected: diff --git a/scripts/level1.cpp b/scripts/level1.cpp index 6e03591a5..ce2841413 100644 --- a/scripts/level1.cpp +++ b/scripts/level1.cpp @@ -86,7 +86,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/level10.cpp b/scripts/level10.cpp index cbd2d875f..118bf4fd6 100644 --- a/scripts/level10.cpp +++ b/scripts/level10.cpp @@ -145,7 +145,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/level11.cpp b/scripts/level11.cpp index 1db0f5955..823a34e56 100644 --- a/scripts/level11.cpp +++ b/scripts/level11.cpp @@ -210,7 +210,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/level13.cpp b/scripts/level13.cpp index 478db75ef..4bef365ff 100644 --- a/scripts/level13.cpp +++ b/scripts/level13.cpp @@ -168,7 +168,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/level14.cpp b/scripts/level14.cpp index c82bd9c4f..dae460851 100644 --- a/scripts/level14.cpp +++ b/scripts/level14.cpp @@ -108,7 +108,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/level17.cpp b/scripts/level17.cpp index ba09b5dda..a6820404d 100644 --- a/scripts/level17.cpp +++ b/scripts/level17.cpp @@ -194,7 +194,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/level2.cpp b/scripts/level2.cpp index 0f5bd5ff5..0e38d006a 100644 --- a/scripts/level2.cpp +++ b/scripts/level2.cpp @@ -128,7 +128,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/level3.cpp b/scripts/level3.cpp index b5b536982..c696e2a50 100644 --- a/scripts/level3.cpp +++ b/scripts/level3.cpp @@ -125,7 +125,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/level4.cpp b/scripts/level4.cpp index f0d614914..ac8c19b85 100644 --- a/scripts/level4.cpp +++ b/scripts/level4.cpp @@ -76,7 +76,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/level5.cpp b/scripts/level5.cpp index 3f941c54b..56a86e33a 100644 --- a/scripts/level5.cpp +++ b/scripts/level5.cpp @@ -95,7 +95,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/level7.cpp b/scripts/level7.cpp index d96bddb86..4ed28b74d 100644 --- a/scripts/level7.cpp +++ b/scripts/level7.cpp @@ -127,7 +127,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/level8.cpp b/scripts/level8.cpp index 52fbaf66c..08a20b284 100644 --- a/scripts/level8.cpp +++ b/scripts/level8.cpp @@ -123,7 +123,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/levelS2.cpp b/scripts/levelS2.cpp index b6e567dcd..1e59e6c9b 100644 --- a/scripts/levelS2.cpp +++ b/scripts/levelS2.cpp @@ -195,7 +195,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/merc5.cpp b/scripts/merc5.cpp index 329fafdf6..5be250c35 100644 --- a/scripts/merc5.cpp +++ b/scripts/merc5.cpp @@ -108,7 +108,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/myPowerHouse.cpp b/scripts/myPowerHouse.cpp index a4eabcf0d..dcf811aa0 100644 --- a/scripts/myPowerHouse.cpp +++ b/scripts/myPowerHouse.cpp @@ -62,7 +62,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/orbital.cpp b/scripts/orbital.cpp index 4761cc8c9..406b5be7f 100644 --- a/scripts/orbital.cpp +++ b/scripts/orbital.cpp @@ -63,7 +63,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: BaseScript(); - ~BaseScript(); + virtual ~BaseScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; diff --git a/scripts/testscript.cpp b/scripts/testscript.cpp index a0ed458df..b3caa8b5a 100644 --- a/scripts/testscript.cpp +++ b/scripts/testscript.cpp @@ -56,7 +56,7 @@ tScriptInfo ScriptInfo[MAX_IDS] = {{ID_SHIELD_ORB, "Shield"}, {ID_ENERGY_ORB, "E class BaseObjScript { public: BaseObjScript(); - ~BaseObjScript(); + virtual ~BaseObjScript(); virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); protected: