rename to G_SetPlayerGamepadIndicatorColor
This commit is contained in:
1 parent
acb0144742
commit
49fcf3e486
6 files changed
+15
-15
No files matched your search
+5
-5
@@ -6065,7 +6065,7 @@ static void Command_SkinSearch(void)
|
||||
*/
|
||||
static void Color_OnChange(void)
|
||||
{
|
||||
G_SetPlayerGamepadIndicatorToPlayerColor(0, 0); // i want this to always change so its here
|
||||
G_SetPlayerGamepadIndicatorColor(0, 0); // i want this to always change so its here
|
||||
|
||||
if (!Playing())
|
||||
return; // do whatever you want
|
||||
@@ -6087,7 +6087,7 @@ static void Color_OnChange(void)
|
||||
players[consoleplayer].skincolor);
|
||||
}
|
||||
|
||||
G_SetPlayerGamepadIndicatorToPlayerColor(0, 0); // update again
|
||||
G_SetPlayerGamepadIndicatorColor(0, 0); // update again
|
||||
}
|
||||
|
||||
/** Sends a color change for the secondary splitscreen player, unless that
|
||||
@@ -6111,7 +6111,7 @@ static void Color2_OnChange(void)
|
||||
players[displayplayers[1]].skincolor);
|
||||
}
|
||||
|
||||
G_SetPlayerGamepadIndicatorToPlayerColor(1, 0);
|
||||
G_SetPlayerGamepadIndicatorColor(1, 0);
|
||||
}
|
||||
|
||||
static void Color3_OnChange(void)
|
||||
@@ -6130,7 +6130,7 @@ static void Color3_OnChange(void)
|
||||
players[displayplayers[2]].skincolor);
|
||||
}
|
||||
|
||||
G_SetPlayerGamepadIndicatorToPlayerColor(2, 0);
|
||||
G_SetPlayerGamepadIndicatorColor(2, 0);
|
||||
}
|
||||
|
||||
static void Color4_OnChange(void)
|
||||
@@ -6149,7 +6149,7 @@ static void Color4_OnChange(void)
|
||||
players[displayplayers[3]].skincolor);
|
||||
}
|
||||
|
||||
G_SetPlayerGamepadIndicatorToPlayerColor(3, 0);
|
||||
G_SetPlayerGamepadIndicatorColor(3, 0);
|
||||
}
|
||||
|
||||
/** Displays the result of the chat being muted or unmuted.
|
||||
|
||||
+2
-2
@@ -2151,7 +2151,7 @@ void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive)
|
||||
if (viewnum == 1 && demo.playback)
|
||||
consoleplayer = displayplayers[0];
|
||||
|
||||
G_SetPlayerGamepadIndicatorToPlayerColor(viewnum-1, 0);
|
||||
G_SetPlayerGamepadIndicatorColor(viewnum-1, 0);
|
||||
}
|
||||
|
||||
//
|
||||
@@ -8542,7 +8542,7 @@ void G_SetGamestate(gamestate_t newstate)
|
||||
gamestate = newstate;
|
||||
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
G_SetPlayerGamepadIndicatorToPlayerColor(i, 0); // dumb hack but works
|
||||
G_SetPlayerGamepadIndicatorColor(i, 0); // dumb hack but works
|
||||
|
||||
#ifdef HAVE_DISCORDRPC
|
||||
DRPC_UpdatePresence();
|
||||
|
||||
+3
-3
@@ -16,7 +16,6 @@
|
||||
#include "g_input.h"
|
||||
#include "g_game.h"
|
||||
#include "keys.h"
|
||||
#include "k_kart.h"
|
||||
#include "hu_stuff.h" // need HUFONT start & end
|
||||
#include "d_net.h"
|
||||
#include "console.h"
|
||||
@@ -864,6 +863,8 @@ static const char *gamecontrolname[num_gamecontrols] =
|
||||
|
||||
#define NUMKEYNAMES (sizeof (keynames)/sizeof (keyname_t))
|
||||
|
||||
#include "k_kart.h"
|
||||
|
||||
static INT32 G_GetDeviceForPlayer(INT32 player)
|
||||
{
|
||||
switch (player)
|
||||
@@ -911,8 +912,7 @@ static UINT16 G_GetSkinColor(INT32 player)
|
||||
}
|
||||
}
|
||||
|
||||
// ehhhhhh ill maybe add splitscreen support eventually lol
|
||||
void G_SetPlayerGamepadIndicatorToPlayerColor(INT32 player, UINT16 color)
|
||||
void G_SetPlayerGamepadIndicatorColor(INT32 player, UINT16 color)
|
||||
{
|
||||
INT32 device;
|
||||
UINT16 skincolor;
|
||||
|
||||
+1
-1
@@ -132,7 +132,7 @@ extern INT32 gamecontrol4[num_gamecontrols][2];
|
||||
// peace to my little coder fingers!
|
||||
// check a gamecontrol being active or not
|
||||
|
||||
void G_SetPlayerGamepadIndicatorToPlayerColor(INT32 player, UINT16 color);
|
||||
void G_SetPlayerGamepadIndicatorColor(INT32 player, UINT16 color);
|
||||
void G_PlayerDeviceRumble(INT32 player, UINT16 low_strength, UINT16 high_strength);
|
||||
|
||||
// remaps the input event to a game control.
|
||||
|
||||
+1
-1
@@ -3266,4 +3266,4 @@ int LUA_BaseLib(lua_State *L)
|
||||
lua_pushvalue(L, LUA_GLOBALSINDEX);
|
||||
luaL_register(L, NULL, lib);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
+3
-3
@@ -11255,7 +11255,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
||||
{
|
||||
S_StartSound(NULL,sfx_menu1); // Tails
|
||||
setupm_fakecolor--;
|
||||
G_SetPlayerGamepadIndicatorToPlayerColor(setupm_playernum, setupm_fakecolor);
|
||||
G_SetPlayerGamepadIndicatorColor(setupm_playernum, setupm_fakecolor);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -11311,7 +11311,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
||||
{
|
||||
S_StartSound(NULL,sfx_menu1); // Tails
|
||||
setupm_fakecolor++;
|
||||
G_SetPlayerGamepadIndicatorToPlayerColor(setupm_playernum, setupm_fakecolor);
|
||||
G_SetPlayerGamepadIndicatorColor(setupm_playernum, setupm_fakecolor);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -11351,7 +11351,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
||||
{
|
||||
S_StartSound(NULL,sfx_menu1); // Tails
|
||||
setupm_fakecolor = col;
|
||||
G_SetPlayerGamepadIndicatorToPlayerColor(setupm_playernum, setupm_fakecolor);
|
||||
G_SetPlayerGamepadIndicatorColor(setupm_playernum, setupm_fakecolor);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user