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

small m32 changes

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1519 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2009-10-01 19:43:15 +00:00
parent bd8e26175e
commit 8ac8615034
5 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2757,19 +2757,30 @@ SKIP:
dragpoint(pointhighlight,dax,day); dragpoint(pointhighlight,dax,day);
else if ((pointhighlight&0xc000) == 16384) else if ((pointhighlight&0xc000) == 16384)
{ {
daz = ((tilesizy[sprite[pointhighlight&16383].picnum]*sprite[pointhighlight&16383].yrepeat)<<2); int32_t daspr = pointhighlight&16383;
vec3_t vec, ovec;
Bmemcpy(&ovec, (vec3_t *)&sprite[daspr], sizeof(vec3_t));
vec.x = dax;
vec.y = day;
vec.z = sprite[daspr].z;
if (setsprite(daspr, &vec) == -1)
Bmemcpy(&sprite[daspr], &ovec, sizeof(vec3_t));
/*
daz = ((tilesizy[sprite[daspr].picnum]*sprite[daspr].yrepeat)<<2);
for (i=0; i<numsectors; i++) for (i=0; i<numsectors; i++)
if (inside(dax,day,i) == 1) if (inside(dax,day,i) == 1)
if (sprite[pointhighlight&16383].z >= getceilzofslope(i,dax,day)) if (sprite[daspr].z >= getceilzofslope(i,dax,day))
if (sprite[pointhighlight&16383].z-daz <= getflorzofslope(i,dax,day)) if (sprite[daspr].z-daz <= getflorzofslope(i,dax,day))
{ {
sprite[pointhighlight&16383].x = dax; sprite[daspr].x = dax;
sprite[pointhighlight&16383].y = day; sprite[daspr].y = day;
if (sprite[pointhighlight&16383].sectnum != i) if (sprite[daspr].sectnum != i)
changespritesect(pointhighlight&16383,(int16_t)i); changespritesect(daspr,(int16_t)i);
break; break;
} }
*/
} }
} }
asksave = 1; asksave = 1;

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

@ -152,6 +152,9 @@ int32_t loadsetup(const char *fn)
if (readconfig(fp, "maxrefreshfreq", val, VL) > 0) maxrefreshfreq = Batoi(val); if (readconfig(fp, "maxrefreshfreq", val, VL) > 0) maxrefreshfreq = Batoi(val);
#endif #endif
#if defined(POLYMOST) && defined(USE_OPENGL) #if defined(POLYMOST) && defined(USE_OPENGL)
if (readconfig(fp, "usemodels", val, VL) > 0) usemodels = Batoi(val)?1:0;
if (readconfig(fp, "usehightile", val, VL) > 0) usehightile = Batoi(val)?1:0;
glusetexcache = glusetexcachecompression = -1; glusetexcache = glusetexcachecompression = -1;
if (readconfig(fp, "glusetexcache", val, VL) > 0) if (readconfig(fp, "glusetexcache", val, VL) > 0)
{ {
@ -312,6 +315,8 @@ int32_t writesetup(const char *fn)
"\n" "\n"
#if defined(POLYMOST) && defined(USE_OPENGL) #if defined(POLYMOST) && defined(USE_OPENGL)
"; OpenGL mode options\n" "; OpenGL mode options\n"
"usemodels = %d\n"
"usehightile = %d\n"
"glusetexcache = %d\n" "glusetexcache = %d\n"
"glusetexcachecompression = %d\n" "glusetexcachecompression = %d\n"
"gltexfiltermode = %d\n" "gltexfiltermode = %d\n"
@ -457,6 +462,7 @@ int32_t writesetup(const char *fn)
#endif #endif
editorgridextent, editorgridextent,
#if defined(POLYMOST) && defined(USE_OPENGL) #if defined(POLYMOST) && defined(USE_OPENGL)
usemodels, usehightile,
glusetexcache, glusetexcachecompression, gltexfiltermode, glanisotropy, glusetexcache, glusetexcachecompression, gltexfiltermode, glanisotropy,
#endif #endif
#ifdef RENDERTYPEWIN #ifdef RENDERTYPEWIN

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

@ -11139,7 +11139,7 @@ void draw2dscreen(int32_t posxe, int32_t posye, int16_t ange, int32_t zoome, int
} }
if (editstatus == 1) if (editstatus == 1)
{ {
if ((pointhighlight-16384) > 0 && (j+16384 == pointhighlight || ((sprite[j].x == sprite[pointhighlight-16384].x) && (sprite[j].y == sprite[pointhighlight-16384].y)))) if ((pointhighlight-16384) >= 0 && (j+16384 == pointhighlight || ((sprite[j].x == sprite[pointhighlight-16384].x) && (sprite[j].y == sprite[pointhighlight-16384].y))))
{ {
if (totalclock & 32) col += (2<<2); if (totalclock & 32) col += (2<<2);
} }

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

@ -229,7 +229,7 @@ static void attach_debugger_here(void){}
static void sighandler(int signum) static void sighandler(int signum)
{ {
if (signum==SIGSEGV) // if (signum==SIGSEGV)
{ {
SDL_WM_GrabInput(SDL_GRAB_OFF); SDL_WM_GrabInput(SDL_GRAB_OFF);
SDL_ShowCursor(SDL_ENABLE); SDL_ShowCursor(SDL_ENABLE);
@ -278,6 +278,8 @@ int32_t initsystem(void)
} }
signal(SIGSEGV, sighandler); signal(SIGSEGV, sighandler);
signal(SIGABRT, sighandler);
signal(SIGFPE, sighandler);
atexit(uninitsystem); atexit(uninitsystem);

6
polymer/eduke32/source/m32exec.c
View file

@ -1223,12 +1223,14 @@ skip_check:
case ITER_LOOPOFWALL: case ITER_LOOPOFWALL:
if (parm2 < 0 || parm2 >= numwalls) if (parm2 < 0 || parm2 >= numwalls)
goto badindex; goto badindex;
for (ii=parm2, jj=wall[parm2].point2; jj!=ii; jj=wall[jj].point2) jj = parm2;
do
{ {
Gv_SetVarX(var, jj); Gv_SetVarX(var, jj);
insptr = beg; insptr = beg;
X_DoExecute(1); X_DoExecute(1);
} jj = wall[jj].point2;
} while (jj != parm2);
break; break;
case ITER_RANGE: case ITER_RANGE:
for (jj=0; jj<parm2; jj++) for (jj=0; jj<parm2; jj++)