zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 13:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Monsters should not check the inventory for damage absorbtion when

Browse source 
they have the MF5_NODAMAGE flag set.
- Added patch for saving automap zoom.


SVN r1587 (trunk)
This commit is contained in:
Christoph Oelckers 2009-05-15 22:06:44 +00:00
parent eb52c9a90e
commit b55ca6ffaa
5 changed files with 8 additions and 3 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 @@
May 15, 2009 (Changes by Graf Zahl) May 15, 2009 (Changes by Graf Zahl)
- Fixed: Monsters should not check the inventory for damage absorbtion when
they have the MF5_NODAMAGE flag set.
- Added patch for saving automap zoom.
- Added ACS GetChar function. - Added ACS GetChar function.
- Added Gez's submission for polyobjects being able to crush corpses but made - Added Gez's submission for polyobjects being able to crush corpses but made
it an explicit MAPINFO option only. it an explicit MAPINFO option only.

2
src/am_map.cpp
View file

@ -1912,4 +1912,6 @@ void AM_SerializeMarkers(FArchive &arc)
{ {
arc << markpoints[i].x << markpoints[i].y; arc << markpoints[i].x << markpoints[i].y;
} }
arc << scale_mtof;
arc << scale_ftom;
} }

2
src/p_acs.cpp
View file

@ -2897,7 +2897,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args)
case ACSF_GetChar: case ACSF_GetChar:
{ {
const char *p = FBehavior::StaticLookupString(args[0]); const char *p = FBehavior::StaticLookupString(args[0]);
if (p != NULL && args[1] >= 0 && args[1] < strlen(p)) if (p != NULL && args[1] >= 0 && args[1] < int(strlen(p)))
{ {
return p[args[1]]; return p[args[1]];
} }

2
src/p_interaction.cpp
View file

@ -1156,7 +1156,7 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
else else
{ {
// Armor for monsters. // Armor for monsters.
if (!(flags & DMG_NO_ARMOR) && target->Inventory != NULL) if (!(flags & DMG_NO_ARMOR) && target->Inventory != NULL && damage > 0)
{ {
int newdam = damage; int newdam = damage;
target->Inventory->AbsorbDamage (damage, mod, newdam); target->Inventory->AbsorbDamage (damage, mod, newdam);

2
src/version.h
View file

@ -75,7 +75,7 @@
// SAVESIG should match SAVEVER. // SAVESIG should match SAVEVER.
// MINSAVEVER is the minimum level snapshot version that can be loaded. // MINSAVEVER is the minimum level snapshot version that can be loaded.
#define MINSAVEVER 1583 #define MINSAVEVER 1586
#if SVN_REVISION_NUMBER < MINSAVEVER #if SVN_REVISION_NUMBER < MINSAVEVER
// Never write a savegame with a version lower than what we need // Never write a savegame with a version lower than what we need