smol cleanup

also check for splitscreen and if not dont run a for loop lul
This commit is contained in:
Alug committed 2024-07-21 22:24:44 +02:00
1 parent 94bd1cb37b
commit aef62c45de
2 files changed
+10 -253

No files matched your search

+9 -253
View File
@@ -324,265 +324,25 @@ static inline void P_RunThinkers(void)
}
}
//
// P_DoAutobalanceTeams()
//
// Determine if the teams are unbalanced, and if so, move a player to the other team.
//
/*static void P_DoAutobalanceTeams(void)
void P_RunChaseCameras(void)
{
changeteam_union NetPacket;
UINT16 usvalue;
INT32 i=0;
INT32 red=0, blue=0;
INT32 redarray[MAXPLAYERS], bluearray[MAXPLAYERS];
INT32 redflagcarrier = 0, blueflagcarrier = 0;
INT32 totalred = 0, totalblue = 0;
UINT8 i;
NetPacket.value.l = NetPacket.value.b = 0;
memset(redarray, 0, sizeof(redarray));
memset(bluearray, 0, sizeof(bluearray));
// Only do it if we have enough room in the net buffer to send it.
// Otherwise, come back next time and try again.
if (sizeof(usvalue) > GetFreeXCmdSize())
return;
//We have to store the players in an array with the rest of their team.
//We can then pick a random player to be forced to change teams.
for (i = 0; i < MAXPLAYERS; i++)
if (!splitscreen)
{
if (playeringame[i] && players[i].ctfteam)
{
if (players[i].ctfteam == 1)
{
if (!players[i].gotflag)
{
redarray[red] = i; //store the player's node.
red++;
}
else
redflagcarrier++;
}
else
{
if (!players[i].gotflag)
{
bluearray[blue] = i; //store the player's node.
blue++;
}
else
blueflagcarrier++;
}
}
}
totalred = red + redflagcarrier;
totalblue = blue + blueflagcarrier;
if ((abs(totalred - totalblue) > cv_autobalance.value))
{
if (totalred > totalblue)
{
i = M_RandomKey(red);
NetPacket.packet.newteam = 2;
NetPacket.packet.playernum = redarray[i];
NetPacket.packet.verification = true;
NetPacket.packet.autobalance = true;
usvalue = SHORT(NetPacket.value.l|NetPacket.value.b);
SendNetXCmd(XD_TEAMCHANGE, &usvalue, sizeof(usvalue));
}
if (totalblue > totalred)
{
i = M_RandomKey(blue);
NetPacket.packet.newteam = 1;
NetPacket.packet.playernum = bluearray[i];
NetPacket.packet.verification = true;
NetPacket.packet.autobalance = true;
usvalue = SHORT(NetPacket.value.l|NetPacket.value.b);
SendNetXCmd(XD_TEAMCHANGE, &usvalue, sizeof(usvalue));
}
}
}
//
// P_DoTeamscrambling()
//
// If a team scramble has been started, scramble one person from the
// pre-made scramble array. Said array is created in TeamScramble_OnChange()
//
void P_DoTeamscrambling(void)
{
changeteam_union NetPacket;
UINT16 usvalue;
NetPacket.value.l = NetPacket.value.b = 0;
// Only do it if we have enough room in the net buffer to send it.
// Otherwise, come back next time and try again.
if (sizeof(usvalue) > GetFreeXCmdSize())
return;
if (scramblecount < scrambletotal)
{
if (players[scrambleplayers[scramblecount]].ctfteam != scrambleteams[scramblecount])
{
NetPacket.packet.newteam = scrambleteams[scramblecount];
NetPacket.packet.playernum = scrambleplayers[scramblecount];
NetPacket.packet.verification = true;
NetPacket.packet.scrambled = true;
usvalue = SHORT(NetPacket.value.l|NetPacket.value.b);
SendNetXCmd(XD_TEAMCHANGE, &usvalue, sizeof(usvalue));
}
scramblecount++; //Increment, and get to the next player when we come back here next time.
if (camera[consoleplayer].chase)
P_MoveChaseCamera(&players[consoleplayer], &camera[consoleplayer], false);
}
else
CV_SetValue(&cv_teamscramble, 0);
}
static inline void P_DoSpecialStageStuff(void)
{
boolean inwater = false;
INT32 i;
// Can't drown in a special stage
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i] || players[i].spectator)
continue;
players[i].powers[pw_underwater] = players[i].powers[pw_spacetime] = 0;
}
if (sstimer < 15*TICRATE+6 && sstimer > 7 && (mapheaderinfo[gamemap-1]->levelflags & LF_SPEEDMUSIC))
S_SpeedMusic(1.4f);
if (sstimer < 7 && sstimer > 0) // The special stage time is up!
{
sstimer = 0;
for (i = 0; i < MAXPLAYERS; i++)
for (i = 0; i <= splitscreen; i++)
{
if (playeringame[i])
{
players[i].exiting = raceexittime+1;
players[i].pflags &= ~PF_GLIDING;
}
if (i == consoleplayer)
S_StartSound(NULL, sfx_lose);
}
if (mapheaderinfo[gamemap-1]->levelflags & LF_SPEEDMUSIC)
S_SpeedMusic(1.0f);
stagefailed = true;
}
if (sstimer > 1) // As long as time isn't up...
{
UINT32 ssrings = 0;
// Count up the rings of all the players and see if
// they've collected the required amount.
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i])
{
ssrings += (players[i].mo->health-1);
// If in water, deplete timer 6x as fast.
if ((players[i].mo->eflags & MFE_TOUCHWATER)
|| (players[i].mo->eflags & MFE_UNDERWATER))
inwater = true;
}
if (ssrings >= totalrings && totalrings > 0)
{
// Halt all the players
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i])
{
players[i].mo->momx = players[i].mo->momy = 0;
players[i].exiting = raceexittime+1;
}
sstimer = 0;
P_GiveEmerald(true);
}
// Decrement the timer
if (!objectplacing)
{
if (inwater)
sstimer -= 6;
else
sstimer--;
if (camera[i].chase)
P_MoveChaseCamera(&players[displayplayers[i]], &camera[i], false);
}
}
}
static inline void P_DoTagStuff(void)
{
INT32 i;
// tell the netgame who the initial IT person is.
if (leveltime == TICRATE)
{
for (i = 0; i < MAXPLAYERS; i++)
{
if (players[i].pflags & PF_TAGIT)
{
CONS_Printf(M_GetText("%s is now IT!\n"), player_names[i]); // Tell everyone who is it!
break;
}
}
}
//increment survivor scores
if (leveltime % TICRATE == 0 && leveltime > (hidetime * TICRATE))
{
INT32 participants = 0;
for (i=0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !players[i].spectator)
participants++;
}
for (i=0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !players[i].spectator && players[i].playerstate == PST_LIVE
&& !(players[i].pflags & (PF_TAGIT|PF_TAGGED)))
//points given is the number of participating players divided by two.
P_AddPlayerScore(&players[i], participants/2);
}
}
}
static inline void P_DoCTFStuff(void)
{
// Automatic team balance for CTF and team match
if (leveltime % (TICRATE * 5) == 0) //only check once per five seconds for the sake of CPU conservation.
{
// Do not attempt to autobalance and scramble teams at the same time.
// Only the server should execute this. No verified admins, please.
if ((cv_autobalance.value && !cv_teamscramble.value) && cv_allowteamchange.value && server)
P_DoAutobalanceTeams();
}
// Team scramble code for team match and CTF.
if ((leveltime % (TICRATE/7)) == 0)
{
// If we run out of time in the level, the beauty is that
// the Y_Ticker() team scramble code will pick it up.
if (cv_teamscramble.value && server)
P_DoTeamscrambling();
}
}*/
//
// P_Ticker
//
@@ -830,11 +590,7 @@ void P_Ticker(boolean run)
}
// Always move the camera.
for (i = 0; i <= splitscreen; i++)
{
if (camera[i].chase)
P_MoveChaseCamera(&players[displayplayers[i]], &camera[i], false);
}
P_RunChaseCameras();
if (run)
{
+1
View File
@@ -24,6 +24,7 @@ extern tic_t leveltime;
void Command_Numthinkers_f(void);
void Command_CountMobjs_f(void);
void P_RunChaseCameras(void);
void P_Ticker(boolean run);
void P_PreTicker(INT32 frames);
void P_DoTeamscrambling(void);