- Added and fixed Boss death submission for random spawner.
- Added functions to FActorInfo that can set the damage factors and
pain chances to reduce the chance of new errors when working with
these features.
- Fixed: The handling of the deprecated FIRERESIST flag didn't work.
There were 3 problems:
* Actor defaults have no class information so HandleDeprecatedFlags
needs to be passed a pointer to the ActorInfo.
* The DamageFactors list is only created when needed so the code needs to
check if it already exists.
* damage factors are stored as fixed_t but this set a float.
- Added a traditional Strife color set for the automap.
SVN r1183 (trunk)
This commit is contained in:
parent
0e5587812e
commit
3638c658d6
7 changed files with 197 additions and 86 deletions
|
|
@ -101,6 +101,7 @@ EXTERN_CVAR (Bool, cl_run)
|
|||
EXTERN_CVAR (Int, crosshair)
|
||||
EXTERN_CVAR (Bool, freelook)
|
||||
EXTERN_CVAR (Int, sv_smartaim)
|
||||
EXTERN_CVAR (Int, am_colorset)
|
||||
|
||||
static void CalcIndent (menu_t *menu);
|
||||
|
||||
|
|
@ -544,7 +545,6 @@ static void StartMapColorsMenu (void);
|
|||
|
||||
EXTERN_CVAR (Int, am_rotate)
|
||||
EXTERN_CVAR (Int, am_overlay)
|
||||
EXTERN_CVAR (Bool, am_usecustomcolors)
|
||||
EXTERN_CVAR (Bool, am_showitems)
|
||||
EXTERN_CVAR (Bool, am_showmonsters)
|
||||
EXTERN_CVAR (Bool, am_showsecrets)
|
||||
|
|
@ -554,8 +554,9 @@ EXTERN_CVAR (Bool, am_showtotaltime)
|
|||
EXTERN_CVAR (Bool, am_drawmapback)
|
||||
|
||||
static value_t MapColorTypes[] = {
|
||||
{ 1, "Custom" },
|
||||
{ 0, "Traditional Doom" }
|
||||
{ 0, "Custom" },
|
||||
{ 1, "Traditional Doom" },
|
||||
{ 2, "Traditional Strife" }
|
||||
};
|
||||
|
||||
static value_t SecretTypes[] = {
|
||||
|
|
@ -577,7 +578,7 @@ static value_t OverlayTypes[] = {
|
|||
};
|
||||
|
||||
static menuitem_t AutomapItems[] = {
|
||||
{ discrete, "Map color set", {&am_usecustomcolors}, {2.0}, {0.0}, {0.0}, {MapColorTypes} },
|
||||
{ discrete, "Map color set", {&am_colorset}, {3.0}, {0.0}, {0.0}, {MapColorTypes} },
|
||||
{ more, "Set custom colors", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t*)StartMapColorsMenu} },
|
||||
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
|
||||
{ discrete, "Rotate automap", {&am_rotate}, {3.0}, {0.0}, {0.0}, {RotateTypes} },
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue