Merge remote branch 'origin/fruitiex/fruitbalance'

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 49e65928478fabb3c41eaee1961258baafc60b0f..050a2915df005d8183456c873e5d9adfb720ccc2 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1479,6 +1479,7 @@ set con_completion_gotomap        map
 set con_completion_vmap                map
 set con_completion_vnextmap    map
 set con_completion_vdomap      map
+set con_completion_playermodel models/player/*.iqm
 
 // these non-saved engine cvars shall be savedG
 seta cl_port $cl_port

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index 9bc5dce9d9f6c75a8b4929547eedef1a34ac8ef9..0880ddc4b26548f66cfd5d99c2a049a5b7d6e12d 100644 (file)
--- a/qcsrc/client/laser.qc
+++ b/qcsrc/client/laser.qc
@@ -34,6 +34,7 @@ void Draw_Laser()
        {
                if(self.count & 0x10)
                {
+                       makevectors(self.angles);
                        trace_endpos = self.origin + v_forward * 1048576;
                        trace_dphitq3surfaceflags = Q3SURFACEFLAG_SKY;
                }

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index a001732da2553a9411b4fdf4e09793dfe7d2ba7f..07e9127827dc0131c43a9874c4e4bfca87f23e2c 100644 (file)
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@ -431,6 +431,7 @@ void WaypointSprite_Load()
        {
                float dh, n, i, o, f;
                string s, sname, sframes;
+
                dh = search_begin("models/sprites/*_frame*.tga", FALSE, FALSE);
                n = search_getsize(dh);
                for(i = 0; i < n; ++i)
@@ -445,6 +446,21 @@ void WaypointSprite_Load()
                        db_put(tempdb, sname, ftos(max(f, stof(db_get(tempdb, sname)))));
                }
                search_end(dh);
+
+               dh = search_begin("models/sprites/*_frame*.jpg", FALSE, FALSE);
+               n = search_getsize(dh);
+               for(i = 0; i < n; ++i)
+               {
+                       s = search_getfilename(dh, i);
+                       s = substring(s, 15, strlen(s) - 15 - 4); // strip models/sprites/ and .jpg
+
+                       o = strstrofs(s, "_frame", 0);
+                       sname = strcat("/spriteframes/", substring(s, 0, o));
+                       sframes = substring(s, o + 6, strlen(s) - o - 6);
+                       f = stof(sframes) + 1;
+                       db_put(tempdb, sname, ftos(max(f, stof(db_get(tempdb, sname)))));
+               }
+               search_end(dh);
        }
        waypointsprite_initialized = 1;
 }