git-svn-id: https://svn.eduke32.com/eduke32@950 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/Makefile.deps

@@ -1,4 +1,4 @@
-duke3d_h=$(EINC)/build.h $(EINC)/polymer.h $(EINC)/pragmas.h $(EINC)/compat.h $(EINC)/cache1d.h $(EINC)/baselayer.h $(SRC)/jmact/types.h $(SRC)/jmact/file_lib.h $(SRC)/jmact/util_lib.h $(SRC)/jmact/keyboard.h $(SRC)/jmact/control.h $(INC)/develop.h $(INC)/gamedefs.h $(INC)/function.h $(INC)/config.h $(INC)/sounds.h $(INC)/rts.h $(INC)/_rts.h $(INC)/soundefs.h $(SRC)/jaudiolib/fx_man.h $(SRC)/jaudiolib/music.h $(INC)/namesdyn.h $(INC)/funct.h $(INC)/duke3d.h $(EINC)/mmulti.h
+duke3d_h=$(EINC)/build.h $(EINC)/polymer.h $(EINC)/pragmas.h $(EINC)/compat.h $(EINC)/cache1d.h $(EINC)/baselayer.h $(SRC)/jmact/types.h $(SRC)/jmact/file_lib.h $(SRC)/jmact/util_lib.h $(SRC)/jmact/keyboard.h $(SRC)/jmact/control.h $(INC)/gamedefs.h $(INC)/function.h $(INC)/config.h $(INC)/sounds.h $(INC)/rts.h $(INC)/_rts.h $(INC)/soundefs.h $(SRC)/jaudiolib/fx_man.h $(SRC)/jaudiolib/music.h $(INC)/namesdyn.h $(INC)/funct.h $(INC)/duke3d.h $(EINC)/mmulti.h
 gamedef_h=$(SRC)/gamedef.h
 
 $(OBJ)/game.$o: $(SRC)/game.c $(SRC)/jmact/scriplib.h $(duke3d_h) $(INC)/osdfuncs.h $(INC)/osdcmds.h $(INC)/grpscan.h
@@ -36,7 +36,7 @@ $(OBJ)/startgtk.game.$o: $(SRC)/startgtk.game.c $(duke3d_h) $(EINC)/dynamicgtk.h
 
 
 # jMACT objects
-$(OBJ)/animlib.$o: $(SRC)/jmact/animlib.c $(SRC)/jmact/types.h $(INC)/develop.h $(SRC)/jmact/util_lib.h $(SRC)/jmact/animlib.h $(EINC)/compat.h
+$(OBJ)/animlib.$o: $(SRC)/jmact/animlib.c $(SRC)/jmact/types.h $(SRC)/jmact/util_lib.h $(SRC)/jmact/animlib.h $(EINC)/compat.h
 $(OBJ)/util_lib.$o: $(SRC)/jmact/util_lib.c $(SRC)/jmact/util_lib.h $(SRC)/jmact/types.h $(EINC)/compat.h
 $(OBJ)/file_lib.$o: $(SRC)/jmact/file_lib.c $(SRC)/jmact/file_lib.h $(SRC)/jmact/types.h
 $(OBJ)/control.$o: $(SRC)/jmact/control.c $(SRC)/jmact/types.h $(SRC)/jmact/control.h $(SRC)/jmact/keyboard.h $(SRC)/jmact/mouse.h $(EINC)/baselayer.h

polymer/eduke32/source/develop.h

@@ -1,63 +0,0 @@
-//-------------------------------------------------------------------------
-/*
-Copyright (C) 1996, 2003 - 3D Realms Entertainment
-Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
-Copyright (C) 2004, 2007 - EDuke32 developers
-
-This file is part of EDuke32
-
-EDuke32 is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 2
-as published by the Free Software Foundation.
-
-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 _develop_public
-#define _develop_public
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DEVELOPMENT          0
-#define SHAREWARE            0
-#define LOCATIONINFO         1
-#define SOFTWAREERROR        1
-#define MEMORYCORRUPTIONTEST 1
-#define PRECACHETEST         0
-#define DATACORRUPTIONTEST   0
-#define RANDOMNUMBERTEST     0
-
-
-#if ( LOCATIONINFO == 1 )
-
-#define funcstart() \
-   { \
-   SoftError( "funcstart : module '%s' at line %d.\n", __FILE__, __LINE__ );\
-   }
-
-#define funcend() \
-   { \
-   SoftError( "  funcend : module '%s' at line %d.\n", __FILE__, __LINE__ );\
-   }
-
-#else
-
-#define funcstart()
-#define funcend()
-
-#endif
-
-#ifdef __cplusplus
-};
-#endif
-#endif

polymer/eduke32/source/duke3d.h

@@ -83,7 +83,6 @@ extern int g_ScriptVersion, g_Shareware, g_GameType;
 
 #include "types.h"
 #include "file_lib.h"
-#include "develop.h"
 #include "gamedefs.h"
 #include "keyboard.h"
 #include "util_lib.h"

polymer/eduke32/source/game.c

@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "duke3d.h"
 #include "types.h"
-#include "develop.h"
 #include "scriplib.h"
 #include "file_lib.h"
 #include "mathutil.h"

polymer/eduke32/source/jmact/animlib.c

@@ -27,7 +27,6 @@ Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
 
 #include "compat.h"
 #include "types.h"
-#include "develop.h"
 #include "util_lib.h"
 #include "animlib.h"
 

polymer/eduke32/source/jmact/develop.h

@@ -1,66 +0,0 @@
-//-------------------------------------------------------------------------
-/*
-Copyright (C) 1996, 2003 - 3D Realms Entertainment
-
-This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
-
-Duke Nukem 3D 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.
-
-Original Source: 1996 - Todd Replogle
-Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
-Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
-*/
-//-------------------------------------------------------------------------
-
-#ifndef _develop_public
-#define _develop_public
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DEVELOPMENT          0
-#define SHAREWARE            0
-#define LOCATIONINFO         1
-#define SOFTWAREERROR        1
-#define MEMORYCORRUPTIONTEST 1
-#define PRECACHETEST         0
-#define DATACORRUPTIONTEST   0
-#define RANDOMNUMBERTEST     0
-
-
-#if ( LOCATIONINFO == 1 )
-
-#define funcstart() \
-   { \
-   SoftError( "funcstart : module '%s' at line %d.\n", __FILE__, __LINE__ );\
-   }
-
-#define funcend() \
-   { \
-   SoftError( "  funcend : module '%s' at line %d.\n", __FILE__, __LINE__ );\
-   }
-
-#else
-
-#define funcstart()
-#define funcend()
-
-#endif
-
-#ifdef __cplusplus
-};
-#endif
-#endif

polymer/eduke32/source/jmact/mathutil.c

@@ -31,43 +31,34 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 //-------------------------------------------------------------------------
 
-#include "types.h"
-#include "compat.h"
 #include "pragmas.h"
 
 // I wonder if it's faster to use Ken's functions here...
 
 int FindDistance2D(int x, int y)
 {
-    int t;
+    x= klabs(x);
-
-    x= klabs(x);        /* absolute values */
     y= klabs(y);
 
-    if (x<y)
+    if (x<y) swaplong(&x,&y);
-        swaplong(&x,&y);
 
-    t = y + (y>>1);
+    {
-
+        int t = y + (y>>1);
-    return (x - (x>>5) - (x>>7)  + (t>>2) + (t>>6));
+        return (x - (x>>5) - (x>>7)  + (t>>2) + (t>>6));
+    }
 }
 
-
 int FindDistance3D(int x, int y, int z)
 {
-    int t;
+    x= klabs(x);
-
-    x= klabs(x);           /* absolute values */
     y= klabs(y);
     z= klabs(z);
 
-    if (x<y)
+    if (x<y) swaplong(&x,&y);
-        swaplong(&x,&y);
+    if (x<z) swaplong(&x,&z);
 
-    if (x<z)
+    {
-        swaplong(&x,&z);
+        int t = y + z;
-
+        return (x - (x>>4) + (t>>2) + (t>>3));
-    t = y + z;
+    }
-
-    return (x - (x>>4) + (t>>2) + (t>>3));
 }