zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 00:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added full sound definitions for Heretic's ChickenPlayer and Hexen's

Browse source 
PigPlayer (submitted by NeuralStunner.)
- Added unmorph fix by Gez.


SVN r2056 (trunk)
This commit is contained in:
Christoph Oelckers 2009-12-28 22:41:14 +00:00
parent 3d40dbb659
commit 9b5c2c81f1
5 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/rh-log.txt
View file

@ -1,4 +1,7 @@
December 28, 2009 (Changes by Graf Zahl) December 28, 2009 (Changes by Graf Zahl)
- Added full sound definitions for Heretic's ChickenPlayer and Hexen's
PigPlayer (submitted by NeuralStunner.)
- Added unmorph fix by Gez.
- merged all portals with the same displacement together. While this provides - merged all portals with the same displacement together. While this provides
a mild performance increase it's not what I hoped it would do... a mild performance increase it's not what I hoped it would do...
- Moved portal initialization for the portal things to P_SpawnSpecials - Moved portal initialization for the portal things to P_SpawnSpecials

2
src/g_shared/a_morph.cpp
View file

@ -192,7 +192,7 @@ bool P_UndoPlayerMorph (player_t *activator, player_t *player, int unmorphflag,
return false; return false;
} }
bool DeliberateUnmorphIsOkay = !!(player->MorphStyle & unmorphflag); bool DeliberateUnmorphIsOkay = !!(MORPH_STANDARDUNDOING & unmorphflag);
if ((pmo->flags2 & MF2_INVULNERABLE) // If the player is invulnerable if ((pmo->flags2 & MF2_INVULNERABLE) // If the player is invulnerable
&& ((player != activator) // and either did not decide to unmorph, && ((player != activator) // and either did not decide to unmorph,

3
src/g_shared/a_morph.h
View file

@ -23,6 +23,9 @@ enum
MORPH_UNDOBYDEATH = 0x00000200, // Actor unmorphs when killed and (unless MORPH_UNDOBYDEATHSAVES) stays dead MORPH_UNDOBYDEATH = 0x00000200, // Actor unmorphs when killed and (unless MORPH_UNDOBYDEATHSAVES) stays dead
MORPH_UNDOBYDEATHFORCED = 0x00000400, // Actor (if unmorphed when killed) forces unmorph (not very useful with UNDOBYDEATHSAVES) MORPH_UNDOBYDEATHFORCED = 0x00000400, // Actor (if unmorphed when killed) forces unmorph (not very useful with UNDOBYDEATHSAVES)
MORPH_UNDOBYDEATHSAVES = 0x00000800, // Actor (if unmorphed when killed) regains their health and doesn't die MORPH_UNDOBYDEATHSAVES = 0x00000800, // Actor (if unmorphed when killed) regains their health and doesn't die
MORPH_UNDOBYTIMEOUT = 0x00001000, // Player unmorphs once countdown expires
MORPH_STANDARDUNDOING = MORPH_UNDOBYTOMEOFPOWER | MORPH_UNDOBYCHAOSDEVICE | MORPH_UNDOBYTIMEOUT,
}; };
struct PClass; struct PClass;

2
src/p_user.cpp
View file

@ -2309,7 +2309,7 @@ void P_PlayerThink (player_t *player)
} }
if (!--player->morphTics) if (!--player->morphTics)
{ // Attempt to undo the chicken/pig { // Attempt to undo the chicken/pig
P_UndoPlayerMorph (player, player); P_UndoPlayerMorph (player, player, MORPH_UNDOBYTIMEOUT);
} }
} }
// Cycle psprites // Cycle psprites

12
wadsrc/static/sndinfo.txt
View file

@ -545,6 +545,10 @@ $playersound player male *jump plrjmp
$playersound player male *burndeath hedat1 $playersound player male *burndeath hedat1
$playeralias chicken male *usefail chicken/peck $playeralias chicken male *usefail chicken/peck
$PlayerAlias Chicken Male *Grunt chicken/pain
$PlayerAlias Chicken Male *Land chicken/pain
$PlayerAlias Chicken Male *Jump chicken/active
$PlayerAlias Chicken Male *EvilLaugh chicken/active
chicken/sight chicpai chicken/sight chicpai
chicken/pain chicpai chicken/pain chicpai
@ -887,6 +891,14 @@ $playeralias mage male *puzzfail PuzzleFailMage
$playersound mage male *jump mgjump $playersound mage male *jump mgjump
$playeralias pig male *usefail PigActive1 $playeralias pig male *usefail PigActive1
$PlayerAlias Pig Male *UseFail PigActive1
$playeralias Pig Male *PuzzFail PigActive2
$PlayerAlias Pig Male *Grunt PigActive1
$PlayerAlias Pig Male *Land PigActive2
$PlayerAlias Pig Male *Jump PigActive1
$PlayerAlias Pig Male *Poison PigActive2
$PlayerAlias Pig Male *Falling PigPain
$PlayerAlias Pig Male *Splat PigDeath
$alias world/drip Ambient10 $alias world/drip Ambient10
$alias world/watersplash WaterSplash $alias world/watersplash WaterSplash