ref: b0d1d3ba2cf621625268f38722b1f6aa819b7c79
parent: 655f385834d9f2076c8545199d6d703b226395ae
author: Simon Howard <[email protected]>
date: Fri Feb 24 14:14:22 EST 2006
Remove redundant stuff relating to the old network code Subversion-branch: /trunk/chocolate-doom Subversion-revision: 388
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: d_net.c 386 2006-02-23 23:42:00Z fraggle $
+// $Id: d_net.c 388 2006-02-24 19:14:22Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.22 2006/02/24 19:14:22 fraggle
+// Remove redundant stuff relating to the old network code
+//
// Revision 1.21 2006/02/23 23:42:00 fraggle
// Replace -client with -connect which takes a hostname/ip to connect to.
//
@@ -114,7 +117,7 @@
//-----------------------------------------------------------------------------
-static const char rcsid[] = "$Id: d_net.c 386 2006-02-23 23:42:00Z fraggle $";
+static const char rcsid[] = "$Id: d_net.c 388 2006-02-24 19:14:22Z fraggle $";
#include "d_main.h"
@@ -133,16 +136,7 @@
#include "net_sdl.h"
#include "net_loop.h"
-#define NCMD_EXIT 0x80000000
-#define NCMD_RETRANSMIT 0x40000000
-#define NCMD_SETUP 0x20000000
-#define NCMD_KILL 0x10000000 // kill game
-#define NCMD_CHECKSUM 0x0fffffff
-
-doomcom_t* doomcom;
-
-
//
// NETWORKING
//
@@ -152,8 +146,6 @@
//
// a gametic cannot be run until nettics[] > gametic for all players
//
-#define RESENDCOUNT 10
-#define PL_DRONE 0x80 // bit flag in doomdata->player
ticcmd_t netcmds[MAXPLAYERS][BACKUPTICS];
int nettics[MAXPLAYERS];
@@ -162,7 +154,7 @@
int lastnettic;
int ticdup;
-int maxsend; // BACKUPTICS/(2*ticdup)-1
+int extratics;
void D_ProcessEvents (void);
@@ -253,6 +245,7 @@
consoleplayer = 0;
netgame = false;
ticdup = 1;
+ extratics = 1;
lowres_turn = false;
for (i=0; i<MAXPLAYERS; i++)
--- a/src/d_net.h
+++ b/src/d_net.h
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: d_net.h 373 2006-02-19 13:38:59Z fraggle $
+// $Id: d_net.h 388 2006-02-24 19:14:22Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -32,105 +32,11 @@
#include "d_player.h"
+#define MAXNETNODES 8
-
-
-//
-// Network play related stuff.
-// There is a data struct that stores network
-// communication related stuff, and another
-// one that defines the actual packets to
-// be transmitted.
-//
-
-#define DOOMCOM_ID 0x12345678l
-
-// Max computers/players in a game.
-#define MAXNETNODES 8
-
-
// Networking and tick handling related.
#define BACKUPTICS 128
-typedef enum
-{- CMD_SEND = 1,
- CMD_GET = 2
-
-} command_t;
-
-
-//
-// Network packet data.
-//
-typedef struct
-{- // High bit is retransmit request.
- unsigned checksum;
- // Only valid if NCMD_RETRANSMIT.
- byte retransmitfrom;
-
- byte starttic;
- byte player;
- byte numtics;
- ticcmd_t cmds[BACKUPTICS];
-
-} doomdata_t;
-
-
-
-
-typedef struct
-{- // Supposed to be DOOMCOM_ID?
- long id;
-
- // DOOM executes an int to execute commands.
- short intnum;
- // Communication between DOOM and the driver.
- // Is CMD_SEND or CMD_GET.
- short command;
- // Is dest for send, set by get (-1 = no packet).
- short remotenode;
-
- // Number of bytes in doomdata to be sent
- short datalength;
-
- // Info common to all nodes.
- // Console is allways node 0.
- short numnodes;
- // Flag: 1 = no duplication, 2-5 = dup for slow nets.
- short ticdup;
- // Flag: 1 = send a backup tic in every packet.
- short extratics;
- // Flag: 1 = deathmatch.
- short deathmatch;
- // Flag: -1 = new game, 0-5 = load savegame
- short savegame;
- short episode; // 1-3
- short map; // 1-9
- short skill; // 1-5
-
- // Info specific to this node.
- short consoleplayer;
- short numplayers;
-
- // These are related to the 3-display mode,
- // in which two drones looking left and right
- // were used to render two additional views
- // on two additional computers.
- // Probably not operational anymore.
- // 1 = left, 0 = center, -1 = right
- short angleoffset;
- // 1 = drone
- short drone;
-
- // The packet data to be sent.
- doomdata_t data;
-
-} doomcom_t;
-
-
extern int extratics;
// Create any new ticcmds and broadcast to other players.
@@ -149,6 +55,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.6 2006/02/24 19:14:22 fraggle
+// Remove redundant stuff relating to the old network code
+//
// Revision 1.5 2006/02/19 13:38:59 fraggle
// Increase the size of BACKUPTICS to deal with heavy lag
//
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: doomstat.h 378 2006-02-23 19:12:02Z fraggle $
+// $Id: doomstat.h 388 2006-02-24 19:14:22Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -280,13 +280,7 @@
// Netgame stuff (buffers and pointers, i.e. indices).
-// This is ???
-extern doomcom_t* doomcom;
-// This points inside doomcom.
-extern doomdata_t* netbuffer;
-
-
extern int rndindex;
extern int maketic;
@@ -301,6 +295,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.12 2006/02/24 19:14:22 fraggle
+// Remove redundant stuff relating to the old network code
+//
// Revision 1.11 2006/02/23 19:12:01 fraggle
// Add lowres_turn to indicate whether we generate angleturns which are
// 8-bit as opposed to 16-bit. This is used when recording demos without