summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2007-05-04 13:09:25 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2007-05-04 13:09:25 +0000
commit00fb4bde7974a20aacfc1c52e48fff2faee2d385 (patch)
tree2097ef003495d7e6b4a8cf697ad7896039aac113 /src/game.cpp
parentb3376bfe4e26591e1dc1066d8f2270baf4f9f759 (diff)
downloadmana-00fb4bde7974a20aacfc1c52e48fff2faee2d385.tar.gz
mana-00fb4bde7974a20aacfc1c52e48fff2faee2d385.tar.bz2
mana-00fb4bde7974a20aacfc1c52e48fff2faee2d385.tar.xz
mana-00fb4bde7974a20aacfc1c52e48fff2faee2d385.zip
Merged particle engine into main eAthena branch.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp
index d8235384..a51343dd 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -40,6 +40,7 @@
#include "localplayer.h"
#include "log.h"
#include "npc.h"
+#include "particle.h"
#include "gui/buy.h"
#include "gui/buysell.h"
@@ -117,6 +118,7 @@ DebugWindow *debugWindow;
BeingManager *beingManager = NULL;
FloorItemManager *floorItemManager = NULL;
+Particle* particleEngine = NULL;
const int MAX_TIME = 10000;
@@ -251,6 +253,8 @@ Game::Game(Network *network):
beingManager = new BeingManager(network);
floorItemManager = new FloorItemManager();
+ particleEngine = new Particle(NULL);
+ particleEngine->setupEngine();
// Initialize timers
tick_time = 0;
@@ -295,6 +299,7 @@ Game::~Game()
delete beingManager;
delete floorItemManager;
delete joystick;
+ delete particleEngine;
beingManager = NULL;
floorItemManager = NULL;