Abstracting networking protocols - Step 1: Renaming network-related files; Removing net_ipx.h (former network.h) includes from as much files as possible to make isolation of IPX-related functions easier in Step 2; Version defines Cleanup - needed later for good Version-Checking
This commit is contained in:
parent
b537639fac
commit
8da36f8873
|
@ -1,5 +1,9 @@
|
|||
D2X-Rebirth Changelog
|
||||
|
||||
20090304
|
||||
--------
|
||||
various: Abstracting networking protocols - Step 1: Renaming network-related files; Removing net_ipx.h (former network.h) includes from as much files as possible to make isolation of IPX-related functions easier in Step 2; Version defines Cleanup - needed later for good Version-Checking
|
||||
|
||||
20090303
|
||||
--------
|
||||
arch/include/digi_mixer_music.h, arch/include/jukebox.h, arch/sdl/digi_mixer_music.c, arch/sdl/digi_mixer.c, arch/sdl/digi.c, arch/sdl/init.c, arch/sdl/jukebox.c, arch/sdl/rbaudio.c, include/rbaudio.h, main/automap.c, main/config.h, main/credits.c, main/digi.h, main/game.c, main/gamecntl.c, main/kconfig.c, main/kmatrix.c, main/menu.c, main/network.c, main/newmenu.c, main/scores.c, main/songs.c, main/songs.h: Associate the jukebox with Redbook Audio via new 'extmusic' layer - separating from MIDI and making it handle ALL music (not just game music)
|
||||
|
|
|
@ -135,10 +135,10 @@ common_sources = [
|
|||
'main/movie.c',
|
||||
'main/multi.c',
|
||||
'main/multibot.c',
|
||||
'main/net_ipx.c',
|
||||
'main/netdrv.c',
|
||||
'main/netdrv_udp.c',
|
||||
'main/netpkt.c',
|
||||
'main/network.c',
|
||||
'main/newdemo.c',
|
||||
'main/newmenu.c',
|
||||
'main/noloss.c',
|
||||
|
@ -241,8 +241,8 @@ editor_sources = [
|
|||
|
||||
# for linux
|
||||
arch_linux_sources = [
|
||||
'arch/linux/netdrv_ipx.c',
|
||||
'arch/linux/netdrv_kali.c',
|
||||
'arch/linux/ipx.c',
|
||||
'arch/linux/ipx_kali.c',
|
||||
'arch/linux/ukali.c'
|
||||
]
|
||||
|
||||
|
@ -260,7 +260,7 @@ if (sdlmixer == 1):
|
|||
# for windows
|
||||
arch_win32_sources = [
|
||||
'arch/win32/hmpfile.c',
|
||||
'arch/win32/netdrv_ipx.c',
|
||||
'arch/win32/ipx.c',
|
||||
]
|
||||
|
||||
# for Mac OS X
|
||||
|
|
|
@ -55,7 +55,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "multibot.h"
|
||||
#ifdef NETWORK
|
||||
#include "multi.h"
|
||||
#include "network.h"
|
||||
#endif
|
||||
#include "gameseq.h"
|
||||
#include "key.h"
|
||||
|
|
|
@ -54,7 +54,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "multibot.h"
|
||||
#ifdef NETWORK
|
||||
#include "multi.h"
|
||||
#include "network.h"
|
||||
#endif
|
||||
#include "gameseq.h"
|
||||
#include "key.h"
|
||||
|
|
|
@ -58,7 +58,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "gamefont.h"
|
||||
#ifdef NETWORK
|
||||
#include "multi.h"
|
||||
#include "network.h"
|
||||
#endif
|
||||
#include "kconfig.h"
|
||||
#include "endlevel.h"
|
||||
|
|
|
@ -55,9 +55,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "player.h"
|
||||
#include "gauges.h"
|
||||
#include "powerup.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#endif
|
||||
#include "newmenu.h"
|
||||
#include "scores.h"
|
||||
#include "effects.h"
|
||||
|
|
|
@ -61,7 +61,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "vclip.h"
|
||||
#include "fireball.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
#endif
|
||||
#include "text.h"
|
||||
#include "digi.h"
|
||||
|
|
|
@ -47,7 +47,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "collide.h"
|
||||
#include "newmenu.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
#endif
|
||||
#include "gameseq.h"
|
||||
#include "physics.h"
|
||||
|
|
|
@ -49,7 +49,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "collide.h"
|
||||
#include "laser.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#include "multi.h"
|
||||
#endif
|
||||
#include "multibot.h"
|
||||
|
|
|
@ -75,9 +75,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "powerup.h"
|
||||
#include "fireball.h"
|
||||
#include "newmenu.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#endif
|
||||
#include "gamefont.h"
|
||||
#include "endlevel.h"
|
||||
#include "kconfig.h"
|
||||
|
|
|
@ -71,9 +71,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "powerup.h"
|
||||
#include "songs.h"
|
||||
#include "newmenu.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#endif
|
||||
#include "gamefont.h"
|
||||
#include "endlevel.h"
|
||||
#include "kconfig.h"
|
||||
|
|
|
@ -55,7 +55,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "gameseq.h"
|
||||
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
#endif
|
||||
|
||||
#ifdef OGL
|
||||
|
|
|
@ -79,7 +79,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "endlevel.h"
|
||||
#ifdef NETWORK
|
||||
# include "multi.h"
|
||||
# include "network.h"
|
||||
# include "netpkt.h"
|
||||
#endif
|
||||
#include "playsave.h"
|
||||
|
|
|
@ -44,7 +44,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "sounds.h"
|
||||
#ifdef NETWORK
|
||||
#include "multi.h"
|
||||
#include "network.h"
|
||||
#endif
|
||||
#include "endlevel.h"
|
||||
#include "cntrlcen.h"
|
||||
|
|
|
@ -77,9 +77,6 @@ char copyright[] = "DESCENT II COPYRIGHT (C) 1994-1996 PARALLAX SOFTWARE CORPOR
|
|||
#include "player.h"
|
||||
#include "text.h"
|
||||
#include "gauges.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#endif
|
||||
#include "gamefont.h"
|
||||
#include "kconfig.h"
|
||||
#include "mouse.h"
|
||||
|
|
|
@ -50,7 +50,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "kmatrix.h"
|
||||
#include "gauges.h"
|
||||
#include "pcx.h"
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
|
||||
#ifdef OGL
|
||||
#include "ogl_init.h"
|
||||
|
|
|
@ -48,9 +48,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "timer.h"
|
||||
#include "player.h"
|
||||
#include "sounds.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#endif
|
||||
#include "ai.h"
|
||||
#include "powerup.h"
|
||||
#include "multi.h"
|
||||
|
|
|
@ -50,7 +50,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "gamefont.h"
|
||||
#include "newmenu.h"
|
||||
#ifdef NETWORK
|
||||
# include "network.h"
|
||||
# include "net_ipx.h"
|
||||
# include "netdrv.h"
|
||||
# include "multi.h"
|
||||
#endif
|
||||
|
|
|
@ -30,7 +30,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "u_mem.h"
|
||||
#include "strutil.h"
|
||||
#include "game.h"
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
#include "multi.h"
|
||||
#include "object.h"
|
||||
#include "laser.h"
|
||||
|
|
|
@ -29,7 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "object.h"
|
||||
#include "multibot.h"
|
||||
#include "game.h"
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
#include "multi.h"
|
||||
#include "laser.h"
|
||||
#include "error.h"
|
||||
|
|
|
@ -42,7 +42,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "player.h"
|
||||
#include "gameseq.h"
|
||||
#include "fireball.h"
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
#include "game.h"
|
||||
#include "multi.h"
|
||||
#include "endlevel.h"
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: network.h,v 1.1.1.1 2006/03/17 19:56:24 zicodxx Exp $ */
|
||||
/* $Id: net_ipx.h,v 1.1.1.1 2006/03/17 19:56:24 zicodxx Exp $ */
|
||||
/*
|
||||
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
||||
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
|
@ -37,7 +37,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "config.h"
|
||||
#include "args.h"
|
||||
#include "text.h"
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
#include "console.h"
|
||||
#include "netdrv.h"
|
||||
#include "checker.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include "console.h"
|
||||
#include "error.h"
|
||||
#include "netdrv.h"
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
#include "timer.h"
|
||||
#include "netdrv_udp.h"
|
||||
#include "key.h"
|
||||
|
|
|
@ -113,7 +113,7 @@ ushort netmisc_calc_checksum(void * vptr, int len)
|
|||
|
||||
#include "multi.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
#endif
|
||||
#include "object.h"
|
||||
#include "powerup.h"
|
||||
|
|
|
@ -22,7 +22,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#define _NETMISC_H
|
||||
|
||||
#include "multi.h"
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
|
||||
// Returns a checksum of a block of memory.
|
||||
extern ushort netmisc_calc_checksum(void *vptr, int len);
|
||||
|
|
|
@ -88,7 +88,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "palette.h"
|
||||
#include "multi.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
#endif
|
||||
#include "text.h"
|
||||
#include "cntrlcen.h"
|
||||
|
|
|
@ -51,9 +51,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "newmenu.h"
|
||||
#include "gamefont.h"
|
||||
#include "gamepal.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#endif
|
||||
#include "iff.h"
|
||||
#include "pcx.h"
|
||||
#include "u_mem.h"
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include "strutil.h"
|
||||
#include "pstypes.h"
|
||||
#include "netpkt.h"
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
#include "game.h"
|
||||
#include "multi.h"
|
||||
#include "netpkt.h"
|
||||
|
|
|
@ -62,9 +62,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "newdemo.h"
|
||||
#include "player.h"
|
||||
#include "weapon.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#endif
|
||||
#include "newmenu.h"
|
||||
#include "gauges.h"
|
||||
#include "multi.h"
|
||||
|
|
|
@ -85,7 +85,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "laser.h"
|
||||
#include "state.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#include "net_ipx.h"
|
||||
#endif
|
||||
#ifdef OGL
|
||||
#include "gr.h"
|
||||
|
|
|
@ -43,9 +43,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "endlevel.h"
|
||||
#include "gameseq.h"
|
||||
#include "multi.h"
|
||||
#ifdef NETWORK
|
||||
#include "network.h"
|
||||
#endif
|
||||
#include "palette.h"
|
||||
#include "robot.h"
|
||||
#include "bm.h"
|
||||
|
|
|
@ -1,9 +1,4 @@
|
|||
/* $Id: vers_id.h,v 1.1.1.1 2006/03/17 19:57:28 zicodxx Exp $ */
|
||||
//
|
||||
// Auto-generated include file [used to be]
|
||||
// Generated by MAKE from INFERNO.INI settings
|
||||
//
|
||||
|
||||
/* Version defines */
|
||||
|
||||
#ifndef _VERS_ID
|
||||
#define _VERS_ID
|
||||
|
@ -12,12 +7,12 @@
|
|||
|
||||
#ifdef D2XMICRO
|
||||
#define VERSION D2XMAJOR "." D2XMINOR "." D2XMICRO
|
||||
#define D2X_IVER (atoi(D2XMAJOR)*10000+atoi(D2XMINOR)*100+atoi(D2XMICRO)
|
||||
#else
|
||||
#define VERSION D2XMAJOR "." D2XMINOR
|
||||
#define D2X_IVER (atoi(D2XMAJOR)*10000+atoi(D2XMINOR)*100)
|
||||
#endif
|
||||
|
||||
#define DESCENT_VERSION "D2X-Rebirth v" VERSION
|
||||
// #define D2X_IVER (D2XMAJOR*10000+D2XMINOR*100+D2XMICRO)
|
||||
#define D2X_IVER (atoi(D2XMAJOR)*1000+atoi(D2XMINOR)*10)
|
||||
|
||||
#endif /* _VERS_ID */
|
||||
|
|
Loading…
Reference in a new issue