summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-27 12:10:34 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-27 12:15:50 +0100
commit38674a7732d2224e07e80c0c4224e3468e4ddfb0 (patch)
treef022f88febb3653320682452e4fc618ea60392ab /src/main.cpp
parent06be39a51f62d365ce84d7815173577d2ecf8496 (diff)
downloadmana-38674a7732d2224e07e80c0c4224e3468e4ddfb0.tar.gz
mana-38674a7732d2224e07e80c0c4224e3468e4ddfb0.tar.bz2
mana-38674a7732d2224e07e80c0c4224e3468e4ddfb0.tar.xz
mana-38674a7732d2224e07e80c0c4224e3468e4ddfb0.zip
Moved choosing of random death message to a function
Also dynamically calculated the size of the array, so that you don't have to count the messages manually. :P
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 2f99b352..e954df4e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,18 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <getopt.h>
-#include <iostream>
-#include <physfs.h>
-#include <unistd.h>
-#include <vector>
-#include <SDL_image.h>
-
-#include <guichan/actionlistener.hpp>
-
-#include <libxml/parser.h>
-
-#include <SDL/SDL_ttf.h>
+#include "main.h"
#include "configuration.h"
#include "emoteshortcut.h"
@@ -42,7 +31,6 @@
#include "lockedarray.h"
#include "log.h"
#include "logindata.h"
-#include "main.h"
#ifdef USE_OPENGL
#include "openglgraphics.h"
#endif
@@ -111,6 +99,18 @@
#include "utils/stringutils.h"
#include "utils/strprintf.h"
+#include <SDL_image.h>
+
+#include <guichan/actionlistener.hpp>
+
+#include <libxml/parser.h>
+
+#include <getopt.h>
+#include <iostream>
+#include <physfs.h>
+#include <unistd.h>
+#include <vector>
+
#ifdef __APPLE__
#include <CoreFoundation/CFBundle.h>
#endif