diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini index 4bf3abf1..642fb2f3 100644 --- a/artifacts/ddraw.ini +++ b/artifacts/ddraw.ini @@ -91,7 +91,7 @@ FadeMultiplier=100 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX [Interface] -;Set to 1 to enable drawing a dotted line when traveling on the world map (similar to Fallout 1) +;Set to 1 to draw a dotted line while traveling on the world map (similar to Fallout 1) WorldMapTravelMarkers=0 ;Uncomment these lines to change the appearance of the markers ;The color index in Fallout default palette (valid range: 1..228; default is 134) diff --git a/artifacts/scripting/headers/define_extra.h b/artifacts/scripting/headers/define_extra.h index 55504fa1..66836912 100644 --- a/artifacts/scripting/headers/define_extra.h +++ b/artifacts/scripting/headers/define_extra.h @@ -98,7 +98,8 @@ #define CFLG_FLATTN 2048 // 0x00000800 - Flatten (leaves no dead body) #define CFLG_SPECIAL 4096 // 0x00001000 - Special (has a special type of death) #define CFLG_RANGED 8192 // 0x00002000 - Range (has extra hand-to-hand range) -#define CFLG_NOKNOCKDOWN 16384 // 0x00004000 - Knock (cannot be knocked back) +#define CFLG_NOKNOCKBACK 16384 // 0x00004000 - Knock (cannot be knocked back) +#define CFLG_NOKNOCKDOWN CFLG_NOKNOCKBACK // for old scripts /* Window flags */ #define WIN_FLAG_MOVEONTOP (0x4) diff --git a/sfall/Define.h b/sfall/Define.h index a69ca416..301aed67 100644 --- a/sfall/Define.h +++ b/sfall/Define.h @@ -294,14 +294,14 @@ enum CritterFlags : long CFLG_Level = 0x04, // Level received ? CFLG_Addict = 0x08, // Drug addiction ? CFLG_NoSteal = 0x20, // Can't be stolen from - CFLG_NoDrop = 0x40, // Doesn't drop items + CFLG_NoDrop = 0x40, // Can't Drop items CFLG_NoLimbs = 0x80, // Can't lose limbs - CFLG_DeadAges = 0x100, // Dead body does not disappear - CFLG_NoHeal = 0x200, // Damage is not healed with time - CFLG_Invlunerable = 0x400, // Is Invlunerable (cannot be hurt) - CFLG_NotFlattens = 0x800, // Doesn't flatten on death (leaves no dead body) - CFLG_SpecialDeath = 0x1000, // Has a special type of death - CFLG_RangeHth = 0x2000, // Has extra hand-to-hand range + CFLG_NoAges = 0x100, // Dead Bodies Can't Age + CFLG_NoHeal = 0x200, // Can't Heal by Aging + CFLG_Invulnerable = 0x400, // Is Invulnerable (cannot be hurt) + CFLG_NoFlatten = 0x800, // Can't Flatten on Death (leaves no dead body) + CFLG_SpecialDeath = 0x1000, // Has Special Death + CFLG_RangeHth = 0x2000, // Has Extra Hand-To-Hand Range CFLG_NoKnockBack = 0x4000, // Can't be knocked back };