diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c index 94f87c514..2bd37d514 100644 --- a/polymer/eduke32/source/actors.c +++ b/polymer/eduke32/source/actors.c @@ -580,7 +580,7 @@ void lotsofmoney(int sp, int n) { int i ,j; spritetype *s = &sprite[sp]; - + for (i=n;i>0;i--) { j = EGS(s->sectnum,s->x,s->y,s->z-(TRAND%(47<<8)),MONEY,-32,8,8,TRAND&2047,0,0,sp,5); @@ -592,7 +592,7 @@ void lotsofmail(int sp, int n) { int i ,j; spritetype *s = &sprite[sp]; - + for (i=n;i>0;i--) { j = EGS(s->sectnum,s->x,s->y,s->z-(TRAND%(47<<8)),MAIL,-32,8,8,TRAND&2047,0,0,sp,5); @@ -604,7 +604,7 @@ void lotsofpaper(int sp, int n) { int i ,j; spritetype *s = &sprite[sp]; - + for (i=n;i>0;i--) { j = EGS(s->sectnum,s->x,s->y,s->z-(TRAND%(47<<8)),PAPER,-32,8,8,TRAND&2047,0,0,sp,5); @@ -654,7 +654,7 @@ void gutsdir(int sp, int gtype, int n, int p) long gutz,floorz; int i,a,j,sx,sy; spritetype *s = &sprite[sp]; - + if (badguy(s) && s->xrepeat < 16) sx = sy = 8; else sx = sy = 32; diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index b4b09057e..4fed36873 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -1626,7 +1626,7 @@ static void m32_showmouse(void) plotpixel(searchx,searchy-i,0); plotpixel(searchx,searchy+i,0); } - + if (xdim > 640) { for (i=1;i<=4;i++) @@ -1636,7 +1636,7 @@ static void m32_showmouse(void) plotpixel(searchx,searchy-i,whitecol); plotpixel(searchx,searchy+i,whitecol); } - } + } } static int AskIfSure(void) @@ -4669,7 +4669,7 @@ int ExtInit(void) autosavetimer = totalclock+120*180; OSD_RegisterFunction("quit","you tried to get help on quit?",osdcmd_quit); - OSD_RegisterFunction("editorgridextent","editorgridextent: sets the size of the 2D mode editing grid",osdcmd_editorgridextent); + OSD_RegisterFunction("editorgridextent","editorgridextent: sets the size of the 2D mode editing grid",osdcmd_editorgridextent); return rv; } @@ -4801,7 +4801,7 @@ void ExtAnalyzeSprites(void) #if defined(USE_OPENGL) && defined(POLYMOST) if (!usemodels || md_tilehasmodel(tspr->picnum) < 0) -#endif +#endif { if (frames!=0) { diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c index 78dc33fbf..10ff989d4 100644 --- a/polymer/eduke32/source/config.c +++ b/polymer/eduke32/source/config.c @@ -227,7 +227,7 @@ void CONFIG_SetDefaultKeys(int type) } return; } - + for (i=0; i < (int32)(sizeof(keydefaults)/sizeof(keydefaults[0])); i+=3) { f = CONFIG_FunctionNameToNum(keydefaults[i+0]); @@ -311,7 +311,7 @@ void CONFIG_SetDefaults(void) // JBF 20031211 - CONFIG_SetDefaultKeys(0); + CONFIG_SetDefaultKeys(0); memset(MouseFunctions, -1, sizeof(MouseFunctions)); for (i=0; iextra = *actorscrptr[s_pn]; @@ -6232,15 +6232,15 @@ void animatesprites(long x,long y,int a,long smoothratio) i = t->owner; s = &sprite[t->owner]; -/* - t->x = sprpos[i].x+mulscale16((long)(s->x-sprpos[i].x),smoothratio); - t->y = sprpos[i].y+mulscale16((long)(s->y-sprpos[i].y),smoothratio); - t->z = sprpos[i].z+mulscale16((long)(s->z-sprpos[i].z),smoothratio); + /* + t->x = sprpos[i].x+mulscale16((long)(s->x-sprpos[i].x),smoothratio); + t->y = sprpos[i].y+mulscale16((long)(s->y-sprpos[i].y),smoothratio); + t->z = sprpos[i].z+mulscale16((long)(s->z-sprpos[i].z),smoothratio); - sprpos[i].x = s->x; - sprpos[i].y = s->y; - sprpos[i].z = s->z; -*/ + sprpos[i].x = s->x; + sprpos[i].y = s->y; + sprpos[i].z = s->z; + */ //greenslime can't be handled through the dynamictostatic system due to addition on constant if ((t->picnum >= GREENSLIME)&&(t->picnum <= GREENSLIME+7)) {} diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c index 9a7aa099e..52ba2b214 100644 --- a/polymer/eduke32/source/gameexec.c +++ b/polymer/eduke32/source/gameexec.c @@ -3170,7 +3170,7 @@ int getincangle(int a,int na) { // OSD_Printf("getincangle() returning %d\n",na-a); return (na-a); - } + } if (na > 1024) na -= 2048; if (a > 1024) a -= 2048; @@ -3289,7 +3289,7 @@ static void move(void) { long newx = ps[g_p].posx+(ps[g_p].posxv/768); long newy = ps[g_p].posy+(ps[g_p].posyv/768); - + goalang = getangle(newx-g_sp->x,newy-g_sp->y); angdif = getincangle(g_sp->ang,goalang)>>2; if ((angdif > -8 && angdif < 0) || (angdif < 8 && angdif > 0)) @@ -4607,7 +4607,7 @@ static int parse(void) long x2=scale(GetGameVarID(*insptr++,g_i,g_p),xdim,320); long y2=scale(GetGameVarID(*insptr++,g_i,g_p),ydim,200); long smoothratio = 65536; - + if (x1 > x2) swaplong(&x1,&x2); if (y1 > y2) swaplong(&y1,&y2); @@ -4624,8 +4624,8 @@ static int parse(void) if (!ud.pause_on && ((ud.show_help == 0 && ud.multimode < 2 && !(ps[myconnectindex].gm&MODE_MENU)) || ud.multimode > 1 || ud.recstat == 2)) smoothratio = min(max((totalclock-ototalclock)*(65536L/TICSPERFRAME),0),65536); #endif - dointerpolations(smoothratio); - + dointerpolations(smoothratio); + #ifdef SE40 se40code(x,y,z,a,horiz,smoothratio); #endif @@ -4645,7 +4645,7 @@ static int parse(void) { long tposx,tposy; short tang; - + preparemirror(x,y,z,a,horiz,mirrorwall[i],mirrorsector[i],&tposx,&tposy,&tang); j = visibility; diff --git a/polymer/eduke32/source/gamevars.c b/polymer/eduke32/source/gamevars.c index bdfd5d0f1..878e0ae56 100755 --- a/polymer/eduke32/source/gamevars.c +++ b/polymer/eduke32/source/gamevars.c @@ -1187,8 +1187,8 @@ static void AddSystemVars() AddGameVar("myonground",(long)&myonground, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_PCHAR | GAMEVAR_FLAG_SYNCCHECK); AddGameVar("myhardlanding",(long)&myhardlanding, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_PCHAR | GAMEVAR_FLAG_SYNCCHECK); AddGameVar("myreturntocenter",(long)&myreturntocenter, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_PCHAR | GAMEVAR_FLAG_SYNCCHECK); - - AddGameVar("display_mirror",(long)&display_mirror, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_PCHAR | GAMEVAR_FLAG_SYNCCHECK); + + AddGameVar("display_mirror",(long)&display_mirror, GAMEVAR_FLAG_SYSTEM | GAMEVAR_FLAG_PCHAR | GAMEVAR_FLAG_SYNCCHECK); } void InitGameVars(void) diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c index f610ca2a4..19028d067 100644 --- a/polymer/eduke32/source/premap.c +++ b/polymer/eduke32/source/premap.c @@ -250,7 +250,7 @@ static void cachegoodsprites(void) tloadtile(BULLETHOLE,1); tloadtile(BLOODPOOL,1); for (i = TRANSPORTERBEAM; i < (TRANSPORTERBEAM+6); i++) tloadtile(i,1); - + for (i = SMALLSMOKE; i < (SMALLSMOKE+4); i++) tloadtile(i,1); for (i = BLOOD; i < (BLOOD+4); i++) tloadtile(i,1); @@ -261,7 +261,7 @@ static void cachegoodsprites(void) for (i=FORCERIPPLE; i<(FORCERIPPLE+9); i++) tloadtile(i,1); for (i=MENUSCREEN; i