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

Fix build issue with bullet plugin.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5555 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2019-10-01 22:19:09 +00:00
parent df3fca5bc0
commit f3a779639c
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/Makefile
View file

@ -2003,7 +2003,7 @@ endif
plugins-dbg: plugins-dbg:
@-mkdir -p $(DEBUG_DIR) @-mkdir -p $(DEBUG_DIR)
@if test -e ../plugins/Makefile; \ @if test -e ../plugins/Makefile; \
then $(MAKE) native -C ../plugins OUT_DIR="$(DEBUG_DIR)" CC="$(CC) $(W32_CFLAGS) $(DEBUG_CFLAGS)" ARCH="$(ARCH)" BASE_CFLAGS="$(BASE_CFLAGS)" FTE_TARGET="$(FTE_TARGET)"; \ then $(MAKE) native -C ../plugins OUT_DIR="$(DEBUG_DIR)" CC="$(CC) $(W32_CFLAGS) $(DEBUG_CFLAGS)" CCX="$(CC) $(W32_CFLAGS) $(subst -Wno-pointer-sign,,$(DEBUG_CFLAGS))" ARCH="$(ARCH)" BASE_CFLAGS="$(BASE_CFLAGS)" BASE_CXXFLAGS="$(subst -Wno-pointer-sign,,$(BASE_CFLAGS))" FTE_TARGET="$(FTE_TARGET)"; \
else echo no plugins directory installed; \ else echo no plugins directory installed; \
fi fi
plugins: plugins:
@ -2011,7 +2011,7 @@ plugins:
plugins-rel: plugins-rel:
@-mkdir -p $(RELEASE_DIR) @-mkdir -p $(RELEASE_DIR)
@if test -e ../plugins/Makefile; \ @if test -e ../plugins/Makefile; \
then $(MAKE) native -C ../plugins OUT_DIR="$(RELEASE_DIR)" CC="$(CC) $(W32_CFLAGS) $(RELEASE_CFLAGS)" ARCH="$(ARCH)" BASE_CFLAGS="$(BASE_CFLAGS)" FTE_TARGET="$(FTE_TARGET)"; \ then $(MAKE) native -C ../plugins OUT_DIR="$(RELEASE_DIR)" CC="$(CC) $(W32_CFLAGS) $(RELEASE_CFLAGS)" CCX="$(CXX) $(W32_CFLAGS) $(subst -Wno-pointer-sign,,$(RELEASE_CFLAGS))" ARCH="$(ARCH)" BASE_CFLAGS="$(BASE_CFLAGS)" BASE_CXXFLAGS="$(subst -Wno-pointer-sign,,$(BASE_CFLAGS))" FTE_TARGET="$(FTE_TARGET)"; \
else echo no plugins directory installed; \ else echo no plugins directory installed; \
fi fi
plugins-rel: plugins-rel:

2
engine/client/image.c
View file

@ -2287,7 +2287,7 @@ METHODDEF(void) jpeg_error_exit (j_common_ptr cinfo)
{ {
longjmp(((jpeg_error_mgr_wrapper *) cinfo->err)->setjmp_buffer, 1); longjmp(((jpeg_error_mgr_wrapper *) cinfo->err)->setjmp_buffer, 1);
} }
static qboolean screenshotJPEG(char *filename, enum fs_relative fsroot, int compression, qbyte *screendata, qintptr_t stride, int screenwidth, int screenheight, enum uploadfmt fmt, unsigned int writemeta) qboolean screenshotJPEG(char *filename, enum fs_relative fsroot, int compression, qbyte *screendata, qintptr_t stride, int screenwidth, int screenheight, enum uploadfmt fmt, unsigned int writemeta)
{ {
qbyte *buffer; qbyte *buffer;
vfsfile_t *outfile; vfsfile_t *outfile;

7
engine/common/pr_bgcmd.c
View file

@ -1665,16 +1665,17 @@ typedef struct
char *stringdata; char *stringdata;
}; };
} pf_hashentry_t; } pf_hashentry_t;
#define FIRSTTABLE 1
static pf_hashtab_t *pf_hashtab; static pf_hashtab_t *pf_hashtab;
static size_t pf_hash_maxtables; static size_t pf_hash_maxtables;
static pf_hashtab_t pf_peristanthashtab; //persists over map changes. static pf_hashtab_t pf_peristanthashtab; //persists over map changes.
//static pf_hashtab_t pf_reverthashtab; //pf_peristanthashtab as it was at map start, for map restarts. //static pf_hashtab_t pf_reverthashtab; //pf_peristanthashtab as it was at map start, for map restarts.
static pf_hashtab_t *PF_hash_findtab(pubprogfuncs_t *prinst, int idx) static pf_hashtab_t *PF_hash_findtab(pubprogfuncs_t *prinst, int idx)
{ {
idx -= 1; idx -= FIRSTTABLE;
if (idx >= 0 && (unsigned)idx < pf_hash_maxtables && pf_hashtab[idx].prinst) if (idx >= 0 && (unsigned)idx < pf_hash_maxtables && pf_hashtab[idx].prinst)
return &pf_hashtab[idx]; return &pf_hashtab[idx];
else if (idx == -1) else if (idx == 0-FIRSTTABLE)
{ {
if (!pf_peristanthashtab.tab.numbuckets) if (!pf_peristanthashtab.tab.numbuckets)
{ {
@ -1898,7 +1899,7 @@ void QCBUILTIN PF_hash_createtab (pubprogfuncs_t *prinst, struct globalvars_s *p
pf_hashtab[i].prinst = prinst; pf_hashtab[i].prinst = prinst;
pf_hashtab[i].bucketmem = Z_Malloc(Hash_BytesForBuckets(numbuckets)); pf_hashtab[i].bucketmem = Z_Malloc(Hash_BytesForBuckets(numbuckets));
Hash_InitTable(&pf_hashtab[i].tab, numbuckets, pf_hashtab[i].bucketmem); Hash_InitTable(&pf_hashtab[i].tab, numbuckets, pf_hashtab[i].bucketmem);
G_FLOAT(OFS_RETURN) = i + 1; G_FLOAT(OFS_RETURN) = i + FIRSTTABLE;
} }
void pf_hash_savegame(void) //write the persistant table to a saved game. void pf_hash_savegame(void) //write the persistant table to a saved game.