From c2f7a7b2d0c305ace23154a23234c51508da6b3f Mon Sep 17 00:00:00 2001 From: Spoike Date: Fri, 19 Aug 2022 13:29:27 +0000 Subject: [PATCH] Fix some issues from last commit. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6304 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- build_qc.sh | 10 +++++----- engine/qclib/qcc_pr_comp.c | 5 +++-- engine/qclib/qccmain.c | 1 + engine/server/sv_main.c | 8 +++++++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/build_qc.sh b/build_qc.sh index c458fc27d..27442a294 100755 --- a/build_qc.sh +++ b/build_qc.sh @@ -89,12 +89,12 @@ if [ "$FTEQCC" != "" ]; then ( cd quakec/csaddon/src echo -n "Making csaddon... " - $FTEQCC -srcfile csaddon.src > $BUILDLOGFOLDER/csaddon.txt + $FTEQCC -srcfile csaddon.src > $BUILDLOGFOLDER/csaddon.txt 2>&1 if [ $? -eq 0 ]; then echo "done" cp ../csaddon.dat $BUILDFOLDER/csaddon/ cd .. - zip -9 $BUILDFOLDER/csaddon/csaddon.pk3 csaddon.dat + zip -q9 $BUILDFOLDER/csaddon/csaddon.pk3 csaddon.dat else echo "failed" fi @@ -102,13 +102,13 @@ if [ "$FTEQCC" != "" ]; then ( cd quakec/menusys echo -n "Making menusys... " - $FTEQCC -srcfile menu.src > $BUILDLOGFOLDER/menu.txt + $FTEQCC -srcfile menu.src > $BUILDLOGFOLDER/menu.txt 2>&1 if [ $? -eq 0 ]; then echo "done" - zip -q -9 -o -r $BUILDFOLDER/csaddon/menusys_src.zip . + zip -q -q9 -o -r $BUILDFOLDER/csaddon/menusys_src.zip . cp ../menu.dat $BUILDFOLDER/csaddon/ cd .. - zip -9 $BUILDFOLDER/csaddon/menusys.pk3 menu.dat + zip -q9 $BUILDFOLDER/csaddon/menusys.pk3 menu.dat else echo "failed" fi diff --git a/engine/qclib/qcc_pr_comp.c b/engine/qclib/qcc_pr_comp.c index f82805d17..a431bc94c 100644 --- a/engine/qclib/qcc_pr_comp.c +++ b/engine/qclib/qcc_pr_comp.c @@ -18586,6 +18586,7 @@ void QCC_PR_ParseDefs (char *classname, pbool fatal_unused) type->scope = pr_scope; } + def = NULL; continue; } @@ -18888,10 +18889,10 @@ void QCC_PR_ParseDefs (char *classname, pbool fatal_unused) } while (QCC_PR_CheckToken (",")); if (type->type == ev_function) - QCC_PR_CheckTokenComment (";", &def->comment); + QCC_PR_CheckTokenComment (";", def?&def->comment:NULL); else { - if (!QCC_PR_CheckTokenComment (";", &def->comment)) + if (!QCC_PR_CheckTokenComment (";", def?&def->comment:NULL)) QCC_PR_ParseWarning(WARN_UNDESIRABLECONVENTION, "Missing semicolon at end of definition"); } } diff --git a/engine/qclib/qccmain.c b/engine/qclib/qccmain.c index 242353239..d5a9f875d 100644 --- a/engine/qclib/qccmain.c +++ b/engine/qclib/qccmain.c @@ -3918,6 +3918,7 @@ static void QCC_PR_CRCMessages(unsigned short crc) QCC_PR_Warning(WARN_SYSTEMCRC2, NULL, 0, "Recognised progs as outdated CSQC module"); break; case 52195: //this is what DP requires. don't print it as the warning that it is as that would royally piss off xonotic and their use of -Werror. + if (verbose >= VERBOSE_PROGRESS) externs->Printf("Recognised progs as DP-specific CSQC module\n"); break; case 10020: diff --git a/engine/server/sv_main.c b/engine/server/sv_main.c index 3af45020a..95a2bb992 100644 --- a/engine/server/sv_main.c +++ b/engine/server/sv_main.c @@ -4488,7 +4488,12 @@ qboolean SVNQ_ConnectionlessPacket(void) } if (NET_WasSpecialPacket(svs.sockets)) return true; - if (sv_listen_nq.ival == 2 && net_from.prot == NP_DGRAM && net_from.type != NA_ICE) +#ifdef HAVE_PACKET + if (sv_listen_nq.ival == 2 && net_from.prot == NP_DGRAM +#ifdef SUPPORT_ICE + && net_from.type != NA_ICE +#endif + ) { if (password.string[0] && stricmp(password.string, "none") && @@ -4522,6 +4527,7 @@ qboolean SVNQ_ConnectionlessPacket(void) /*don't worry about repeating, the nop case above will recover it*/ } else +#endif { str = va("connect %i %i %i \"\\name\\unconnected\\mod\\%i\\modver\\%i\\flags\\%i\\password\\%i\"", protver, 0, SV_NewChallenge(), mod, modver, flags, passwd); Cmd_TokenizeString (str, false, false);