- Fixed: 'Painchance' in DECORATE failed when reading custom damage type names.

- Added Karate Chris's patch for menu opening console commands.


SVN r684 (trunk)
This commit is contained in:
Christoph Oelckers 2008-01-09 09:01:30 +00:00
parent c694c55afd
commit 3bd53dafbe
3 changed files with 19 additions and 0 deletions

View file

@ -1,3 +1,7 @@
January 9, 2008 (Changes by Graf Zahl)
- Fixed: 'Painchance' in DECORATE failed when reading custom damage type names.
- Added Karate Chris's patch for menu opening console commands.
January 8, 2008 January 8, 2008
- Fixed: When starting a teamplay netgame, players who did not specify a team - Fixed: When starting a teamplay netgame, players who did not specify a team
were not informed about which team they ended up joining. were not informed about which team they ended up joining.

View file

@ -2567,6 +2567,13 @@ static void StartScoreboardMenu (void)
M_SwitchMenu (&ScoreboardMenu); M_SwitchMenu (&ScoreboardMenu);
} }
CCMD (menu_messages)
{
M_StartControlPanel (true);
OptionsActive = true;
StartMessagesMenu ();
}
CCMD (menu_automap) CCMD (menu_automap)
{ {
M_StartControlPanel (true); M_StartControlPanel (true);
@ -2574,6 +2581,13 @@ CCMD (menu_automap)
StartAutomapMenu (); StartAutomapMenu ();
} }
CCMD (menu_scoreboard)
{
M_StartControlPanel (true);
OptionsActive = true;
StartScoreboardMenu ();
}
static void StartMapColorsMenu (void) static void StartMapColorsMenu (void)
{ {
M_SwitchMenu (&MapColorsMenu); M_SwitchMenu (&MapColorsMenu);

View file

@ -868,6 +868,7 @@ static void ActorPainChance (AActor *defaults, Baggage &bag)
if (!SC_CheckNumber()) if (!SC_CheckNumber())
{ {
FName painType; FName painType;
SC_MustGetString();
if (SC_Compare("Normal")) painType = NAME_None; if (SC_Compare("Normal")) painType = NAME_None;
else painType=sc_String; else painType=sc_String;
SC_MustGetToken(','); SC_MustGetToken(',');