From e316013c1d104ece1dcbe962c6ec3f12ecc77cf5 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 26 Apr 2006 17:48:43 +0000
Subject: [PATCH] *yawn*
git-svn-id: https://svn.eduke32.com/eduke32@117 1a8010ca-5511-0410-912e-c29ae57300e0
---
polymer/build/src/defs.c | 9 +++++----
polymer/eduke32/source/game.c | 2 +-
polymer/eduke32/source/gameexec.c | 12 ++++++------
polymer/eduke32/source/player.c | 21 ++++-----------------
4 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/polymer/build/src/defs.c b/polymer/build/src/defs.c
index 21525fe45..4f548a71d 100644
--- a/polymer/build/src/defs.c
+++ b/polymer/build/src/defs.c
@@ -402,10 +402,10 @@ static int defsparser(scriptfile *script)
{
int tile1,tile2,xsiz,ysiz,i;
- if (scriptfile_getsymbol(script,&tile1)) break;
- if (scriptfile_getsymbol(script,&tile2)) break;
- if (scriptfile_getsymbol(script,&xsiz)) break;
- if (scriptfile_getsymbol(script,&ysiz)) break;
+ if (scriptfile_getnumber(script,&tile1)) break;
+ if (scriptfile_getnumber(script,&tile2)) break;
+ if (scriptfile_getnumber(script,&xsiz)) break;
+ if (scriptfile_getnumber(script,&ysiz)) break;
if (tile2 < tile1) {
initprintf("Warning: backwards tile range on line %s:%d\n", script->filename, scriptfile_getlinum(script,cmdtokptr));
i = tile2;
@@ -424,6 +424,7 @@ static int defsparser(scriptfile *script)
}
}
}
+ break;
}
case T_DEFINEMODEL:
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 74171528c..bc4aa79da 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -7619,7 +7619,7 @@ void checkcommandline(int argc,char **argv)
else if( *c == 'D')
{
- FILE * fp=fopenfrompath("gamevars.txt","w");
+ FILE * fp=fopen("gamevars.txt","w");
InitGameVars();
DumpGameVars(fp);
fclose(fp);
diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c
index b2e8e247b..8ff6ed30b 100644
--- a/polymer/eduke32/source/gameexec.c
+++ b/polymer/eduke32/source/gameexec.c
@@ -4069,16 +4069,16 @@ SKIPJIBS:
case CON_CANSEESPR:
{
- long var1, var2, rvar;
+ long lVar1, lVar2, lVar3;
insptr++;
- var1 = GetGameVarID(*insptr++,g_i,g_p);
- var2 = GetGameVarID(*insptr++,g_i,g_p);
- rvar = *insptr++;
+ lVar1 = GetGameVarID(*insptr++,g_i,g_p);
+ lVar2 = GetGameVarID(*insptr++,g_i,g_p);
+ lVar3 = *insptr++;
- SetGameVarID(rvar, cansee(sprite[var1].x,sprite[var1].y,sprite[var1].z,sprite[var1].sectnum,
- sprite[var2].x,sprite[var2].y,sprite[var2].z,sprite[var2].sectnum), g_i, g_p);
+ SetGameVarID(lVar3, cansee(sprite[lVar1].x,sprite[lVar1].y,sprite[lVar1].z,sprite[lVar1].sectnum,
+ sprite[lVar2].x,sprite[lVar2].y,sprite[lVar2].z,sprite[lVar2].sectnum), g_i, g_p);
break;
}
diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c
index 2f7196cb1..7599e5bd9 100644
--- a/polymer/eduke32/source/player.c
+++ b/polymer/eduke32/source/player.c
@@ -154,33 +154,20 @@ void hitscantrail(long x1, long y1, long z1, long x2, long y2, long z2, short an
long xv, yv, zv, n, j, i;
short sect = -1;
- /* mathematical bullshit */
-
x1 += (sintable[(348+ang+512)&2047]/projectile[atwith].offset);
y1 += (sintable[(ang+348)&2047]/projectile[atwith].offset);
- /* find the distance between our player's projectile firing position and the impact point */
-
- n = (FindDistance2D(x1-x2,y1-y2))/256;
-
- /* apply an offset if needed, defined in CONs */
+ n = (FindDistance2D(x1-x2,y1-y2))>>8;
z1 += (projectile[atwith].toffset<<8)+1024;
- /* figure out how much distance to put between each sprite */
-
xv = (x2-x1)/n;
yv = (y2-y1)/n;
zv = (z2-z1)/n;
- // Bsprintf(tempbuf,"%ld, %ld, %ld (%ld)",xv,yv,zv,n);
- // AddLog(tempbuf);
-
- x1 += xv/4;
- y1 += yv/4;
- z1 += zv/4;
-
- /* spawn the trail sprites */
+ x1 += xv>>2;
+ y1 += yv>>2;
+ z1 += zv>>2;
for(i=0;i<projectile[atwith].tnum;i++)
{