From 52fa738ef8cca52e051651e226f6057ba40c96a7 Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 21 Mar 2020 13:18:17 -0700 Subject: [PATCH] Replace even more ints with INT32 --- src/g_game.h | 6 +++--- src/g_splitscreen.c | 48 ++++++++++++++++++++++----------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/g_game.h b/src/g_game.h index 9d4a3e4d9..08af3a2b5 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -308,9 +308,9 @@ void G_ResetViews(void); void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive); void G_AdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive); -void G_AddPartyMember (int party_member, int new_party_member); -void G_RemovePartyMember (int party_member); -void G_ResetSplitscreen (int playernum); +void G_AddPartyMember (INT32 party_member, INT32 new_party_member); +void G_RemovePartyMember (INT32 party_member); +void G_ResetSplitscreen (INT32 playernum); void G_AddPlayer(INT32 playernum); diff --git a/src/g_splitscreen.c b/src/g_splitscreen.c index 7aec3f159..ffc548147 100644 --- a/src/g_splitscreen.c +++ b/src/g_splitscreen.c @@ -14,21 +14,21 @@ #include "p_local.h" #include "r_local.h" -int splitscreen_original_party_size[MAXPLAYERS]; -int splitscreen_original_party[MAXPLAYERS][MAXSPLITSCREENPLAYERS]; +INT32 splitscreen_original_party_size[MAXPLAYERS]; +INT32 splitscreen_original_party[MAXPLAYERS][MAXSPLITSCREENPLAYERS]; -int splitscreen_invitations[MAXPLAYERS]; -int splitscreen_party_size[MAXPLAYERS]; -int splitscreen_party[MAXPLAYERS][MAXSPLITSCREENPLAYERS]; +INT32 splitscreen_invitations[MAXPLAYERS]; +INT32 splitscreen_party_size[MAXPLAYERS]; +INT32 splitscreen_party[MAXPLAYERS][MAXSPLITSCREENPLAYERS]; boolean splitscreen_partied[MAXPLAYERS]; void -G_ResetSplitscreen (int playernum) +G_ResetSplitscreen (INT32 playernum) { INT32 old_displayplayers[MAXSPLITSCREENPLAYERS]; - int i; + INT32 i; splitscreen_party_size[playernum] = splitscreen_original_party_size[playernum]; @@ -63,18 +63,18 @@ G_ResetSplitscreen (int playernum) } void -G_RemovePartyMember (int playernum) +G_RemovePartyMember (INT32 playernum) { - int old_party[MAXSPLITSCREENPLAYERS]; - int new_party[MAXSPLITSCREENPLAYERS]; + INT32 old_party[MAXSPLITSCREENPLAYERS]; + INT32 new_party[MAXSPLITSCREENPLAYERS]; - int old_party_size; - int before; - int after; - int views; + INT32 old_party_size; + INT32 before; + INT32 after; + INT32 views; - int i; - int n; + INT32 i; + INT32 n; old_party_size = splitscreen_party_size[playernum]; @@ -135,18 +135,18 @@ G_RemovePartyMember (int playernum) } void -G_AddPartyMember (int invitation, int playernum) +G_AddPartyMember (INT32 invitation, INT32 playernum) { - int * party; - int *add_party; + INT32 * party; + INT32 *add_party; - int old_party_size; - int new_party_size; + INT32 old_party_size; + INT32 new_party_size; - int views; + INT32 views; - int i; - int n; + INT32 i; + INT32 n; views = splitscreen_original_party_size[playernum];