build: resolve 2107 instances of -Wdelete-non-virtual-dtor

scripts/Y2K.cpp:467:5: warning: deleting object of polymorphic class type "LevelScript_0000" which has non-virtual destructor might cause undefined behavior [-Wdelete-non-virtual-dtor] 467 | delete ((LevelScript_0000 *)ptr);
DescentDevelopers · Nov 3, 2024 · a58c275 · a58c275
1 parent d51ce96
commit a58c275
Show file tree

Hide file tree

Showing 56 changed files with 56 additions and 53 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
 };
-Original file line number
+Diff line change
@@ Expand Up @@
     class ClutterScript {
     public:
+      virtual ~ClutterScript() = default;
       virtual int16_t CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; }
     };
@@ Expand Down @@