team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some issues from last commit. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6304 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2022-08-19 13:29:27 +00:00
parent f8af9b18eb
commit c2f7a7b2d0
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build_qc.sh
View File

@ -89,12 +89,12 @@ if [ "$FTEQCC" != "" ]; then
( cd quakec/csaddon/src ( cd quakec/csaddon/src
echo -n "Making csaddon... " echo -n "Making csaddon... "
$FTEQCC -srcfile csaddon.src > $BUILDLOGFOLDER/csaddon.txt $FTEQCC -srcfile csaddon.src > $BUILDLOGFOLDER/csaddon.txt 2>&1
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "done" echo "done"
cp ../csaddon.dat $BUILDFOLDER/csaddon/ cp ../csaddon.dat $BUILDFOLDER/csaddon/
cd .. cd ..
zip -9 $BUILDFOLDER/csaddon/csaddon.pk3 csaddon.dat zip -q9 $BUILDFOLDER/csaddon/csaddon.pk3 csaddon.dat
else else
echo "failed" echo "failed"
fi fi
@ -102,13 +102,13 @@ if [ "$FTEQCC" != "" ]; then
( cd quakec/menusys ( cd quakec/menusys
echo -n "Making 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 if [ $? -eq 0 ]; then
echo "done" 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/ cp ../menu.dat $BUILDFOLDER/csaddon/
cd .. cd ..
zip -9 $BUILDFOLDER/csaddon/menusys.pk3 menu.dat zip -q9 $BUILDFOLDER/csaddon/menusys.pk3 menu.dat
else else
echo "failed" echo "failed"
fi fi

5
engine/qclib/qcc_pr_comp.c
View File

@ -18586,6 +18586,7 @@ void QCC_PR_ParseDefs (char *classname, pbool fatal_unused)
type->scope = pr_scope; type->scope = pr_scope;
} }
def = NULL;
continue; continue;
} }
@ -18888,10 +18889,10 @@ void QCC_PR_ParseDefs (char *classname, pbool fatal_unused)
} while (QCC_PR_CheckToken (",")); } while (QCC_PR_CheckToken (","));
if (type->type == ev_function) if (type->type == ev_function)
QCC_PR_CheckTokenComment (";", &def->comment); QCC_PR_CheckTokenComment (";", def?&def->comment:NULL);
else 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"); QCC_PR_ParseWarning(WARN_UNDESIRABLECONVENTION, "Missing semicolon at end of definition");
} }
} }

1
engine/qclib/qccmain.c
View File

@ -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"); QCC_PR_Warning(WARN_SYSTEMCRC2, NULL, 0, "Recognised progs as outdated CSQC module");
break; 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. 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"); externs->Printf("Recognised progs as DP-specific CSQC module\n");
break; break;
case 10020: case 10020:

8
engine/server/sv_main.c
View File

@ -4488,7 +4488,12 @@ qboolean SVNQ_ConnectionlessPacket(void)
} }
if (NET_WasSpecialPacket(svs.sockets)) if (NET_WasSpecialPacket(svs.sockets))
return true; 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] && if (password.string[0] &&
stricmp(password.string, "none") && stricmp(password.string, "none") &&
@ -4522,6 +4527,7 @@ qboolean SVNQ_ConnectionlessPacket(void)
/*don't worry about repeating, the nop case above will recover it*/ /*don't worry about repeating, the nop case above will recover it*/
} }
else 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); 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); Cmd_TokenizeString (str, false, false);