2 files changed, 14 insertions, 29 deletions
diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp
index 477caf94..f9387184 100644
--- a/src/net/ea/generalhandler.cpp
+++ b/src/net/ea/generalhandler.cpp
@@ -59,7 +59,6 @@
 #include <list>
 
 Net::GeneralHandler *generalHandler;
-std::list<ItemDB::Stat*> stats;
 
 namespace EAthena {
 
@@ -88,19 +87,13 @@ GeneralHandler::GeneralHandler():
     handledMessages = _messages;
     generalHandler = this;
 
-    ItemDB::Stat stat;
-    stat.tag = "str"; stat.format = N_("Strength: %d");
-    stats.push_back(&stat);
-    stat.tag = "agi"; stat.format = N_("Agility: %d");
-    stats.push_back(&stat);
-    stat.tag = "vit"; stat.format = N_("Vitality: %d");
-    stats.push_back(&stat);
-    stat.tag = "int"; stat.format = N_("Intelligence: %d");
-    stats.push_back(&stat);
-    stat.tag = "dex"; stat.format = N_("Dexterity: %d");
-    stats.push_back(&stat);
-    stat.tag = "luck"; stat.format = N_("Luck: %d");
-    stats.push_back(&stat);
+    std::list<ItemDB::Stat> stats;
+    stats.push_back(ItemDB::Stat("str", N_("Strength: %d")));
+    stats.push_back(ItemDB::Stat("agi", N_("Agility: %d")));
+    stats.push_back(ItemDB::Stat("vit", N_("Vitality: %d")));
+    stats.push_back(ItemDB::Stat("int", N_("Intelligence: %d")));
+    stats.push_back(ItemDB::Stat("dex", N_("Dexterity: %d")));
+    stats.push_back(ItemDB::Stat("luck", N_("Luck: %d")));
 
     ItemDB::setStatsList(stats);
 }
diff --git a/src/net/tmwserv/generalhandler.cpp b/src/net/tmwserv/generalhandler.cpp
index 8a47e6f9..d283729d 100644
--- a/src/net/tmwserv/generalhandler.cpp
+++ b/src/net/tmwserv/generalhandler.cpp
@@ -52,8 +52,6 @@ Net::Connection *gameServerConnection = 0;
 Net::Connection *chatServerConnection = 0;
 Net::Connection *accountServerConnection = 0;
 
-std::list<ItemDB::Stat*> stats;
-
 namespace TmwServ {
 
 GeneralHandler::GeneralHandler():
@@ -79,19 +77,13 @@ GeneralHandler::GeneralHandler():
 
     generalHandler = this;
 
-    ItemDB::Stat stat;
-    stat.tag = "str"; stat.format = N_("Strength: %d");
-    stats.push_back(&stat);
-    stat.tag = "agi"; stat.format = N_("Agility: %d");
-    stats.push_back(&stat);
-    stat.tag = "dex"; stat.format = N_("Dexterity: %d");
-    stats.push_back(&stat);
-    stat.tag = "vit"; stat.format = N_("Vitality: %d");
-    stats.push_back(&stat);
-    stat.tag = "int"; stat.format = N_("Intelligence: %d");
-    stats.push_back(&stat);
-    stat.tag = "will"; stat.format = N_("Willpower: %d");
-    stats.push_back(&stat);
+    std::list<ItemDB::Stat> stats;
+    stats.push_back(ItemDB::Stat("str", N_("Strength: %d")));
+    stats.push_back(ItemDB::Stat("agi", N_("Agility: %d")));
+    stats.push_back(ItemDB::Stat("dex", N_("Dexterity: %d")));
+    stats.push_back(ItemDB::Stat("vit", N_("Vitality: %d")));
+    stats.push_back(ItemDB::Stat("int", N_("Intelligence: %d")));
+    stats.push_back(ItemDB::Stat("will", N_("Willpower: %d")));
 
     ItemDB::setStatsList(stats);
 }