zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor fixes

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1833 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-03-07 22:56:00 +00:00
parent 148f3cadef
commit 2f5a8a0f6b
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
polymer/eduke32/build/src/build.c
View file

@ -1864,14 +1864,13 @@ static void updatesprite1(int16_t i)
{ {
setsprite(i, (vec3_t *)&sprite[i]); setsprite(i, (vec3_t *)&sprite[i]);
if ((sprite[i].cstat&48)!=32 && sprite[i].sectnum>=0) if (sprite[i].sectnum>=0)
{ {
int32_t tempint, cz, fz; int32_t tempint, cz, fz;
tempint = spriteheight(i, NULL); tempint = spriteheight(i, NULL);
if (sprite[i].cstat&128) if (sprite[i].cstat&128)
tempint >>= 1; tempint >>= 1;
cz = getceilzofslope(sprite[i].sectnum, sprite[i].x,sprite[i].y); getzsofslope(sprite[i].sectnum, sprite[i].x, sprite[i].y, &cz, &fz);
fz = getflorzofslope(sprite[i].sectnum, sprite[i].x,sprite[i].y);
sprite[i].z = max(sprite[i].z, cz+tempint); sprite[i].z = max(sprite[i].z, cz+tempint);
sprite[i].z = min(sprite[i].z, fz); sprite[i].z = min(sprite[i].z, fz);
} }

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

@ -853,8 +853,8 @@ const char *SectorEffectorTagText(int32_t lotag)
"CONVAYER BELT", "CONVAYER BELT",
"ENGINE", // 25 "ENGINE", // 25
"(UNKNOWN)", "(UNKNOWN)",
"LIGHTNING (H= TILE#4890)",
"CAMERA FOR PLAYBACK", "CAMERA FOR PLAYBACK",
"LIGHTNING (H= TILE#4890)",
"FLOAT", "FLOAT",
"2 WAY TRAIN (ST=31)", // 30 "2 WAY TRAIN (ST=31)", // 30
"FLOOR RISE", "FLOOR RISE",