zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

A couple of trivial changes.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4171 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-11-22 19:26:44 +00:00
parent fd978ced59
commit 7182f0a7f2
5 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/eduke32/build/include/build.h
View file

@ -764,8 +764,8 @@ typedef struct {
// XXX: currently always 0.
int32_t yoffs;
int8_t lognumtiles; // 1<<bits: number of tiles in multi-sky
int8_t tileofs[MAXPSKYTILES]; // for 0 <= j < (1<<bits): tile offset relative to basetile
int8_t lognumtiles; // 1<<lognumtiles: number of tiles in multi-sky
int8_t tileofs[MAXPSKYTILES]; // for 0 <= j < (1<<lognumtiles): tile offset relative to basetile
} psky_t;
// Index of map-global (legacy) multi-sky:
@ -1394,8 +1394,6 @@ void hash_delete(hashtable_t *t, const char *s);
# endif
#endif
extern void initialize_engine_globals(void);
static inline void push_nofog(void)
{
#ifdef USE_OPENGL

4
polymer/eduke32/build/src/engine.c
View file

@ -7236,8 +7236,6 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
int32_t ouryxaspect, ourxyaspect;
UNREFERENCED_PARAMETER(uniqid);
if (g_rotatespriteNoWidescreen)
{
dastat |= 1024;
@ -7251,6 +7249,8 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
polymost_dorotatesprite(sx,sy,z,a,picnum,dashade,dapalnum,dastat,daalpha,cx1,cy1,cx2,cy2,uniqid);
return;
}
#else
UNREFERENCED_PARAMETER(uniqid);
#endif
//============================================================================= //POLYMOST ENDS

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

@ -2349,7 +2349,7 @@ static int32_t md3draw(md3model_t *m, const spritetype *tspr)
indexhandle = m->vindexes;
//PLAG: delayed polygon-level sorted rendering
if (m->usesalpha && !(tspr->cstat & 1024))
if (m->usesalpha && !(tspr->cstat & CSTAT_SPRITE_MDHACK))
{
for (i=s->numtris-1; i>=0; i--)
{

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

@ -4169,7 +4169,7 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
x1 = hudmem[(dastat&4)>>2][picnum].xadd;
y1 = hudmem[(dastat&4)>>2][picnum].yadd;
z1 = hudmem[(dastat&4)>>2][picnum].zadd;
#ifdef POLYMER
if (pr_overridehud) {
x1 = pr_hudxadd;
@ -4177,7 +4177,6 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
z1 = pr_hudzadd;
}
#endif
if (!(hudmem[(dastat&4)>>2][picnum].flags&2)) //"NOBOB" is specified in DEF
{
double fx = ((double)sx)*(1.0/65536.0);
@ -4305,21 +4304,19 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
spriteext[tspr.owner].roll = a;
spriteext[tspr.owner].zoff = z;
fov = hudmem[(dastat&4)>>2][picnum].fov;
if (fov == -1) {
if (fov == -1)
fov = pr_fov;
}
if (pr_overridehud) {
if (pr_overridehud)
fov = pr_hudfov;
}
polymer_setaspect(fov);
polymer_drawsprite(MAXSPRITESONSCREEN);
polymer_setaspect(pr_fov);
spriteext[tspr.owner].zoff = 0;

2
polymer/eduke32/package/sdk/samples/a.m32
View file

@ -228,7 +228,7 @@ defstate fiddlewithlights
case 1:
{
set k pr_parallaxscale
ftoi k PSCALESTEPS // must convert to scaled integer, maps 0..1 to 0..PARALLAXSTEPS
ftoi k PSCALESTEPS // must convert to scaled integer, maps 0..1 to 0..PSCALESTEPS
set minval MINPARALLAXSCALE, mul minval PSCALESTEPS
set maxval MAXPARALLAXSCALE, mul maxval PSCALESTEPS
add k j, clamp k minval maxval