From: Jakob MG <jakob_mg@hotmail.com>
Date: Wed, 28 Mar 2012 22:03:47 +0000 (+0200)
Subject: client cvars to default, exampleXonotic.cfg _simple mode/shader for crylink (needs... 
X-Git-Tag: xonotic-v0.7.0~312^2~47
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b3394100881f9df04e740b2270edeef9b492e5fc;p=xonotic%2Fxonotic-data.pk3dir.git

client cvars to default, exampleXonotic.cfg _simple mode/shader for crylink (needs mod_obj_orientation 1, use md3, dpm or iqm to avoid)
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 89edddfe0..f4e3f4fce 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1942,3 +1942,7 @@ alias menu_sync "menu_cmd sync"
 
 set sv_join_notices ""
 set sv_join_notices_time 15
+
+set cl_ghost_items 0.45
+set cl_ghost_items_color "-1 -1 -1"
+set cl_simple_items 0
diff --git a/models/weapons/crylink_simple.tga b/models/weapons/crylink_simple.tga
new file mode 100644
index 000000000..4dfe24eb0
Binary files /dev/null and b/models/weapons/crylink_simple.tga differ
diff --git a/models/weapons/g_crylink_simple.obj b/models/weapons/g_crylink_simple.obj
new file mode 100644
index 000000000..3bd17fcb3
--- /dev/null
+++ b/models/weapons/g_crylink_simple.obj
@@ -0,0 +1,14 @@
+# Blender3D v249 OBJ File: crylink_simple.blend
+# www.blender3d.org
+mtllib g_crylink_simple.mtl
+v 0.000000 40.000000 14.999998
+v 0.000000 10.000001 15.000000
+v 0.000000 9.999999 -15.000000
+v 0.000000 40.000000 -15.000002
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+usemtl crylink_simple
+s off
+f 1/1 4/2 3/3 2/4
diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index a9a595d39..6b4a418bd 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -118,12 +118,13 @@ void ItemRead(float _IsNew)
                 self.mdl = strzone(strcat(_fn2, "_simple.dpm"));
             else if(fexists(strcat(_fn2, "_simple.iqm")))
                 self.mdl = strzone(strcat(_fn2, "_simple.iqm"));
+            else if(fexists(strcat(_fn2, "_simple.obj")))
+                self.mdl = strzone(strcat(_fn2, "_simple.obj"));
             else
             {
                 self.mdl = "";
                 dprint("Simple item requested for ", _fn, " but no model exsist for it\n");
             }
-                
         }
         
         if(self.mdl == "")
@@ -134,6 +135,7 @@ void ItemRead(float _IsNew)
         else
             self.draw      = ItemDrawSimple;
         
+        precache_model(self.mdl);
         setmodel(self, self.mdl);
     }
     /*
diff --git a/scripts/weapons.shader b/scripts/weapons.shader
index 9749b51cc..a0d3c584c 100644
--- a/scripts/weapons.shader
+++ b/scripts/weapons.shader
@@ -99,7 +99,19 @@ minelayer
 {
 	dpreflectcube cubemaps/default/sky
  	{
-		map textures/minelayer.tga
+		map textures/minelayer.tga	
 		rgbgen lightingDiffuse
 	}
 }
+
+crylink_simple
+{
+	deformVertexes autosprite
+	cull none
+ 	{
+		map models/weapons/crylink_simple
+		blendfunc blend
+		//rgbgen lightingDiffuse
+
+	}
+}
\ No newline at end of file