Few maps in progress...

diff --git a/autoexec.cfg b/autoexec.cfg
index bed8bbb145674b056f74f7a2d7c5898ded7cee6f..d048bb0964a7423b85c9c63dc41d10ec58492850 100755 (executable)
--- a/autoexec.cfg
+++ b/autoexec.cfg
@@ -3,6 +3,8 @@
 
 name xolatile
 
+maxfps 60
+
 bind e      [setweapon 1] // Shotgun.
 bind q      [setweapon 2] // Chaingun.
 bind LCTRL  [setweapon 3] // Rocket launcher.

diff --git a/packages/maps/a.ogz b/packages/maps/a.ogz
new file mode 100644 (file)
index 0000000..2a296fb
Binary files /dev/null and b/packages/maps/a.ogz differ

diff --git a/packages/maps/arena1.ogz b/packages/maps/arena1.ogz
new file mode 100644 (file)
index 0000000..051643d
Binary files /dev/null and b/packages/maps/arena1.ogz differ

diff --git a/packages/maps/arena4.ogz b/packages/maps/arena4.ogz
new file mode 100644 (file)
index 0000000..2cb94c2
Binary files /dev/null and b/packages/maps/arena4.ogz differ

diff --git a/packages/maps/furiousheights3.ogz b/packages/maps/furiousheights3.ogz
index 88f537f9cadbf184a2f5a0fe19ab64062dee3eb2..0c356ab23814cf49d9cface42238073f80441ddf 100644 (file)
Binary files a/packages/maps/furiousheights3.ogz and b/packages/maps/furiousheights3.ogz differ

diff --git a/packages/maps/highland.ogz b/packages/maps/highland.ogz
index 758d15305e346ad952b489b8e75903d3f6678a75..9c6fb127f3647b2cc79299b305d3df87378443c5 100644 (file)
Binary files a/packages/maps/highland.ogz and b/packages/maps/highland.ogz differ

diff --git a/packages/maps/ztn.ogz b/packages/maps/ztn.ogz
deleted file mode 100644 (file)
index 84a27d2..0000000
Binary files a/packages/maps/ztn.ogz and /dev/null differ

diff --git a/src/engine/glare.cpp b/src/engine/glare.cpp
index dc639ad4940e49fc5c7544463a1d2b69df8770e5..5842fdcd59fb80f58f9b6854c48fac5268e4386c 100644 (file)
--- a/src/engine/glare.cpp
+++ b/src/engine/glare.cpp
@@ -68,4 +68,4 @@ void addglare()
 
     glDisable(GL_BLEND);
 }
-     
+

diff --git a/src/engine/ragdoll.h b/src/engine/ragdoll.h
index 9f6f641350d499df698527a070f66de4c2804191..2704abd3c202b5cd48fb1646c2d42af29b3b09c0 100644 (file)
--- a/src/engine/ragdoll.h
+++ b/src/engine/ragdoll.h
@@ -21,7 +21,7 @@ struct ragdollskel
     {
         int vert[2];
         float mindist, maxdist;
-    }; 
+    };
 
     struct rotlimit
     {
@@ -107,9 +107,9 @@ struct ragdollskel
     {
         setupjoints();
         setuprotfrictions();
-        
+
         loaded = true;
-    } 
+    }
 
     void addreljoint(int bone, int parent)
     {
@@ -150,7 +150,7 @@ struct ragdolldata
           radius(0),
           timestep(0),
           scale(scale),
-          verts(new vert[skel->verts.length()]), 
+          verts(new vert[skel->verts.length()]),
           tris(new matrix3[skel->tris.length()]),
           animjoints(!skel->animjoints || skel->joints.empty() ? NULL : new matrix4x3[skel->joints.length()]),
           reljoints(skel->reljoints.empty() ? NULL : new dualquat[skel->reljoints.length()])
@@ -250,8 +250,8 @@ struct ragdolldata
 };
 
 /*
-    seed particle position = avg(modelview * base2anim * spherepos)  
-    mapped transform = invert(curtri) * origtrig 
+    seed particle position = avg(modelview * base2anim * spherepos)
+    mapped transform = invert(curtri) * origtrig
     parented transform = parent{invert(curtri) * origtrig} * (invert(parent{base2anim}) * base2anim)
 */
 
@@ -307,7 +307,7 @@ inline void ragdolldata::applyrotlimit(ragdollskel::tri &t1, ragdollskel::tri &t
     v2c.newpos.add(vec().cross(c2, q2c).madd(q2c, s2).add(v2c.pos));
     v2c.weight++;
 }
-    
+
 void ragdolldata::constrainrot()
 {
     loopv(skel->rotlimits)
@@ -321,7 +321,7 @@ void ragdolldata::constrainrot()
         float angle;
         if(!rot.calcangleaxis(angle, axis)) continue;
         angle = r.maxangle - fabs(angle);
-        if(angle >= 0) continue; 
+        if(angle >= 0) continue;
         angle += 1e-3f;
 
         applyrotlimit(skel->tris[r.tri[0]], skel->tris[r.tri[1]], angle, axis);
@@ -458,8 +458,8 @@ void ragdolldata::move(dynent *pl, float ts)
         if(!water) game::physicstrigger(pl, true, 0, 1, pl->inwater);
     }
     pl->inwater = water ? material&MATF_VOLUME : MAT_AIR;
-   
-    calcrotfriction(); 
+
+    calcrotfriction();
        float tsfric = timestep ? ts/timestep : 1,
                  airfric = ragdollairfric + min((ragdollbodyfricscale*collisions)/skel->verts.length(), 1.0f)*(ragdollbodyfric - ragdollairfric);
     collisions = 0;
@@ -485,11 +485,11 @@ void ragdolldata::move(dynent *pl, float ts)
             v.pos = v.oldpos;
             v.oldpos.sub(dir.reflect(collidewall));
             collisions++;
-        }   
+        }
     }
 
     if(unsticks && ragdollunstick) tryunstick(ts*ragdollunstick);
- 
+
     timestep = ts;
     if(collisions)
     {
@@ -501,7 +501,7 @@ void ragdolldata::move(dynent *pl, float ts)
     constrain();
     calctris();
     calcboundsphere();
-}    
+}
 
 FVAR(ragdolleyesmooth, 0, 0.5f, 1);
 VAR(ragdolleyesmoothmillis, 1, 250, 10000);
@@ -531,4 +531,3 @@ void cleanragdoll(dynent *d)
 {
     DELETEP(d->ragdoll);
 }
-

diff --git a/src/engine/shadowmap.cpp b/src/engine/shadowmap.cpp
index 4dafbd8020c61ee38bca8c8e22618f0ee98d6055..34b0fd42148a6e99a7908fb351554679ea38add1 100644 (file)
--- a/src/engine/shadowmap.cpp
+++ b/src/engine/shadowmap.cpp
@@ -161,7 +161,7 @@ static struct shadowmaptexture : rendertarget
         shadowmapping = false;
         shadowmapmaxz = min(shadowmapmaxz, shadowfocus.z);
 
-        if(shadowmapcasters && smdepthpeel) 
+        if(shadowmapcasters && smdepthpeel)
         {
             int sx, sy, sw, sh;
             bool scissoring = rtscissor && scissorblur(sx, sy, sw, sh) && sw > 0 && sh > 0;
@@ -253,8 +253,8 @@ bool isshadowmapreceiver(vtxarray *va)
     float skew = va->size/2*SHADOWSKEW;
     if(!shadowmap || !shadowmaptex ||
        va->o.z + va->size <= shadowfocus.z - shadowmapdist || va->o.z >= shadowmapmaxz ||
-       va->o.x + va->size <= cx - shadowmapradius-skew || va->o.x >= cx + shadowmapradius+skew || 
-       va->o.y + va->size <= cy - shadowmapradius-skew || va->o.y >= cy + shadowmapradius+skew) 
+       va->o.x + va->size <= cx - shadowmapradius-skew || va->o.x >= cx + shadowmapradius+skew ||
+       va->o.y + va->size <= cy - shadowmapradius-skew || va->o.y >= cy + shadowmapradius+skew)
         return false;
     return true;
 #endif
@@ -296,13 +296,13 @@ void pushshadowmap()
                        g = max(25.0f, 0.4f*ambientcolor[1] + 0.6f*max(ambientcolor[1], skylightcolor[1]));
                        b = max(25.0f, 0.4f*ambientcolor[2] + 0.6f*max(ambientcolor[2], skylightcolor[2]));
                }
-               else 
+               else
         {
             r = max(25.0f, 2.0f*ambientcolor[0]);
             g = max(25.0f, 2.0f*ambientcolor[1]);
             b = max(25.0f, 2.0f*ambientcolor[2]);
         }
-       }
+     }
     else { r = shadowmapambientcolor[0]; g = shadowmapambientcolor[1]; b = shadowmapambientcolor[2]; }
     GLOBALPARAMF(shadowmapambient, r/255.0f, g/255.0f, b/255.0f);
 }