zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-16 15:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-01-11 23:59:35 +01:00
commit 2f2bd91083
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_interaction.cpp
View file

@ -1045,7 +1045,7 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
return -1; return -1;
} }
if ((rawdamage < TELEFRAG_DAMAGE) || (target->flags7 & MF7_LAXTELEFRAGDMG)) // TELEFRAG_DAMAGE may only be reduced with NOTELEFRAGPIERCE or it may not guarantee its effect. if ((rawdamage < TELEFRAG_DAMAGE) || (target->flags7 & MF7_LAXTELEFRAGDMG)) // TELEFRAG_DAMAGE may only be reduced with LAXTELEFRAGDMG or it may not guarantee its effect.
{ {
if (player && damage > 1) if (player && damage > 1)
{ {
@ -1221,7 +1221,8 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
((player && player != source->player) || (!player && target != source)) && ((player && player != source->player) || (!player && target != source)) &&
target->IsTeammate (source)) target->IsTeammate (source))
{ {
if (rawdamage < TELEFRAG_DAMAGE) //Use the original damage to check for telefrag amount. Don't let the now-amplified damagetypes do it. //Use the original damage to check for telefrag amount. Don't let the now-amplified damagetypes do it.
if (rawdamage < TELEFRAG_DAMAGE || (target->flags7 & MF7_LAXTELEFRAGDMG))
{ // Still allow telefragging :-( { // Still allow telefragging :-(
damage = (int)((float)damage * level.teamdamage); damage = (int)((float)damage * level.teamdamage);
if (damage < 0) if (damage < 0)

2
src/p_sectors.cpp
View file

@ -883,7 +883,7 @@ FArchive &operator<< (FArchive &arc, secspecial_t &p)
{ {
if (SaveVersion < 4529) if (SaveVersion < 4529)
{ {
short special; int special;
arc << special; arc << special;
sector_t sec; sector_t sec;
P_InitSectorSpecial(&sec, special, true); P_InitSectorSpecial(&sec, special, true);

2
src/wildmidi/wildmidi_lib.cpp
View file

@ -573,7 +573,7 @@ static inline int wm_isdigit(int c) {
#define TOKEN_CNT_INC 8 #define TOKEN_CNT_INC 8
static char** WM_LC_Tokenize_Line(char *line_data) static char** WM_LC_Tokenize_Line(char *line_data)
{ {
int line_length = strlen(line_data); int line_length = (int)strlen(line_data);
int token_data_length = 0; int token_data_length = 0;
int line_ofs = 0; int line_ofs = 0;
int token_start = 0; int token_start = 0;