From 17ca8c354358f01d2f876b9217893b891dac0c6e Mon Sep 17 00:00:00 2001 From: pentarctagon Date: Sun, 25 Aug 2019 11:36:52 -0500 Subject: [PATCH] Remove non-functional methods from player.hpp. Attempting to call them results in an error during linking, for example: undefined reference to `wesnothd::player::set_game(wesnothd::game*)' Backport of 3be0f751cc263065046d44a1f41d2a6131df377f --- src/server/player.hpp | 15 --------------- src/server/player_connection.hpp | 1 + 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/server/player.hpp b/src/server/player.hpp index f4e73124f2d9..7484d076dadf 100644 --- a/src/server/player.hpp +++ b/src/server/player.hpp @@ -21,8 +21,6 @@ namespace wesnothd { -class game; - class player { public: @@ -52,19 +50,6 @@ class player bool is_message_flooding(); - /** - * @return true iff the player is in a game - */ - bool in_game() const { return get_game() != nullptr; } - - /** - * @return a pointer to the game the player is in, or nullptr if he/she is not - * in a game at the moment - */ - const game* get_game() const; - - void set_game(game* g); - void set_moderator(bool moderator) { moderator_ = moderator; } bool is_moderator() const { return moderator_; } diff --git a/src/server/player_connection.hpp b/src/server/player_connection.hpp index 3f2dff8c4698..73ca60bdaa47 100644 --- a/src/server/player_connection.hpp +++ b/src/server/player_connection.hpp @@ -31,6 +31,7 @@ namespace wesnothd { +class game; class player_record {