- removed some unused files.

source/CMakeLists.txt

@@ -810,7 +810,6 @@ set (PCH_SOURCES
 	build/src/kplib.cpp
 	build/src/mdsprite.cpp
 	build/src/mhk.cpp
-	build/src/mmulti_null.cpp
 	build/src/mutex.cpp
 	build/src/osd.cpp
 	build/src/palette.cpp

source/build/include/build.h

@@ -1484,9 +1484,6 @@ int32_t engineLoadBoardV5V6(const char *filename, char fromwhere, vec3_t *dapos,
 
 #include "hash.h"
 
-#ifdef POLYMER
-# include "polymer.h"
-#endif
 #ifdef USE_OPENGL
 # include "polymost.h"
 #endif

source/build/include/elauxlib.h

@@ -1,19 +0,0 @@
-
-#ifndef elauxlib_h_
-#define elauxlib_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef USE_LUAJIT_2_1
-# include <luajit-2.1/lauxlib.h>
-#else
-# include <luajit-2.0/lauxlib.h>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

source/build/include/elua.h

@@ -1,19 +0,0 @@
-
-#ifndef elua_h_
-#define elua_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef USE_LUAJIT_2_1
-# include <luajit-2.1/lua.h>
-#else
-# include <luajit-2.0/lua.h>
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

source/build/include/lunatic.h

@@ -1,34 +0,0 @@
-/* The Lunatic Interpreter, part of EDuke32. Common, engine-side stuff. */
-
-#ifndef ENGINE_LUNATIC_H_
-#define ENGINE_LUNATIC_H_
-
-#include "elua.h"
-
-typedef struct
-{
-    char *name;
-    lua_State *L;
-} L_State;
-
-
-// -- functions --
-
-// helpers taking the lua_State directly:
-void L_PushDebugTraceback(lua_State *L);
-void L_CheckAndRegisterFunction(lua_State *L, void *regkeyaddr);
-int L_HandleError(lua_State *L, int errcode, void (*ErrorPrintFunc)(const char *));
-
-// Callback on Lua error. <str> must be used immediately or strdup'd.
-extern void (*L_ErrorFunc)(const char *str);
-// Out-of-memory handler, supposed to terminate the host program.
-extern void (*L_OutOfMemFunc)(void);
-
-int L_CreateState(L_State *estate, const char *name, void (*StateSetupFunc)(lua_State *));
-void L_DestroyState(L_State *estate);
-int L_RunOnce(L_State *estate, const char *fn);
-int L_RunString(L_State *estate, char const *buf, int size, const char *name);
-
-static inline int L_IsInitialized(const L_State *estate) { return (estate->L != NULL); }
-
-#endif

source/build/include/mmulti.h

@@ -15,42 +15,6 @@ extern int myconnectindex, numplayers;
 extern int connecthead, connectpoint2[MAXMULTIPLAYERS];
 extern unsigned char syncstate;
 
-#if 0
-int initmultiplayersparms(int argc, char const * const * argv);
-int initmultiplayerscycle(void);
-void initmultiplayers(int argc, char const * const * argv, unsigned char damultioption, unsigned char dacomrateoption, unsigned char dapriority);
-#else
-static inline int initmultiplayersparms(int argc, char const * const * argv)
-{
-    UNREFERENCED_PARAMETER(argc);
-    UNREFERENCED_PARAMETER(argv);
-    return 0;
-}
-static inline int initmultiplayerscycle(void)
-{
-    return 0;
-}
-static inline void initmultiplayers(int argc, char const * const * argv, unsigned char damultioption, unsigned char dacomrateoption, unsigned char dapriority)
-{
-    UNREFERENCED_PARAMETER(argc);
-    UNREFERENCED_PARAMETER(argv);
-    UNREFERENCED_PARAMETER(damultioption);
-    UNREFERENCED_PARAMETER(dacomrateoption);
-    UNREFERENCED_PARAMETER(dapriority);
-}
-#endif
-
-void setpackettimeout(int datimeoutcount, int daresendagaincount);
-void uninitmultiplayers(void);
-void sendlogon(void);
-void sendlogoff(void);
-int getoutputcirclesize(void);
-void setsocket(int newsocket);
-void sendpacket(int other, const unsigned char *bufptr, int messleng);
-int getpacket(const int *other, const unsigned char *bufptr);
-void flushpackets(void);
-void genericmultifunction(int other, const unsigned char *bufptr, int messleng, int command);
-int isvalidipaddress(const char *st);
 
 #endif  // mmulti_h_
 

source/build/src/engine.cpp

@@ -29,16 +29,9 @@
 # include "glsurface.h"
 # include "hightile.h"
 # include "mdsprite.h"
-# ifdef POLYMER
-#  include "polymer.h"
-# endif
 # include "polymost.h"
 #endif
 
-#ifdef LUNATIC
-# include "lunatic.h"
-L_State g_engState;
-#endif
 
 #include "vfs.h"
 

source/build/src/mmulti_null.cpp

@@ -1,102 +0,0 @@
-// "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
-// Ken Silverman's official web site: "http://www.advsys.net/ken"
-// See the included license file "BUILDLIC.TXT" for license info.
-//
-// This file has been modified from Ken Silverman's original release
-// by Jonathon Fowler (jf@jonof.id.au)
-// by the EDuke32 team (development@voidpoint.com)
-
-#include "compat.h"
-#include "mmulti.h"
-
-
-int myconnectindex, numplayers;
-int connecthead, connectpoint2[MAXMULTIPLAYERS] = { -1 };
-unsigned char syncstate = 0;
-
-int isvalidipaddress (const char *st)
-{
-    UNREFERENCED_PARAMETER(st);
-    return 0;
-}
-#if 0 // XXX XXX XXX: causes internal compiler error with gcc 8.2.0, wtf?
-int initmultiplayersparms(int argc, char const * const * argv)
-{
-    UNREFERENCED_PARAMETER(argc);
-    UNREFERENCED_PARAMETER(argv);
-    return 0;
-}
-
-int initmultiplayerscycle(void)
-{
-    return 0;
-}
-
-void initmultiplayers(int argc, char const * const * argv, unsigned char damultioption, unsigned char dacomrateoption, unsigned char dapriority)
-{
-    UNREFERENCED_PARAMETER(argc);
-    UNREFERENCED_PARAMETER(argv);
-    UNREFERENCED_PARAMETER(damultioption);
-    UNREFERENCED_PARAMETER(dacomrateoption);
-    UNREFERENCED_PARAMETER(dapriority);
-
-    numplayers = 1; myconnectindex = 0;
-    connecthead = 0; connectpoint2[0] = -1;
-}
-#endif
-void setpackettimeout(int datimeoutcount, int daresendagaincount)
-{
-    UNREFERENCED_PARAMETER(datimeoutcount);
-    UNREFERENCED_PARAMETER(daresendagaincount);
-}
-
-void uninitmultiplayers(void)
-{
-}
-
-void sendlogon(void)
-{
-}
-
-void sendlogoff(void)
-{
-}
-
-int getoutputcirclesize(void)
-{
-    return 0;
-}
-
-void setsocket(int newsocket)
-{
-    UNREFERENCED_PARAMETER(newsocket);
-}
-
-void sendpacket(int other, const unsigned char *bufptr, int messleng)
-{
-    UNREFERENCED_PARAMETER(other);
-    UNREFERENCED_PARAMETER(bufptr);
-    UNREFERENCED_PARAMETER(messleng);
-}
-
-int getpacket (const int *other, const unsigned char *bufptr)
-{
-    UNREFERENCED_PARAMETER(other);
-    UNREFERENCED_PARAMETER(bufptr);
-
-    return 0;
-}
-
-void flushpackets(void)
-{
-}
-
-void genericmultifunction(int other, const unsigned char *bufptr, int messleng, int command)
-{
-    UNREFERENCED_PARAMETER(other);
-    UNREFERENCED_PARAMETER(bufptr);
-    UNREFERENCED_PARAMETER(messleng);
-    UNREFERENCED_PARAMETER(command);
-}
-
-

source/build/src/sdlayer.cpp

@@ -17,6 +17,7 @@
 #include "sdl_inc.h"
 #include "softsurface.h"
 #include "m_argv.h"
+#include "mmulti.h"
 #include "../../glbackend/glbackend.h"
 
 #ifdef USE_OPENGL
@@ -62,6 +63,10 @@ int32_t startwin_settitle(const char* s) { return gi->startwin_settitle(s); }
 int32_t startwin_run(void) { return gi->startwin_run(); }
 #endif
 
+int myconnectindex, numplayers;
+int connecthead, connectpoint2[MAXMULTIPLAYERS];
+unsigned char syncstate;
+
 /// These can be useful for debugging sometimes...
 //#define SDL_WM_GrabInput(x) SDL_WM_GrabInput(SDL_GRAB_OFF)
 //#define SDL_ShowCursor(x) SDL_ShowCursor(SDL_ENABLE)

source/duke3d/src/duke3d.h

@@ -32,14 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "fx_man.h"
 #include "keyboard.h"
 #include "pragmas.h"
-
-#ifdef POLYMER
-    #include "polymer.h"
-#else
-#ifdef USE_OPENGL
-    #include "polymost.h"
-#endif
-#endif
+#include "polymost.h"
 
 
 #define HEAD2                   APPNAME
@@ -54,18 +47,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     #define VOLUMEONE           (g_Shareware == 1)
 #endif
 
-// increase by 3, because atomic GRP adds 1, and Shareware adds 2
-#ifdef LUNATIC
-// Lunatic
 # define BYTEVERSION_EDUKE32      339
-#else
-// Non-Lua build
-# define BYTEVERSION_EDUKE32      339
-#endif
 
-//#define BYTEVERSION_13      27
-//#define BYTEVERSION_14      116
-//#define BYTEVERSION_15      117
 #define BYTEVERSION         (BYTEVERSION_EDUKE32+(PLUTOPAK?1:(VOLUMEONE<<1)))
 
 #define NUMPAGES            1