OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- made all references to the GameNames array an inline function call to allow easier modification later

Browse source 
- changed all parsers that check for the current game to use the same function for the game check.
- fixed: The TEAMINFO parser handled 'game Any' incorrectly.


SVN r2934 (trunk)
This commit is contained in:
Christoph Oelckers 2010-10-12 07:14:31 +00:00
commit 352a926ddf
13 changed files with 37 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/g_shared/a_keys.cpp
View file

@ -199,27 +199,11 @@ static void ParseLock(FScanner &sc)
keynum = sc.Number;
sc.MustGetString();
if (sc.Compare("DOOM"))
if (!sc.Compare("{"))
{
if (gameinfo.gametype != GAME_Doom) keynum=-1;
if (!CheckGame(sc.String, false)) keynum = -1;
sc.MustGetStringName("{");
}
else if (sc.Compare("HERETIC"))
{
if (gameinfo.gametype != GAME_Heretic) keynum=-1;
}
else if (sc.Compare("HEXEN"))
{
if (gameinfo.gametype != GAME_Hexen) keynum=-1;
}
else if (sc.Compare("STRIFE"))
{
if (gameinfo.gametype != GAME_Strife) keynum=-1;
}
else if (sc.Compare("CHEX"))
{
if (gameinfo.gametype != GAME_Chex) keynum=-1;
}
else sc.UnGet();
ignorekey = true;
if (keynum > 0 && keynum < 255)
@ -239,7 +223,6 @@ static void ParseLock(FScanner &sc)
sc.ScriptError("Lock index %d out of range", keynum);
}
sc.MustGetStringName("{");
while (!sc.CheckString("}"))
{
sc.MustGetString();