Stronger gloss with slightly darker bloom

[voretournament/voretournament.git] / data / qcsrc / menu / voret / dialog_singleplayer.c

diff --git a/data/qcsrc/menu/voret/dialog_singleplayer.c b/data/qcsrc/menu/voret/dialog_singleplayer.c
index c69854efc55b4af2a12304e704e29dcdded24d5b..8cb9e7eb667af3c175ab12165d03e5dbab360961 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_singleplayer.c
+++ b/data/qcsrc/menu/voret/dialog_singleplayer.c
@@ -4,7 +4,7 @@ CLASS(VoretSingleplayerDialog) EXTENDS(VoretDialog)
        ATTRIB(VoretSingleplayerDialog, title, string, "Singleplayer")\r
        ATTRIB(VoretSingleplayerDialog, color, vector, SKINCOLOR_DIALOG_SINGLEPLAYER)\r
        ATTRIB(VoretSingleplayerDialog, intendedWidth, float, 0.80)\r
-       ATTRIB(VoretSingleplayerDialog, rows, float, 24)\r
+       ATTRIB(VoretSingleplayerDialog, rows, float, 25)\r
        ATTRIB(VoretSingleplayerDialog, columns, float, 5)\r
        ATTRIB(VoretSingleplayerDialog, campaignBox, entity, NULL)\r
 ENDCLASS(VoretSingleplayerDialog)\r
@@ -26,18 +26,27 @@ void InstantAction_LoadMap(entity btn, entity dummy)
                return;\r
        while((s = fgets(fh)))\r
        {\r
+               if(substring(s, 0, 4) == "set ")\r
+                       s = substring(s, 4, strlen(s) - 4);\r
                n = tokenize_console(s);\r
-               if(argv(0) == "changelevel")\r
+               if(argv(0) == "bot_number")\r
+                       cvar_set("bot_number", argv(1));\r
+               else if(argv(0) == "skill")\r
+                       cvar_set("skill", argv(1));\r
+               else if(argv(0) == "timelimit")\r
+                       cvar_set("timelimit_override", argv(1));\r
+               else if(argv(0) == "fraglimit")\r
+                       cvar_set("fraglimit_override", argv(1));\r
+               else if(argv(0) == "gametype")\r
+                       MapInfo_SwitchGameType(MapInfo_Type_FromString(argv(1)));\r
+               else if(argv(0) == "changelevel")\r
                {\r
                        fclose(fh);\r
                        localcmd("\nmenu_loadmap_prepare\n");\r
-                       MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH);\r
                        MapInfo_LoadMap(argv(1));\r
                        cvar_set("lastlevel", "1");\r
                        return;\r
                }\r
-               else if(argv(0) != "" && argv(0) != "//" && argv(0) != "#")\r
-                       cvar_set(argv(0), argv(1)); //TODO: sanity check, this can currently set any cvar!\r
        }\r
        fclose(fh);\r
 }\r
@@ -52,13 +61,16 @@ void fillVoretSingleplayerDialog(entity me)
                        e.onClick = InstantAction_LoadMap;\r
                        e.onClickEntity = NULL;\r
        me.TR(me);\r
+       me.TR(me);\r
+               me.TDempty(me, (me.columns - 3) / 2);\r
+               me.TD(me, 1, 3, makeVoretCommandButton("Tutorial", '0 0 0', "map tutorial", COMMANDBUTTON_APPLY));\r
        me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 1, btnPrev = makeVoretButton("<<", '0 0 0'));\r
                me.TD(me, 1, me.columns - 2, lblTitle = makeVoretTextLabel(0.5, "???"));\r
                me.TD(me, 1, 1, btnNext = makeVoretButton(">>", '0 0 0'));\r
        me.TR(me);\r
-               me.TD(me, me.rows - 5, me.columns, me.campaignBox = makeVoretCampaignList());\r
+               me.TD(me, me.rows - 6, me.columns, me.campaignBox = makeVoretCampaignList());\r
                        btnPrev.onClick = MultiCampaign_Prev;\r
                        btnPrev.onClickEntity = me.campaignBox;\r
                        btnNext.onClick = MultiCampaign_Next;\r