zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-18 02:01:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added a new setting for am_overlay: 2 will disable the normal automap and

Browse source 
show only the overlayed version.


SVN r99 (trunk)
This commit is contained in:
Randy Heit 2006-05-10 03:17:34 +00:00
parent def53bdd5d
commit 0bf87acb00
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/rh-log.txt
View file

@ -1,4 +1,6 @@
May 9, 2006 May 9, 2006
- Added a new setting for am_overlay: 2 will disable the normal automap and
show only the overlayed version.
- Fixed?: WallSpriteColumn apparently needs to set dc_texturefrac. At least - Fixed?: WallSpriteColumn apparently needs to set dc_texturefrac. At least
Valgrind seems to say so. Valgrind seems to say so.
- Fixed: The FWadCollection destructor needs to use free to free the LumpInfo - Fixed: The FWadCollection destructor needs to use free to free the LumpInfo

4
src/am_map.cpp
View file

@ -97,7 +97,7 @@ inline fixed_t MTOF(fixed_t x)
static int WeightingScale; static int WeightingScale;
CVAR (Bool, am_rotate, false, CVAR_ARCHIVE); CVAR (Bool, am_rotate, false, CVAR_ARCHIVE);
CVAR (Bool, am_overlay, false, CVAR_ARCHIVE); CVAR (Int, am_overlay, 0, CVAR_ARCHIVE);
CVAR (Bool, am_showsecrets, true, CVAR_ARCHIVE); CVAR (Bool, am_showsecrets, true, CVAR_ARCHIVE);
CVAR (Bool, am_showmonsters, true, CVAR_ARCHIVE); CVAR (Bool, am_showmonsters, true, CVAR_ARCHIVE);
CVAR (Bool, am_showitems, false, CVAR_ARCHIVE); CVAR (Bool, am_showitems, false, CVAR_ARCHIVE);
@ -892,7 +892,7 @@ void AM_ToggleMap ()
} }
else else
{ {
if (am_overlay && viewactive) if (am_overlay==1 && viewactive)
{ {
viewactive = false; viewactive = false;
SB_state = screen->GetPageCount (); SB_state = screen->GetPageCount ();

10
src/m_options.cpp
View file

@ -532,7 +532,7 @@ menu_t VideoMenu =
static void StartMapColorsMenu (void); static void StartMapColorsMenu (void);
EXTERN_CVAR (Bool, am_rotate) EXTERN_CVAR (Bool, am_rotate)
EXTERN_CVAR (Bool, am_overlay) EXTERN_CVAR (Int, am_overlay)
EXTERN_CVAR (Bool, am_usecustomcolors) EXTERN_CVAR (Bool, am_usecustomcolors)
EXTERN_CVAR (Bool, am_showitems) EXTERN_CVAR (Bool, am_showitems)
EXTERN_CVAR (Bool, am_showmonsters) EXTERN_CVAR (Bool, am_showmonsters)
@ -553,12 +553,18 @@ static value_t SecretTypes[] = {
{ 2, "Always" }, { 2, "Always" },
}; };
static value_t OverlayTypes[] = {
{ 0, "Off" },
{ 1, "On" },
{ 2, "Exclusively" }
};
static menuitem_t AutomapItems[] = { static menuitem_t AutomapItems[] = {
{ discrete, "Map color set", {&am_usecustomcolors}, {2.0}, {0.0}, {0.0}, {MapColorTypes} }, { discrete, "Map color set", {&am_usecustomcolors}, {2.0}, {0.0}, {0.0}, {MapColorTypes} },
{ more, "Set custom colors", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t*)StartMapColorsMenu} }, { more, "Set custom colors", {NULL}, {0.0}, {0.0}, {0.0}, {(value_t*)StartMapColorsMenu} },
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} }, { redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
{ discrete, "Rotate automap", {&am_rotate}, {2.0}, {0.0}, {0.0}, {OnOff} }, { discrete, "Rotate automap", {&am_rotate}, {2.0}, {0.0}, {0.0}, {OnOff} },
{ discrete, "Overlay automap", {&am_overlay}, {2.0}, {0.0}, {0.0}, {OnOff} }, { discrete, "Overlay automap", {&am_overlay}, {3.0}, {0.0}, {0.0}, {OverlayTypes} },
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} }, { redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
{ discrete, "Show item counts", {&am_showitems}, {2.0}, {0.0}, {0.0}, {OnOff} }, { discrete, "Show item counts", {&am_showitems}, {2.0}, {0.0}, {0.0}, {OnOff} },
{ discrete, "Show monster counts", {&am_showmonsters}, {2.0}, {0.0}, {0.0}, {OnOff} }, { discrete, "Show monster counts", {&am_showmonsters}, {2.0}, {0.0}, {0.0}, {OnOff} },