View | Details | Raw Unified | Return to bug 197604
Collapse All | Expand All

(-)games/cube/files/patch-entities.cpp (+15 lines)
Line 0 Link Here
1
--- entities.cpp.orig	2015-02-14 01:42:48.128349000 +0100
2
+++ entities.cpp	2015-02-14 01:44:19.309526000 +0100
3
@@ -25,9 +25,9 @@
4
         entity &e = ents[i];
5
         if(e.type==MAPMODEL)
6
         {
7
-            mapmodelinfo &mmi = getmminfo(e.attr2);
8
-            if(!&mmi) continue;
9
-			rendermodel(mmi.name, 0, 1, e.attr4, (float)mmi.rad, e.x, (float)S(e.x, e.y)->floor+mmi.zoff+e.attr3, e.y, (float)((e.attr1+7)-(e.attr1+7)%15), 0, false, 1.0f, 10.0f, mmi.snap);
10
+            mapmodelinfo *mmi = getmminfo(e.attr2);
11
+            if(!mmi) continue;
12
+			rendermodel(mmi->name, 0, 1, e.attr4, (float)mmi->rad, e.x, (float)S(e.x, e.y)->floor+mmi->zoff+e.attr3, e.y, (float)((e.attr1+7)-(e.attr1+7)%15), 0, false, 1.0f, 10.0f, mmi->snap);
13
         }
14
         else
15
         {
(-)games/cube/files/patch-physics.cpp (+22 lines)
Line 0 Link Here
1
--- physics.cpp.orig	2015-02-14 01:31:41.351723000 +0100
2
+++ physics.cpp	2015-02-14 01:40:28.770647000 +0100
3
@@ -46,14 +46,14 @@
4
     {
5
         entity &e = ents[i];
6
         if(e.type!=MAPMODEL) continue;
7
-        mapmodelinfo &mmi = getmminfo(e.attr2);
8
-        if(!&mmi || !mmi.h) continue;
9
-        const float r = mmi.rad+d->radius;
10
+        mapmodelinfo *mmi = getmminfo(e.attr2);
11
+        if(!mmi || !mmi->h) continue;
12
+        const float r = mmi->rad+d->radius;
13
         if(fabs(e.x-d->o.x)<r && fabs(e.y-d->o.y)<r)
14
         { 
15
-            float mmz = (float)(S(e.x, e.y)->floor+mmi.zoff+e.attr3);
16
+            float mmz = (float)(S(e.x, e.y)->floor+mmi->zoff+e.attr3);
17
             if(d->o.z-d->eyeheight<mmz) { if(mmz<hi) hi = mmz; }
18
-            else if(mmz+mmi.h>lo) lo = mmz+mmi.h;
19
+            else if(mmz+mmi->h>lo) lo = mmz+mmi->h;
20
         };
21
     };
22
 };
(-)games/cube/files/patch-protos.h (+11 lines)
Line 0 Link Here
1
--- protos.h.orig	2015-02-14 01:31:41.352230000 +0100
2
+++ protos.h	2015-02-14 01:39:01.934630000 +0100
3
@@ -192,7 +192,7 @@
4
 
5
 // rendermd2
6
 extern void rendermodel(char *mdl, int frame, int range, int tex, float rad, float x, float y, float z, float yaw, float pitch, bool teammate, float scale, float speed, int snap = 0, int basetime = 0);
7
-extern mapmodelinfo &getmminfo(int i);
8
+extern mapmodelinfo *getmminfo(int i);
9
 
10
 // server
11
 extern void initserver(bool dedicated, int uprate, char *sdesc, char *ip, char *master, char *passwd, int maxcl);
(-)games/cube/files/patch-rendermd2.cpp (+11 lines)
Line 0 Link Here
1
--- rendermd2.cpp.orig	2015-02-14 01:31:41.354388000 +0100
2
+++ rendermd2.cpp	2015-02-14 01:39:38.592584000 +0100
3
@@ -234,7 +234,7 @@
4
 
5
 void mapmodelreset() { mapmodels.setsize(0); };
6
 
7
-mapmodelinfo &getmminfo(int i) { return i<mapmodels.length() ? mapmodels[i]->mmi : *(mapmodelinfo *)0; };
8
+mapmodelinfo *getmminfo(int i) { return i<mapmodels.length() ? &mapmodels[i]->mmi : 0; };
9
 
10
 COMMAND(mapmodel, ARG_5STR);
11
 COMMAND(mapmodelreset, ARG_NONE);

Return to bug 197604