From a7539c130fb61a49b6f60d81aaf9a2b0c3fba71e Mon Sep 17 00:00:00 2001 From: helixhorned Date: Tue, 30 Sep 2008 13:08:57 +0000 Subject: [PATCH] Reverted sprite interpolation for SE31; minor additions to game.c git-svn-id: https://svn.eduke32.com/eduke32@1084 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/actors.c | 30 ++++-------------------------- polymer/eduke32/source/game.c | 7 +++++++ 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c index 2af2af5a1..fa7787c3b 100644 --- a/polymer/eduke32/source/actors.c +++ b/polymer/eduke32/source/actors.c @@ -7231,10 +7231,6 @@ static void moveeffectors(void) //STATNUM 3 t[0] = 0; t[3] = s->hitag; 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 { @@ -7249,8 +7245,7 @@ static void moveeffectors(void) //STATNUM 3 g_player[sprite[j].yvel].ps->posz += l; if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4) { - hittype[j].bposz = sprite[j].z; - sprite[j].z += l; + hittype[j].bposz = sprite[j].z += l; hittype[j].floorz = sc->floorz; } j = nextspritesect[j]; @@ -7266,11 +7261,6 @@ static void moveeffectors(void) //STATNUM 3 t[2] = 0; t[0] = 0; 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 { @@ -7285,8 +7275,7 @@ static void moveeffectors(void) //STATNUM 3 g_player[sprite[j].yvel].ps->posz += l; if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4) { - hittype[j].bposz = sprite[j].z; - sprite[j].z += l; + hittype[j].bposz = sprite[j].z += l; hittype[j].floorz = sc->floorz; } j = nextspritesect[j]; @@ -7304,11 +7293,6 @@ static void moveeffectors(void) //STATNUM 3 t[0] = 0; t[2] = 1; 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 { @@ -7323,8 +7307,7 @@ static void moveeffectors(void) //STATNUM 3 g_player[sprite[j].yvel].ps->posz += l; if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4) { - hittype[j].bposz = sprite[j].z; - sprite[j].z += l; + hittype[j].bposz = sprite[j].z += l; hittype[j].floorz = sc->floorz; } j = nextspritesect[j]; @@ -7339,10 +7322,6 @@ static void moveeffectors(void) //STATNUM 3 callsound(s->sectnum,i); t[2] = 1; 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 { @@ -7357,8 +7336,7 @@ static void moveeffectors(void) //STATNUM 3 g_player[sprite[j].yvel].ps->posz -= l; if (sprite[j].zvel == 0 && sprite[j].statnum != 3 && sprite[j].statnum != 4) { - hittype[j].bposz = sprite[j].z; - sprite[j].z -= l; + hittype[j].bposz = sprite[j].z -= l; hittype[j].floorz = sc->floorz; } j = nextspritesect[j]; diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 0135c1b26..fe51143f9 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -9833,6 +9833,11 @@ static void checkcommandline(int argc, const char **argv) k = Bstrchr(c,'.'); if (k) { + if (!Bstrcasecmp(k,".map")) + { + CommandMap = (char *)argv[i++]; + continue; + } if (!Bstrcasecmp(k,".grp") || !Bstrcasecmp(k,".zip")) { 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; 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.clipping = ud.scrollmode = ud.overhead_on = ud.pause_on = 0;