From 2df4717f18475835c5924c84624d44d2674c6aa7 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 20 Feb 2020 17:20:50 -0800
Subject: [PATCH] Fix NO_LUA compiling
---
src/d_clisrv.c | 2 ++
src/d_main.c | 6 +++++-
src/d_net.c | 2 ++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index f31c2bcd4e..3ad8db3c79 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -3197,8 +3197,10 @@ void D_QuitNetGame(void)
// abort send/receive of files
CloseNetFile();
+#ifdef HAVE_BLUA
RemoveAllLuaFileTransfers();
waitingforluafiletransfer = false;
+#endif
if (server)
{
diff --git a/src/d_main.c b/src/d_main.c
index 715c90aa9e..a54cdfc8db 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1126,8 +1126,10 @@ void D_SRB2Main(void)
// can't use sprintf since there is %u in savegamename
strcatbf(savegamename, srb2home, PATHSEP);
+#ifdef HAVE_BLUA
snprintf(luafiledir, sizeof luafiledir, "%s" PATHSEP "luafiles", srb2home);
-#else
+#endif
+#else/*DEFAULTDIR*/
snprintf(srb2home, sizeof srb2home, "%s", userhome);
snprintf(downloaddir, sizeof downloaddir, "%s", userhome);
if (dedicated)
@@ -1138,8 +1140,10 @@ void D_SRB2Main(void)
// can't use sprintf since there is %u in savegamename
strcatbf(savegamename, userhome, PATHSEP);
+#ifdef HAVE_BLUA
snprintf(luafiledir, sizeof luafiledir, "%s" PATHSEP "luafiles", userhome);
#endif
+#endif/*DEFAULTDIR*/
}
configfile[sizeof configfile - 1] = '\0';
diff --git a/src/d_net.c b/src/d_net.c
index ddb991235c..a83d6d0ff2 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -803,9 +803,11 @@ static const char *packettypename[NUMPACKETTYPE] =
"RESYNCHEND",
"RESYNCHGET",
+#ifdef HAVE_BLUA
"SENDINGLUAFILE",
"ASKLUAFILE",
"HASLUAFILE",
+#endif
"FILEFRAGMENT",
"TEXTCMD",
--
GitLab