zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

A couple of trivial stylistic changes.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3694 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-04-21 19:55:03 +00:00
parent c298c56652
commit dac18a99e9
3 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
polymer/eduke32/source/actors.c
View file

@ -2977,16 +2977,11 @@ ACTOR_STATIC void G_MoveWeapons(void)
A_GetZLimits(i); A_GetZLimits(i);
switch (DYNAMICTILEMAP(s->picnum)) if (s->picnum == RPG && actor[i].picnum != BOSS2 && s->xrepeat >= 10 &&
sector[s->sectnum].lotag != ST_2_UNDERWATER)
{ {
case RPG__STATIC: j = A_Spawn(i,SMALLSMOKE);
if (DYNAMICTILEMAP(s->picnum) == RPG__STATIC && actor[i].picnum != BOSS2 && sprite[j].z += (1<<8);
s->xrepeat >= 10 && sector[s->sectnum].lotag != ST_2_UNDERWATER)
{
j = A_Spawn(i,SMALLSMOKE);
sprite[j].z += (1<<8);
}
break;
} }
{ {
@ -3069,7 +3064,8 @@ ACTOR_STATIC void G_MoveWeapons(void)
{ {
j &= (MAXWALLS-1); j &= (MAXWALLS-1);
if (s->picnum != RPG && s->picnum != FREEZEBLAST && s->picnum != SPIT && (wall[j].overpicnum == MIRROR || wall[j].picnum == MIRROR)) if (s->picnum != RPG && s->picnum != FREEZEBLAST && s->picnum != SPIT &&
(wall[j].overpicnum == MIRROR || wall[j].picnum == MIRROR))
{ {
Proj_BounceOffWall(s, j); Proj_BounceOffWall(s, j);
s->owner = i; s->owner = i;
@ -3143,7 +3139,6 @@ ACTOR_STATIC void G_MoveWeapons(void)
sprite[k].cstat |= 8; sprite[k].cstat |= 8;
sprite[k].z += (48<<8); sprite[k].z += (48<<8);
} }
} }
if (s->xrepeat >= 10) if (s->xrepeat >= 10)
@ -3174,7 +3169,6 @@ ACTOR_STATIC void G_MoveWeapons(void)
sprite[k].cstat |= 8; sprite[k].cstat |= 8;
sprite[k].z += (72<<8); sprite[k].z += (72<<8);
} }
} }
} }
} }

9
polymer/eduke32/source/game.c
View file

@ -7346,7 +7346,7 @@ FOUNDCHEAT:
if (k != CHEAT_COMEGETSOME) if (k != CHEAT_COMEGETSOME)
{ {
P_DoQuote(QUOTE_CHEAT_GODMODE_ON,g_player[myconnectindex].ps); P_DoQuote(QUOTE_CHEAT_GODMODE_ON, g_player[myconnectindex].ps);
} }
else else
{ {
@ -7355,21 +7355,22 @@ FOUNDCHEAT:
S_PlaySound(DUKE_GETWEAPON2); S_PlaySound(DUKE_GETWEAPON2);
P_DoQuote(QUOTE_RESERVED4, g_player[myconnectindex].ps); P_DoQuote(QUOTE_RESERVED4, g_player[myconnectindex].ps);
G_CheatGetInv(); G_CheatGetInv();
for (weapon = PISTOL_WEAPON; weapon < MAX_WEAPONS; weapon++) for (weapon = PISTOL_WEAPON; weapon < MAX_WEAPONS; weapon++)
g_player[myconnectindex].ps->gotweapon |= (1<<weapon); g_player[myconnectindex].ps->gotweapon |= (1<<weapon);
for (weapon = PISTOL_WEAPON; weapon < (MAX_WEAPONS); weapon++) for (weapon = PISTOL_WEAPON; weapon < MAX_WEAPONS; weapon++)
P_AddAmmo(weapon, g_player[myconnectindex].ps, g_player[myconnectindex].ps->max_ammo_amount[weapon]); P_AddAmmo(weapon, g_player[myconnectindex].ps, g_player[myconnectindex].ps->max_ammo_amount[weapon]);
g_player[myconnectindex].ps->got_access = 7; g_player[myconnectindex].ps->got_access = 7;
} }
} }
else else
{ {
sprite[pi].extra = g_player[myconnectindex].ps->max_player_health; sprite[pi].extra = g_player[myconnectindex].ps->max_player_health;
actor[pi].extra = -1; actor[pi].extra = -1;
g_player[myconnectindex].ps->last_extra = g_player[myconnectindex].ps->max_player_health; g_player[myconnectindex].ps->last_extra = g_player[myconnectindex].ps->max_player_health;
P_DoQuote(QUOTE_CHEAT_GODMODE_OFF,g_player[myconnectindex].ps); P_DoQuote(QUOTE_CHEAT_GODMODE_OFF, g_player[myconnectindex].ps);
} }
sprite[pi].extra = g_player[myconnectindex].ps->max_player_health; sprite[pi].extra = g_player[myconnectindex].ps->max_player_health;

2
polymer/eduke32/source/player.c
View file

@ -4770,7 +4770,9 @@ void P_ProcessInput(int32_t snum)
P_QuickKill(p); P_QuickKill(p);
else if (p->falling_counter > 9) else if (p->falling_counter > 9)
{ {
// Falling damage.
s->extra -= p->falling_counter-(krand()&3); s->extra -= p->falling_counter-(krand()&3);
if (s->extra <= 0) if (s->extra <= 0)
{ {
A_PlaySound(SQUISHED,p->i); A_PlaySound(SQUISHED,p->i);