Merge from raven-branch

Subversion-branch: /branches/strife-branch
Subversion-revision: 1825

4 files changed, 129 insertions, 120 deletions

diff --git a/src/hexen/am_data.h b/src/hexen/am_data.h
index db964598..a4cb47f3 100644
--- a/src/hexen/am_data.h
+++ b/src/hexen/am_data.h
@@ -22,26 +22,25 @@
 //
 //-----------------------------------------------------------------------------
 
+#ifndef __AMDATA_H__
+#define __AMDATA_H__
 
-#ifndef __AMDATA_H__

-#define __AMDATA_H__

-

-// a line drawing of the player pointing right, starting from the middle.

-

-#define R ((8*PLAYERRADIUS)/7)

-

-mline_t player_arrow[] = {

-  { { -R+R/4, 0 }, { 0, 0} }, // center line.

-  { { -R+R/4, R/8 }, { R, 0} }, // blade

-  { { -R+R/4, -R/8 }, { R, 0 } },

-  { { -R+R/4, -R/4 }, { -R+R/4, R/4 } }, // crosspiece

-  { { -R+R/8, -R/4 }, { -R+R/8, R/4 } },

-  { { -R+R/8, -R/4 }, { -R+R/4, -R/4} }, //crosspiece connectors

-  { { -R+R/8, R/4 }, { -R+R/4, R/4} },

-  { { -R-R/4, R/8 }, { -R-R/4, -R/8 } }, //pommel

-  { { -R-R/4, R/8 }, { -R+R/8, R/8 } },

-  { { -R-R/4, -R/8}, { -R+R/8, -R/8 } }

-  };

+// a line drawing of the player pointing right, starting from the middle.
+
+#define R ((8*PLAYERRADIUS)/7)
+
+mline_t player_arrow[] = {
+  { { -R+R/4, 0 }, { 0, 0} }, // center line.
+  { { -R+R/4, R/8 }, { R, 0} }, // blade
+  { { -R+R/4, -R/8 }, { R, 0 } },
+  { { -R+R/4, -R/4 }, { -R+R/4, R/4 } }, // crosspiece
+  { { -R+R/8, -R/4 }, { -R+R/8, R/4 } },
+  { { -R+R/8, -R/4 }, { -R+R/4, -R/4} }, //crosspiece connectors
+  { { -R+R/8, R/4 }, { -R+R/4, R/4} },
+  { { -R-R/4, R/8 }, { -R-R/4, -R/8 } }, //pommel
+  { { -R-R/4, R/8 }, { -R+R/8, R/8 } },
+  { { -R-R/4, -R/8}, { -R+R/8, -R/8 } }
+  };
 
 /*
 mline_t keysquare[] = {
@@ -55,64 +54,64 @@ mline_t keysquare[] = {
 	{ { -3*R/4, 0 }, { -3*R/4, -R/4 } }
 	};
 */
-

-/*mline_t player_arrow[] = {

-  { { -R+R/8, 0 }, { R, 0 } }, // -----

-  { { R, 0 }, { R-R/2, R/4 } },  // ----->

-  { { R, 0 }, { R-R/2, -R/4 } },

-  { { -R+R/8, 0 }, { -R-R/8, R/4 } }, // >---->

-  { { -R+R/8, 0 }, { -R-R/8, -R/4 } },

-  { { -R+3*R/8, 0 }, { -R+R/8, R/4 } }, // >>--->

-  { { -R+3*R/8, 0 }, { -R+R/8, -R/4 } }

-  };

-*/

-#undef R

-#define NUMPLYRLINES (sizeof(player_arrow)/sizeof(mline_t))

+
+/*mline_t player_arrow[] = {
+  { { -R+R/8, 0 }, { R, 0 } }, // -----
+  { { R, 0 }, { R-R/2, R/4 } },  // ----->
+  { { R, 0 }, { R-R/2, -R/4 } },
+  { { -R+R/8, 0 }, { -R-R/8, R/4 } }, // >---->
+  { { -R+R/8, 0 }, { -R-R/8, -R/4 } },
+  { { -R+3*R/8, 0 }, { -R+R/8, R/4 } }, // >>--->
+  { { -R+3*R/8, 0 }, { -R+R/8, -R/4 } }
+  };
+*/
+#undef R
+#define NUMPLYRLINES (sizeof(player_arrow)/sizeof(mline_t))
 #define NUMKEYSQUARELINES (sizeof(keysquare)/sizeof(mline_t))
 
 /*
-#define R ((8*PLAYERRADIUS)/7)

-mline_t cheat_player_arrow[] = {

-  { { -R+R/8, 0 }, { R, 0 } }, // -----

-  { { R, 0 }, { R-R/2, R/6 } },  // ----->

-  { { R, 0 }, { R-R/2, -R/6 } },

-  { { -R+R/8, 0 }, { -R-R/8, R/6 } }, // >----->

-  { { -R+R/8, 0 }, { -R-R/8, -R/6 } },

-  { { -R+3*R/8, 0 }, { -R+R/8, R/6 } }, // >>----->

-  { { -R+3*R/8, 0 }, { -R+R/8, -R/6 } },

-  { { -R/2, 0 }, { -R/2, -R/6 } }, // >>-d--->

-  { { -R/2, -R/6 }, { -R/2+R/6, -R/6 } },

-  { { -R/2+R/6, -R/6 }, { -R/2+R/6, R/4 } },

-  { { -R/6, 0 }, { -R/6, -R/6 } }, // >>-dd-->

-  { { -R/6, -R/6 }, { 0, -R/6 } },

-  { { 0, -R/6 }, { 0, R/4 } },

-  { { R/6, R/4 }, { R/6, -R/7 } }, // >>-ddt->

-  { { R/6, -R/7 }, { R/6+R/32, -R/7-R/32 } },

-  { { R/6+R/32, -R/7-R/32 }, { R/6+R/10, -R/7 } }

-  };

-#undef R

-#define NUMCHEATPLYRLINES (sizeof(cheat_player_arrow)/sizeof(mline_t))

+#define R ((8*PLAYERRADIUS)/7)
+mline_t cheat_player_arrow[] = {
+  { { -R+R/8, 0 }, { R, 0 } }, // -----
+  { { R, 0 }, { R-R/2, R/6 } },  // ----->
+  { { R, 0 }, { R-R/2, -R/6 } },
+  { { -R+R/8, 0 }, { -R-R/8, R/6 } }, // >----->
+  { { -R+R/8, 0 }, { -R-R/8, -R/6 } },
+  { { -R+3*R/8, 0 }, { -R+R/8, R/6 } }, // >>----->
+  { { -R+3*R/8, 0 }, { -R+R/8, -R/6 } },
+  { { -R/2, 0 }, { -R/2, -R/6 } }, // >>-d--->
+  { { -R/2, -R/6 }, { -R/2+R/6, -R/6 } },
+  { { -R/2+R/6, -R/6 }, { -R/2+R/6, R/4 } },
+  { { -R/6, 0 }, { -R/6, -R/6 } }, // >>-dd-->
+  { { -R/6, -R/6 }, { 0, -R/6 } },
+  { { 0, -R/6 }, { 0, R/4 } },
+  { { R/6, R/4 }, { R/6, -R/7 } }, // >>-ddt->
+  { { R/6, -R/7 }, { R/6+R/32, -R/7-R/32 } },
+  { { R/6+R/32, -R/7-R/32 }, { R/6+R/10, -R/7 } }
+  };
+#undef R
+#define NUMCHEATPLYRLINES (sizeof(cheat_player_arrow)/sizeof(mline_t))
 */
 
 
 /*
-#define R (FRACUNIT)

-mline_t triangle_guy[] = {

-  { { -.867*R, -.5*R }, { .867*R, -.5*R } },

-  { { .867*R, -.5*R } , { 0, R } },

-  { { 0, R }, { -.867*R, -.5*R } }

-  };

-#undef R

-#define NUMTRIANGLEGUYLINES (sizeof(triangle_guy)/sizeof(mline_t))

+#define R (FRACUNIT)
+mline_t triangle_guy[] = {
+  { { -.867*R, -.5*R }, { .867*R, -.5*R } },
+  { { .867*R, -.5*R } , { 0, R } },
+  { { 0, R }, { -.867*R, -.5*R } }
+  };
+#undef R
+#define NUMTRIANGLEGUYLINES (sizeof(triangle_guy)/sizeof(mline_t))
 */
 
-#define R (FRACUNIT)

-mline_t thintriangle_guy[] = {

-  { { -.5*R, -.7*R }, { R, 0 } },

-  { { R, 0 }, { -.5*R, .7*R } },

-  { { -.5*R, .7*R }, { -.5*R, -.7*R } }

-  };

-#undef R

-#define NUMTHINTRIANGLEGUYLINES (sizeof(thintriangle_guy)/sizeof(mline_t))

-

-#endif

+#define R (FRACUNIT)
+mline_t thintriangle_guy[] = {
+  { { (fixed_t)(-.5*R), (fixed_t)(-.7*R) }, { (fixed_t)(R    ), (fixed_t)(0    ) } },
+  { { (fixed_t)(R    ), (fixed_t)(0    ) }, { (fixed_t)(-.5*R), (fixed_t)(.7*R ) } },
+  { { (fixed_t)(-.5*R), (fixed_t)(.7*R ) }, { (fixed_t)(-.5*R), (fixed_t)(-.7*R) } }
+  };
+#undef R
+#define NUMTHINTRIANGLEGUYLINES (sizeof(thintriangle_guy)/sizeof(mline_t))
+
+#endif
diff --git a/src/hexen/m_random.h b/src/hexen/m_random.h
index 44e4643d..582bcfa7 100644
--- a/src/hexen/m_random.h
+++ b/src/hexen/m_random.h
@@ -1,42 +1,42 @@
-// Emacs style mode select   -*- C++ -*- 

-//-----------------------------------------------------------------------------

-//

-// Copyright(C) 1993-1996 Id Software, Inc.

-// Copyright(C) 1993-2008 Raven Software

-// Copyright(C) 2008 Simon Howard

-//

-// This program is free software; you can redistribute it and/or

-// modify it under the terms of the GNU General Public License

-// as published by the Free Software Foundation; either version 2

-// of the License, or (at your option) any later version.

-//

-// This program is distributed in the hope that it will be useful,

-// but WITHOUT ANY WARRANTY; without even the implied warranty of

-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-// GNU General Public License for more details.

-//

-// You should have received a copy of the GNU General Public License

-// along with this program; if not, write to the Free Software

-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA

-// 02111-1307, USA.

-//

-//-----------------------------------------------------------------------------

-

-#ifndef HEXEN_M_RANDOM_H

-#define HEXEN_M_RANDOM_H

-

-// Most damage defined using HITDICE

-#define HITDICE(a) ((1+(P_Random()&7))*a)

-

-int M_Random(void);

-// returns a number from 0 to 255

-int P_Random(void);

-// as M_Random, but used only by the play simulation

-

-void M_ClearRandom(void);

-// fix randoms for demos

-

-extern int rndindex;

-

-#endif // HEXEN_M_RANDOM_H

-

+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 1993-2008 Raven Software
+// Copyright(C) 2008 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+//-----------------------------------------------------------------------------
+
+#ifndef HEXEN_M_RANDOM_H
+#define HEXEN_M_RANDOM_H
+
+// Most damage defined using HITDICE
+#define HITDICE(a) ((1+(P_Random()&7))*a)
+
+int M_Random(void);
+// returns a number from 0 to 255
+int P_Random(void);
+// as M_Random, but used only by the play simulation
+
+void M_ClearRandom(void);
+// fix randoms for demos
+
+extern int rndindex;
+
+#endif // HEXEN_M_RANDOM_H
+
diff --git a/src/hexen/p_mobj.c b/src/hexen/p_mobj.c
index 5d6f7097..ee8f8fd4 100644
--- a/src/hexen/p_mobj.c
+++ b/src/hexen/p_mobj.c
@@ -100,7 +100,7 @@ boolean P_SetMobjState(mobj_t * mobj, statenum_t state)
 
     if (state == S_NULL)
     {                           // Remove mobj
-        mobj->state = S_NULL;
+        mobj->state = (state_t *) S_NULL;
         P_RemoveMobj(mobj);
         return (false);
     }
@@ -130,7 +130,7 @@ boolean P_SetMobjStateNF(mobj_t * mobj, statenum_t state)
 
     if (state == S_NULL)
     {                           // Remove mobj
-        mobj->state = S_NULL;
+        mobj->state = (state_t *) S_NULL;
         P_RemoveMobj(mobj);
         return (false);
     }
diff --git a/src/hexen/r_data.c b/src/hexen/r_data.c
index bd020073..b82c0ff6 100644
--- a/src/hexen/r_data.c
+++ b/src/hexen/r_data.c
@@ -218,7 +218,7 @@ void R_GenerateLookup(int texnum)
 // fill in the lump / offset, so columns with only a single patch are
 // all done
 //
-    patchcount = (byte *) alloca(texture->width);
+    patchcount = (byte *) Z_Malloc(texture->width, PU_STATIC, &patchcount);
     memset(patchcount, 0, texture->width);
     patch = texture->patches;
 
@@ -260,6 +260,8 @@ void R_GenerateLookup(int texnum)
             texturecompositesize[texnum] += texture->height;
         }
     }
+
+    Z_Free(patchcount);
 }
 
 
@@ -319,7 +321,7 @@ void R_InitTextures(void)
     names = W_CacheLumpName("PNAMES", PU_STATIC);
     nummappatches = LONG(*((int *) names));
     name_p = names + 4;
-    patchlookup = alloca(nummappatches * sizeof(*patchlookup));
+    patchlookup = Z_Malloc(nummappatches * sizeof(*patchlookup), PU_STATIC, NULL);
     for (i = 0; i < nummappatches; i++)
     {
         strncpy(name, name_p + i * 8, 8);
@@ -403,6 +405,8 @@ void R_InitTextures(void)
         totalwidth += texture->width;
     }
 
+    Z_Free(patchlookup);
+
     W_ReleaseLumpName("TEXTURE1");
     if (maptex2)
         W_ReleaseLumpName("TEXTURE2");
@@ -620,7 +624,7 @@ void R_PrecacheLevel(void)
 //
 // precache flats
 //      
-    flatpresent = alloca(numflats);
+    flatpresent = Z_Malloc(numflats, PU_STATIC, NULL);
     memset(flatpresent, 0, numflats);
     for (i = 0; i < numsectors; i++)
     {
@@ -637,10 +641,12 @@ void R_PrecacheLevel(void)
             W_CacheLumpNum(lump, PU_CACHE);
         }
 
+    Z_Free(flatpresent);
+
 //
 // precache textures
 //
-    texturepresent = alloca(numtextures);
+    texturepresent = Z_Malloc(numtextures, PU_STATIC, NULL);
     memset(texturepresent, 0, numtextures);
 
     for (i = 0; i < numsides; i++)
@@ -667,10 +673,12 @@ void R_PrecacheLevel(void)
         }
     }
 
+    Z_Free(texturepresent);
+
 //
 // precache sprites
 //
-    spritepresent = alloca(numsprites);
+    spritepresent = Z_Malloc(numsprites, PU_STATIC, NULL);
     memset(spritepresent, 0, numsprites);
 
     for (th = thinkercap.next; th != &thinkercap; th = th->next)
@@ -695,4 +703,6 @@ void R_PrecacheLevel(void)
             }
         }
     }
+
+    Z_Free(spritepresent);
 }