]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
<merlijn> when you switch to simple items in game, it's pretty much random which...
authorJakob MG <jakob_mg@hotmail.com>
Tue, 22 May 2012 12:01:36 +0000 (14:01 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 22 May 2012 12:01:36 +0000 (14:01 +0200)
qcsrc/client/Main.qc
qcsrc/server/t_items.qc

index 562b0d4c91069ca25822917d34fb970e1a6c1a37..3ac1e9cf7a67fee7eb2f82d9e8ffd184a7583b6e 100644 (file)
@@ -87,7 +87,7 @@ void ConsoleCommand_macro_init();
 void CSQC_Init(void)
 {
        prvm_language = cvar_string("prvm_language");
-
+    cl_simple_items = autocvar_cl_simple_items;
 #ifdef USE_FTE
 #pragma target ID
        __engine_check = checkextension("DP_SV_WRITEPICTURE");
@@ -178,7 +178,7 @@ void CSQC_Init(void)
        DamageInfo_Precache();
        Vehicles_Precache();
        turrets_precache();
-  Announcer_Precache();
+    Announcer_Precache();
        Tuba_Precache();
        
        if(autocvar_cl_reticle)
index b43b67656c1ddbdb35a1c24ee6a4d06047cebac0..96a1fbcdc713e80c71a98facd7606873e16d91b6 100644 (file)
 
 float  autocvar_cl_ghost_items;
 vector autocvar_cl_ghost_items_color;
-float  autocvar_cl_simple_items;
 float  autocvar_cl_fullbright_items;
 vector autocvar_cl_staywep_color;
 float  autocvar_cl_staywep_alpha;
+float  autocvar_cl_simple_items;
+float  cl_simple_items;
 
 .float  spawntime;
 .float  gravity;
@@ -130,7 +131,7 @@ void ItemRead(float _IsNew)
         self.mdl = "";
         string _fn = ReadString();
         
-        if(autocvar_cl_simple_items && (self.ItemStatus & ITS_ALLOWSI))
+        if(cl_simple_items && (self.ItemStatus & ITS_ALLOWSI))
         {
             string _fn2 = substring(_fn, 0 , strlen(_fn) -4);