summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-13 01:16:52 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-13 01:16:52 +0000
commitab9debf3fa91f3b36c6739f4affbdc187e78113d (patch)
tree4e22c94c0c3fd70c7741e98a7d81d0150ff57fba /src/main.cpp
parentd0c5ab3fe88e1248f755a764248037960f7bed35 (diff)
downloadmana-client-ab9debf3fa91f3b36c6739f4affbdc187e78113d.tar.gz
mana-client-ab9debf3fa91f3b36c6739f4affbdc187e78113d.tar.bz2
mana-client-ab9debf3fa91f3b36c6739f4affbdc187e78113d.tar.xz
mana-client-ab9debf3fa91f3b36c6739f4affbdc187e78113d.zip
* 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
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp20
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();