* Moved Being public char *speech to private std::string speech

* Moved Being public PATH_NODE *path to private std::list<PATH_NODE> path
* Fixed warping issue which corrupted player (which also applies to respawning)
* Got rid of sound error in Setup window

1 files changed, 3 insertions, 17 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 69ffd431..a48b184b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -76,20 +76,6 @@ Sound sound;
 // ini file configuration reader
 Configuration config;
 
-// macros for safe object deletion
-#define SAFE_DELETE(object) { \
-    if (object != NULL) {     \
-        delete object;        \
-    }                         \
-}
-
-#define SAFE_DELETE_ARRAY(array) { \
-    if (array != NULL) {           \
-        delete [] array;           \
-    }                              \
-}
-
-
 /**
  * Listener used for responding to map start error dialog.
  */
@@ -313,9 +299,9 @@ void init_engine()
 void exit_engine()
 {
     config.write(dir);
-    SAFE_DELETE_ARRAY(dir);
-    SAFE_DELETE(gui);
-    SAFE_DELETE(graphics);
+    delete[] dir;
+    delete gui;
+    delete graphics;
 
     // Shutdown libxml
     xmlCleanupParser();