summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2009-01-23 00:48:23 -0500
committerBen Boeckel <MathStuf@gmail.com>2009-01-23 00:48:23 -0500
commitaef299a2788aa8d847136fba979283cfdef42912 (patch)
tree9da7eea0fdf2928c2023ba2beffbd4875dd5c276
parent4e4ee87168b6555dbaa48e8439b3d2134d46c17a (diff)
Removed extra lines in Stat and included in TeamMember
-rw-r--r--sigbattle/TeamMember.h4
-rw-r--r--sigmod/Stat.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/sigbattle/TeamMember.h b/sigbattle/TeamMember.h
index 4a4c9aad..72b82dd6 100644
--- a/sigbattle/TeamMember.h
+++ b/sigbattle/TeamMember.h
@@ -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
@@ -25,7 +25,7 @@
#include "../sigscript/Config.h"
// Sigmod includes
-#include "../sigmod/Global.h"
+#include "../sigmod/Stat.h"
// Qt includes
#include <QtCore/QFuture>
diff --git a/sigmod/Stat.h b/sigmod/Stat.h
index 53c9f317..2234621d 100644
--- a/sigmod/Stat.h
+++ b/sigmod/Stat.h
@@ -26,7 +26,6 @@
#include <QtCore/QMetaType>
#include <QtCore/QStringList>
-
namespace Sigmod
{
/**
@@ -45,7 +44,6 @@ enum Stat
ST_Accuracy = 6,
ST_Evasion = 7
};
-
/// Strings for the stats for a combined Special stat.
const QStringList StatRBYStr = QStringList() << "HP" << "Attack" << "Defense" << "Speed" << "Special" << "" << "Accuracy" << "Evasion";
/// Strings for the stats when the Special stat is split.