nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2025-04-22 17:52:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

SERVER/CLIENT: Do not spawn spectators during game over; fix missing newline during server restart

Browse source
This commit is contained in:
MotoLegacy 2024-12-26 16:52:11 -05:00
parent 0b820ff6be
commit efc004b3c5
5 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/client/main.qc
View file

@ -48,18 +48,6 @@ void() ToggleMenu =
}
}
//
// SetGamepadBindings()
// Since our menu architecture currently sucks,
// we don't yet support a good binds menu that
// let's you get good gamepad control.. so
// force these binds (sorry!)
//
void() SetGamepadBindings =
{
localcmd("unbindall; bind ~ \"toggleconsole\"; bind ` \"toggleconsole\"; bind ESCAPE \"togglemenu\"; joyadvaxisr 4; joyadvaxisu 2; joyadvaxisx 3; joyadvaxisy -1; bind JOY1 \"+button5\"; bindlevel JOY2 30 \"null\"; bind JOY3 \"+button4\"; bind GP_LSHOULDER \"impulse 33\"; bind AUX1 \"+moveup\"; bind AUX2 \"+button3\"; bindlevel AUX3 30 \"null\"; bindlevel AUX4 30 \"null\"; bind AUX5 \"togglemenu\"; bind AUX10 \"+attack\"; bind GP_Y \"+button4\"; bindlevel GP_A 30 \"impulse 10\"; bindlevel GP_B 30 \"impulse 30\"; bindlevel GP_X 30 \"+button5\"; bindlevel GP_LTHUMB 30 \"impulse 23\"; bindlevel GP_RTHUMB 30 \"+button6\"; bind GP_LTRIGGER \"+button8\"; bindlevel GP_DPAD_DOWN 30 \"+button7\"; bindlevel GP_RSHOULDER 30 \"+button3\"; bindlevel GP_DPAD_RIGHT 30 \"impulse 33\"; bindlevel GP_DPAD_UP 30 \"+button7\"; bind GP_VIEW \"showscores\"; joysidesensitivity 0.8; joyyawsensitivity 0.6; joypitchsensitivity 0.55\n");
}
float(float isnew) SetZombieSkinning =
{
self.drawmask = MASK_ENGINE;

2
source/menu/menu_vide.qc
View file

@ -134,7 +134,7 @@ void() Menu_Video_UpdateShowFPS =
Menu_PlaySound(MENU_SND_ENTER);
current_showfps++;
if (current_showfps > 2) current_showfps = 0;
localcmd(sprintf("show_fps %d", current_showfps));
localcmd(sprintf("show_fps %d\n", current_showfps));
};
void() Menu_Video_UpdateVsync =

4
source/server/damage.qc
View file

@ -42,13 +42,13 @@ void() teddy_react;
void() EndGame_Restart =
{
localcmd("restart");
localcmd("restart\n");
}
// Fade to black function, creates another think for restart
void() EndGame_FadePrompt =
{
nzp_screenflash(self, SCREENFLASH_COLOR_BLACK, 6, SCREENFLASH_FADE_IN);
nzp_screenflash(self, SCREENFLASH_COLOR_BLACK, 5, SCREENFLASH_FADE_IN);
#ifdef FTE

7
source/server/player/last_stand.qc
View file

@ -204,7 +204,12 @@ void(entity client) LastStand_KillPlayer =
self = client;
DisableReviveIcon(self.playernum);
startspectate();
// If we are in the middle of the Game Over
// sequence, we should not allow a bleed
// out to override it.
if (!game_over)
startspectate();
self = old_self;
};

12
source/server/rounds.qc
View file

@ -258,11 +258,13 @@ void() NewRound =
} else {
roundtype = 1;
if (world.fog) {
localcmd(strcat("fog ", world.fog));
} else {
localcmd("fog 0 0 0 0 0\n");
}
string fog_value;
if (world.fog)
fog_value = strcat(world.fog, "\n");
else
fog_value = "0 0 0 0 0\n";
localcmd(strcat("fog ", fog_value));
}
Remaining_Zombies = Total_Zombies = getZombieTotal();