stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-17 02:01:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc

Browse source
This commit is contained in:
TehRealSalt 2018-03-06 01:00:12 -05:00
commit 79b6f3f482
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/m_menu.c
View file

@ -111,7 +111,7 @@ const char *quitmsg[NUM_QUITMESSAGES];
// Stuff for customizing the player select screen Tails 09-22-2003 // Stuff for customizing the player select screen Tails 09-22-2003
description_t description[32] = description_t description[32] =
{ {
{"\x82Sonic\x80\n\x82Speed:\x80 6\n\x82Weight:\x80 4", "", "sonic"}, {"\x82Sonic\x80\n\x82Speed:\x80 7\n\x82Weight:\x80 3", "", "sonic"},
{"???", "", ""}, {"???", "", ""},
{"???", "", ""}, {"???", "", ""},
{"???", "", ""}, {"???", "", ""},

9
src/r_things.c
View file

@ -2467,8 +2467,8 @@ static void Sk_SetDefaultValue(skin_t *skin)
skin->prefcolor = SKINCOLOR_GREEN; skin->prefcolor = SKINCOLOR_GREEN;
// SRB2kart // SRB2kart
skin->kartspeed = 6; skin->kartspeed = 5;
skin->kartweight = 4; skin->kartweight = 5;
// //
skin->normalspeed = 36<<FRACBITS; skin->normalspeed = 36<<FRACBITS;
@ -2534,6 +2534,11 @@ void R_InitSkins(void)
skin->ability = CA_THOK; skin->ability = CA_THOK;
skin->actionspd = 60<<FRACBITS; skin->actionspd = 60<<FRACBITS;
// SRB2kart
skin->kartspeed = 7;
skin->kartweight = 3;
//
skin->normalspeed = 36<<FRACBITS; skin->normalspeed = 36<<FRACBITS;
skin->runspeed = 28<<FRACBITS; skin->runspeed = 28<<FRACBITS;
skin->thrustfactor = 5; skin->thrustfactor = 5;

10
src/y_inter.c
View file

@ -2192,6 +2192,9 @@ void Y_VoteDrawer(void)
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (dedicated && i == 0) // While leaving blank spots for non-existent players is largely intentional, the first spot *always* being blank looks a tad silly :V
continue;
if ((playeringame[i] && !players[i].spectator) && votes[i] != -1) if ((playeringame[i] && !players[i].spectator) && votes[i] != -1)
{ {
patch_t *pic; patch_t *pic;
@ -2298,6 +2301,13 @@ void Y_VoteTicker(void)
numvotes++; numvotes++;
} }
if (numvotes < 1) // Whoops! Get outta here.
{
Y_UnloadVoteData();
Y_FollowIntermission();
return;
}
voteclient.rtics--; voteclient.rtics--;
if (voteclient.rtics <= 0) if (voteclient.rtics <= 0)