stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-27 22:52:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move netcode files to a new folder

Browse source
This commit is contained in:
LJ Sonic 2022-12-31 14:10:19 +01:00
parent 07bc922273
commit 0b17e3c418
54 changed files with 166 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Makefile
View file

@ -207,6 +207,7 @@ objdir:=$(makedir)/objs
sources+=\ sources+=\
$(call List,Sourcefile)\ $(call List,Sourcefile)\
$(call List,blua/Sourcefile)\ $(call List,blua/Sourcefile)\
$(call List,netcode/Sourcefile)\
depends:=$(basename $(filter %.c %.s,$(sources))) depends:=$(basename $(filter %.c %.s,$(sources)))
objects:=$(basename $(filter %.c %.s %.nas,$(sources))) objects:=$(basename $(filter %.c %.s %.nas,$(sources)))

7
src/Sourcefile
View file

@ -1,9 +1,5 @@
string.c string.c
d_main.c d_main.c
d_clisrv.c
d_net.c
d_netfil.c
d_netcmd.c
dehacked.c dehacked.c
deh_soc.c deh_soc.c
deh_lua.c deh_lua.c
@ -77,9 +73,6 @@ s_sound.c
sounds.c sounds.c
w_wad.c w_wad.c
filesrch.c filesrch.c
mserv.c
http-mserv.c
i_tcp.c
lzf.c lzf.c
vid_copy.s vid_copy.s
b_bot.c b_bot.c

2
src/android/i_net.c
View file

@ -1,4 +1,4 @@
#include "../i_net.h" #include "../netcode/i_net.h"
boolean I_InitNetwork(void) boolean I_InitNetwork(void)
{ {

2
src/blua/liolib.c
View file

@ -19,7 +19,7 @@
#include "lualib.h" #include "lualib.h"
#include "../i_system.h" #include "../i_system.h"
#include "../g_game.h" #include "../g_game.h"
#include "../d_netfil.h" #include "../netcode/d_netfil.h"
#include "../lua_libs.h" #include "../lua_libs.h"
#include "../byteptr.h" #include "../byteptr.h"
#include "../lua_script.h" #include "../lua_script.h"

4
src/command.c
View file

@ -28,11 +28,11 @@
#include "byteptr.h" #include "byteptr.h"
#include "p_saveg.h" #include "p_saveg.h"
#include "g_game.h" // for player_names #include "g_game.h" // for player_names
#include "d_netcmd.h" #include "netcode/d_netcmd.h"
#include "hu_stuff.h" #include "hu_stuff.h"
#include "p_setup.h" #include "p_setup.h"
#include "lua_script.h" #include "lua_script.h"
#include "d_netfil.h" // findfile #include "netcode/d_netfil.h" // findfile
#include "r_data.h" // Color_cons_t #include "r_data.h" // Color_cons_t
#include "d_main.h" // D_IsPathAllowed #include "d_main.h" // D_IsPathAllowed

6
src/d_main.c
View file

@ -34,7 +34,7 @@
#include "doomdef.h" #include "doomdef.h"
#include "am_map.h" #include "am_map.h"
#include "console.h" #include "console.h"
#include "d_net.h" #include "netcode/d_net.h"
#include "f_finale.h" #include "f_finale.h"
#include "g_game.h" #include "g_game.h"
#include "hu_stuff.h" #include "hu_stuff.h"
@ -56,11 +56,11 @@
#include "w_wad.h" #include "w_wad.h"
#include "z_zone.h" #include "z_zone.h"
#include "d_main.h" #include "d_main.h"
#include "d_netfil.h" #include "netcode/d_netfil.h"
#include "m_cheat.h" #include "m_cheat.h"
#include "y_inter.h" #include "y_inter.h"
#include "p_local.h" // chasecam #include "p_local.h" // chasecam
#include "mserv.h" // ms_RoomId #include "netcode/mserv.h" // ms_RoomId
#include "m_misc.h" // screenshot functionality #include "m_misc.h" // screenshot functionality
#include "deh_tables.h" // Dehacked list test #include "deh_tables.h" // Dehacked list test
#include "m_cond.h" // condition initialization #include "m_cond.h" // condition initialization

2
src/deh_soc.c
View file

@ -34,7 +34,7 @@
#include "r_sky.h" #include "r_sky.h"
#include "fastcmp.h" #include "fastcmp.h"
#include "lua_script.h" // Reluctantly included for LUA_EvalMath #include "lua_script.h" // Reluctantly included for LUA_EvalMath
#include "d_clisrv.h" #include "netcode/d_clisrv.h"
#ifdef HWRENDER #ifdef HWRENDER
#include "hardware/hw_light.h" #include "hardware/hw_light.h"

2
src/deh_soc.h
View file

@ -35,7 +35,7 @@
#include "r_sky.h" #include "r_sky.h"
#include "fastcmp.h" #include "fastcmp.h"
#include "lua_script.h" // Reluctantly included for LUA_EvalMath #include "lua_script.h" // Reluctantly included for LUA_EvalMath
#include "d_clisrv.h" #include "netcode/d_clisrv.h"
#ifdef HWRENDER #ifdef HWRENDER
#include "hardware/hw_light.h" #include "hardware/hw_light.h"

2
src/doomstat.h
View file

@ -633,7 +633,7 @@ extern boolean singletics;
// Netgame stuff // Netgame stuff
// ============= // =============
#include "d_clisrv.h" #include "netcode/d_clisrv.h"
extern consvar_t cv_timetic; // display high resolution timer extern consvar_t cv_timetic; // display high resolution timer
extern consvar_t cv_powerupdisplay; // display powerups extern consvar_t cv_powerupdisplay; // display powerups

2
src/dummy/i_net.c
View file

@ -1,4 +1,4 @@
#include "../i_net.h" #include "../netcode/i_net.h"
boolean I_InitNetwork(void) boolean I_InitNetwork(void)
{ {

2
src/f_finale.c
View file

@ -14,7 +14,7 @@
#include "doomdef.h" #include "doomdef.h"
#include "doomstat.h" #include "doomstat.h"
#include "d_main.h" #include "d_main.h"
#include "d_netcmd.h" #include "netcode/d_netcmd.h"
#include "f_finale.h" #include "f_finale.h"
#include "g_game.h" #include "g_game.h"
#include "hu_stuff.h" #include "hu_stuff.h"

2
src/filesrch.c
View file

@ -26,7 +26,7 @@
#include <string.h> #include <string.h>
#include "filesrch.h" #include "filesrch.h"
#include "d_netfil.h" #include "netcode/d_netfil.h"
#include "m_misc.h" #include "m_misc.h"
#include "z_zone.h" #include "z_zone.h"
#include "m_menu.h" // Addons_option_Onchange #include "m_menu.h" // Addons_option_Onchange

2
src/filesrch.h
View file

@ -5,7 +5,7 @@
#define __FILESRCH_H__ #define __FILESRCH_H__
#include "doomdef.h" #include "doomdef.h"
#include "d_netfil.h" #include "netcode/d_netfil.h"
#include "m_menu.h" // MAXSTRINGLENGTH #include "m_menu.h" // MAXSTRINGLENGTH
#include "w_wad.h" #include "w_wad.h"

2
src/g_demo.c
View file

@ -15,7 +15,7 @@
#include "console.h" #include "console.h"
#include "d_main.h" #include "d_main.h"
#include "d_player.h" #include "d_player.h"
#include "d_clisrv.h" #include "netcode/d_clisrv.h"
#include "p_setup.h" #include "p_setup.h"
#include "i_time.h" #include "i_time.h"
#include "i_system.h" #include "i_system.h"

2
src/g_game.c
View file

@ -15,7 +15,7 @@
#include "console.h" #include "console.h"
#include "d_main.h" #include "d_main.h"
#include "d_player.h" #include "d_player.h"
#include "d_clisrv.h" #include "netcode/d_clisrv.h"
#include "f_finale.h" #include "f_finale.h"
#include "p_setup.h" #include "p_setup.h"
#include "p_saveg.h" #include "p_saveg.h"

2
src/g_input.c
View file

@ -16,7 +16,7 @@
#include "g_input.h" #include "g_input.h"
#include "keys.h" #include "keys.h"
#include "hu_stuff.h" // need HUFONT start & end #include "hu_stuff.h" // need HUFONT start & end
#include "d_net.h" #include "netcode/d_net.h"
#include "console.h" #include "console.h"
#define MAXMOUSESENSITIVITY 100 // sensitivity steps #define MAXMOUSESENSITIVITY 100 // sensitivity steps

2
src/hardware/hw_main.c
View file

@ -29,7 +29,7 @@
#include "../r_patch.h" #include "../r_patch.h"
#include "../r_picformats.h" #include "../r_picformats.h"
#include "../r_bsp.h" #include "../r_bsp.h"
#include "../d_clisrv.h" #include "../netcode/d_clisrv.h"
#include "../w_wad.h" #include "../w_wad.h"
#include "../z_zone.h" #include "../z_zone.h"
#include "../r_splats.h" #include "../r_splats.h"

2
src/hu_stuff.c
View file

@ -19,7 +19,7 @@
#include "m_cond.h" // emblems #include "m_cond.h" // emblems
#include "m_misc.h" // word jumping #include "m_misc.h" // word jumping
#include "d_clisrv.h" #include "netcode/d_clisrv.h"
#include "g_game.h" #include "g_game.h"
#include "g_input.h" #include "g_input.h"

2
src/i_time.c
View file

@ -17,7 +17,7 @@
#include "command.h" #include "command.h"
#include "doomtype.h" #include "doomtype.h"
#include "d_netcmd.h" #include "netcode/d_netcmd.h"
#include "m_fixed.h" #include "m_fixed.h"
#include "i_system.h" #include "i_system.h"

4
src/lua_baselib.c
View file

@ -26,11 +26,11 @@
#include "y_inter.h" #include "y_inter.h"
#include "hu_stuff.h" // HU_AddChatText #include "hu_stuff.h" // HU_AddChatText
#include "console.h" #include "console.h"
#include "d_netcmd.h" // IsPlayerAdmin #include "netcode/d_netcmd.h" // IsPlayerAdmin
#include "m_menu.h" // Player Setup menu color stuff #include "m_menu.h" // Player Setup menu color stuff
#include "m_misc.h" // M_MapNumber #include "m_misc.h" // M_MapNumber
#include "b_bot.h" // B_UpdateBotleader #include "b_bot.h" // B_UpdateBotleader
#include "d_clisrv.h" // CL_RemovePlayer #include "netcode/d_clisrv.h" // CL_RemovePlayer
#include "i_system.h" // I_GetPreciseTime, I_GetPrecisePrecision #include "i_system.h" // I_GetPreciseTime, I_GetPrecisePrecision
#include "lua_script.h" #include "lua_script.h"

2
src/lua_hooklib.c
View file

@ -24,7 +24,7 @@
#include "lua_hud.h" // hud_running errors #include "lua_hud.h" // hud_running errors
#include "m_perfstats.h" #include "m_perfstats.h"
#include "d_netcmd.h" // for cv_perfstats #include "netcode/d_netcmd.h" // for cv_perfstats
#include "i_system.h" // I_GetPreciseTime #include "i_system.h" // I_GetPreciseTime
/* ========================================================================= /* =========================================================================

2
src/lua_script.c
View file

@ -28,7 +28,7 @@
#include "p_slopes.h" // for P_SlopeById and slopelist #include "p_slopes.h" // for P_SlopeById and slopelist
#include "p_polyobj.h" // polyobj_t, PolyObjects #include "p_polyobj.h" // polyobj_t, PolyObjects
#ifdef LUA_ALLOW_BYTECODE #ifdef LUA_ALLOW_BYTECODE
#include "d_netfil.h" // for LUA_DumpFile #include "netcode/d_netfil.h" // for LUA_DumpFile
#endif #endif
#include "lua_script.h" #include "lua_script.h"

2
src/m_cheat.c
View file

@ -19,7 +19,7 @@
#include "r_local.h" #include "r_local.h"
#include "p_local.h" #include "p_local.h"
#include "p_setup.h" #include "p_setup.h"
#include "d_net.h" #include "netcode/d_net.h"
#include "m_cheat.h" #include "m_cheat.h"
#include "m_menu.h" #include "m_menu.h"

6
src/m_menu.c
View file

@ -20,7 +20,7 @@
#include "doomdef.h" #include "doomdef.h"
#include "d_main.h" #include "d_main.h"
#include "d_netcmd.h" #include "netcode/d_netcmd.h"
#include "console.h" #include "console.h"
#include "r_fps.h" #include "r_fps.h"
#include "r_local.h" #include "r_local.h"
@ -53,8 +53,8 @@
#include "hardware/hw_main.h" #include "hardware/hw_main.h"
#endif #endif
#include "d_net.h" #include "netcode/d_net.h"
#include "mserv.h" #include "netcode/mserv.h"
#include "m_misc.h" #include "m_misc.h"
#include "m_anigif.h" #include "m_anigif.h"
#include "byteptr.h" #include "byteptr.h"

2
src/m_menu.h
View file

@ -20,7 +20,7 @@
#include "command.h" #include "command.h"
#include "f_finale.h" // for ttmode_enum #include "f_finale.h" // for ttmode_enum
#include "i_threads.h" #include "i_threads.h"
#include "mserv.h" #include "netcode/mserv.h"
#include "r_things.h" // for SKINNAMESIZE #include "r_things.h" // for SKINNAMESIZE
// Compatibility with old-style named NiGHTS replay files. // Compatibility with old-style named NiGHTS replay files.

2
src/m_perfstats.c
View file

@ -12,7 +12,7 @@
#include "m_perfstats.h" #include "m_perfstats.h"
#include "v_video.h" #include "v_video.h"
#include "i_video.h" #include "i_video.h"
#include "d_netcmd.h" #include "netcode/d_netcmd.h"
#include "r_main.h" #include "r_main.h"
#include "i_system.h" #include "i_system.h"
#include "z_zone.h" #include "z_zone.h"

7
src/netcode/Sourcefile Normal file
View file

@ -0,0 +1,7 @@
d_clisrv.c
d_net.c
d_netcmd.c
d_netfil.c
http-mserv.c
i_tcp.c
mserv.c

68
src/d_clisrv.c → src/netcode/d_clisrv.c Executable file → Normal file
View file

@ -15,48 +15,48 @@
#include <unistd.h> //for unlink #include <unistd.h> //for unlink
#endif #endif
#include "i_time.h" #include "../i_time.h"
#include "i_net.h" #include "i_net.h"
#include "i_system.h" #include "../i_system.h"
#include "i_video.h" #include "../i_video.h"
#include "d_net.h" #include "d_net.h"
#include "d_main.h" #include "../d_main.h"
#include "g_game.h" #include "../g_game.h"
#include "st_stuff.h" #include "../st_stuff.h"
#include "hu_stuff.h" #include "../hu_stuff.h"
#include "keys.h" #include "../keys.h"
#include "g_input.h" #include "../g_input.h"
#include "i_gamepad.h" #include "../i_gamepad.h"
#include "m_menu.h" #include "../m_menu.h"
#include "console.h" #include "../console.h"
#include "d_netfil.h" #include "d_netfil.h"
#include "byteptr.h" #include "../byteptr.h"
#include "p_saveg.h" #include "../p_saveg.h"
#include "z_zone.h" #include "../z_zone.h"
#include "p_local.h" #include "../p_local.h"
#include "p_haptic.h" #include "../p_haptic.h"
#include "m_misc.h" #include "../m_misc.h"
#include "am_map.h" #include "../am_map.h"
#include "m_random.h" #include "../m_random.h"
#include "mserv.h" #include "mserv.h"
#include "y_inter.h" #include "../y_inter.h"
#include "r_local.h" #include "../r_local.h"
#include "m_argv.h" #include "../m_argv.h"
#include "p_setup.h" #include "../p_setup.h"
#include "lzf.h" #include "../lzf.h"
#include "lua_script.h" #include "../lua_script.h"
#include "lua_hook.h" #include "../lua_hook.h"
#include "lua_libs.h" #include "../lua_libs.h"
#include "md5.h" #include "../md5.h"
#include "m_perfstats.h" #include "../m_perfstats.h"
// aaaaaa // aaaaaa
#include "i_gamepad.h" #include "../i_gamepad.h"
// cl loading screen // cl loading screen
#include "v_video.h" #include "../v_video.h"
#include "f_finale.h" #include "../f_finale.h"
#include "snake.h" #include "../snake.h"
// //
// NETWORKING // NETWORKING

6
src/d_clisrv.h → src/netcode/d_clisrv.h
View file

@ -13,12 +13,12 @@
#ifndef __D_CLISRV__ #ifndef __D_CLISRV__
#define __D_CLISRV__ #define __D_CLISRV__
#include "d_ticcmd.h" #include "../d_ticcmd.h"
#include "d_net.h" #include "d_net.h"
#include "d_netcmd.h" #include "d_netcmd.h"
#include "d_net.h" #include "d_net.h"
#include "tables.h" #include "../tables.h"
#include "d_player.h" #include "../d_player.h"
#include "mserv.h" #include "mserv.h"
/* /*

16
src/d_net.c → src/netcode/d_net.c
View file

@ -16,19 +16,19 @@
/// This protocol uses a mix of "goback n" and "selective repeat" implementation /// This protocol uses a mix of "goback n" and "selective repeat" implementation
/// The NOTHING packet is sent when connection is idle to acknowledge packets /// The NOTHING packet is sent when connection is idle to acknowledge packets
#include "doomdef.h" #include "../doomdef.h"
#include "g_game.h" #include "../g_game.h"
#include "i_time.h" #include "../i_time.h"
#include "i_net.h" #include "i_net.h"
#include "i_system.h" #include "../i_system.h"
#include "m_argv.h" #include "../m_argv.h"
#include "d_net.h" #include "d_net.h"
#include "w_wad.h" #include "../w_wad.h"
#include "d_netfil.h" #include "d_netfil.h"
#include "d_clisrv.h" #include "d_clisrv.h"
#include "z_zone.h" #include "../z_zone.h"
#include "i_tcp.h" #include "i_tcp.h"
#include "d_main.h" // srb2home #include "../d_main.h" // srb2home
// //
// NETWORKING // NETWORKING

0
src/d_net.h → src/netcode/d_net.h
View file

66
src/d_netcmd.c → src/netcode/d_netcmd.c
View file

@ -12,44 +12,44 @@
/// commands are executed through the command buffer /// commands are executed through the command buffer
/// like console commands, other miscellaneous commands (at the end) /// like console commands, other miscellaneous commands (at the end)
#include "doomdef.h" #include "../doomdef.h"
#include "console.h" #include "../console.h"
#include "command.h" #include "../command.h"
#include "i_time.h" #include "../i_time.h"
#include "i_system.h" #include "../i_system.h"
#include "g_game.h" #include "../g_game.h"
#include "hu_stuff.h" #include "../hu_stuff.h"
#include "g_input.h" #include "../g_input.h"
#include "i_gamepad.h" #include "../i_gamepad.h"
#include "m_menu.h" #include "../m_menu.h"
#include "r_local.h" #include "../r_local.h"
#include "r_skins.h" #include "../r_skins.h"
#include "p_local.h" #include "../p_local.h"
#include "p_setup.h" #include "../p_setup.h"
#include "s_sound.h" #include "../s_sound.h"
#include "i_sound.h" #include "../i_sound.h"
#include "m_misc.h" #include "../m_misc.h"
#include "am_map.h" #include "../am_map.h"
#include "byteptr.h" #include "../byteptr.h"
#include "d_netfil.h" #include "d_netfil.h"
#include "p_spec.h" #include "../p_spec.h"
#include "m_cheat.h" #include "../m_cheat.h"
#include "d_clisrv.h" #include "d_clisrv.h"
#include "d_net.h" #include "d_net.h"
#include "v_video.h" #include "../v_video.h"
#include "d_main.h" #include "../d_main.h"
#include "m_random.h" #include "../m_random.h"
#include "f_finale.h" #include "../f_finale.h"
#include "filesrch.h" #include "../filesrch.h"
#include "mserv.h" #include "mserv.h"
#include "z_zone.h" #include "../z_zone.h"
#include "lua_script.h" #include "../lua_script.h"
#include "lua_hook.h" #include "../lua_hook.h"
#include "m_cond.h" #include "../m_cond.h"
#include "m_anigif.h" #include "../m_anigif.h"
#include "md5.h" #include "../md5.h"
#include "m_perfstats.h" #include "../m_perfstats.h"
#ifdef NETGAME_DEVMODE #ifdef NETGAME_DEVMODE
#define CV_RESTRICT CV_NETVAR #define CV_RESTRICT CV_NETVAR

2
src/d_netcmd.h → src/netcode/d_netcmd.h
View file

@ -15,7 +15,7 @@
#ifndef __D_NETCMD__ #ifndef __D_NETCMD__
#define __D_NETCMD__ #define __D_NETCMD__
#include "command.h" #include "../command.h"
// console vars // console vars
extern consvar_t cv_playername; extern consvar_t cv_playername;

30
src/d_netfil.c → src/netcode/d_netfil.c
View file

@ -31,24 +31,24 @@
#include <sys/utime.h> #include <sys/utime.h>
#endif #endif
#include "doomdef.h" #include "../doomdef.h"
#include "doomstat.h" #include "../doomstat.h"
#include "d_main.h" #include "../d_main.h"
#include "g_game.h" #include "../g_game.h"
#include "i_time.h" #include "../i_time.h"
#include "i_net.h" #include "i_net.h"
#include "i_system.h" #include "../i_system.h"
#include "m_argv.h" #include "../m_argv.h"
#include "d_net.h" #include "d_net.h"
#include "w_wad.h" #include "../w_wad.h"
#include "d_netfil.h" #include "d_netfil.h"
#include "z_zone.h" #include "../z_zone.h"
#include "byteptr.h" #include "../byteptr.h"
#include "p_setup.h" #include "../p_setup.h"
#include "m_misc.h" #include "../m_misc.h"
#include "m_menu.h" #include "../m_menu.h"
#include "md5.h" #include "../md5.h"
#include "filesrch.h" #include "../filesrch.h"
#include <errno.h> #include <errno.h>

2
src/d_netfil.h → src/netcode/d_netfil.h
View file

@ -15,7 +15,7 @@
#include "d_net.h" #include "d_net.h"
#include "d_clisrv.h" #include "d_clisrv.h"
#include "w_wad.h" #include "../w_wad.h"
typedef enum typedef enum
{ {

10
src/http-mserv.c → src/netcode/http-mserv.c
View file

@ -18,14 +18,14 @@ Documentation available here.
#include <curl/curl.h> #include <curl/curl.h>
#endif #endif
#include "doomdef.h" #include "../doomdef.h"
#include "d_clisrv.h" #include "d_clisrv.h"
#include "command.h" #include "../command.h"
#include "m_argv.h" #include "../m_argv.h"
#include "m_menu.h" #include "../m_menu.h"
#include "mserv.h" #include "mserv.h"
#include "i_tcp.h"/* for current_port */ #include "i_tcp.h"/* for current_port */
#include "i_threads.h" #include "../i_threads.h"
/* reasonable default I guess?? */ /* reasonable default I guess?? */
#define DEFAULT_BUFFER_SIZE (4096) #define DEFAULT_BUFFER_SIZE (4096)

0
src/i_addrinfo.c → src/netcode/i_addrinfo.c
View file

0
src/i_addrinfo.h → src/netcode/i_addrinfo.h
View file

4
src/i_net.h → src/netcode/i_net.h
View file

@ -18,8 +18,8 @@
#pragma interface #pragma interface
#endif #endif
#include "doomdef.h" #include "../doomdef.h"
#include "command.h" #include "../command.h"
/// \brief program net id /// \brief program net id
#define DOOMCOM_ID (INT32)0x12345678l #define DOOMCOM_ID (INT32)0x12345678l

8
src/i_tcp.c → src/netcode/i_tcp.c
View file

@ -36,7 +36,7 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif
#include "doomdef.h" #include "../doomdef.h"
#ifdef USE_WINSOCK1 #ifdef USE_WINSOCK1
#include <winsock.h> #include <winsock.h>
@ -122,14 +122,14 @@ typedef union
#define MAXBANS 100 #define MAXBANS 100
#include "i_system.h" #include "../i_system.h"
#include "i_net.h" #include "i_net.h"
#include "d_net.h" #include "d_net.h"
#include "d_netfil.h" #include "d_netfil.h"
#include "i_tcp.h" #include "i_tcp.h"
#include "m_argv.h" #include "../m_argv.h"
#include "doomstat.h" #include "../doomstat.h"
// win32 // win32
#ifdef USE_WINSOCK #ifdef USE_WINSOCK

0
src/i_tcp.h → src/netcode/i_tcp.h
View file

12
src/mserv.c → src/netcode/mserv.c
View file

@ -15,13 +15,13 @@
#include <time.h> #include <time.h>
#endif #endif
#include "doomstat.h" #include "../doomstat.h"
#include "doomdef.h" #include "../doomdef.h"
#include "command.h" #include "../command.h"
#include "i_threads.h" #include "../i_threads.h"
#include "mserv.h" #include "mserv.h"
#include "m_menu.h" #include "../m_menu.h"
#include "z_zone.h" #include "../z_zone.h"
#ifdef MASTERSERVER #ifdef MASTERSERVER

2
src/mserv.h → src/netcode/mserv.h
View file

@ -14,7 +14,7 @@
#ifndef _MSERV_H_ #ifndef _MSERV_H_
#define _MSERV_H_ #define _MSERV_H_
#include "i_threads.h" #include "../i_threads.h"
// lowered from 32 due to menu changes // lowered from 32 due to menu changes
#define NUM_LIST_ROOMS 16 #define NUM_LIST_ROOMS 16

2
src/p_ceilng.c
View file

@ -17,7 +17,7 @@
#include "r_main.h" #include "r_main.h"
#include "s_sound.h" #include "s_sound.h"
#include "z_zone.h" #include "z_zone.h"
#include "d_netcmd.h" #include "netcode/d_netcmd.h"
// ========================================================================== // ==========================================================================
// CEILINGS // CEILINGS

2
src/p_lights.c
View file

@ -17,7 +17,7 @@
#include "r_state.h" #include "r_state.h"
#include "z_zone.h" #include "z_zone.h"
#include "m_random.h" #include "m_random.h"
#include "d_netcmd.h" #include "netcode/d_netcmd.h"
/** Removes any active lighting effects in a sector. /** Removes any active lighting effects in a sector.
* *

2
src/p_user.c
View file

@ -17,7 +17,7 @@
#include "doomdef.h" #include "doomdef.h"
#include "i_system.h" #include "i_system.h"
#include "d_event.h" #include "d_event.h"
#include "d_net.h" #include "netcode/d_net.h"
#include "g_game.h" #include "g_game.h"
#include "p_local.h" #include "p_local.h"
#include "r_fps.h" #include "r_fps.h"

2
src/r_segs.c
View file

@ -20,7 +20,7 @@
#include "w_wad.h" #include "w_wad.h"
#include "z_zone.h" #include "z_zone.h"
#include "d_netcmd.h" #include "netcode/d_netcmd.h"
#include "m_misc.h" #include "m_misc.h"
#include "p_local.h" // Camera... #include "p_local.h" // Camera...
#include "p_slopes.h" #include "p_slopes.h"

2
src/r_things.c
View file

@ -34,7 +34,7 @@
#include "p_tick.h" #include "p_tick.h"
#include "p_local.h" #include "p_local.h"
#include "p_slopes.h" #include "p_slopes.h"
#include "d_netfil.h" // blargh. for nameonly(). #include "netcode/d_netfil.h" // blargh. for nameonly().
#include "m_cheat.h" // objectplace #include "m_cheat.h" // objectplace
#ifdef HWRENDER #ifdef HWRENDER
#include "hardware/hw_md2.h" #include "hardware/hw_md2.h"

2
src/screen.c
View file

@ -27,7 +27,7 @@
#include "hu_stuff.h" #include "hu_stuff.h"
#include "z_zone.h" #include "z_zone.h"
#include "d_main.h" #include "d_main.h"
#include "d_clisrv.h" #include "netcode/d_clisrv.h"
#include "f_finale.h" #include "f_finale.h"
#include "y_inter.h" // usebuffer #include "y_inter.h" // usebuffer
#include "i_sound.h" // closed captions #include "i_sound.h" // closed captions

6
src/sdl/i_net.c
View file

@ -21,16 +21,16 @@
#include "../i_system.h" #include "../i_system.h"
#include "../d_event.h" #include "../d_event.h"
#include "../d_net.h" #include "../netcode/d_net.h"
#include "../m_argv.h" #include "../m_argv.h"
#include "../doomstat.h" #include "../doomstat.h"
#include "../i_net.h" #include "../netcode/i_net.h"
#include "../z_zone.h" #include "../z_zone.h"
#include "../i_tcp.h" #include "../netcode/i_tcp.h"
#ifdef HAVE_SDL #ifdef HAVE_SDL

4
src/sdl/i_system.c
View file

@ -193,7 +193,7 @@ static char returnWadPath[256];
#include "../i_system.h" #include "../i_system.h"
#include "../i_threads.h" #include "../i_threads.h"
#include "../screen.h" //vid.WndParent #include "../screen.h" //vid.WndParent
#include "../d_net.h" #include "../netcode/d_net.h"
#include "../g_game.h" #include "../g_game.h"
#include "../filesrch.h" #include "../filesrch.h"
#include "endtxt.h" #include "endtxt.h"
@ -214,7 +214,7 @@ static char returnWadPath[256];
#if !defined(NOMUMBLE) && defined(HAVE_MUMBLE) #if !defined(NOMUMBLE) && defined(HAVE_MUMBLE)
// Mumble context string // Mumble context string
#include "../d_clisrv.h" #include "../netcode/d_clisrv.h"
#include "../byteptr.h" #include "../byteptr.h"
#endif #endif

2
src/sdl/i_ttf.c
View file

@ -21,7 +21,7 @@
#include "SDL_ttf.h" #include "SDL_ttf.h"
#include "../doomdef.h" #include "../doomdef.h"
#include "../doomstat.h" #include "../doomstat.h"
#include "../d_netfil.h" #include "../netcode/d_netfil.h"
#include "../filesrch.h" #include "../filesrch.h"
#include "i_ttf.h" #include "i_ttf.h"

4
src/w_wad.c
View file

@ -51,8 +51,8 @@
#include "filesrch.h" #include "filesrch.h"
#include "d_main.h" #include "d_main.h"
#include "d_netfil.h" #include "netcode/d_netfil.h"
#include "d_clisrv.h" #include "netcode/d_clisrv.h"
#include "dehacked.h" #include "dehacked.h"
#include "r_defs.h" #include "r_defs.h"
#include "r_data.h" #include "r_data.h"

2
src/y_inter.c
View file

@ -15,7 +15,7 @@
#include "f_finale.h" #include "f_finale.h"
#include "g_game.h" #include "g_game.h"
#include "hu_stuff.h" #include "hu_stuff.h"
#include "i_net.h" #include "netcode/i_net.h"
#include "i_video.h" #include "i_video.h"
#include "p_tick.h" #include "p_tick.h"
#include "r_defs.h" #include "r_defs.h"