Report correct ending success/failure when any counter-op player aborts

This commit is contained in:
GreaseMonkey committed 2024-02-09 16:15:09 +13:00
1 parent 92d3a9f564
commit 94e244a236
2 files changed
+34 -7

No files matched your search

+7 -1
View File
@@ -20,7 +20,11 @@
#define MAX_CHRWAYPOINTS 6
#define MAX_EXPLOSIONS 6
#define MAX_EYESPYDARTS 8
#ifdef PLATFORM_N64
#define MAX_COOPCHRS 2
#else
#define MAX_COOPCHRS MAX_PLAYERS
#endif
#define MAX_MPCHRS (MAX_PLAYERS + MAX_BOTS)
#define MAX_MPPLAYERCONFIGS (MAX_PLAYERS + MAX_COOPCHRS)
#define MAX_OBJECTIVES 10
@@ -82,14 +86,16 @@
#define PLAYERCOUNT() 1
#endif
#if MAX_LOCAL_PLAYERS > 2
#if MAX_COOPCHRS > 2
#define PLAYER_IS_ANTI(plr) (g_Vars.antiplayernum >= 0 && (plr) != g_Vars.bond)
#define PLAYER_IS_NOT_ANTI(plr) (g_Vars.antiplayernum < 0 || (plr) == g_Vars.bond)
#define PLAYERNUM_IS_ANTI(plrnum) (g_Vars.antiplayernum >= 0 && (plrnum) != g_Vars.bondplayernum)
#define PROP_IS_FOR_ANTI_PLAYER(plrprop) (g_Vars.antiplayernum >= 0 && g_Vars.anti && (plrprop)->type == PROPTYPE_PLAYER && (plrprop) != g_Vars.bond->prop)
#define EXPLOSION_OWNER_IS_ANTI_PLAYER(expowner) (g_Vars.antiplayernum >= 0 && (expowner) != g_Vars.bondplayernum && mpGetChrFromPlayerIndex((expowner)) != NULL)
#else
#define PLAYER_IS_ANTI(plr) ((plr) == g_Vars.anti)
#define PLAYER_IS_NOT_ANTI(plr) ((plr) != g_Vars.anti)
//define PLAYERNUM_IS_ANTI(plrnum) ((plrnum) == g_Vars.antiplayernum)
#define PROP_IS_FOR_ANTI_PLAYER(plrprop) ((plrprop) == g_Vars.anti->prop)
#define EXPLOSION_OWNER_IS_ANTI_PLAYER(expowner) ((expowner) == g_Vars.antiplayernum)
#endif