From 11f62025dae26431ac675d3aa7584eece652216a Mon Sep 17 00:00:00 2001
From: RedEnchilada <red@lyrawearspants.com>
Date: Wed, 15 Jun 2016 23:15:14 -0500
Subject: [PATCH] Made the game compile again
I don't know if networking still works.
---
src/Makefile | 8 +++-----
src/lua_consolelib.c | 4 ++--
src/p_inter.c | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index f7a8c1b85e..118ff713ac 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -414,7 +414,6 @@ OBJS:=$(i_main_o) \
$(OBJDIR)/string.o \
$(OBJDIR)/d_main.o \
$(OBJDIR)/d_clisrv.o \
- $(OBJDIR)/d_net.o \
$(OBJDIR)/d_netfil.o \
$(OBJDIR)/d_netcmd.o \
$(OBJDIR)/dehacked.o \
@@ -473,13 +472,12 @@ OBJS:=$(i_main_o) \
$(OBJDIR)/sounds.o \
$(OBJDIR)/w_wad.o \
$(OBJDIR)/filesrch.o \
- $(OBJDIR)/mserv.o \
- $(OBJDIR)/i_tcp.o \
- $(OBJDIR)/lzf.o \
+ $(OBJDIR)/lzf.o \
$(OBJDIR)/vid_copy.o \
+ $(OBJDIR)/d_enet.o \
+ $(OBJDIR)/d_datawrap.o \
$(OBJDIR)/b_bot.o \
$(i_cdmus_o) \
- $(i_net_o) \
$(i_system_o) \
$(i_sound_o) \
$(OBJS)
diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c
index 28cc917628..6685445659 100644
--- a/src/lua_consolelib.c
+++ b/src/lua_consolelib.c
@@ -79,14 +79,14 @@ deny:
//must be hacked/buggy client
lua_settop(gL, 0); // clear stack
CONS_Alert(CONS_WARNING, M_GetText("Illegal lua command received from %s\n"), player_names[playernum]);
- if (server)
+ /*if (server)
{
XBOXSTATIC UINT8 bufn[2];
bufn[0] = (UINT8)playernum;
bufn[1] = KICK_MSG_CON_FAIL;
SendNetXCmd(XD_KICK, &bufn, 2);
- }
+ }*/ ///@NET TODO
}
// Wrapper for COM_AddCommand commands
diff --git a/src/p_inter.c b/src/p_inter.c
index faec17355c..7d869ec758 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -3141,7 +3141,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
// Killing dead. Just for kicks.
// Require source and inflictor be player. Don't hurt for firing rings.
if (cv_killingdead.value && (source && source->player) && (inflictor && inflictor->player) && P_RandomChance(5*FRACUNIT/16))
- P_DamageMobj(source, target, target, 1);
+ P_DamageMobj(source, target, target, 1, 0);
// do the damage
if (player && player->powers[pw_super] && ALL7EMERALDS(player->powers[pw_emeralds]) && inflictor && ((inflictor->flags & MF_MISSILE) || inflictor->player))
--
GitLab