Fix FL_WEAPON flag overlapping FL_JUMPRELEASED. This unintentional change was introdu...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / campaign_file.qc

diff --git a/qcsrc/common/campaign_file.qc b/qcsrc/common/campaign_file.qc
index 8bac6f35ee05678647caf62ec410df13bf5da770..0fef7816b34720448f34b36185ef14e6b40e6e45 100644 (file)
--- a/qcsrc/common/campaign_file.qc
+++ b/qcsrc/common/campaign_file.qc
@@ -1,9 +1,10 @@
 #include "campaign_file.qh"
+
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "util.qh"
-    #include "campaign_common.qh"
+       #include <common/util.qh>
+       #include <common/campaign_common.qh>
 #endif
 
 // CampaignFileLoad(offset, n)
@@ -61,8 +62,13 @@ float CampaignFile_Load(int offset, float n)
                                CAMPAIGN_GETARG; campaign_fraglimit[campaign_entries] = strzone(a);
                                CAMPAIGN_GETARG; campaign_timelimit[campaign_entries] = strzone(a);
                                CAMPAIGN_GETARG; campaign_mutators[campaign_entries] = strzone(a);
+                               #ifdef SVQC
+                               CAMPAIGN_GETARG;
+                               CAMPAIGN_GETARG;
+                               #else
                                CAMPAIGN_GETARG; campaign_shortdesc[campaign_entries] = strzone(a);
                                CAMPAIGN_GETARG; campaign_longdesc[campaign_entries] = strzone(strreplace("\\n", "\n", a));
+                               #endif
 
                                if(i > entlen)
                                        error("syntax error in campaign file: line has not enough fields");
@@ -94,8 +100,10 @@ void CampaignFile_Unload()
                        strfree(campaign_fraglimit[i]);
                        strfree(campaign_timelimit[i]);
                        strfree(campaign_mutators[i]);
+                       #ifndef SVQC
                        strfree(campaign_shortdesc[i]);
                        strfree(campaign_longdesc[i]);
+                       #endif
                }
                campaign_entries = 0;
        }