fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some build fixes.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5776 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2020-10-06 04:30:48 +00:00
parent 432bc96456
commit 899c54223e
3 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build_wip.sh
View file

@ -319,23 +319,33 @@ if [ "$BUILD_LINUXx86" != "n" ]; then
fi fi
if [ -e $BUILDFOLDER/linux_x86/fteqcc32 ]; then if [ -e $BUILDFOLDER/linux_x86/fteqcc32 ]; then
echo "Making csaddon + qcmenu"
mkdir -p $BUILDFOLDER/csaddon/ mkdir -p $BUILDFOLDER/csaddon/
cd $SVNROOT/quakec cd $SVNROOT/quakec
cd csaddon/src cd csaddon/src
echo -n "Making csaddon... "
$BUILDFOLDER/linux_x86/fteqcc32 -srcfile csaddon.src > $BUILDLOGFOLDER/csaddon.txt $BUILDFOLDER/linux_x86/fteqcc32 -srcfile csaddon.src > $BUILDLOGFOLDER/csaddon.txt
if [ $? -eq 0 ]; then
echo "done"
cp ../csaddon.dat $BUILDFOLDER/csaddon/ cp ../csaddon.dat $BUILDFOLDER/csaddon/
cd .. cd ..
zip -9 $BUILDFOLDER/csaddon/csaddon.pk3 csaddon.dat zip -9 $BUILDFOLDER/csaddon/csaddon.pk3 csaddon.dat
else
echo "failed"
fi
cd $SVNROOT/quakec cd $SVNROOT/quakec
cd menusys cd menusys
echo -n "Making menusys... "
$BUILDFOLDER/linux_x86/fteqcc32 -srcfile menu.src > $BUILDLOGFOLDER/menu.txt $BUILDFOLDER/linux_x86/fteqcc32 -srcfile menu.src > $BUILDLOGFOLDER/menu.txt
rm -f fteqcc.log if [ $? -eq 0 ]; then
echo "done"
zip -q -9 -o -r $BUILDFOLDER/csaddon/menusys_src.zip . zip -q -9 -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 -9 $BUILDFOLDER/csaddon/menusys.pk3 menu.dat
else
echo "failed"
fi
else else
echo "Skiping csaddon + qcmenu, no compiler build" echo "Skiping csaddon + qcmenu, no compiler build"
fi fi

9
engine/client/m_download.c
View file

@ -2233,7 +2233,7 @@ static void PM_UpdatePackageList(qboolean autoupdate, int retry)
for (i = 0; i < numdownloadablelists; i++) for (i = 0; i < numdownloadablelists; i++)
{ {
if (downloadablelist[i].status == SRCSTAT_PENDING) if (downloadablelist[i].status == SRCSTAT_PENDING)
downloadablelist[i].status = SRCSTAT_FAILED; downloadablelist[i].status = SRCSTAT_FAILED_DNS;
} }
#else #else
doautoupdate |= autoupdate; doautoupdate |= autoupdate;
@ -3533,7 +3533,7 @@ static void PM_PromptApplyChanges(void)
} }
} }
#endif #endif
#ifdef HAVE_CLIENT #if defined(HAVE_CLIENT) && defined(WEBCLIENT)
static void PM_AddSubList_Callback(void *ctx, promptbutton_t opt) static void PM_AddSubList_Callback(void *ctx, promptbutton_t opt)
{ {
if (opt == PROMPT_YES) if (opt == PROMPT_YES)
@ -4563,7 +4563,9 @@ static void MD_Source_Draw (int x, int y, struct menucustom_s *c, struct emenu_s
break; break;
case SRCSTAT_FAILED_DNS: case SRCSTAT_FAILED_DNS:
Draw_FunStringWidth (x, y, "^&0E ", 48, 2, false); //yellow Draw_FunStringWidth (x, y, "^&0E ", 48, 2, false); //yellow
#ifdef WEBCLIENT
Draw_FunStringWidth (x, y, "DNS", 48, 2, false); Draw_FunStringWidth (x, y, "DNS", 48, 2, false);
#endif
break; break;
case SRCSTAT_FAILED_NORESP: case SRCSTAT_FAILED_NORESP:
Draw_FunStringWidth (x, y, "^&0E ", 48, 2, false); //yellow Draw_FunStringWidth (x, y, "^&0E ", 48, 2, false); //yellow
@ -4810,12 +4812,13 @@ static int MD_AddItemsToDownloadMenu(emenu_t *m, int y, const char *pathprefix)
static void MD_Download_UpdateStatus(struct emenu_s *m) static void MD_Download_UpdateStatus(struct emenu_s *m)
{ {
dlmenu_t *info = m->data; dlmenu_t *info = m->data;
int i, y; int y;
package_t *p; package_t *p;
unsigned int totalpackages=0, selectedpackages=0, addpackages=0, rempackages=0; unsigned int totalpackages=0, selectedpackages=0, addpackages=0, rempackages=0;
menuoption_t *si; menuoption_t *si;
menubutton_t *b, *d; menubutton_t *b, *d;
#ifdef WEBCLIENT #ifdef WEBCLIENT
int i;
unsigned int downloads=0; unsigned int downloads=0;
menucustom_t *c; menucustom_t *c;
#endif #endif

2
engine/gl/gl_heightmap.c
View file

@ -7962,7 +7962,7 @@ qboolean Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
//patch info //patch info
brushtex_t *patch_tex=NULL; brushtex_t *patch_tex=NULL;
int patchsz[2], patchsubdiv[2]; int patchsz[2]={0,0}, patchsubdiv[2]={-1,-1};
qcpatchvert_t patch_v[64][64]; qcpatchvert_t patch_v[64][64];
#ifdef RUNTIMELIGHTING #ifdef RUNTIMELIGHTING