get this to synch correctly again
This commit is contained in:
parent
e22a39d212
commit
eca1a1452b
4 changed files with 21 additions and 14 deletions
|
|
@ -2442,9 +2442,14 @@ void WeaponPref_Send(UINT8 ssplayer)
|
|||
if (cv_dummyrestatweight[ssplayer].value > 9 || cv_dummyrestatweight[ssplayer].value < 0)
|
||||
CV_StealthSetValue(&cv_dummyrestatweight[ssplayer], 0);
|
||||
|
||||
player->kartspeedrestat = cv_dummyrestatspeed[ssplayer].value;
|
||||
player->kartweightrestat = cv_dummyrestatweight[ssplayer].value;
|
||||
player->randomrestat = cv_dummyrestatrandom[ssplayer].value;
|
||||
if (!netgame)
|
||||
{
|
||||
player->kartspeedrestat = cv_dummyrestatspeed[ssplayer].value;
|
||||
player->kartweightrestat = cv_dummyrestatweight[ssplayer].value;
|
||||
player->randomrestat = cv_dummyrestatrandom[ssplayer].value;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (cv_kickstartaccel[ssplayer].value)
|
||||
prefs |= WP_KICKSTARTACCEL;
|
||||
|
|
@ -2458,14 +2463,14 @@ void WeaponPref_Send(UINT8 ssplayer)
|
|||
if (!(cv_jitterlegacy[ssplayer].value))
|
||||
prefs |= WP_LEGACYJITTER;
|
||||
|
||||
if (player->randomrestat)
|
||||
if (cv_dummyrestatrandom[ssplayer].value)
|
||||
prefs |= WP_RANDOMRESTAT;
|
||||
|
||||
UINT8 buf[5];
|
||||
buf[0] = prefs;
|
||||
buf[1] = cv_mindelay.value;
|
||||
buf[2] = player->kartspeedrestat;
|
||||
buf[3] = player->kartweightrestat;
|
||||
buf[2] = cv_dummyrestatspeed[ssplayer].value;
|
||||
buf[3] = cv_dummyrestatweight[ssplayer].value;
|
||||
buf[4] = cv_driftmode[ssplayer].value;
|
||||
|
||||
SendNetXCmdForPlayer(ssplayer, XD_WEAPONPREF, buf, sizeof buf);
|
||||
|
|
|
|||
|
|
@ -457,7 +457,7 @@ typedef enum
|
|||
DRIFTMODE_CLASSIC = 0, // SRB2Kart drifting; no changes
|
||||
DRIFTMODE_SNAPSHOT, // AKA "Runahead" - Use a prediction system to reduce the chances of a wrongdrift
|
||||
DRIFTMODE_INSTANT, // Instantly decide your drift on the tic it happens
|
||||
DRIFTMODE_DELAY, // Delay the time before a drift is decided
|
||||
// DRIFTMODE_DELAY, // Delay the time before a drift is decided
|
||||
NUMDRIFTMODES
|
||||
} driftmode_e;
|
||||
|
||||
|
|
|
|||
|
|
@ -2760,13 +2760,7 @@ static inline void G_PlayerFinishLevel(INT32 player)
|
|||
}
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
INT32 player;
|
||||
boolean notifyrestat;
|
||||
UINT8 kartspeed, kartweight, kartspeedrestat, kartweightrestat;
|
||||
} restatmessage_t;
|
||||
|
||||
static void G_HandleRestatMessage(restatmessage_t *rm)
|
||||
void G_HandleRestatMessage(restatmessage_t *rm)
|
||||
{
|
||||
if (players[rm->player].jointime == 0)
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -364,6 +364,14 @@ INT16 G_GetFirstMapOfGametype(UINT8 pgametype);
|
|||
INT16 G_RandMap(UINT32 tolflags, INT16 pprevmap, UINT8 ignorebuffer, UINT8 maphell, INT16 *extbuffer);
|
||||
void G_AddMapToBuffer(INT16 map);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
INT32 player;
|
||||
boolean notifyrestat;
|
||||
UINT8 kartspeed, kartweight, kartspeedrestat, kartweightrestat;
|
||||
} restatmessage_t;
|
||||
void G_HandleRestatMessage(restatmessage_t *rm);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue