La la la

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

polymer/build/Makefile

@@ -17,7 +17,6 @@ SUPERBUILD ?= 1
 POLYMOST ?= 1		
 USE_OPENGL ?= 1
 NOASM ?= 0
-TESTNET ?= 0
 
 SETSPRITEZ ?= 0
 
@@ -85,6 +84,7 @@ ENGINEOBJS+= \
 	$(OBJ)/lzf_c.$o \
 	$(OBJ)/lzf_d.$o \
 	$(OBJ)/md4.$o \
+    $(OBJ)/mmulti.$o \
 	$(OBJ)/osd.$o \
 	$(OBJ)/pragmas.$o \
 	$(OBJ)/scriptfile.$o \
@@ -93,12 +93,6 @@ ENGINEOBJS+= \
 EDITOROBJS=$(OBJ)/build.$o \
 	$(OBJ)/config.$o
 
-ifeq ($(TESTNET),1)
-	ENGINEOBJS+= $(OBJ)/mmultirm.$o
-else
-	ENGINEOBJS+= $(OBJ)/mmulti.$o
-endif
-
 # detect the platform
 ifeq ($(PLATFORM),LINUX)
 	ASFLAGS+= -f elf

polymer/build/Makefile.shared

@@ -152,6 +152,3 @@ endif
 ifneq (0,$(SETSPRITEZ))
   BUILDCFLAGS+= -DSETSPRITEZ
 endif
-ifneq (0,$(TESTNET))
-  BUILDCFLAGS+= -DTESTNET
-endif

polymer/eduke32/Makefile

@@ -13,7 +13,6 @@ NOASM = 0
 RELEASE?=1
 JFAUD?=0
 NOSOUND?=0
-TESTNET?=0
 
 # build locations
 
@@ -211,7 +210,7 @@ enginelib editorlib:
 	-mkdir -p $(EOBJ)
 	$(MAKE) -C $(EROOT)/ "OBJ=$(CURDIR)/$(EOBJ)" \
 		SUPERBUILD=$(SUPERBUILD) POLYMOST=$(POLYMOST) \
-		USE_OPENGL=$(USE_OPENGL) TESTNET=$(TESTNET) \
+		USE_OPENGL=$(USE_OPENGL) \
 		NOASM=$(NOASM) RELEASE=$(RELEASE) $@
 	
 $(EOBJ)/$(ENGINELIB): enginelib

polymer/eduke32/source/game.c

@@ -486,7 +486,7 @@ void getpackets(void)
     while ((packbufleng = getpacket(&other,packbuf)) > 0)
     {
         lastpackettime = totalclock;
-#ifdef TESTNET
+#if 0
         initprintf("RECEIVED PACKET: type: %d : len %d\n", packbuf[0], packbufleng);
 #endif
         switch (packbuf[0])
@@ -8231,7 +8231,6 @@ void comlinehelp(void)
     wm_msgbox(apptitle,s);
 }
 
-#ifndef TESTNET
 signed int rancid_players = 0;
 char rancid_ip_strings[MAXPLAYERS][32], rancid_local_port_string[8];
 
@@ -8403,7 +8402,6 @@ void setup_rancid_net(char *fn)
             netparam[i] = (char *)&rancid_local_port_string;
     }
 }
-#endif
 
 int loadgroupfiles(char *fn)
 {
@@ -8539,9 +8537,7 @@ void checkcommandline(int argc,char **argv)
                     {
                         NoSetup = TRUE;
                         networkmode = 1;
-#ifndef TESTNET
                         netcfg = argv[i+1];
-#endif
                         i++;
                     }
                     i++;
@@ -9328,7 +9324,6 @@ void Startup(long argc, char **argv)
     for (i=0;i<MAXPLAYERS;i++)
         playerreadyflag[i] = 0;
 
-#ifndef TESTNET
     if (netcfg)
     {
         setup_rancid_net(netcfg);
@@ -9358,9 +9353,6 @@ void Startup(long argc, char **argv)
     if (netparam) Bfree(netparam);
     netparam = NULL;
     netparamcount = 0;
-#else
-    initmultiplayers(argc,argv,0,0,0);
-#endif
 
     if (numplayers > 1)
         initprintf("Multiplayer initialized.\n");
@@ -9799,11 +9791,6 @@ void app_main(int argc,char **argv)
 
     //     initprintf("numplayers=%i\n",numplayers);
 
-#ifdef TESTNET
-    if (natfree)
-        waitforeverybody();
-#endif
-
     if (numplayers > 1)
     {
         ud.multimode = numplayers;