summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2009-08-10 22:12:21 -0400
committerBen Boeckel <MathStuf@gmail.com>2009-08-10 22:12:21 -0400
commit6b733cae841ba78751fcf0f0750be682d01419de (patch)
tree8b9f9d547d1e4b6b65b24b5a6627a7c9a9dacb0d
parentc5418aa5e11bc0bd11df8f9ef6a7fe5b34cce35f (diff)
downloadsigen-no-macros.tar.gz
sigen-no-macros.tar.xz
sigen-no-macros.zip
Use a reference for the typechart gettersno-macros
-rw-r--r--sigmod/Game.cpp8
-rw-r--r--sigmod/Game.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/sigmod/Game.cpp b/sigmod/Game.cpp
index 72aa7e13..5e3299df 100644
--- a/sigmod/Game.cpp
+++ b/sigmod/Game.cpp
@@ -519,14 +519,14 @@ GETTER(Game, QString, description)
GETTER(Game, bool, singlePlayer)
GETTER(Game, Script, startScript)
-const Matrix<Fraction>* Game::typechart() const
+const Matrix<Fraction>& Game::typechart() const
{
- return &m_typechart;
+ return m_typechart;
}
-Matrix<Fraction>* Game::typechart()
+Matrix<Fraction>& Game::typechart()
{
- return &m_typechart;
+ return m_typechart;
}
Fraction Game::typechart(const int attack, const int defense) const
diff --git a/sigmod/Game.h b/sigmod/Game.h
index f9a55a72..a2bb81a4 100644
--- a/sigmod/Game.h
+++ b/sigmod/Game.h
@@ -154,8 +154,8 @@ class SIGMOD_EXPORT Game : public Object
QString description() const;
bool singlePlayer() const;
Sigcore::Script startScript() const;
- const Sigcore::Matrix<Sigcore::Fraction>* typechart() const;
- Sigcore::Matrix<Sigcore::Fraction>* typechart();
+ const Sigcore::Matrix<Sigcore::Fraction>& typechart() const;
+ Sigcore::Matrix<Sigcore::Fraction>& typechart();
Sigcore::Fraction typechart(const int attack, const int defense) const;
QPoint mapPosition(const int map) const;
QMap<int, QPoint> mapPosition() const;