zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-25 21:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: Player could crouch while dead.

Browse source 
SVN r209 (trunk)
This commit is contained in:
Christoph Oelckers 2006-06-21 17:59:34 +00:00
parent 14765bf64b
commit e7f21912a5
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.mgw
View file

@ -29,8 +29,8 @@ cleanexe:
@$(MAKE) -C . -f Makefile.mingw clean @$(MAKE) -C . -f Makefile.mingw clean
clean: clean:
@$(MAKE) -C tools/lemon -f Makefile.mgw clean @$(MAKE) -C tools/lemon -f Makefile clean
@$(MAKE) -C tools/re2c -f Makefile.mgw clean @$(MAKE) -C tools/re2c -f Makefile clean
@$(MAKE) -C tools/dehsupp -f Makefile clean @$(MAKE) -C tools/dehsupp -f Makefile clean
@$(MAKE) -C tools/makewad -f Makefile clean @$(MAKE) -C tools/makewad -f Makefile clean
@$(MAKE) -C tools/xlatcc -f Makefile clean @$(MAKE) -C tools/xlatcc -f Makefile clean

1
docs/rh-log.txt
View file

@ -1,4 +1,5 @@
June 21, 2006 (Changes by Graf Zahl) June 21, 2006 (Changes by Graf Zahl)
- Fixed: Player could crouch while dead.
- Fixed: The sidedef loader could allocate insufficient memory if a map - Fixed: The sidedef loader could allocate insufficient memory if a map
contained unused sidedefs. contained unused sidedefs.
- Fixed: Color control sequences were written to the log file. Since any - Fixed: Color control sequences were written to the log file. Since any

2
src/d_net.cpp
View file

@ -2255,7 +2255,7 @@ void Net_DoCommand (int type, byte **stream, int player)
break; break;
case DEM_CROUCH: case DEM_CROUCH:
if (gamestate == GS_LEVEL && players[player].mo != NULL) if (gamestate == GS_LEVEL && players[player].mo != NULL && players[player].health > 0)
{ {
players[player].crouching = players[player].crouchdir<0? 1 : -1; players[player].crouching = players[player].crouchdir<0? 1 : -1;
} }

2
src/p_user.cpp
View file

@ -1422,7 +1422,7 @@ void P_PlayerThink (player_t *player)
} }
// Handle crouching // Handle crouching
if (player->morphTics == 0 && !(dmflags & DF_NO_CROUCH)) if (player->morphTics == 0 && player->health > 0 && !(dmflags & DF_NO_CROUCH))
{ {
if (!(player->cheats & CF_TOTALLYFROZEN)) if (!(player->cheats & CF_TOTALLYFROZEN))
{ {