Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2012-10-13 12:13:04 +0000
committerStijn Buys <ingar@osirion.org>2012-10-13 12:13:04 +0000
commit3b8ea0849fac5532d61a90608bda876cf518ba1b (patch)
treedb7f34c22e746cfdc04574e0054c324c53838122 /src/game/base/game.cc
parent0d58c4f8ab1d174c808c77bf94342c91f6e0c443 (diff)
Read weapons.ini.
Diffstat (limited to 'src/game/base/game.cc')
-rw-r--r--src/game/base/game.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index dd720f0..a79f5cc 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -29,6 +29,7 @@
#include "base/ship.h"
#include "base/star.h"
#include "base/template.h"
+#include "base/weapon.h"
#include "math/mathlib.h"
#include "sys/sys.h"
@@ -939,6 +940,12 @@ Game::Game() : core::Module("Project::OSiRiON", true)
return;
}
+ // read weapons.ini
+ if (!Weapon::init()) {
+ abort();
+ return;
+ }
+
// read ships.ini
if (!ShipModel::init()) {
abort();
@@ -1039,6 +1046,9 @@ Game::~Game()
// clear Cargo
Cargo::done();
+ // clear Weapon
+ Weapon::clear();
+
// clear ShipModel
ShipModel::done();