Quake 2 Oop Conversion Project - Source Diff 3.05 vs 3.14 - p_hud.c
diff -s -r q2_305/p_hud.c q2_314/p_hud.c
Left File < - 3.05/p_hud.c
Right File > - 3.14/p_hud.c
Back to Index
15c15,16
< ent->client->showscores = true;
---
> if (deathmatch->value || coop->value)
> ent->client->showscores = true;
23a25
> ent->client->ps.rdflags &= ~RDF_UNDERWATER;
44c46
< if (deathmatch->value)
---
> if (deathmatch->value || coop->value)
54c56
< int i;
---
> int i, n;
58c60,62
< return; // allready activated
---
> return; // already activated
>
> game.autosaved = false;
59a64,72
> // respawn any dead clients
> for (i=0 ; i<maxclients->value ; i++)
> {
> client = g_edicts + 1 + i;
> if (!client->inuse)
> continue;
> if (client->health <= 0)
> respawn(client);
> }
64,68c77,93
< // if on same unit, return immediately
< if (!deathmatch->value && (targ->map && targ->map[0] != '*') )
< { // go immediately to the next level
< level.exitintermission = 1;
< return;
---
> if (strstr(level.changemap, "*"))
> {
> if (coop->value)
> {
> for (i=0 ; i<maxclients->value ; i++)
> {
> client = g_edicts + 1 + i;
> if (!client->inuse)
> continue;
> // strip players of all keys between units
> for (n = 0; n < MAX_ITEMS; n++)
> {
> if (itemlist[n].flags & IT_KEY)
> client->client->pers.inventory[n] = 0;
> }
> }
> }
69a95,103
> else
> {
> if (!deathmatch->value)
> {
> level.exitintermission = 1; // go immediately to the next level
> return;
> }
> }
>
218c252
< Cmd_Help_f
---
> Cmd_Score_f
220c254
< Display the current help message
---
> Display the scoreboard
223c257
< void Cmd_Help_f (edict_t *ent)
---
> void Cmd_Score_f (edict_t *ent)
225,226c259,260
< char string[1024];
< char *sk;
---
> ent->client->showinventory = false;
> ent->client->showhelp = false;
228c262,265
< if (ent->client->showscores && !game.helpchanged)
---
> if (!deathmatch->value && !coop->value)
> return;
>
> if (ent->client->showscores)
234,236d270
< // remove help icon
< game.helpchanged = false;
<
238c272,273
< ent->client->showinventory = false;
---
> DeathmatchScoreboard (ent);
> }
240,244c275,286
< if (deathmatch->value)
< {
< DeathmatchScoreboard (ent);
< return;
< }
---
>
> /*
> ==================
> HelpComputer
>
> Draw help computer.
> ==================
> */
> void HelpComputer (edict_t *ent)
> {
> char string[1024];
> char *sk;
250c292
< else
---
> else if (skill->value == 2)
251a294,295
> else
> sk = "hard+";
275a320,348
> /*
> ==================
> Cmd_Help_f
>
> Display the current help message
> ==================
> */
> void Cmd_Help_f (edict_t *ent)
> {
> // this is for backwards compatability
> if (deathmatch->value)
> {
> Cmd_Score_f (ent);
> return;
> }
>
> ent->client->showinventory = false;
> ent->client->showscores = false;
>
> if (ent->client->showhelp && (ent->client->resp.game_helpchanged == game.helpchanged))
> {
> ent->client->showhelp = false;
> return;
> }
>
> ent->client->showhelp = true;
> ent->client->resp.helpchanged = 0;
> HelpComputer (ent);
> }
322c395
< gi.sound(ent, CHAN_ITEM, gi.soundindex("misc/power1.wav"), 1, ATTN_NORM, 0); //FIXME powering down sound
---
> gi.sound(ent, CHAN_ITEM, gi.soundindex("misc/power2.wav"), 1, ATTN_NORM, 0);
408c481
< if (ent->client->showscores)
---
> if (ent->client->showscores || ent->client->showhelp)
420c493
< // help icon
---
> // help icon / current weapon if not shown
422c495
< if (game.helpchanged && (level.framenum&8) )
---
> if (ent->client->resp.helpchanged && (level.framenum&8) )
424c497,498
< else if (ent->client->pers.hand == CENTER_HANDED && ent->client->pers.weapon)
---
> else if ( (ent->client->pers.hand == CENTER_HANDED || ent->client->ps.fov > 91)
> && ent->client->pers.weapon)