ZDoom

If you are unsure how to rebase, yes, that' s my recommendation. I've just finished fixing bugs so it's a good time right now.

Right. Sorry about that. I've been trying to figure out how to rebase it. Does that essentially mean deleting my fork and starting anew?

Ha, ha, it wasn't even correct to begin with...

/home/edward-san/zdoom/trunk/src/p_interaction.cpp: In function ‘int P_DamageMobj(AActor*, AActor*, AActor*, int, FName, int)’:
/home/edward-san/zdoom/trunk/src/p_interaction.cpp:1265:100: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
    if ((player->cheats & CF_BUDDHA2) || ((player->cheats & CF_BUDDHA) && damage < TELEFRAG_DAMAGE) && player->playerstate != PST_DEAD)
                                                                                                    ^

[code]/home/edward-san/zdoom/trunk/src/p_interaction.cpp: In function ‘int P_DamageMobj(AActor*, AActor*, AActor*, int, FName, int)’:
/home/edward-san/zdoom/trunk/src/p_interaction.cpp:1265:100: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
if ((player->cheats & CF_BUDDHA2) || ((player->cheats & CF_BUDDHA) && damage < TELEFRAG_DAMAGE) && player->playerstate != PST_DEAD)
^
[/code]

Added - but please note that I didn't merge this, but cherry-picked your commits into the master branch because for some reason this pull request created a bit of the mess in the commit history. So next time you do something, make sure you perform a rebase instead of a merge when you pull the changes before you start working.

For the ultimate enthusiast and/or tester who just needs to live through all sorts of testing, [url=https://github.com/rheit/zdoom/pull/131]this is for them[/url].

In short, it remains absolutely stalwart against no matter how much damage is dealt, or by whatever means it is dealt with.

Also attempts to fix that annoying bug where NODAMAGE doesn't factor in when voodoo dolls are damaged. That flag means precisely that.