|
From: Markus R. <god...@us...> - 2009-07-30 08:34:17
|
Module: performous
Branch: master
Commit: 366b96e080defc98559ab11cf4621ca3db80da73
Author: Markus Raab <un...@ma...>
Date: Thu Jul 30 10:21:56 2009 +0200
move PlayerItem to player.hh
---
game/player.hh | 20 ++++++++++++++++++++
game/players.hh | 20 --------------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/game/player.hh b/game/player.hh
index 6335ec9..a32aa2d 100644
--- a/game/player.hh
+++ b/game/player.hh
@@ -46,3 +46,23 @@ struct Player {
return other.m_score < m_score;
}
};
+
+/** Static Information of a player, not
+ dependent from current song.
+
+ Used for Players Management.
+ */
+struct PlayerItem {
+ std::string name; /// unique name, link to highscore
+ std::string path; /// a path to a picture shown
+ std::string picture; /// + the filename for it
+/* Future ideas
+ std::string displayedName; /// artist name, short name, nick (can be changed)
+ std::map<std::string, int> scores; /// map between a Song and the highest score the Player achieved
+*/
+
+ bool operator== (PlayerItem const& pi) const
+ {
+ return name == pi.name;
+ }
+};
diff --git a/game/players.hh b/game/players.hh
index 9f78b70..11dcdb4 100644
--- a/game/players.hh
+++ b/game/players.hh
@@ -8,26 +8,6 @@
#include "animvalue.hh"
-/** Static Information of a player, not
- dependent from current song.
-
- Used for Players Management.
- */
-struct PlayerItem {
- std::string name; /// unique name, link to highscore
- std::string path; /// a path to a picture shown
- std::string picture; /// + the filename for it
-/* Future ideas
- std::string displayedName; /// artist name, short name, nick (can be changed)
- std::map<std::string, int> scores; /// map between a Song and the highest score the Player achieved
-*/
-
- bool operator== (PlayerItem const& pi) const
- {
- return name == pi.name;
- }
-};
-
/**A collection of all Players.
The current players plugged in a song can
|