vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

It's SINT8 not INT8

This commit is contained in:
Sryder 2018-02-23 01:04:52 +00:00
parent d508137bb9
commit dbc27e9c9e
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/d_netcmd.c
View File

@ -1973,7 +1973,7 @@ void D_SetupVote(void)
SendNetXCmd(XD_SETUPVOTE, buf, p - buf); SendNetXCmd(XD_SETUPVOTE, buf, p - buf);
} }
void D_ModifyClientVote(INT8 voted) void D_ModifyClientVote(SINT8 voted)
{ {
XBOXSTATIC UINT8 buf[1]; XBOXSTATIC UINT8 buf[1];
buf[0] = (UINT8)(voted+1); buf[0] = (UINT8)(voted+1);
@ -4599,14 +4599,14 @@ static void Got_SetupVotecmd(UINT8 **cp, INT32 playernum)
static void Got_ModifyVotecmd(UINT8 **cp, INT32 playernum) static void Got_ModifyVotecmd(UINT8 **cp, INT32 playernum)
{ {
INT8 voted = READUINT8(*cp); SINT8 voted = READSINT8(*cp);
votes[playernum] = (INT8)(voted-1); votes[playernum] = (SINT8)(voted-1);
} }
static void Got_PickVotecmd(UINT8 **cp, INT32 playernum) static void Got_PickVotecmd(UINT8 **cp, INT32 playernum)
{ {
INT8 pick = READUINT8(*cp); SINT8 pick = READSINT8(*cp);
INT8 level = READUINT8(*cp); SINT8 level = READSINT8(*cp);
if (playernum != serverplayer && !IsPlayerAdmin(playernum)) if (playernum != serverplayer && !IsPlayerAdmin(playernum))
{ {
@ -4622,7 +4622,7 @@ static void Got_PickVotecmd(UINT8 **cp, INT32 playernum)
return; return;
} }
Y_SetupVoteFinish((INT8)pick, (INT8)level); Y_SetupVoteFinish((SINT8)pick, (SINT8)level);
} }
/** Prints the number of the displayplayer. /** Prints the number of the displayplayer.
@ -4712,7 +4712,7 @@ static void Command_RestartAudio_f(void)
I_ShutdownSound(); I_ShutdownSound();
I_StartupSound(); I_StartupSound();
I_InitMusic(); I_InitMusic();
// These must be called or no sound and music until manually set. // These must be called or no sound and music until manually set.
I_SetSfxVolume(cv_soundvolume.value); I_SetSfxVolume(cv_soundvolume.value);
@ -4720,7 +4720,7 @@ static void Command_RestartAudio_f(void)
I_SetMIDIMusicVolume(cv_midimusicvolume.value); I_SetMIDIMusicVolume(cv_midimusicvolume.value);
if (Playing()) // Gotta make sure the player is in a level if (Playing()) // Gotta make sure the player is in a level
P_RestoreMusic(&players[consoleplayer]); P_RestoreMusic(&players[consoleplayer]);
} }
/** Quits a game and returns to the title screen. /** Quits a game and returns to the title screen.

2
src/d_netcmd.h
View File

@ -252,7 +252,7 @@ void Command_Retry_f(void);
void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore
void D_MapChange(INT32 pmapnum, INT32 pgametype, boolean pultmode, boolean presetplayers, INT32 pdelay, boolean pskipprecutscene, boolean pfromlevelselect); void D_MapChange(INT32 pmapnum, INT32 pgametype, boolean pultmode, boolean presetplayers, INT32 pdelay, boolean pskipprecutscene, boolean pfromlevelselect);
void D_SetupVote(void); void D_SetupVote(void);
void D_ModifyClientVote(INT8 voted); void D_ModifyClientVote(SINT8 voted);
void D_PickVote(void); void D_PickVote(void);
void ObjectPlace_OnChange(void); void ObjectPlace_OnChange(void);
boolean IsPlayerAdmin(INT32 playernum); boolean IsPlayerAdmin(INT32 playernum);

6
src/doomstat.h
View File

@ -254,7 +254,7 @@ typedef struct
// SRB2kart // SRB2kart
//boolean automap; ///< Displays a level's white map outline in modified games //boolean automap; ///< Displays a level's white map outline in modified games
fixed_t mobj_scale; ///< Replacement for TOL_ERZ3 fixed_t mobj_scale; ///< Replacement for TOL_ERZ3
// Lua stuff. // Lua stuff.
// (This is not ifdeffed so the map header structure can stay identical, just in case.) // (This is not ifdeffed so the map header structure can stay identical, just in case.)
@ -450,8 +450,8 @@ extern boolean comebackshowninfo;
extern tic_t curlap, bestlap; extern tic_t curlap, bestlap;
extern INT16 votelevels[4]; extern INT16 votelevels[4];
extern INT8 votes[MAXPLAYERS]; extern SINT8 votes[MAXPLAYERS];
extern INT8 pickedvote; extern SINT8 pickedvote;
extern tic_t hidetime; extern tic_t hidetime;

8
src/g_game.c
View File

@ -249,8 +249,8 @@ boolean comeback; // Battle Mode's karma comeback is on/off
// Voting system // Voting system
INT16 votelevels[4]; // Levels that were rolled by the host INT16 votelevels[4]; // Levels that were rolled by the host
INT8 votes[MAXPLAYERS]; // Each player's vote SINT8 votes[MAXPLAYERS]; // Each player's vote
INT8 pickedvote; // What vote the host rolls SINT8 pickedvote; // What vote the host rolls
// Client-sided variables (NEVER use in anything that needs to be synced with other players) // Client-sided variables (NEVER use in anything that needs to be synced with other players)
boolean legitimateexit; // Did this client actually finish the match? boolean legitimateexit; // Did this client actually finish the match?
@ -1407,7 +1407,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
// drift button // drift button
if (InputDown(gc_drift, ssplayer)) if (InputDown(gc_drift, ssplayer))
cmd->buttons |= BT_DRIFT; cmd->buttons |= BT_DRIFT;
// Lua scriptable buttons // Lua scriptable buttons
if (InputDown(gc_custom1, ssplayer)) if (InputDown(gc_custom1, ssplayer))
cmd->buttons |= BT_CUSTOM1; cmd->buttons |= BT_CUSTOM1;
@ -3142,7 +3142,7 @@ INT16 G_RandMap(INT16 tolflags, INT16 pprevmap, boolean dontadd, boolean ignoreb
} }
} }
} }
if (isokmap) if (isokmap)
okmaps[numokmaps++] = ix; okmaps[numokmaps++] = ix;
} }

8
src/y_inter.c
View File

@ -177,7 +177,7 @@ typedef struct
typedef struct typedef struct
{ {
INT8 selection; SINT8 selection;
UINT8 delay; UINT8 delay;
UINT8 ranim; UINT8 ranim;
UINT8 rtics; UINT8 rtics;
@ -1351,7 +1351,7 @@ void Y_StartIntermission(void)
{ {
// setup time data // setup time data
data.coop.tics = players[consoleplayer].realtime; data.coop.tics = players[consoleplayer].realtime;
// Update visitation flags // Update visitation flags
mapvisited[gamemap-1] |= MV_BEATEN; mapvisited[gamemap-1] |= MV_BEATEN;
if (ALL7EMERALDS(emeralds)) if (ALL7EMERALDS(emeralds))
@ -1364,7 +1364,7 @@ void Y_StartIntermission(void)
if (modeattacking == ATTACKING_RECORD) if (modeattacking == ATTACKING_RECORD)
Y_UpdateRecordReplays(); Y_UpdateRecordReplays();
} }
// Calculate who won // Calculate who won
Y_CalculateTournamentPoints(); Y_CalculateTournamentPoints();
@ -2497,7 +2497,7 @@ static void Y_UnloadVoteData(void)
// //
// Y_SetupVoteFinish // Y_SetupVoteFinish
// //
void Y_SetupVoteFinish(INT8 pick, INT8 level) void Y_SetupVoteFinish(SINT8 pick, SINT8 level)
{ {
if (pickedvote == -1) if (pickedvote == -1)
{ {

2
src/y_inter.h
View File

@ -21,7 +21,7 @@ void Y_VoteDrawer(void);
void Y_VoteTicker(void); void Y_VoteTicker(void);
void Y_StartVote(void); void Y_StartVote(void);
void Y_EndVote(void); void Y_EndVote(void);
void Y_SetupVoteFinish(INT8 pick, INT8 level); void Y_SetupVoteFinish(SINT8 pick, SINT8 level);
typedef enum typedef enum
{ {