OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Moved bot related variables from player_t into a new FBot class.

Browse source
This commit is contained in:
ChillyDoom 2014-10-13 18:40:25 +01:00
commit 83d84eaae9
20 changed files with 325 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/wi_stuff.cpp
View file

@ -1330,7 +1330,7 @@ void WI_updateDeathmatchStats ()
for (i = 0; i < MAXPLAYERS; i++)
{
// If the player is in the game and not ready, stop checking
if (playeringame[i] && !players[i].isbot && !playerready[i])
if (playeringame[i] && !players[i].Bot.isbot && !playerready[i])
break;
}
@ -1429,7 +1429,7 @@ void WI_drawDeathmatchStats ()
clamp(int(g*255.f), 0, 255),
clamp(int(b*255.f), 0, 255)), 0.8f, x, y - ypadding, (deaths_x - x) + (8 * CleanXfac), lineheight);
if (playerready[pnum] || player->isbot) // Bots are automatically assumed ready, to prevent confusion
if (playerready[pnum] || player->Bot.isbot) // Bots are automatically assumed ready, to prevent confusion
screen->DrawTexture(readyico, x - (readyico->GetWidth() * CleanXfac), y, DTA_CleanNoMove, true, TAG_DONE);
color = (EColorRange)HU_GetRowColor(player, pnum == consoleplayer);
@ -1638,7 +1638,7 @@ void WI_updateNetgameStats ()
for (i = 0; i < MAXPLAYERS; i++)
{
// If the player is in the game and not ready, stop checking
if (playeringame[i] && !players[i].isbot && !playerready[i])
if (playeringame[i] && !players[i].Bot.isbot && !playerready[i])
break;
}
@ -1735,7 +1735,7 @@ void WI_drawNetgameStats ()
clamp(int(g*255.f), 0, 255),
clamp(int(b*255.f), 0, 255)), 0.8f, x, y - ypadding, (secret_x - x) + (8 * CleanXfac), lineheight);
if (playerready[i] || player->isbot) // Bots are automatically assumed ready, to prevent confusion
if (playerready[i] || player->Bot.isbot) // Bots are automatically assumed ready, to prevent confusion
screen->DrawTexture(readyico, x - (readyico->GetWidth() * CleanXfac), y, DTA_CleanNoMove, true, TAG_DONE);
color = (EColorRange)HU_GetRowColor(player, i == consoleplayer);
@ -2010,7 +2010,7 @@ void WI_checkForAccelerate(void)
{
if ((player->cmd.ucmd.buttons ^ player->oldbuttons) &&
((players[i].cmd.ucmd.buttons & players[i].oldbuttons)
== players[i].oldbuttons) && !player->isbot)
== players[i].oldbuttons) && !player->Bot.isbot)
{
acceleratestage = 1;
playerready[i] = true;