mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-10 23:02:03 +00:00
Change multiplayer random ID generation scheme and remove some dead code
git-svn-id: https://svn.eduke32.com/eduke32@1537 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx
parent
d6f525b44b
commit
784e919941
17 changed files with 2173 additions and 3342 deletions
|
|
@ -18,7 +18,6 @@ USE_OPENGL = 1
|
||||||
NOASM = 0
|
NOASM = 0
|
||||||
LINKED_GTK = 0
|
LINKED_GTK = 0
|
||||||
BUILD32_ON_64 = 0
|
BUILD32_ON_64 = 0
|
||||||
RANCID_NETWORKING = 1
|
|
||||||
|
|
||||||
# Debugging/Build options
|
# Debugging/Build options
|
||||||
RELEASE?=1
|
RELEASE?=1
|
||||||
|
|
@ -242,11 +241,7 @@ endif
|
||||||
|
|
||||||
include Makefile.deps
|
include Makefile.deps
|
||||||
|
|
||||||
ifneq (0,$(RANCID_NETWORKING))
|
duke3d_h+=$(EINC)/mmulti_unstable.h
|
||||||
duke3d_h+=$(EINC)/mmulti_unstable.h
|
|
||||||
else
|
|
||||||
duke3d_h+=$(EINC)/mmulti.h
|
|
||||||
endif
|
|
||||||
|
|
||||||
.PHONY: enginelib editorlib
|
.PHONY: enginelib editorlib
|
||||||
enginelib editorlib:
|
enginelib editorlib:
|
||||||
|
|
@ -257,7 +252,7 @@ endif
|
||||||
$(MAKE) -C $(EROOT)/ "OBJ=../$(EOBJ)" \
|
$(MAKE) -C $(EROOT)/ "OBJ=../$(EOBJ)" \
|
||||||
SUPERBUILD=$(SUPERBUILD) POLYMOST=$(POLYMOST) DEBUGANYWAY=$(DEBUGANYWAY)\
|
SUPERBUILD=$(SUPERBUILD) POLYMOST=$(POLYMOST) DEBUGANYWAY=$(DEBUGANYWAY)\
|
||||||
USE_OPENGL=$(USE_OPENGL) BUILD32_ON_64=$(BUILD32_ON_64) \
|
USE_OPENGL=$(USE_OPENGL) BUILD32_ON_64=$(BUILD32_ON_64) \
|
||||||
NOASM=$(NOASM) RELEASE=$(RELEASE) OPTLEVEL=$(OPTLEVEL) RANCID_NETWORKING=$(RANCID_NETWORKING) $@
|
NOASM=$(NOASM) RELEASE=$(RELEASE) OPTLEVEL=$(OPTLEVEL) $@
|
||||||
ifeq ($(PRETTY_OUTPUT),1)
|
ifeq ($(PRETTY_OUTPUT),1)
|
||||||
printf "\033[K\033[0;35mChanging dir to \033[1;35m$(CURDIR)\033[0;35m \033[0m\n"
|
printf "\033[K\033[0;35mChanging dir to \033[1;35m$(CURDIR)\033[0;35m \033[0m\n"
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ DXROOT="U:\SDKs\Microsoft DirectX SDK (April 2007)
|
||||||
MSSDKROOT="N:\Program Files\Microsoft Visual Studio 9.0\VC
|
MSSDKROOT="N:\Program Files\Microsoft Visual Studio 9.0\VC
|
||||||
PLATFORMSDK="N:\Program Files\Microsoft Visual Studio 9.0\VC\PlatformSDK
|
PLATFORMSDK="N:\Program Files\Microsoft Visual Studio 9.0\VC\PlatformSDK
|
||||||
|
|
||||||
ENGINEOPTS=/DSUPERBUILD /DPOLYMOST /DUSE_OPENGL /DRANCID_NETWORKING /DPOLYMER
|
ENGINEOPTS=/DSUPERBUILD /DPOLYMOST /DUSE_OPENGL /DPOLYMER
|
||||||
|
|
||||||
CC=cl
|
CC=cl
|
||||||
AS=ml
|
AS=ml
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ PRETTY_OUTPUT = 1
|
||||||
# USE_OPENGL - enables OpenGL support in Polymost
|
# USE_OPENGL - enables OpenGL support in Polymost
|
||||||
# NOASM - disables the use of inline assembly pragmas
|
# NOASM - disables the use of inline assembly pragmas
|
||||||
# LINKED_GTK - enables compile-time linkage to GTK
|
# LINKED_GTK - enables compile-time linkage to GTK
|
||||||
# RANCID_NETWORKING - enable network backend from rancidmeat port
|
|
||||||
#
|
#
|
||||||
|
|
||||||
SUPERBUILD ?= 1
|
SUPERBUILD ?= 1
|
||||||
|
|
@ -27,7 +26,6 @@ USE_OPENGL ?= 1
|
||||||
NOASM ?= 0
|
NOASM ?= 0
|
||||||
LINKED_GTK ?= 0
|
LINKED_GTK ?= 0
|
||||||
BUILD32_ON_64 ?= 0
|
BUILD32_ON_64 ?= 0
|
||||||
RANCID_NETWORKING ?= 0
|
|
||||||
|
|
||||||
ifeq (0,$(USE_OPENGL))
|
ifeq (0,$(USE_OPENGL))
|
||||||
POLYMER = 0
|
POLYMER = 0
|
||||||
|
|
@ -145,11 +143,7 @@ ifeq (1,$(POLYMER))
|
||||||
ENGINEOBJS+= $(OBJ)/polymer.$o
|
ENGINEOBJS+= $(OBJ)/polymer.$o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (0,$(RANCID_NETWORKING))
|
ENGINEOBJS+= $(OBJ)/mmulti_unstable.$o
|
||||||
ENGINEOBJS+= $(OBJ)/mmulti_unstable.$o
|
|
||||||
else
|
|
||||||
ENGINEOBJS+= $(OBJ)/mmulti.$o
|
|
||||||
endif
|
|
||||||
|
|
||||||
EDITOROBJS=$(OBJ)/build.$o \
|
EDITOROBJS=$(OBJ)/build.$o \
|
||||||
$(OBJ)/config.$o
|
$(OBJ)/config.$o
|
||||||
|
|
|
||||||
|
|
@ -20,9 +20,6 @@ $(OBJ)/kplib.$o: $(SRC)/kplib.c $(INC)/compat.h
|
||||||
$(OBJ)/fastlz.$o: $(SRC)/fastlz.c $(INC)/fastlz.h
|
$(OBJ)/fastlz.$o: $(SRC)/fastlz.c $(INC)/fastlz.h
|
||||||
$(OBJ)/lzwnew.$o: $(SRC)/lzwnew.c
|
$(OBJ)/lzwnew.$o: $(SRC)/lzwnew.c
|
||||||
$(OBJ)/md4.$o: $(SRC)/md4.c $(INC)/md4.h $(INC)/compat.h
|
$(OBJ)/md4.$o: $(SRC)/md4.c $(INC)/md4.h $(INC)/compat.h
|
||||||
$(OBJ)/mmulti_null.$o: $(SRC)/mmulti_null.c $(INC)/mmulti.h
|
|
||||||
$(OBJ)/mmulti.$o: $(SRC)/mmulti.c $(INC)/mmulti.h
|
|
||||||
# $(OBJ)/enet_mmulti.$o: $(SRC)/enet_mmulti.cpp $(INC)/enet_mmulti.h
|
|
||||||
$(OBJ)/mmulti_unstable.$o: $(SRC)/mmulti_unstable.c $(INC)/mmulti_unstable.h
|
$(OBJ)/mmulti_unstable.$o: $(SRC)/mmulti_unstable.c $(INC)/mmulti_unstable.h
|
||||||
$(OBJ)/osd.$o: $(SRC)/osd.c $(INC)/build.h $(INC)/osd.h $(INC)/compat.h $(INC)/baselayer.h
|
$(OBJ)/osd.$o: $(SRC)/osd.c $(INC)/build.h $(INC)/osd.h $(INC)/compat.h $(INC)/baselayer.h
|
||||||
$(OBJ)/pragmas.$o: $(SRC)/pragmas.c $(INC)/compat.h
|
$(OBJ)/pragmas.$o: $(SRC)/pragmas.c $(INC)/compat.h
|
||||||
|
|
|
||||||
|
|
@ -163,10 +163,6 @@ endif
|
||||||
|
|
||||||
BUILDCFLAGS+= -DRENDERTYPE$(RENDERTYPE)=1
|
BUILDCFLAGS+= -DRENDERTYPE$(RENDERTYPE)=1
|
||||||
|
|
||||||
ifneq (0,$(RANCID_NETWORKING))
|
|
||||||
# LIBS+= -lenet
|
|
||||||
BUILDCFLAGS+= -DRANCID_NETWORKING
|
|
||||||
endif
|
|
||||||
ifneq (0,$(SUPERBUILD))
|
ifneq (0,$(SUPERBUILD))
|
||||||
BUILDCFLAGS+= -DSUPERBUILD
|
BUILDCFLAGS+= -DSUPERBUILD
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
// mmulti.h
|
|
||||||
|
|
||||||
#ifndef __mmulti_h__
|
|
||||||
#define __mmulti_h__
|
|
||||||
|
|
||||||
#define MAXMULTIPLAYERS 16
|
|
||||||
|
|
||||||
extern int32_t myconnectindex, numplayers;
|
|
||||||
extern int32_t connecthead, connectpoint2[MAXMULTIPLAYERS];
|
|
||||||
extern char syncstate;
|
|
||||||
extern int32_t natfree; //Addfaz NatFree
|
|
||||||
|
|
||||||
int32_t initmultiplayersparms(int32_t argc, char **argv);
|
|
||||||
int32_t initmultiplayerscycle(void);
|
|
||||||
|
|
||||||
void mmulti_initmultiplayers(int32_t argc, char **argv);
|
|
||||||
void mmulti_setpackettimeout(int32_t datimeoutcount, int32_t daresendagaincount);
|
|
||||||
void mmulti_uninitmultiplayers(void);
|
|
||||||
void mmulti_sendlogon(void);
|
|
||||||
void mmulti_sendlogoff(void);
|
|
||||||
int32_t mmulti_getoutputcirclesize(void);
|
|
||||||
void mmulti_sendpacket(int32_t other, char *bufptr, int32_t messleng);
|
|
||||||
int32_t mmulti_getpacket(int32_t *other, char *bufptr);
|
|
||||||
void mmulti_flushpackets(void);
|
|
||||||
void mmulti_generic(int32_t other, char *bufptr, int32_t messleng, int32_t command);
|
|
||||||
int32_t isvalidipaddress(char *st);
|
|
||||||
|
|
||||||
void nfIncCP(void); //Addfaz NatFree
|
|
||||||
int32_t nfCheckHF (int32_t other); //Addfaz NatFree
|
|
||||||
int32_t nfCheckCP(int32_t other); //Addfaz NatFree
|
|
||||||
|
|
||||||
#endif // __mmulti_h__
|
|
||||||
|
|
||||||
|
|
@ -16,7 +16,7 @@ int32_t mmulti_getpacket(int32_t *other, char *bufptr);
|
||||||
void mmulti_flushpackets(void);
|
void mmulti_flushpackets(void);
|
||||||
void mmulti_generic(int32_t other, char *bufptr, int32_t messleng, int32_t command);
|
void mmulti_generic(int32_t other, char *bufptr, int32_t messleng, int32_t command);
|
||||||
|
|
||||||
extern int32_t natfree;
|
extern int32_t natfree, numplayers;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,914 +0,0 @@
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <ctype.h>
|
|
||||||
|
|
||||||
#include "compat.h"
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
|
||||||
#include <winsock2.h>
|
|
||||||
#include <ws2tcpip.h>
|
|
||||||
#else
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#ifndef __BEOS__
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#endif
|
|
||||||
#ifdef __sun
|
|
||||||
#include <sys/filio.h>
|
|
||||||
#endif
|
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <netdb.h>
|
|
||||||
#define SOCKET int32_t
|
|
||||||
#define INVALID_HANDLE_VALUE (-1)
|
|
||||||
#define INVALID_SOCKET (-1)
|
|
||||||
#define SOCKET_ERROR (-1)
|
|
||||||
#define closesocket close
|
|
||||||
#define ioctlsocket ioctl
|
|
||||||
#define LPHOSTENT struct hostent *
|
|
||||||
|
|
||||||
#include <sys/time.h>
|
|
||||||
static int32_t GetTickCount(void)
|
|
||||||
{
|
|
||||||
struct timeval tv;
|
|
||||||
int32_t ti;
|
|
||||||
if (gettimeofday(&tv,NULL) < 0) return 0;
|
|
||||||
// tv is sec.usec, GTC gives msec
|
|
||||||
ti = tv.tv_sec * 1000;
|
|
||||||
ti += tv.tv_usec / 1000;
|
|
||||||
return ti;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef KSFORBUILD
|
|
||||||
# include "compat.h"
|
|
||||||
# include "baselayer.h"
|
|
||||||
# define printf initprintf
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef min
|
|
||||||
#define min(a,b) ((a)<(b)?(a):(b))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MAXPLAYERS 16
|
|
||||||
#define MAXPAKSIZ 576
|
|
||||||
|
|
||||||
|
|
||||||
#define PAKRATE 250 //Packet rate/sec limit ... necessary?
|
|
||||||
int32_t packetrate = PAKRATE;
|
|
||||||
#define SIMMIS 0 //Release:0 Test:100 Packets per 256 missed.
|
|
||||||
#define SIMLAG 0 //Release:0 Test: 10 Packets to delay receipt
|
|
||||||
#if (SIMLAG != 0)
|
|
||||||
static int32_t simlagcnt[MAXPLAYERS];
|
|
||||||
static char simlagfif[MAXPLAYERS][SIMLAG+1][MAXPAKSIZ+2];
|
|
||||||
#endif
|
|
||||||
#if ((SIMMIS != 0) || (SIMLAG != 0))
|
|
||||||
#pragma message("\n\nWARNING! INTENTIONAL PACKET LOSS SIMULATION IS ENABLED!\nREMEMBER TO CHANGE SIMMIS&SIMLAG to 0 before RELEASE!\n\n")
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int32_t myconnectindex, numplayers;
|
|
||||||
int32_t connecthead, connectpoint2[MAXPLAYERS];
|
|
||||||
|
|
||||||
static int32_t tims, lastsendtims[MAXPLAYERS];
|
|
||||||
static char pakbuf[MAXPAKSIZ];
|
|
||||||
|
|
||||||
#define FIFSIZ 512 //16384/40 = 6min:49sec
|
|
||||||
static int32_t ipak[MAXPLAYERS][FIFSIZ], icnt0[MAXPLAYERS];
|
|
||||||
static int32_t opak[MAXPLAYERS][FIFSIZ], ocnt0[MAXPLAYERS], ocnt1[MAXPLAYERS];
|
|
||||||
static char pakmem[4194304]; static int32_t pakmemi = 1;
|
|
||||||
|
|
||||||
#define NETPORT 0x5bd9
|
|
||||||
static SOCKET mysock;
|
|
||||||
static int32_t myip, myport = NETPORT, otherip[MAXPLAYERS], otherport[MAXPLAYERS];
|
|
||||||
static int32_t snatchip = 0, snatchport = 0, danetmode = 255, netready = 0;
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
int32_t wsainitialized = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*Addfaz NatFree Start*/
|
|
||||||
int32_t natfree; //NatFree mode flag
|
|
||||||
int32_t nfCurrentPlayer = 0; //Current NatFree player counter. Will only talk with one player at a time
|
|
||||||
int32_t nfFinished = 0; //Flag that determines NatFree has found all players and set the correct port numbers [normal routines can then take place]
|
|
||||||
int32_t HeardFrom[MAXPLAYERS]; //For connecthead
|
|
||||||
int32_t HeardFrom2[MAXPLAYERS]; //For others
|
|
||||||
|
|
||||||
int32_t nfCheckCP(int32_t other) //Check if target player is our current NatFree Player
|
|
||||||
{
|
|
||||||
if (!natfree || nfFinished)
|
|
||||||
return 1;
|
|
||||||
else if (nfCurrentPlayer == other) return 1;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t nfCheckHF(int32_t other) //function to check if we've heard from a player
|
|
||||||
{
|
|
||||||
if (HeardFrom[other] == 1)
|
|
||||||
return 1;
|
|
||||||
else
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void nfIncCP() //function to handle currentplayer increment
|
|
||||||
{
|
|
||||||
if (natfree && !nfFinished)
|
|
||||||
{
|
|
||||||
nfCurrentPlayer++; //Increment player counter
|
|
||||||
if (nfCurrentPlayer == myconnectindex) nfCurrentPlayer++; //Bypass my index
|
|
||||||
if (nfCurrentPlayer >= numplayers)
|
|
||||||
{
|
|
||||||
nfFinished = 1; //Set NatFree finished flag. Perform non-natfree networking routines
|
|
||||||
initprintf("natfree: all players accounted for.\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/*Addfaz NatFree End*/
|
|
||||||
|
|
||||||
void netuninit()
|
|
||||||
{
|
|
||||||
if (mysock != (SOCKET)INVALID_HANDLE_VALUE) closesocket(mysock);
|
|
||||||
#ifdef _WIN32
|
|
||||||
if (wsainitialized)
|
|
||||||
WSACleanup();
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
static int32_t set_socket_blockmode(SOCKET socket, int32_t onOrOff)
|
|
||||||
{
|
|
||||||
#ifdef _WIN32
|
|
||||||
uint32_t flags;
|
|
||||||
#else
|
|
||||||
int32_t flags;
|
|
||||||
#endif
|
|
||||||
int32_t rc = 0;
|
|
||||||
|
|
||||||
/* set socket to be (non-)blocking. */
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
flags = (onOrOff) ? 0 : 1;
|
|
||||||
rc = (ioctlsocket(socket, FIONBIO, (void *)&flags) == 0);
|
|
||||||
#else
|
|
||||||
flags = fcntl(socket, F_GETFL, 0);
|
|
||||||
if (flags != -1)
|
|
||||||
{
|
|
||||||
if (onOrOff)
|
|
||||||
flags &= ~O_NONBLOCK;
|
|
||||||
else
|
|
||||||
flags |= O_NONBLOCK;
|
|
||||||
rc = (fcntl(socket, F_SETFL, flags) == 0);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return(rc);
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t netinit(int32_t portnum)
|
|
||||||
{
|
|
||||||
LPHOSTENT lpHostEnt;
|
|
||||||
char hostnam[256];
|
|
||||||
struct sockaddr_in ip;
|
|
||||||
#ifdef __BEOS__
|
|
||||||
int32_t i;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
if (wsainitialized == 0)
|
|
||||||
{
|
|
||||||
WSADATA ws;
|
|
||||||
|
|
||||||
if (WSAStartup(0x101,&ws) == SOCKET_ERROR) return(0);
|
|
||||||
wsainitialized = 1;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
mysock = socket(AF_INET,SOCK_DGRAM,0); if (mysock == INVALID_SOCKET) return(0);
|
|
||||||
#ifdef __BEOS__
|
|
||||||
i = 1; if (setsockopt(mysock,SOL_SOCKET,SO_NONBLOCK,&i,sizeof(i)) < 0) return(0);
|
|
||||||
#else
|
|
||||||
// i = 1; if (ioctlsocket(mysock,FIONBIO,(uint32_t *)&i) == SOCKET_ERROR) return(0);
|
|
||||||
if (!set_socket_blockmode(mysock,0)) return(0);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ip.sin_family = AF_INET;
|
|
||||||
ip.sin_addr.s_addr = INADDR_ANY;
|
|
||||||
ip.sin_port = htons(portnum);
|
|
||||||
if (bind(mysock,(struct sockaddr *)&ip,sizeof(ip)) != SOCKET_ERROR)
|
|
||||||
{
|
|
||||||
myport = portnum;
|
|
||||||
if (gethostname(hostnam,sizeof(hostnam)) != SOCKET_ERROR)
|
|
||||||
if ((lpHostEnt = gethostbyname(hostnam)))
|
|
||||||
{
|
|
||||||
myip = ip.sin_addr.s_addr = *(int32_t *)lpHostEnt->h_addr;
|
|
||||||
printf("mmulti: This machine's IP is %s\n", inet_ntoa(ip.sin_addr));
|
|
||||||
}
|
|
||||||
return(1);
|
|
||||||
}
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t netsend(int32_t other, char *dabuf, int32_t bufsiz) //0:buffer full... can't send
|
|
||||||
{
|
|
||||||
struct sockaddr_in ip;
|
|
||||||
|
|
||||||
if (!otherip[other]) return(0);
|
|
||||||
|
|
||||||
/*Addfaz NatFree Start*/
|
|
||||||
if (natfree && !nfFinished)
|
|
||||||
{
|
|
||||||
if (other == connecthead && !nfCheckHF(connecthead))
|
|
||||||
return(0); //Only greet the connecthead if we've heard from them.
|
|
||||||
|
|
||||||
if (myconnectindex != connecthead)
|
|
||||||
{
|
|
||||||
if (!nfCheckCP(other) && other != connecthead)
|
|
||||||
return(0); //Only connect to currentplayer or connecthead
|
|
||||||
else if (!nfCheckCP(other) && !nfCheckHF(other))
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/*Addfaz NatFree End*/
|
|
||||||
|
|
||||||
ip.sin_family = AF_INET;
|
|
||||||
ip.sin_addr.s_addr = otherip[other];
|
|
||||||
ip.sin_port = otherport[other];
|
|
||||||
return(sendto(mysock,dabuf,bufsiz,0,(struct sockaddr *)&ip,sizeof(struct sockaddr_in)) != SOCKET_ERROR);
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t netread(int32_t *other, char *dabuf, int32_t bufsiz) //0:no packets in buffer
|
|
||||||
{
|
|
||||||
struct sockaddr_in ip;
|
|
||||||
int32_t i;
|
|
||||||
|
|
||||||
i = sizeof(ip);
|
|
||||||
|
|
||||||
if (recvfrom(mysock,dabuf,bufsiz,0,(struct sockaddr *)&ip,(socklen_t *)&i) == -1) return(0);
|
|
||||||
#if (SIMMIS > 0)
|
|
||||||
if ((rand()&255) < SIMMIS) return(0);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
snatchip = (int32_t)ip.sin_addr.s_addr; snatchport = (int32_t)ip.sin_port;
|
|
||||||
|
|
||||||
(*other) = myconnectindex;
|
|
||||||
for (i=0; i<MAXPLAYERS; i++)
|
|
||||||
if ((otherip[i] == snatchip) && (otherport[i] == snatchport))
|
|
||||||
{(*other) = i; break; }
|
|
||||||
|
|
||||||
/*Addfaz NatFree Start*/
|
|
||||||
if (natfree && !nfFinished)
|
|
||||||
{
|
|
||||||
if (!nfCheckHF((*other))) //Check if have heard from this player already
|
|
||||||
{
|
|
||||||
if (otherip[nfCurrentPlayer] == snatchip) //Check IP Matches
|
|
||||||
{
|
|
||||||
if (!nfCheckHF(nfCurrentPlayer) && !HeardFrom2[nfCurrentPlayer])
|
|
||||||
{
|
|
||||||
if (otherport[nfCurrentPlayer] != snatchport) //If Port numbers do not match
|
|
||||||
{
|
|
||||||
initprintf("natfree: port number for player %d changed from %d to %d.\n",nfCurrentPlayer,otherport[nfCurrentPlayer],snatchport);
|
|
||||||
otherport[nfCurrentPlayer] = snatchport; //Correct the port number
|
|
||||||
}
|
|
||||||
}
|
|
||||||
(*other) = nfCurrentPlayer; //Set pointer
|
|
||||||
if (!nfCheckHF(nfCurrentPlayer) && myconnectindex != connecthead)
|
|
||||||
{
|
|
||||||
HeardFrom[nfCurrentPlayer] = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
HeardFrom[i] = 1;
|
|
||||||
HeardFrom2[i] = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/*Addfaz NatFree Endt*/
|
|
||||||
|
|
||||||
#if (SIMLAG > 1)
|
|
||||||
i = simlagcnt[*other]%(SIMLAG+1);
|
|
||||||
*(int16_t *)&simlagfif[*other][i][0] = bufsiz; Bmemcpy(&simlagfif[*other][i][2],dabuf,bufsiz);
|
|
||||||
simlagcnt[*other]++; if (simlagcnt[*other] < SIMLAG+1) return(0);
|
|
||||||
i = simlagcnt[*other]%(SIMLAG+1);
|
|
||||||
bufsiz = *(int16_t *)&simlagfif[*other][i][0]; Bmemcpy(dabuf,&simlagfif[*other][i][2],bufsiz);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t isvalidipaddress(char *st)
|
|
||||||
{
|
|
||||||
int32_t i, bcnt, num;
|
|
||||||
|
|
||||||
bcnt = 0; num = 0;
|
|
||||||
for (i=0; st[i]; i++)
|
|
||||||
{
|
|
||||||
if (st[i] == '.') { bcnt++; num = 0; continue; }
|
|
||||||
if (st[i] == ':')
|
|
||||||
{
|
|
||||||
if (bcnt != 3) return(0);
|
|
||||||
num = 0;
|
|
||||||
for (i++; st[i]; i++)
|
|
||||||
{
|
|
||||||
if ((st[i] >= '0') && (st[i] <= '9'))
|
|
||||||
{ num = num*10+st[i]-'0'; if (num >= 65536) return(0); }
|
|
||||||
else return(0);
|
|
||||||
}
|
|
||||||
return(1);
|
|
||||||
}
|
|
||||||
if ((st[i] >= '0') && (st[i] <= '9'))
|
|
||||||
{ num = num*10+st[i]-'0'; if (num >= 256) return(0); }
|
|
||||||
|
|
||||||
}
|
|
||||||
return(bcnt == 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
//---------------------------------- Obsolete variables&functions ----------------------------------
|
|
||||||
char syncstate = 0;
|
|
||||||
void mmulti_setpackettimeout(int32_t datimeoutcount, int32_t daresendagaincount) { UNREFERENCED_PARAMETER(datimeoutcount); UNREFERENCED_PARAMETER(daresendagaincount); }
|
|
||||||
void mmulti_generic(int32_t other, char *bufptr, int32_t messleng, int32_t command)
|
|
||||||
{
|
|
||||||
UNREFERENCED_PARAMETER(other);
|
|
||||||
UNREFERENCED_PARAMETER(bufptr);
|
|
||||||
UNREFERENCED_PARAMETER(messleng);
|
|
||||||
UNREFERENCED_PARAMETER(command);
|
|
||||||
}
|
|
||||||
int32_t mmulti_getoutputcirclesize() { return(0); }
|
|
||||||
void mmulti_flushpackets() {}
|
|
||||||
void mmulti_sendlogon() {}
|
|
||||||
void mmulti_sendlogoff() {}
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
static int32_t crctab16[256];
|
|
||||||
static void initcrc16()
|
|
||||||
{
|
|
||||||
int32_t i, j, k, a;
|
|
||||||
for (j=0; j<256; j++)
|
|
||||||
{
|
|
||||||
for (i=7,k=(j<<8),a=0; i>=0; i--,k=((k<<1)&65535))
|
|
||||||
{
|
|
||||||
if ((k^a)&0x8000) a = ((a<<1)&65535)^0x1021;
|
|
||||||
else a = ((a<<1)&65535);
|
|
||||||
}
|
|
||||||
crctab16[j] = (a&65535);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#define updatecrc16(crc,dat) crc = (((crc<<8)&65535)^crctab16[((((uint16_t)crc)>>8)&65535)^dat])
|
|
||||||
static uint16_t getcrc16(char *buffer, int32_t bufleng)
|
|
||||||
{
|
|
||||||
int32_t i, j;
|
|
||||||
|
|
||||||
j = 0;
|
|
||||||
for (i=bufleng-1; i>=0; i--) updatecrc16(j,buffer[i]);
|
|
||||||
return((uint16_t)(j&65535));
|
|
||||||
}
|
|
||||||
|
|
||||||
void mmulti_uninitmultiplayers() { netuninit(); }
|
|
||||||
|
|
||||||
int32_t mmulti_getpacket(int32_t *, char *);
|
|
||||||
static void initmultiplayers_reset(void)
|
|
||||||
{
|
|
||||||
int32_t i;
|
|
||||||
|
|
||||||
initcrc16();
|
|
||||||
memset(icnt0,0,sizeof(icnt0));
|
|
||||||
memset(ocnt0,0,sizeof(ocnt0));
|
|
||||||
memset(ocnt1,0,sizeof(ocnt1));
|
|
||||||
memset(ipak,0,sizeof(ipak));
|
|
||||||
//memset(opak,0,sizeof(opak)); //Don't need to init opak
|
|
||||||
//memset(pakmem,0,sizeof(pakmem)); //Don't need to init pakmem
|
|
||||||
#if (SIMLAG > 1)
|
|
||||||
memset(simlagcnt,0,sizeof(simlagcnt));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
lastsendtims[0] = GetTickCount();
|
|
||||||
for (i=1; i<MAXPLAYERS; i++) lastsendtims[i] = lastsendtims[0];
|
|
||||||
numplayers = 1; myconnectindex = 0;
|
|
||||||
|
|
||||||
memset(otherip,0,sizeof(otherip));
|
|
||||||
for (i=0; i<MAXPLAYERS; i++) otherport[i] = htons(NETPORT);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Multiplayer command line summary. Assume myconnectindex always = 0 for 192.168.1.2
|
|
||||||
//
|
|
||||||
// /n0 (mast/slav) 2 player: 3 player:
|
|
||||||
// 192.168.1.2 game /n0 game /n0:3
|
|
||||||
// 192.168.1.100 game /n0 192.168.1.2 game /n0 192.168.1.2
|
|
||||||
// 192.168.1.4 game /n0 192.168.1.2
|
|
||||||
//
|
|
||||||
// /n1 (peer-peer) 2 player: 3 player:
|
|
||||||
// 192.168.1.2 game /n1 192.168.1.100 game /n1 192.168.1.100 192.168.1.4
|
|
||||||
// 192.168.1.100 game 192.168.1.2 /n1 game 192.168.1.2 /n1 192.168.1.4
|
|
||||||
// 192.168.1.4 game 192.168.1.2 192.168.1.100 /n1
|
|
||||||
int32_t initmultiplayersparms(int32_t argc, char **argv)
|
|
||||||
{
|
|
||||||
int32_t i, j, daindex, portnum = NETPORT;
|
|
||||||
char *st;
|
|
||||||
|
|
||||||
initmultiplayers_reset();
|
|
||||||
danetmode = 255; daindex = 0;
|
|
||||||
|
|
||||||
// if (!argv) return 0;
|
|
||||||
// go looking for the port, if specified
|
|
||||||
for (i=0; i<argc; i++)
|
|
||||||
{
|
|
||||||
if (argv[i][0] != '-' && argv[i][0] != '/') continue;
|
|
||||||
if ((argv[i][1] == 'p' || argv[i][1] == 'P') && argv[i][2])
|
|
||||||
{
|
|
||||||
char *p;
|
|
||||||
j = strtol(argv[i]+2, &p, 10);
|
|
||||||
if (!(*p) && j > 1024 && j<65535) portnum = j;
|
|
||||||
|
|
||||||
printf("mmulti: Using port %d\n", portnum);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
netinit(portnum);
|
|
||||||
|
|
||||||
for (i=0; i<argc; i++)
|
|
||||||
{
|
|
||||||
//if (((argv[i][0] == '/') || (argv[i][0] == '-')) &&
|
|
||||||
// ((argv[i][1] == 'N') || (argv[i][1] == 'n')) &&
|
|
||||||
// ((argv[i][2] == 'E') || (argv[i][2] == 'e')) &&
|
|
||||||
// ((argv[i][3] == 'T') || (argv[i][3] == 't')) &&
|
|
||||||
// (!argv[i][4]))
|
|
||||||
// { foundnet = 1; continue; }
|
|
||||||
//if (!foundnet) continue;
|
|
||||||
|
|
||||||
if ((argv[i][0] == '-') || (argv[i][0] == '/'))
|
|
||||||
{
|
|
||||||
if ((argv[i][1] == 'N') || (argv[i][1] == 'n') || (argv[i][1] == 'I') || (argv[i][1] == 'i'))
|
|
||||||
{
|
|
||||||
numplayers = 2;
|
|
||||||
if (argv[i][2] == '0')
|
|
||||||
{
|
|
||||||
danetmode = 0;
|
|
||||||
if ((argv[i][3] == ':') && (argv[i][4] >= '0') && (argv[i][4] <= '9'))
|
|
||||||
{
|
|
||||||
numplayers = (argv[i][4]-'0');
|
|
||||||
if ((argv[i][5] >= '0') && (argv[i][5] <= '9')) numplayers = numplayers*10+(argv[i][5]-'0');
|
|
||||||
printf("mmulti: %d-player game\n", numplayers);
|
|
||||||
}
|
|
||||||
printf("mmulti: Master-slave mode\n");
|
|
||||||
}
|
|
||||||
else if (argv[i][2] == '1')
|
|
||||||
{
|
|
||||||
danetmode = 1;
|
|
||||||
myconnectindex = daindex; daindex++;
|
|
||||||
printf("mmulti: Peer-to-peer mode\n");
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
else if ((argv[i][1] == 'P') || (argv[i][1] == 'p')) continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
st = Bstrdup(argv[i]); if (!st) break;
|
|
||||||
if (isvalidipaddress(st))
|
|
||||||
{
|
|
||||||
if ((danetmode == 1) && (daindex == myconnectindex)) daindex++;
|
|
||||||
for (j=0; st[j]; j++)
|
|
||||||
{
|
|
||||||
if (st[j] == ':')
|
|
||||||
{ otherport[daindex] = htons((uint16_t)atol(&st[j+1])); st[j] = 0; break; }
|
|
||||||
}
|
|
||||||
otherip[daindex] = inet_addr(st);
|
|
||||||
printf("mmulti: Player %d at %s:%d\n",daindex,st,ntohs(otherport[daindex]));
|
|
||||||
daindex++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
LPHOSTENT lph;
|
|
||||||
uint16_t pt = htons(NETPORT);
|
|
||||||
|
|
||||||
for (j=0; st[j]; j++)
|
|
||||||
if (st[j] == ':')
|
|
||||||
{ pt = htons((uint16_t)atol(&st[j+1])); st[j] = 0; break; }
|
|
||||||
if ((lph = gethostbyname(st)))
|
|
||||||
{
|
|
||||||
if ((danetmode == 1) && (daindex == myconnectindex)) daindex++;
|
|
||||||
otherip[daindex] = *(int32_t *)lph->h_addr;
|
|
||||||
otherport[daindex] = pt;
|
|
||||||
printf("mmulti: Player %d at %s:%d (%s)\n",daindex,
|
|
||||||
inet_ntoa(*(struct in_addr *)lph->h_addr),ntohs(pt),argv[i]);
|
|
||||||
daindex++;
|
|
||||||
}
|
|
||||||
else printf("mmulti: Failed resolving %s\n",argv[i]);
|
|
||||||
}
|
|
||||||
Bfree(st);
|
|
||||||
}
|
|
||||||
if ((danetmode == 255) && (daindex)) { numplayers = 2; danetmode = 0; } //an IP w/o /n# defaults to /n0
|
|
||||||
if ((numplayers >= 2) && (daindex) && (!danetmode)) myconnectindex = 1;
|
|
||||||
if (daindex > numplayers) numplayers = daindex;
|
|
||||||
|
|
||||||
//for(i=0;i<numplayers;i++)
|
|
||||||
// printf("Player %d: %d.%d.%d.%d:%d\n",i,otherip[i]&255,(otherip[i]>>8)&255,(otherip[i]>>16)&255,((uint32_t)otherip[i])>>24,ntohs(otherport[i]));
|
|
||||||
|
|
||||||
connecthead = 0;
|
|
||||||
for (i=0; i<numplayers-1; i++) connectpoint2[i] = i+1;
|
|
||||||
connectpoint2[numplayers-1] = -1;
|
|
||||||
|
|
||||||
// return (((!danetmode) && (numplayers >= 2)) || (numplayers == 2));
|
|
||||||
return (numplayers >= 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t initmultiplayerscycle(void)
|
|
||||||
{
|
|
||||||
int32_t i, k;
|
|
||||||
// extern int32_t totalclock;
|
|
||||||
|
|
||||||
idle();
|
|
||||||
|
|
||||||
mmulti_getpacket(&i,0);
|
|
||||||
|
|
||||||
tims = GetTickCount();
|
|
||||||
if (myconnectindex == connecthead) //Player 0 only
|
|
||||||
{
|
|
||||||
for (i=numplayers-1; i>0; i--)
|
|
||||||
if (!otherip[i]) break;
|
|
||||||
if (!i)
|
|
||||||
{
|
|
||||||
nfIncCP(); //Addfaz NatFree
|
|
||||||
netready = 1; //Player 0 is ready
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (netready) return 0;
|
|
||||||
if (tims < lastsendtims[connecthead]) lastsendtims[connecthead] = tims;
|
|
||||||
if (tims >= lastsendtims[connecthead]+250) //1000/PAKRATE)
|
|
||||||
{
|
|
||||||
lastsendtims[connecthead] = tims;
|
|
||||||
|
|
||||||
// short crc16ofs; //offset of crc16
|
|
||||||
// int32_t icnt0; //-1 (special packet for MMULTI.C's player collection)
|
|
||||||
// ...
|
|
||||||
// unsigned short crc16; //CRC16 of everything except crc16
|
|
||||||
k = 2;
|
|
||||||
*(int32_t *)&pakbuf[k] = -1; k += 4;
|
|
||||||
pakbuf[k++] = 0xaa;
|
|
||||||
*(uint16_t *)&pakbuf[0] = (uint16_t)k;
|
|
||||||
*(uint16_t *)&pakbuf[k] = getcrc16(pakbuf,k); k += 2;
|
|
||||||
netsend(connecthead,pakbuf,k);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void mmulti_initmultiplayers(int32_t argc, char **argv, char damultioption, char dacomrateoption, char dapriority)
|
|
||||||
{
|
|
||||||
UNREFERENCED_PARAMETER(damultioption);
|
|
||||||
UNREFERENCED_PARAMETER(dacomrateoption);
|
|
||||||
UNREFERENCED_PARAMETER(dapriority);
|
|
||||||
|
|
||||||
if (initmultiplayersparms(argc,argv))
|
|
||||||
{
|
|
||||||
#if 0
|
|
||||||
int32_t i, j, k, otims;
|
|
||||||
//Console code seems to crash Win98 upon quitting game
|
|
||||||
//it's not necessary and it's not portable anyway
|
|
||||||
char tbuf[1024];
|
|
||||||
uint32_t u;
|
|
||||||
HANDLE hconsout;
|
|
||||||
AllocConsole();
|
|
||||||
SetConsoleTitle("Multiplayer status...");
|
|
||||||
hconsout = GetStdHandle(STD_OUTPUT_HANDLE);
|
|
||||||
otims = 0;
|
|
||||||
#endif
|
|
||||||
while (initmultiplayerscycle())
|
|
||||||
{
|
|
||||||
#if 0
|
|
||||||
if ((tims < otims) || (tims > otims+100))
|
|
||||||
{
|
|
||||||
otims = tims;
|
|
||||||
sprintf(tbuf,"\rWait for players (%d/%d): ",myconnectindex,numplayers);
|
|
||||||
for (i=0; i<numplayers; i++)
|
|
||||||
{
|
|
||||||
if (i == myconnectindex) { strcat(tbuf,"<me> "); continue; }
|
|
||||||
if (!otherip[i]) { strcat(tbuf,"?.?.?.?:? "); continue; }
|
|
||||||
sprintf(&tbuf[strlen(tbuf)],"%d.%d.%d.%d:%04x ",otherip[i]&255,(otherip[i]>>8)&255,(otherip[i]>>16)&255,(((uint32_t)otherip[i])>>24),otherport[i]);
|
|
||||||
}
|
|
||||||
WriteConsole(hconsout,tbuf,strlen(tbuf),&u,0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
FreeConsole();
|
|
||||||
#else
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
netready = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void mmulti_dosendpackets(int32_t other) //Host to send intially, client to send to others once heard from host.
|
|
||||||
{
|
|
||||||
int32_t i, j, k;
|
|
||||||
|
|
||||||
if (!otherip[other]) return;
|
|
||||||
|
|
||||||
//Packet format:
|
|
||||||
// short crc16ofs; //offset of crc16
|
|
||||||
// int32_t icnt0; //earliest unacked packet
|
|
||||||
// char ibits[32]; //ack status of packets icnt0<=i<icnt0+256
|
|
||||||
// while (short leng) //leng: !=0 for packet, 0 for no more packets
|
|
||||||
// {
|
|
||||||
// int32_t ocnt; //index of following packet data
|
|
||||||
// char pak[leng]; //actual packet data :)
|
|
||||||
// }
|
|
||||||
// unsigned short crc16; //CRC16 of everything except crc16
|
|
||||||
|
|
||||||
|
|
||||||
tims = GetTickCount();
|
|
||||||
if (tims < lastsendtims[other]) lastsendtims[other] = tims;
|
|
||||||
if (tims < lastsendtims[other]+1000/packetrate) return;
|
|
||||||
lastsendtims[other] = tims;
|
|
||||||
|
|
||||||
k = 2;
|
|
||||||
*(int32_t *)&pakbuf[k] = icnt0[other]; k += 4;
|
|
||||||
memset(&pakbuf[k],0,32);
|
|
||||||
for (i=icnt0[other]; i<icnt0[other]+256; i++)
|
|
||||||
if (ipak[other][i&(FIFSIZ-1)])
|
|
||||||
pakbuf[((i-icnt0[other])>>3)+k] |= (1<<((i-icnt0[other])&7));
|
|
||||||
k += 32;
|
|
||||||
|
|
||||||
while ((ocnt0[other] < ocnt1[other]) && (!opak[other][ocnt0[other]&(FIFSIZ-1)])) ocnt0[other]++;
|
|
||||||
for (i=ocnt0[other]; i<ocnt1[other]; i++)
|
|
||||||
{
|
|
||||||
j = *(int16_t *)&pakmem[opak[other][i&(FIFSIZ-1)]]; if (!j) continue; //packet already acked
|
|
||||||
if (k+6+j+4 > (int32_t)sizeof(pakbuf)) break;
|
|
||||||
|
|
||||||
*(uint16_t *)&pakbuf[k] = (uint16_t)j; k += 2;
|
|
||||||
*(int32_t *)&pakbuf[k] = i; k += 4;
|
|
||||||
Bmemcpy(&pakbuf[k],&pakmem[opak[other][i&(FIFSIZ-1)]+2],j); k += j;
|
|
||||||
}
|
|
||||||
*(uint16_t *)&pakbuf[k] = 0; k += 2;
|
|
||||||
*(uint16_t *)&pakbuf[0] = (uint16_t)k;
|
|
||||||
*(uint16_t *)&pakbuf[k] = getcrc16(pakbuf,k); k += 2;
|
|
||||||
|
|
||||||
//printf("Send: "); for(i=0;i<k;i++) printf("%02x ",pakbuf[i]); printf("\n");
|
|
||||||
|
|
||||||
/*Addfaz NatFree Start*/
|
|
||||||
if (nfCheckCP(other) || !natfree) //Clients only if heard from host
|
|
||||||
netsend(other,pakbuf,k);
|
|
||||||
/*Addfaz NatFree End*/
|
|
||||||
}
|
|
||||||
|
|
||||||
void mmulti_sendpacket(int32_t other, char *bufptr, int32_t messleng)
|
|
||||||
{
|
|
||||||
// int32_t i, j;
|
|
||||||
|
|
||||||
if (numplayers < 2) return;
|
|
||||||
|
|
||||||
if (pakmemi+messleng+2 > (int32_t)sizeof(pakmem)) pakmemi = 1;
|
|
||||||
opak[other][ocnt1[other]&(FIFSIZ-1)] = pakmemi;
|
|
||||||
*(int16_t *)&pakmem[pakmemi] = messleng;
|
|
||||||
Bmemcpy(&pakmem[pakmemi+2],bufptr,messleng); pakmemi += messleng+2;
|
|
||||||
ocnt1[other]++;
|
|
||||||
|
|
||||||
//printf("Send: "); for(i=0;i<messleng;i++) printf("%02x ",bufptr[i]); printf("\n");
|
|
||||||
|
|
||||||
mmulti_dosendpackets(other);
|
|
||||||
}
|
|
||||||
|
|
||||||
//passing bufptr == 0 enables receive&sending raw packets but does not return any received packets
|
|
||||||
//(used as hack for player collection)
|
|
||||||
int32_t mmulti_getpacket(int32_t *retother, char *bufptr)
|
|
||||||
{
|
|
||||||
int32_t i, j, k, ic0, crc16ofs, messleng, other;
|
|
||||||
|
|
||||||
if (numplayers < 2) return(0);
|
|
||||||
|
|
||||||
if (netready)
|
|
||||||
{
|
|
||||||
for (i=connecthead; i>=0; i=connectpoint2[i])
|
|
||||||
{
|
|
||||||
if (i != myconnectindex) mmulti_dosendpackets(i);
|
|
||||||
if ((!danetmode) && (myconnectindex != connecthead)) break; //slaves in M/S mode only send to master
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
while (netread(&other,pakbuf,sizeof(pakbuf)))
|
|
||||||
{
|
|
||||||
//Packet format:
|
|
||||||
// short crc16ofs; //offset of crc16
|
|
||||||
// int32_t icnt0; //earliest unacked packet
|
|
||||||
// char ibits[32]; //ack status of packets icnt0<=i<icnt0+256
|
|
||||||
// while (short leng) //leng: !=0 for packet, 0 for no more packets
|
|
||||||
// {
|
|
||||||
// int32_t ocnt; //index of following packet data
|
|
||||||
// char pak[leng]; //actual packet data :)
|
|
||||||
// }
|
|
||||||
// unsigned short crc16; //CRC16 of everything except crc16
|
|
||||||
k = 0;
|
|
||||||
crc16ofs = (int32_t)(*(uint16_t *)&pakbuf[k]); k += 2;
|
|
||||||
|
|
||||||
//printf("Recv: "); for(i=0;i<crc16ofs+2;i++) printf("%02x ",pakbuf[i]); printf("\n");
|
|
||||||
|
|
||||||
if ((crc16ofs+2 <= (int32_t)sizeof(pakbuf)) && (getcrc16(pakbuf,crc16ofs) == (*(uint16_t *)&pakbuf[crc16ofs])))
|
|
||||||
{
|
|
||||||
ic0 = *(int32_t *)&pakbuf[k]; k += 4;
|
|
||||||
if (ic0 == -1)
|
|
||||||
{
|
|
||||||
//Slave sends 0xaa to Master at initmultiplayers() and waits for 0xab response
|
|
||||||
//Master responds to slave with 0xab whenever it receives a 0xaa - even if during game!
|
|
||||||
if ((pakbuf[k] == 0xaa) && (myconnectindex == connecthead))
|
|
||||||
{
|
|
||||||
for (other=1; other<numplayers; other++)
|
|
||||||
{
|
|
||||||
//Only send to others asking for a response
|
|
||||||
if ((otherip[other]) && ((otherip[other] != snatchip) || (otherport[other] != snatchport))) continue;
|
|
||||||
otherip[other] = snatchip;
|
|
||||||
otherport[other] = snatchport;
|
|
||||||
|
|
||||||
// short crc16ofs; //offset of crc16
|
|
||||||
// int32_t icnt0; //-1 (special packet for MMULTI.C's player collection)
|
|
||||||
// ...
|
|
||||||
// unsigned short crc16; //CRC16 of everything except crc16
|
|
||||||
k = 2;
|
|
||||||
*(int32_t *)&pakbuf[k] = -1; k += 4;
|
|
||||||
pakbuf[k++] = 0xab;
|
|
||||||
pakbuf[k++] = (uint8_t)other;
|
|
||||||
pakbuf[k++] = (uint8_t)numplayers;
|
|
||||||
*(uint16_t *)&pakbuf[0] = (uint16_t)k;
|
|
||||||
*(uint16_t *)&pakbuf[k] = getcrc16(pakbuf,k); k += 2;
|
|
||||||
|
|
||||||
/*Addfaz NatFree Start*/
|
|
||||||
if (natfree && !nfCheckHF(other))
|
|
||||||
{
|
|
||||||
initprintf("natfree: heard from player %d\n", other);
|
|
||||||
HeardFrom[other] = 1;
|
|
||||||
HeardFrom2[other] = 1;
|
|
||||||
nfIncCP();
|
|
||||||
}
|
|
||||||
/*Addfaz NatFree End*/
|
|
||||||
|
|
||||||
netsend(other,pakbuf,k);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if ((pakbuf[k] == 0xab) && (myconnectindex != connecthead))
|
|
||||||
{
|
|
||||||
if (((uint32_t)pakbuf[k+1] < (uint32_t)pakbuf[k+2]) &&
|
|
||||||
((uint32_t)pakbuf[k+2] < (uint32_t)MAXPLAYERS))
|
|
||||||
{
|
|
||||||
myconnectindex = (int32_t)pakbuf[k+1];
|
|
||||||
numplayers = (int32_t)pakbuf[k+2];
|
|
||||||
|
|
||||||
connecthead = 0;
|
|
||||||
for (i=0; i<numplayers-1; i++) connectpoint2[i] = i+1;
|
|
||||||
connectpoint2[numplayers-1] = -1;
|
|
||||||
|
|
||||||
otherip[connecthead] = snatchip;
|
|
||||||
otherport[connecthead] = snatchport;
|
|
||||||
netready = 1;
|
|
||||||
|
|
||||||
/*Addfaz NatFree Start*/
|
|
||||||
if (natfree)
|
|
||||||
{
|
|
||||||
initprintf("natfree: heard from player %d (head).\n", connecthead);
|
|
||||||
HeardFrom[connecthead] = 1;
|
|
||||||
HeardFrom2[connecthead] = 1;
|
|
||||||
nfIncCP();
|
|
||||||
}
|
|
||||||
/*Addfaz NatFree End*/
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (ocnt0[other] < ic0) ocnt0[other] = ic0;
|
|
||||||
for (i=ic0; i<min(ic0+256,ocnt1[other]); i++)
|
|
||||||
if (pakbuf[((i-ic0)>>3)+k]&(1<<((i-ic0)&7)))
|
|
||||||
opak[other][i&(FIFSIZ-1)] = 0;
|
|
||||||
k += 32;
|
|
||||||
|
|
||||||
messleng = (int32_t)(*(uint16_t *)&pakbuf[k]); k += 2;
|
|
||||||
while (messleng)
|
|
||||||
{
|
|
||||||
j = *(int32_t *)&pakbuf[k]; k += 4;
|
|
||||||
if ((j >= icnt0[other]) && (!ipak[other][j&(FIFSIZ-1)]))
|
|
||||||
{
|
|
||||||
if (pakmemi+messleng+2 > (int32_t)sizeof(pakmem)) pakmemi = 1;
|
|
||||||
ipak[other][j&(FIFSIZ-1)] = pakmemi;
|
|
||||||
*(int16_t *)&pakmem[pakmemi] = messleng;
|
|
||||||
Bmemcpy(&pakmem[pakmemi+2],&pakbuf[k],messleng); pakmemi += messleng+2;
|
|
||||||
}
|
|
||||||
k += messleng;
|
|
||||||
messleng = (int32_t)(*(uint16_t *)&pakbuf[k]); k += 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Return next valid packet from any player
|
|
||||||
if (!bufptr) return(0);
|
|
||||||
for (i=connecthead; i>=0; i=connectpoint2[i])
|
|
||||||
{
|
|
||||||
if (i != myconnectindex)
|
|
||||||
{
|
|
||||||
j = ipak[i][icnt0[i]&(FIFSIZ-1)];
|
|
||||||
if (j)
|
|
||||||
{
|
|
||||||
messleng = *(int16_t *)&pakmem[j]; Bmemcpy(bufptr,&pakmem[j+2],messleng);
|
|
||||||
*retother = i; ipak[i][icnt0[i]&(FIFSIZ-1)] = 0; icnt0[i]++;
|
|
||||||
//printf("Recv: "); for(i=0;i<messleng;i++) printf("%02x ",bufptr[i]); printf("\n");
|
|
||||||
|
|
||||||
/*Addfaz NatFree Start*/
|
|
||||||
if (natfree && !HeardFrom2[nfCurrentPlayer] && i == nfCurrentPlayer)
|
|
||||||
{
|
|
||||||
initprintf("natfree: heard from player %d.\n", i);
|
|
||||||
HeardFrom2[nfCurrentPlayer] = 1;
|
|
||||||
HeardFrom[nfCurrentPlayer] = 1;
|
|
||||||
nfIncCP();
|
|
||||||
}
|
|
||||||
/*Addfaz NatFree End*/
|
|
||||||
|
|
||||||
return(messleng);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if ((!danetmode) && (myconnectindex != connecthead)) break; //slaves in M/S mode only send to master
|
|
||||||
}
|
|
||||||
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t getexternaladdress(char *buffer, const char *host, int32_t port)
|
|
||||||
{
|
|
||||||
int32_t bytes_sent, i=0, j=0;
|
|
||||||
struct sockaddr_in dest_addr;
|
|
||||||
struct hostent *h;
|
|
||||||
char *req = "GET / HTTP/1.0\r\n\r\n";
|
|
||||||
char *text = "Current IP Address: ";
|
|
||||||
char tempbuf[1024], ipaddr[32];
|
|
||||||
|
|
||||||
memset(buffer, 0, sizeof(buffer));
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
if (wsainitialized == 0)
|
|
||||||
{
|
|
||||||
WSADATA ws;
|
|
||||||
|
|
||||||
if (WSAStartup(0x101,&ws) == SOCKET_ERROR)
|
|
||||||
{
|
|
||||||
initprintf("mmulti: Winsock error in getexternaladdress() (%d)\n",errno);
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
wsainitialized = 1;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if ((h=gethostbyname(host)) == NULL)
|
|
||||||
{
|
|
||||||
initprintf("mmulti: gethostbyname() error in getexternaladdress() (%d)\n",h_errno);
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
dest_addr.sin_addr.s_addr = ((struct in_addr *)(h->h_addr))->s_addr;
|
|
||||||
dest_addr.sin_family = AF_INET;
|
|
||||||
dest_addr.sin_port = htons(port);
|
|
||||||
|
|
||||||
memset(&(dest_addr.sin_zero), '\0', 8);
|
|
||||||
|
|
||||||
mysock = socket(PF_INET, SOCK_STREAM, 0);
|
|
||||||
|
|
||||||
if (mysock == INVALID_SOCKET)
|
|
||||||
{
|
|
||||||
initprintf("mmulti: socket() error in getexternaladdress() (%d)\n",errno);
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (connect(mysock, (struct sockaddr *)&dest_addr, sizeof(struct sockaddr)) == SOCKET_ERROR)
|
|
||||||
{
|
|
||||||
initprintf("mmulti: connect() error in getexternaladdress() (%d)\n",errno);
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
bytes_sent = send(mysock, req, strlen(req), 0);
|
|
||||||
if (bytes_sent == SOCKET_ERROR)
|
|
||||||
{
|
|
||||||
initprintf("mmulti: send() error in getexternaladdress() (%d)\n",errno);
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
// initprintf("sent %d bytes\n",bytes_sent);
|
|
||||||
recv(mysock, (char *)&tempbuf, sizeof(tempbuf), 0);
|
|
||||||
closesocket(mysock);
|
|
||||||
j = Bstrlen(text);
|
|
||||||
for (i=Bstrlen(tempbuf); i>0; i--)
|
|
||||||
if (!Bstrncmp(&tempbuf[i], text, j))
|
|
||||||
{
|
|
||||||
i += j;
|
|
||||||
j = 0;
|
|
||||||
while (isdigit(tempbuf[i]) || (tempbuf[i] == '.'))
|
|
||||||
{
|
|
||||||
ipaddr[j] = tempbuf[i];
|
|
||||||
i++, j++;
|
|
||||||
}
|
|
||||||
ipaddr[j++] = '\0';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
Bmemcpy(buffer,&ipaddr,j);
|
|
||||||
return(1);
|
|
||||||
}
|
|
||||||
|
|
@ -1,75 +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 (jonof@edgenetwk.com)
|
|
||||||
|
|
||||||
|
|
||||||
#include "mmulti.h"
|
|
||||||
|
|
||||||
|
|
||||||
int32_t myconnectindex, numplayers;
|
|
||||||
int32_t connecthead, connectpoint2[MAXMULTIPLAYERS];
|
|
||||||
char syncstate = 0;
|
|
||||||
|
|
||||||
int32_t isvalidipaddress(char *st)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t initmultiplayersparms(int32_t argc, char **argv)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t initmultiplayerscycle(void)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void mmulti_initmultiplayers(int32_t argc, char **argv, char damultioption, char dacomrateoption, char dapriority)
|
|
||||||
{
|
|
||||||
numplayers = 1; myconnectindex = 0;
|
|
||||||
connecthead = 0; connectpoint2[0] = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void mmulti_setpackettimeout(int32_t datimeoutcount, int32_t daresendagaincount)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void mmulti_uninitmultiplayers(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void mmulti_sendlogon(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void mmulti_sendlogoff(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t mmulti_getoutputcirclesize(void)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void mmulti_sendpacket(int32_t other, char *bufptr, int32_t messleng)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t mmulti_getpacket(int32_t *other, char *bufptr)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void mmulti_flushpackets(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void mmulti_generic(int32_t other, char *bufptr, int32_t messleng, int32_t command)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -8,7 +8,7 @@
|
||||||
#include "baselayer.h"
|
#include "baselayer.h"
|
||||||
#include "cache1d.h"
|
#include "cache1d.h"
|
||||||
#include "pragmas.h"
|
#include "pragmas.h"
|
||||||
#include "mmulti.h"
|
#include "mmulti_unstable.h"
|
||||||
|
|
||||||
symbol_t *symbols = NULL;
|
symbol_t *symbols = NULL;
|
||||||
static symbol_t *addnewsymbol(const char *name);
|
static symbol_t *addnewsymbol(const char *name);
|
||||||
|
|
|
||||||
|
|
@ -738,7 +738,7 @@ void polymost_glinit()
|
||||||
}
|
}
|
||||||
else rewind(cacheindexptr);
|
else rewind(cacheindexptr);
|
||||||
|
|
||||||
cachefilehandle = Bopen(TEXCACHEFILE,BO_BINARY|BO_CREAT|BO_APPEND|BO_RDWR,BS_IREAD|BS_IWRITE);
|
cachefilehandle = Bopen(TEXCACHEFILE, BO_BINARY|BO_CREAT|BO_APPEND|BO_RDWR, BS_IREAD|BS_IWRITE);
|
||||||
|
|
||||||
if (cachefilehandle < 0)
|
if (cachefilehandle < 0)
|
||||||
{
|
{
|
||||||
|
|
@ -757,7 +757,9 @@ void polymost_glinit()
|
||||||
}
|
}
|
||||||
|
|
||||||
curcacheindex = firstcacheindex;
|
curcacheindex = firstcacheindex;
|
||||||
initprintf("Cache contains %d bytes of garbage data\n",Blseek(cachefilehandle, 0, BSEEK_END)-i);
|
i = Blseek(cachefilehandle, 0, BSEEK_END)-i;
|
||||||
|
if (i)
|
||||||
|
initprintf("Cache contains %d bytes of garbage data\n",i);
|
||||||
// Blseek(cachefilehandle, 0, BSEEK_SET);
|
// Blseek(cachefilehandle, 0, BSEEK_SET);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@
|
||||||
#include "build.h"
|
#include "build.h"
|
||||||
#include "a.h"
|
#include "a.h"
|
||||||
#include "osd.h"
|
#include "osd.h"
|
||||||
#include "mmulti.h"
|
#include "mmulti_unstable.h"
|
||||||
|
|
||||||
// undefine to restrict windowed resolutions to conventional sizes
|
// undefine to restrict windowed resolutions to conventional sizes
|
||||||
#define ANY_WINDOWED_SIZE
|
#define ANY_WINDOWED_SIZE
|
||||||
|
|
|
||||||
|
|
@ -662,12 +662,6 @@ int32_t CONFIG_ReadSetup(void)
|
||||||
|
|
||||||
SCRIPT_GetString(ud.config.scripthandle, "Comm Setup","RTSName",&ud.rtsname[0]);
|
SCRIPT_GetString(ud.config.scripthandle, "Comm Setup","RTSName",&ud.rtsname[0]);
|
||||||
|
|
||||||
#ifndef RANCID_NETWORKING
|
|
||||||
// The packetrate mechanism is specific to the eduke32 networking code
|
|
||||||
SCRIPT_GetNumber(ud.config.scripthandle, "Comm Setup", "Rate",(int32_t *)&packetrate);
|
|
||||||
packetrate = min(max(packetrate,50),1000);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
SCRIPT_GetNumber(ud.config.scripthandle, "Setup","ConfigVersion",&ud.configversion);
|
SCRIPT_GetNumber(ud.config.scripthandle, "Setup","ConfigVersion",&ud.configversion);
|
||||||
SCRIPT_GetNumber(ud.config.scripthandle, "Setup","ForceSetup",&ud.config.ForceSetup);
|
SCRIPT_GetNumber(ud.config.scripthandle, "Setup","ForceSetup",&ud.config.ForceSetup);
|
||||||
SCRIPT_GetNumber(ud.config.scripthandle, "Setup","NoAutoLoad",&ud.config.NoAutoLoad);
|
SCRIPT_GetNumber(ud.config.scripthandle, "Setup","NoAutoLoad",&ud.config.NoAutoLoad);
|
||||||
|
|
@ -1239,12 +1233,6 @@ void CONFIG_WriteSetup(void)
|
||||||
SCRIPT_PutString(ud.config.scripthandle, "Comm Setup","PlayerName",&szPlayerName[0]);
|
SCRIPT_PutString(ud.config.scripthandle, "Comm Setup","PlayerName",&szPlayerName[0]);
|
||||||
SCRIPT_PutString(ud.config.scripthandle, "Comm Setup","RTSName",&ud.rtsname[0]);
|
SCRIPT_PutString(ud.config.scripthandle, "Comm Setup","RTSName",&ud.rtsname[0]);
|
||||||
|
|
||||||
#ifndef RANCID_NETWORKING
|
|
||||||
// The packetrate mechanism is specific to the eduke32 networking code
|
|
||||||
SCRIPT_PutNumber(ud.config.scripthandle, "Comm Setup", "Rate", packetrate, FALSE, FALSE);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
SCRIPT_PutString(ud.config.scripthandle, "Setup","SelectedGRP",&duke3dgrp[0]);
|
SCRIPT_PutString(ud.config.scripthandle, "Setup","SelectedGRP",&duke3dgrp[0]);
|
||||||
|
|
||||||
// #ifdef _WIN32
|
// #ifdef _WIN32
|
||||||
|
|
|
||||||
|
|
@ -39,11 +39,7 @@ extern "C" {
|
||||||
#include "cache1d.h"
|
#include "cache1d.h"
|
||||||
#include "pragmas.h"
|
#include "pragmas.h"
|
||||||
|
|
||||||
#ifdef RANCID_NETWORKING
|
|
||||||
#include "mmulti_unstable.h"
|
#include "mmulti_unstable.h"
|
||||||
#else
|
|
||||||
#include "mmulti.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "baselayer.h"
|
#include "baselayer.h"
|
||||||
|
|
||||||
|
|
@ -636,9 +632,6 @@ extern char g_numVolumes;
|
||||||
|
|
||||||
extern int32_t g_lastSaveSlot;
|
extern int32_t g_lastSaveSlot;
|
||||||
extern int32_t g_restorePalette;
|
extern int32_t g_restorePalette;
|
||||||
#ifndef RANCID_NETWORKING
|
|
||||||
extern int32_t packetrate;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
extern int32_t cachecount;
|
extern int32_t cachecount;
|
||||||
extern char boardfilename[BMAX_PATH];
|
extern char boardfilename[BMAX_PATH];
|
||||||
|
|
|
||||||
|
|
@ -71,9 +71,6 @@ static int32_t g_noSound = 0;
|
||||||
static int32_t g_noMusic = 0;
|
static int32_t g_noMusic = 0;
|
||||||
static char *CommandMap = NULL;
|
static char *CommandMap = NULL;
|
||||||
static char *CommandName = NULL;
|
static char *CommandName = NULL;
|
||||||
#ifndef RANCID_NETWORKING
|
|
||||||
static char *CommandNet = NULL;
|
|
||||||
#endif
|
|
||||||
static int32_t g_keepAddr = 0;
|
static int32_t g_keepAddr = 0;
|
||||||
int32_t CommandWeaponChoice = 0;
|
int32_t CommandWeaponChoice = 0;
|
||||||
static struct strllist
|
static struct strllist
|
||||||
|
|
@ -9308,25 +9305,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
|
||||||
i++;
|
i++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#ifndef RANCID_NETWORKING
|
if (!Bstrcasecmp(c+1,"net") || !Bstrcasecmp(c+1,"rmnet"))
|
||||||
if (!Bstrcasecmp(c+1,"rmnet"))
|
|
||||||
{
|
|
||||||
if (argc > i+1)
|
|
||||||
{
|
|
||||||
g_noSetup = TRUE;
|
|
||||||
g_networkBroadcastMode = 1;
|
|
||||||
CommandNet = (char *)argv[i+1];
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
i++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
if (!Bstrcasecmp(c+1,"net")
|
|
||||||
#ifdef RANCID_NETWORKING
|
|
||||||
|| !Bstrcasecmp(c+1,"rmnet")
|
|
||||||
#endif
|
|
||||||
)
|
|
||||||
{
|
{
|
||||||
g_noSetup = TRUE;
|
g_noSetup = TRUE;
|
||||||
firstnet = i;
|
firstnet = i;
|
||||||
|
|
@ -10178,20 +10157,6 @@ static void G_Startup(void)
|
||||||
for (i=0; i<MAXPLAYERS; i++)
|
for (i=0; i<MAXPLAYERS; i++)
|
||||||
g_player[i].playerreadyflag = 0;
|
g_player[i].playerreadyflag = 0;
|
||||||
|
|
||||||
#ifndef RANCID_NETWORKING
|
|
||||||
if (CommandNet)
|
|
||||||
{
|
|
||||||
setup_rancid_net(CommandNet);
|
|
||||||
if (Bstrlen(rancid_ip_strings[MAXPLAYERS-1]))
|
|
||||||
{
|
|
||||||
initprintf("rmnet: Using %s as sort IP\n",rancid_ip_strings[MAXPLAYERS-1]);
|
|
||||||
initprintf("rmnet: %d players\n",rancid_players);
|
|
||||||
}
|
|
||||||
CommandNet = NULL;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef RANCID_NETWORKING
|
|
||||||
// TODO: split this up in the same fine-grained manner as eduke32 network backend, to
|
// TODO: split this up in the same fine-grained manner as eduke32 network backend, to
|
||||||
// allow for event handling
|
// allow for event handling
|
||||||
mmulti_initmultiplayers(netparamcount,netparam);
|
mmulti_initmultiplayers(netparamcount,netparam);
|
||||||
|
|
@ -10202,22 +10167,6 @@ static void G_Startup(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
|
||||||
if (initmultiplayersparms(netparamcount,netparam))
|
|
||||||
{
|
|
||||||
initprintf("Waiting for players...\n");
|
|
||||||
while (initmultiplayerscycle())
|
|
||||||
{
|
|
||||||
handleevents();
|
|
||||||
if (quitevent)
|
|
||||||
{
|
|
||||||
G_Shutdown();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (netparam) Bfree(netparam);
|
if (netparam) Bfree(netparam);
|
||||||
netparam = NULL;
|
netparam = NULL;
|
||||||
netparamcount = 0;
|
netparamcount = 0;
|
||||||
|
|
@ -10637,25 +10586,10 @@ void app_main(int32_t argc,const char **argv)
|
||||||
glusetexcache = -1;
|
glusetexcache = -1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
#ifdef _WIN32
|
|
||||||
ud.config.CheckForUpdates = -1;
|
|
||||||
#endif
|
|
||||||
*/
|
|
||||||
|
|
||||||
i = CONFIG_ReadSetup();
|
i = CONFIG_ReadSetup();
|
||||||
if (getenv("DUKE3DGRP")) duke3dgrp = getenv("DUKE3DGRP");
|
if (getenv("DUKE3DGRP")) duke3dgrp = getenv("DUKE3DGRP");
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
/*
|
|
||||||
if (ud.config.CheckForUpdates == -1)
|
|
||||||
{
|
|
||||||
i=wm_ynbox("Automatic Update Notifications",
|
|
||||||
"Would you like to check for new versions of EDuke32 at startup?");
|
|
||||||
ud.config.CheckForUpdates = 0;
|
|
||||||
if (i) ud.config.CheckForUpdates = 1;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
// initprintf("build %d\n",(uint8_t)atoi(BUILDDATE));
|
// initprintf("build %d\n",(uint8_t)atoi(BUILDDATE));
|
||||||
|
|
||||||
|
|
@ -10699,15 +10633,8 @@ void app_main(int32_t argc,const char **argv)
|
||||||
#if defined(POLYMOST) && defined(USE_OPENGL)
|
#if defined(POLYMOST) && defined(USE_OPENGL)
|
||||||
if (glusetexcache == -1)
|
if (glusetexcache == -1)
|
||||||
{
|
{
|
||||||
#if 0
|
ud.config.useprecache = glusetexcompr = 1;
|
||||||
i=wm_ynbox("Texture Cache",
|
glusetexcache = 2;
|
||||||
"Would you like to enable the on-disk texture cache?\n\n"
|
|
||||||
"You generally want to say 'yes' here, especially if using the HRP.");
|
|
||||||
#else
|
|
||||||
i = 1;
|
|
||||||
#endif
|
|
||||||
if (i) ud.config.useprecache = glusetexcompr = 1, glusetexcache = 2;
|
|
||||||
else glusetexcache = 0;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -383,33 +383,6 @@ static int32_t osdcmd_fileinfo(const osdfuncparm_t *parm)
|
||||||
return OSDCMD_OK;
|
return OSDCMD_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
static int32_t osdcmd_rate(const osdfuncparm_t *parm)
|
|
||||||
{
|
|
||||||
#ifndef RANCID_NETWORKING
|
|
||||||
int32_t i;
|
|
||||||
|
|
||||||
if (parm->numparms == 0)
|
|
||||||
{
|
|
||||||
OSD_Printf("\"rate\" is \"%d\"\n", packetrate);
|
|
||||||
return OSDCMD_SHOWHELP;
|
|
||||||
}
|
|
||||||
else if (parm->numparms != 1) return OSDCMD_SHOWHELP;
|
|
||||||
|
|
||||||
i = Batol(parm->parms[0]);
|
|
||||||
|
|
||||||
if (i >= 40 && i <= 1000)
|
|
||||||
{
|
|
||||||
packetrate = i;
|
|
||||||
OSD_Printf("rate %d\n", packetrate);
|
|
||||||
}
|
|
||||||
else OSD_Printf("rate: value out of range\n");
|
|
||||||
#endif
|
|
||||||
UNREFERENCED_PARAMETER(parm);
|
|
||||||
return OSDCMD_OK;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int32_t osdcmd_restartsound(const osdfuncparm_t *parm)
|
static int32_t osdcmd_restartsound(const osdfuncparm_t *parm)
|
||||||
{
|
{
|
||||||
UNREFERENCED_PARAMETER(parm);
|
UNREFERENCED_PARAMETER(parm);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue