zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 12:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reverted sprite interpolation for SE31; minor additions to game.c

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1084 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2008-09-30 13:08:57 +00:00
parent 4437919385
commit a7539c130f
2 changed files with 11 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
polymer/eduke32/source/actors.c
View file

@ -7231,10 +7231,6 @@ static void moveeffectors(void) //STATNUM 3
t[0] = 0; t[0] = 0;
t[3] = s->hitag; t[3] = s->hitag;
callsound(s->sectnum,i); callsound(s->sectnum,i);
for (j=headspritesect[s->sectnum]; j>=0; j=nextspritesect[j])
if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4)
hittype[j].bposz = sprite[j].z;
} }
else else
{ {
@ -7249,8 +7245,7 @@ static void moveeffectors(void) //STATNUM 3
g_player[sprite[j].yvel].ps->posz += l; g_player[sprite[j].yvel].ps->posz += l;
if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4) if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4)
{ {
hittype[j].bposz = sprite[j].z; hittype[j].bposz = sprite[j].z += l;
sprite[j].z += l;
hittype[j].floorz = sc->floorz; hittype[j].floorz = sc->floorz;
} }
j = nextspritesect[j]; j = nextspritesect[j];
@ -7266,11 +7261,6 @@ static void moveeffectors(void) //STATNUM 3
t[2] = 0; t[2] = 0;
t[0] = 0; t[0] = 0;
t[3] = s->hitag; t[3] = s->hitag;
for (j=headspritesect[s->sectnum]; j>=0; j=nextspritesect[j])
if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4)
hittype[j].bposz = sprite[j].z;
} }
else else
{ {
@ -7285,8 +7275,7 @@ static void moveeffectors(void) //STATNUM 3
g_player[sprite[j].yvel].ps->posz += l; g_player[sprite[j].yvel].ps->posz += l;
if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4) if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4)
{ {
hittype[j].bposz = sprite[j].z; hittype[j].bposz = sprite[j].z += l;
sprite[j].z += l;
hittype[j].floorz = sc->floorz; hittype[j].floorz = sc->floorz;
} }
j = nextspritesect[j]; j = nextspritesect[j];
@ -7304,11 +7293,6 @@ static void moveeffectors(void) //STATNUM 3
t[0] = 0; t[0] = 0;
t[2] = 1; t[2] = 1;
t[3] = s->hitag; t[3] = s->hitag;
for (j=headspritesect[s->sectnum]; j>=0; j=nextspritesect[j])
if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4)
hittype[j].bposz = sprite[j].z;
} }
else else
{ {
@ -7323,8 +7307,7 @@ static void moveeffectors(void) //STATNUM 3
g_player[sprite[j].yvel].ps->posz += l; g_player[sprite[j].yvel].ps->posz += l;
if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4) if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4)
{ {
hittype[j].bposz = sprite[j].z; hittype[j].bposz = sprite[j].z += l;
sprite[j].z += l;
hittype[j].floorz = sc->floorz; hittype[j].floorz = sc->floorz;
} }
j = nextspritesect[j]; j = nextspritesect[j];
@ -7339,10 +7322,6 @@ static void moveeffectors(void) //STATNUM 3
callsound(s->sectnum,i); callsound(s->sectnum,i);
t[2] = 1; t[2] = 1;
t[3] = s->hitag; t[3] = s->hitag;
for (j=headspritesect[s->sectnum]; j>=0; j=nextspritesect[j])
if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4)
hittype[j].bposz = sprite[j].z;
} }
else else
{ {
@ -7357,8 +7336,7 @@ static void moveeffectors(void) //STATNUM 3
g_player[sprite[j].yvel].ps->posz -= l; g_player[sprite[j].yvel].ps->posz -= l;
if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4) if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4)
{ {
hittype[j].bposz = sprite[j].z; hittype[j].bposz = sprite[j].z -= l;
sprite[j].z -= l;
hittype[j].floorz = sc->floorz; hittype[j].floorz = sc->floorz;
} }
j = nextspritesect[j]; j = nextspritesect[j];

7
polymer/eduke32/source/game.c
View file

@ -9833,6 +9833,11 @@ static void checkcommandline(int argc, const char **argv)
k = Bstrchr(c,'.'); k = Bstrchr(c,'.');
if (k) if (k)
{ {
if (!Bstrcasecmp(k,".map"))
{
CommandMap = (char *)argv[i++];
continue;
}
if (!Bstrcasecmp(k,".grp") || !Bstrcasecmp(k,".zip")) if (!Bstrcasecmp(k,".grp") || !Bstrcasecmp(k,".zip"))
{ {
addgroup(argv[i++]); addgroup(argv[i++]);
@ -11481,6 +11486,8 @@ static int opendemoread(int which_demo) // 0 = mine
if (kread(recfilep,(int *)&g_player[i].pteam,sizeof(int)) != sizeof(int)) goto corrupt; if (kread(recfilep,(int *)&g_player[i].pteam,sizeof(int)) != sizeof(int)) goto corrupt;
g_player[i].ps->team = g_player[i].pteam; g_player[i].ps->team = g_player[i].pteam;
} }
i = ud.reccnt/((TICRATE/TICSPERFRAME)*ud.multimode);
OSD_Printf("demo duration: %d min %d sec\n", i/60, i%60);
ud.god = ud.cashman = ud.eog = ud.showallmap = 0; ud.god = ud.cashman = ud.eog = ud.showallmap = 0;
ud.clipping = ud.scrollmode = ud.overhead_on = ud.pause_on = 0; ud.clipping = ud.scrollmode = ud.overhead_on = ud.pause_on = 0;