summaryrefslogtreecommitdiffstats
path: root/sigencore/Arena.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2009-01-27 22:09:00 -0500
committerBen Boeckel <MathStuf@gmail.com>2009-01-27 22:09:00 -0500
commitb90813b5eb6a383f2d8f6ef53ecc992c5a2ba718 (patch)
treeccc9bd03f8b3e841a7c2fee507c08b76c1596dc6 /sigencore/Arena.cpp
parente04c4922a13ed10e9d6b086eacc299f0c5a05984 (diff)
downloadsigen-b90813b5eb6a383f2d8f6ef53ecc992c5a2ba718.tar.gz
sigen-b90813b5eb6a383f2d8f6ef53ecc992c5a2ba718.tar.xz
sigen-b90813b5eb6a383f2d8f6ef53ecc992c5a2ba718.zip
Fix internal references to be Sigencore instead of Sigbattle
Diffstat (limited to 'sigencore/Arena.cpp')
-rw-r--r--sigencore/Arena.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/sigencore/Arena.cpp b/sigencore/Arena.cpp
index 8a6dc7bd..9589e2e0 100644
--- a/sigencore/Arena.cpp
+++ b/sigencore/Arena.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2007-2009 Ben Boeckel <MathStuf@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
// Header include
#include "Arena.h"
-// Sigbattle includes
+// Sigencore includes
#include "Player.h"
// Sigscript includes
@@ -40,17 +40,17 @@
#include <QtCore/QtConcurrentRun>
#include <QtCore/QUuid>
-Sigbattle::TeamMember::RequestedAction Sigbattle::requestDecision(TeamMember* teamMember)
+Sigencore::TeamMember::RequestedAction Sigencore::requestDecision(TeamMember* teamMember)
{
return TeamMember::RequestedAction(teamMember, QtConcurrent::run(decision, teamMember));
}
-Sigbattle::TeamMember::Action Sigbattle::decision(TeamMember* teamMember)
+Sigencore::TeamMember::Action Sigencore::decision(TeamMember* teamMember)
{
return teamMember->requestAction();
}
-Sigbattle::Arena::Arena(Sigscript::SigmodWrapper* sigmod, QSet<Player*> players, const bool isWild, Sigscript::Config* parent) :
+Sigencore::Arena::Arena(Sigscript::SigmodWrapper* sigmod, QSet<Player*> players, const bool isWild, Sigscript::Config* parent) :
Sigscript::Config(parent),
m_sigmod(sigmod),
m_isWild(isWild),
@@ -64,20 +64,20 @@ Sigbattle::Arena::Arena(Sigscript::SigmodWrapper* sigmod, QSet<Player*> players,
player->enterArena(this);
}
-Sigbattle::Arena::~Arena()
+Sigencore::Arena::~Arena()
{
delete m_actions;
}
-QList<Sigbattle::TeamMember*> Sigbattle::Arena::active() const
+QList<Sigencore::TeamMember*> Sigencore::Arena::active() const
{
- QList<Sigbattle::TeamMember*> active;
+ QList<Sigencore::TeamMember*> active;
foreach (Player* player, m_players)
active += player->active();
return active;
}
-int Sigbattle::Arena::numActiveTeams() const
+int Sigencore::Arena::numActiveTeams() const
{
int active = 0;
foreach (Player* player, m_players)
@@ -85,17 +85,17 @@ int Sigbattle::Arena::numActiveTeams() const
return active;
}
-bool Sigbattle::Arena::isOver() const
+bool Sigencore::Arena::isOver() const
{
return m_isOver;
}
-Sigscript::SigmodWrapper* Sigbattle::Arena::sigmod() const
+Sigscript::SigmodWrapper* Sigencore::Arena::sigmod() const
{
return m_sigmod;
}
-void Sigbattle::Arena::registerScript(const Sigcore::Script& script)
+void Sigencore::Arena::registerScript(const Sigcore::Script& script)
{
if (!script.script().isEmpty())
{
@@ -107,7 +107,7 @@ void Sigbattle::Arena::registerScript(const Sigcore::Script& script)
}
}
-void Sigbattle::Arena::cleanUp()
+void Sigencore::Arena::cleanUp()
{
emit(aboutToClearActions());
m_isOver = true;
@@ -119,7 +119,7 @@ void Sigbattle::Arena::cleanUp()
player->exitArena();
}
-void Sigbattle::Arena::handleAction(TeamMember* teamMember, TeamMember::Action action)
+void Sigencore::Arena::handleAction(TeamMember* teamMember, TeamMember::Action action)
{
TeamMember::ActionData data = action.second;
switch (action.first)
@@ -206,13 +206,13 @@ void Sigbattle::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a
checkForLosers();
}
-void Sigbattle::Arena::setupBattle()
+void Sigencore::Arena::setupBattle()
{
foreach (Player* player, m_players)
player->enterArena(this);
}
-void Sigbattle::Arena::distributeWinnings()
+void Sigencore::Arena::distributeWinnings()
{
foreach (Player* player, m_players)
{
@@ -227,7 +227,7 @@ void Sigbattle::Arena::distributeWinnings()
}
}
-void Sigbattle::Arena::checkForLosers()
+void Sigencore::Arena::checkForLosers()
{
static QSet<Player*> losers;
foreach (Player* player, m_players)
@@ -236,7 +236,7 @@ void Sigbattle::Arena::checkForLosers()
}
}
-Sigbattle::TeamMember* Sigbattle::Arena::findMember(const QUuid& id)
+Sigencore::TeamMember* Sigencore::Arena::findMember(const QUuid& id)
{
foreach (Player* player, m_players)
{