zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 07:57:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'automap_colors'

Browse source
This commit is contained in:
Christoph Oelckers 2013-08-02 18:16:05 +02:00
commit 8f45e906d4
4 changed files with 524 additions and 267 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

770
src/am_map.cpp
View file

File diff suppressed because it is too large Load diff

1
src/g_level.h
View file

@ -103,6 +103,7 @@ struct FMapInfoParser
void ParseIntermissionAction(FIntermissionDescriptor *Desc); void ParseIntermissionAction(FIntermissionDescriptor *Desc);
void ParseIntermission(); void ParseIntermission();
void ParseAMColors();
FName CheckEndSequence(); FName CheckEndSequence();
FName ParseEndGame(); FName ParseEndGame();
}; };

12
src/g_mapinfo.cpp
View file

@ -1842,6 +1842,18 @@ void FMapInfoParser::ParseMapInfo (int lump, level_info_t &gamedefaults, level_i
sc.ScriptError("intermission definitions not supported with old MAPINFO syntax"); sc.ScriptError("intermission definitions not supported with old MAPINFO syntax");
} }
} }
else if (sc.Compare("automap"))
{
if (format_type != FMT_Old)
{
format_type = FMT_New;
ParseAMColors();
}
else
{
sc.ScriptError("automap colorset definitions not supported with old MAPINFO syntax");
}
}
else else
{ {
sc.ScriptError("%s: Unknown top level keyword", sc.String); sc.ScriptError("%s: Unknown top level keyword", sc.String);

8
wadsrc/static/menudef.txt
View file

@ -932,6 +932,7 @@ OptionMenu AutomapOptions
{ {
Title "AUTOMAP OPTIONS" Title "AUTOMAP OPTIONS"
Option "Map color set", "am_colorset", "MapColorTypes" Option "Map color set", "am_colorset", "MapColorTypes"
Option "Allow map defined colors", "am_customcolors", "YesNo"
Submenu "Set custom colors", "MapColorMenu" Submenu "Set custom colors", "MapColorMenu"
Submenu "Customize map controls", "MapControlsMenu" Submenu "Customize map controls", "MapControlsMenu"
StaticText " " StaticText " "
@ -1022,12 +1023,15 @@ OptionMenu MapColorMenu
ColorPicker "2-sided walls with different ceilings", "am_ovcdwallcolor" ColorPicker "2-sided walls with different ceilings", "am_ovcdwallcolor"
ColorPicker "2-sided walls with 3D floors", "am_ovefwallcolor" ColorPicker "2-sided walls with 3D floors", "am_ovefwallcolor"
ColorPicker "Not-yet-seen walls", "am_ovunseencolor" ColorPicker "Not-yet-seen walls", "am_ovunseencolor"
ColorPicker "Locked doors", "am_ovotherwallscolor" ColorPicker "Locked doors", "am_ovlockedcolor"
ColorPicker "Teleporter", "am_ovtelecolor" ColorPicker "Teleporter to the same map", "am_ovtelecolor"
ColorPicker "Teleporter to a different map", "am_ovinterlevelcolor"
ColorPicker "Secret sector", "am_ovsecretsectorcolor" ColorPicker "Secret sector", "am_ovsecretsectorcolor"
ColorPicker "Special trigger lines", "am_ovspecialwallcolor" ColorPicker "Special trigger lines", "am_ovspecialwallcolor"
StaticText " " StaticText " "
StaticText "Overlay Cheat Mode", 1 StaticText "Overlay Cheat Mode", 1
ColorPicker "Invisible 2-sided walls", "am_ovotherwallscolor"
ColorPicker "Secret walls", "am_ovsecretwallcolor"
ColorPicker "Actors", "am_ovthingcolor" ColorPicker "Actors", "am_ovthingcolor"
ColorPicker "Monsters", "am_ovthingcolor_monster" ColorPicker "Monsters", "am_ovthingcolor_monster"
ColorPicker "Friends", "am_ovthingcolor_friend" ColorPicker "Friends", "am_ovthingcolor_friend"