From 1ff627f85e378363489b9924464c5ae2ec15604b Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 21 Sep 2013 23:34:05 +0000 Subject: [PATCH] Move multi_send_got_flag declaration to header --- common/main/multi.h | 5 +++++ d2x-rebirth/main/powerup.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common/main/multi.h b/common/main/multi.h index d7bb23ae1..3abd03641 100644 --- a/common/main/multi.h +++ b/common/main/multi.h @@ -337,6 +337,11 @@ void multi_disconnect_player(int pnum); void multi_object_to_object_rw(object *obj, object_rw *obj_rw); void multi_object_rw_to_object(object_rw *obj_rw, object *obj); +#if defined(DXX_BUILD_DESCENT_I) +static inline void multi_send_got_flag (char a) { (void)a; } +#elif defined(DXX_BUILD_DESCENT_II) +void multi_send_got_flag (char); +#endif // Exported variables diff --git a/d2x-rebirth/main/powerup.c b/d2x-rebirth/main/powerup.c index 63a664dff..c2fe37580 100644 --- a/d2x-rebirth/main/powerup.c +++ b/d2x-rebirth/main/powerup.c @@ -219,7 +219,6 @@ int pick_up_vulcan_ammo(void) extern char GetKeyValue(char); extern void check_to_use_primary(int); -extern void multi_send_got_flag (char); // returns true if powerup consumed int do_powerup(object *obj)