1 files changed, 9 insertions, 9 deletions

diff --git a/sigencore/Player.cpp b/sigencore/Player.cpp
index 6474bc28..2b72657f 100644
--- a/sigencore/Player.cpp
+++ b/sigencore/Player.cpp
@@ -22,16 +22,16 @@
 #include "Team.h"
 
 // Sigscript includes
+#include <sigscript/GameWrapper.h>
 #include <sigscript/ItemWrapper.h>
 #include <sigscript/ItemTypeWrapper.h>
 #include <sigscript/RulesWrapper.h>
-#include <sigscript/SigmodWrapper.h>
 
-Sigencore::Player::Player(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent) :
-        Client(sigmod, parent),
+Sigencore::Player::Player(Sigscript::GameWrapper* game, Sigscript::Config* parent) :
+        Client(game, parent),
         m_world(NULL),
         m_arena(NULL),
-        m_team(new Team(sigmod, this)),
+        m_team(new Team(game, this)),
         m_money(0)
 {
 }
@@ -63,7 +63,7 @@ Sigencore::Arena* Sigencore::Player::arena() const
 bool Sigencore::Player::enterArena(Arena* arena)
 {
     m_active.clear();
-    for (int i = 0; (m_active.size() < m_sigmod->rules()->maxFight()) && (i < m_team->numMembers()); ++i)
+    for (int i = 0; (m_active.size() < m_game->rules()->maxFight()) && (i < m_team->numMembers()); ++i)
     {
         TeamMember* member = m_team->teamMembers()[i];
         if (member->currentHp())
@@ -110,7 +110,7 @@ int Sigencore::Player::itemWeight(const int item, const bool distinct) const
 {
     if (item < 0)
         return itemWeightTotal(distinct);
-    Sigscript::ItemWrapper* itemd = m_sigmod->item(item);
+    Sigscript::ItemWrapper* itemd = m_game->item(item);
     int weight = 0;
     if (itemd && m_items.contains(itemd))
         weight += itemd->weight() * (distinct ? m_items[itemd] : 1);
@@ -144,7 +144,7 @@ int Sigencore::Player::itemCount(const int item, const bool distinct) const
 {
     if (item < 0)
         return itemCountTotal(distinct);
-    Sigscript::ItemWrapper* itemd = m_sigmod->item(item);
+    Sigscript::ItemWrapper* itemd = m_game->item(item);
     int count = 0;
     if (itemd && m_items.contains(itemd))
         count += (distinct ? m_items[itemd] : 1);
@@ -207,7 +207,7 @@ int Sigencore::Player::giveItems(Sigscript::ItemWrapper* item, const int count,
         int maxWeight = INT_MAX;
         int maxWeightType = item->type()->maxWeight();
         maxWeightType = (maxWeightType == -1) ? INT_MAX : maxWeightType;
-        int maxWeightTotal = m_sigmod->rules()->maxTotalWeight();
+        int maxWeightTotal = m_game->rules()->maxTotalWeight();
         maxWeightTotal = (maxWeightTotal == -1) ? INT_MAX : maxWeightTotal;
         valueOfType(QString("weight-item-maximum-%1").arg(name), &maxWeight);
         valueOfType(QString("weight-item-type-maximum-%1").arg(typeName), &maxWeightType);
@@ -246,7 +246,7 @@ int Sigencore::Player::giveItems(Sigscript::ItemWrapper* item, const int count,
 bool Sigencore::Player::giveMoney(const int amount, const bool allOrNothing)
 {
     int playerMin = 0;
-    int playerMax = m_sigmod->rules()->maxMoney();
+    int playerMax = m_game->rules()->maxMoney();
     valueOfType("money-minimum", &playerMin);
     valueOfType("money-maximum", &playerMax);
     const int newUnbounded = m_money + amount;