client cvars to default, exampleXonotic.cfg _simple mode/shader for crylink (needs...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 89edddfe0d7fc8d194872bef6babbc2feb034c71..f4e3f4fcec0b36ac99afba8976a03d76e137b11d 100644 (file)
--- 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 (file)
index 0000000..4dfe24e
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 (file)
index 0000000..3bd17fc
--- /dev/null
+++ b/models/weapons/g_crylink_simple.obj
@@ -0,0 +1,14 @@
+# Blender3D v249 OBJ File: crylink_simple.blend\r
+# www.blender3d.org\r
+mtllib g_crylink_simple.mtl\r
+v 0.000000 40.000000 14.999998\r
+v 0.000000 10.000001 15.000000\r
+v 0.000000 9.999999 -15.000000\r
+v 0.000000 40.000000 -15.000002\r
+vt 1.000000 1.000000\r
+vt 0.000000 1.000000\r
+vt 0.000000 0.000000\r
+vt 1.000000 0.000000\r
+usemtl crylink_simple\r
+s off\r
+f 1/1 4/2 3/3 2/4\r

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index a9a595d394744883da8b41e5d57e1cf3229655f0..6b4a418bdbc237d4ba30203264c710d88428be71 100644 (file)
--- 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 9749b51cc2d22f2dcc5781507c20a8a7d7a78411..a0d3c584c316bcb8492dee7f9621175b0a699f65 100644 (file)
--- 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