zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-27 01:10:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

a couple more trivial tweaks

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2247 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-01-10 23:45:34 +00:00
parent fa6f2d9ca2
commit e3150b2801
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/build/include/scriptfile.h
View file

@ -14,7 +14,7 @@ int32_t scriptfile_getnumber(scriptfile *sf, int32_t *num);
int32_t scriptfile_getdouble(scriptfile *sf, double *num); int32_t scriptfile_getdouble(scriptfile *sf, double *num);
int32_t scriptfile_getstring(scriptfile *sf, char **st); int32_t scriptfile_getstring(scriptfile *sf, char **st);
int32_t scriptfile_getsymbol(scriptfile *sf, int32_t *num); int32_t scriptfile_getsymbol(scriptfile *sf, int32_t *num);
int32_t scriptfile_getlinum(scriptfile *sf, char *ptr); int32_t scriptfile_getlinum(const scriptfile *sf, const char *ptr);
int32_t scriptfile_getbraces(scriptfile *sf, char **braceend); int32_t scriptfile_getbraces(scriptfile *sf, char **braceend);
scriptfile *scriptfile_fromfile(const char *fn); scriptfile *scriptfile_fromfile(const char *fn);

7
polymer/eduke32/build/src/mdsprite.c
View file

@ -73,7 +73,7 @@ static int32_t allocvbos = 0, curvbo = 0;
static GLuint *vertvbos = NULL; static GLuint *vertvbos = NULL;
static GLuint *indexvbos = NULL; static GLuint *indexvbos = NULL;
mdmodel_t *mdload(const char *); static mdmodel_t *mdload(const char *);
int32_t mddraw(spritetype *); int32_t mddraw(spritetype *);
static void mdfree(mdmodel_t *); static void mdfree(mdmodel_t *);
int32_t globalnoeffect=0; int32_t globalnoeffect=0;
@ -725,7 +725,10 @@ static int32_t mdloadskin_cached(int32_t fil, texcacheheader *head, int32_t *doa
} }
bglBindTexture(GL_TEXTURE_2D,*glpic); bglBindTexture(GL_TEXTURE_2D,*glpic);
bglGetError(); while (bglGetError() != GL_NO_ERROR)
{
/* no-op*/
}
// load the mipmaps // load the mipmaps
for (level = 0; level==0 || (pict.xdim > 1 || pict.ydim > 1); level++) for (level = 0; level==0 || (pict.xdim > 1 || pict.ydim > 1); level++)

6
polymer/eduke32/build/src/polymost.c
View file

@ -1457,7 +1457,11 @@ void writexcache(char *fn, int32_t len, int32_t dameth, char effect, texcachehea
if (Bwrite(cachefilehandle, head, sizeof(texcacheheader)) != sizeof(texcacheheader)) goto failure; if (Bwrite(cachefilehandle, head, sizeof(texcacheheader)) != sizeof(texcacheheader)) goto failure;
bglGetError(); while (bglGetError() != GL_NO_ERROR)
{
/* no-op*/
}
for (level = 0; level==0 || (padx > 1 || pady > 1); level++) for (level = 0; level==0 || (padx > 1 || pady > 1); level++)
{ {
bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_COMPRESSED_ARB, (GLint *)&gi); bglGetTexLevelParameteriv(GL_TEXTURE_2D, level, GL_TEXTURE_COMPRESSED_ARB, (GLint *)&gi);

2
polymer/eduke32/build/src/scriptfile.c
View file

@ -183,7 +183,7 @@ int32_t scriptfile_getbraces(scriptfile *sf, char **braceend)
} }
int32_t scriptfile_getlinum(scriptfile *sf, char *ptr) int32_t scriptfile_getlinum(const scriptfile *sf, const char *ptr)
{ {
int32_t i, stp; int32_t i, stp;
intptr_t ind; intptr_t ind;

2
polymer/eduke32/source/premap.c
View file

@ -1008,7 +1008,7 @@ static inline void G_SetupBackdrop(int16_t sky)
G_MultiPskyInit(); G_MultiPskyInit();
} }
Bmemset(pskyoff, 0, sizeof(pskyoff[0]) * MAXPSKYTILES); Bmemset(pskyoff, 0, sizeof(pskyoff));
if (parallaxyscale != 65536) if (parallaxyscale != 65536)
parallaxyscale = 32768; parallaxyscale = 32768;