From 070bc06506e853c191014ebd00f7e5a05cfad00e Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Tue, 21 Sep 2021 04:01:40 +0300
Subject: [PATCH 15/15] Macrofy client_player()
See osdn #42865
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
client/client_main.c | 8 --------
client/client_main.h | 4 +++-
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/client/client_main.c b/client/client_main.c
index e9cd4b440b..9983dc1d23 100644
--- a/client/client_main.c
+++ b/client/client_main.c
@@ -1332,14 +1332,6 @@ bool client_has_player(void)
return client.conn.playing != NULL;
}
-/****************************************************************************
- Either controlling or observing.
-****************************************************************************/
-struct player *client_player(void)
-{
- return client.conn.playing;
-}
-
/****************************************************************************
Return the vision of the player on a tile. Client version of
./server/maphand/map_is_known_and_seen().
diff --git a/client/client_main.h b/client/client_main.h
index f33cdb8dc3..bd708feaf9 100644
--- a/client/client_main.h
+++ b/client/client_main.h
@@ -101,7 +101,9 @@ bool client_is_observer(void);
bool client_is_global_observer(void);
int client_player_number(void);
bool client_has_player(void);
-struct player *client_player(void);
+
+#define client_player() client.conn.playing
+
void set_seconds_to_turndone(double seconds);
int get_seconds_to_turndone(void);
bool is_waiting_turn_change(void);
--
2.33.0