Cleanup common includes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / campaign.qc

diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index 336d825a7f58cc2ba4aa99ae1a45d81781293b80..2ac3c58d1f5089fa3744300b14dc342b19c77c23 100644 (file)
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -1,12 +1,14 @@
 #include "campaign.qh"
 
-#include "defs.qh"
+#include <common/mapinfo.qh>
+#include <common/weapons/_all.qh>
+#include <common/stats.qh>
 
 #include "cheats.qh"
-#include "miscfunctions.qh"
-#include "g_world.qh"
+#include <server/intermission.qh>
+#include "world.qh"
 
-#include "../common/campaign_common.qh"
+#include <common/campaign_common.qh>
 
 // campaign cvars:
 //   _campaign_index: index of CURRENT map
@@ -21,11 +23,6 @@ string campaign_index_var;
 
 float CampaignBailout(string s)
 {
-#if 0
-       cvar = cvar_normal;
-       cvar_string = cvar_string_normal;
-       cvar_set = cvar_set_normal;
-#endif
        cvar_set("g_campaign", "0");
        LOG_INFO("^4campaign initialization failed: ", s);
        if(autocvar__campaign_testrun)
@@ -33,41 +30,12 @@ float CampaignBailout(string s)
        return 1;
 }
 
-#if 0
-string cvar_campaignwrapper_list; // string of format ; var value; var value; var value;
-string cvar_string_campaignwrapper(string theCvar)
-{
-       float p, q;
-       p = strstrofs(cvar_campaignwrapper_list, strcat("; ", theCvar, " "), 0);
-       if(p < 0)
-               return cvar_defstring(theCvar);
-       p += strlen(theCvar) + 3;
-       q = strstrofs(cvar_campaignwrapper_list, ";", p);
-       if(q < 0)
-               return cvar_defstring(theCvar);
-       return substring(cvar_campaignwrapper_list, p, q - p);
-}
-float cvar_campaignwrapper(string theCvar)
-{
-       return stof(cvar_string_campaignwrapper(theCvar));
-}
-void cvar_set_campaignwrapper(string theCvar, string theValue)
-{
-       if(cvar_string_campaignwrapper(theCvar) == theValue)
-               return;
-       string s = cvar_campaignwrapper_list;
-       cvar_campaignwrapper_list = strzone(strcat("; ", theCvar, " ", theValue, s));
-       strunzone(s);
-       //print(cvar_campaignwrapper_list, "\n");
-}
-#endif
-
 float Campaign_Invalid()
 {
        string thismapname, wantedmapname;
        thismapname = GetMapname();
        wantedmapname = campaign_gametype[0];
-       if(MapInfo_CurrentGametype() != MapInfo_Type_FromString(wantedmapname))
+       if(MapInfo_CurrentGametype() != MapInfo_Type_FromString(wantedmapname, false))
                return CampaignBailout("wrong game type!");
        wantedmapname = campaign_mapname[0];
        if(wantedmapname != thismapname)
@@ -101,7 +69,7 @@ void CampaignPreInit()
 
        if(autocvar_sv_cheats)
        {
-               MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0]));
+               MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0], false));
                CampaignFile_Unload();
                CampaignBailout("JOLLY CHEATS AHAHAHAHAHAHAH))");
                return;
@@ -113,9 +81,6 @@ void CampaignPreInit()
        cvar_set("sv_public", "0");
        cvar_set("pausable", "1");
 
-#if 0
-       cvar_campaignwrapper_list = strzone(strcat("; ", campaign_mutators[0], "; "));
-#else
        string cvar_campaignwrapper_list = strcat("; ", campaign_mutators[0], "; ");
        int argc = tokenizebyseparator(cvar_campaignwrapper_list, "; ");
        if(argc > 0)
@@ -124,30 +89,16 @@ void CampaignPreInit()
                {
                        string arg = argv(j);
                        if(arg == "") continue;
-                       _MapInfo_Parse_Settemp(mapname, MAPINFO_SETTEMP_ACL_USER, 0, arg, 0); // no recursion!
+                       _MapInfo_Parse_Settemp(mapname, MAPINFO_SETTEMP_ACL_USER, 0, arg, 1);
                }
        }
-#endif
-
-#if 0
-       cvar = cvar_campaignwrapper;
-       cvar_string = cvar_string_campaignwrapper;
-       cvar_set = cvar_set_campaignwrapper;
-       cvar_set("g_campaign", "1");
-       cvar_set("g_dm", "0");
-       cvar_set("skill", ftos(baseskill));
-       cvar_set("bot_number", ftos(campaign_bots[0]));
-#else
+
        cvar_settemp("g_campaign", "1");
        cvar_settemp("g_dm", "0");
        cvar_settemp("skill", ftos(baseskill));
        cvar_settemp("bot_number", ftos(campaign_bots[0]));
-#endif
-       MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0]));
 
-       // copy sv_gravity cvar, as the engine needs it too (sorry, this will mess
-       // with the menu a little still...)
-       cvar_set_normal("sv_gravity", ftos(autocvar_sv_gravity));
+       MapInfo_SwitchGameType(MapInfo_Type_FromString(campaign_gametype[0], false));
 
        if(Campaign_Invalid())
                return;
@@ -163,9 +114,6 @@ void CampaignPostInit()
                cvar_set("fraglimit", "0");
                cvar_set("leadlimit", "0");
                cvar_set("timelimit", "0.01");
-               cvar_set_normal("fraglimit", "0");
-               cvar_set_normal("leadlimit", "0");
-               cvar_set_normal("timelimit", "0.01");
        }
        else
        {
@@ -173,15 +121,12 @@ void CampaignPostInit()
                tokenizebyseparator(campaign_fraglimit[0], "+");
                if(argv(0) != "default") {
                        cvar_set("fraglimit", argv(0));
-                       cvar_set_normal("fraglimit", argv(0));
                }
                if(argv(1) != "default") {
                        cvar_set("leadlimit", argv(1));
-                       cvar_set_normal("leadlimit", argv(1));
                }
                if(campaign_timelimit[0] != "default") {
                        cvar_set("timelimit", campaign_timelimit[0]);
-                       cvar_set_normal("timelimit", campaign_timelimit[0]);
                }
        }
 }
@@ -194,7 +139,7 @@ void CampaignSaveCvar(string cvarname, float value)
        string l;
 
        registercvar(cvarname, ftos(value));
-       cvar_set_normal(cvarname, ftos(value));
+       cvar_set(cvarname, ftos(value));
        // note: cvarname must be remembered
 
        fh = fopen("campaign.cfg", FILE_READ);
@@ -279,7 +224,7 @@ void CampaignPreIntermission()
 
        if(campaign_won && cheatcount_total == 0 && !autocvar__campaign_testrun)
        {
-               if(campaign_level == cvar_normal(campaign_index_var))
+               if(campaign_level == cvar(campaign_index_var))
                {
                        if(campaign_entries < 2)
                        {