git-svn-id: https://svn.eduke32.com/eduke32@523 1a8010ca-5511-0410-912e-c29ae57300e0

This commit is contained in:
terminx 2007-03-13 18:37:46 +00:00
parent 7c7b8c2869
commit 4b4d37cf3f
5 changed files with 22 additions and 13 deletions

View file

@ -159,8 +159,8 @@ long r_glowmapping = 1;
long r_vertexarrays = 1; long r_vertexarrays = 1;
// Vertex Buffer Objects model drawing cvars // Vertex Buffer Objects model drawing cvars
long r_vbos = 1; long r_vbos = 0;
long r_vbocount = 1; long r_vbocount = 64;
static float fogresult, ofogresult, fogcol[4]; static float fogresult, ofogresult, fogcol[4];

View file

@ -245,4 +245,6 @@ extern inline int checkspriteflagsp(int iPicnum, int iType);
extern int getteampal(int team); extern int getteampal(int team);
extern void se40code(long x,long y,long z,long a,long h, long smoothratio);
#endif // __funct_h__ #endif // __funct_h__

View file

@ -3832,7 +3832,7 @@ static void SE40_Draw(int spnum,long x,long y,long z,int a,int h,long smoothrati
} }
} // end SE40 } // end SE40
static void se40code(long x,long y,long z,long a,long h, long smoothratio) void se40code(long x,long y,long z,long a,long h, long smoothratio)
{ {
int i; int i;
@ -6232,15 +6232,6 @@ void animatesprites(long x,long y,int a,long smoothratio)
i = t->owner; i = t->owner;
s = &sprite[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);
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 //greenslime can't be handled through the dynamictostatic system due to addition on constant
if ((t->picnum >= GREENSLIME)&&(t->picnum <= GREENSLIME+7)) if ((t->picnum >= GREENSLIME)&&(t->picnum <= GREENSLIME+7))
{} {}
@ -6774,6 +6765,12 @@ PALONLY:
if (actorscrptr[s->picnum]) if (actorscrptr[s->picnum])
{ {
#if 0
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->ang = sprpos[i].ang+mulscale16((long)(s->ang-sprpos[i].ang),smoothratio);
#endif
if (t4) if (t4)
{ {
l = *(long *)(t4+8); l = *(long *)(t4+8);

View file

@ -4626,6 +4626,8 @@ static int parse(void)
#endif #endif
dointerpolations(smoothratio); dointerpolations(smoothratio);
#define SE40
#ifdef SE40 #ifdef SE40
se40code(x,y,z,a,horiz,smoothratio); se40code(x,y,z,a,horiz,smoothratio);
#endif #endif
@ -6431,6 +6433,13 @@ void execute(int iActor,int iPlayer,long lDist)
{ {
move(); move();
#if 0
sprpos[g_i].x = g_sp->x;
sprpos[g_i].y = g_sp->y;
sprpos[g_i].z = g_sp->z;
sprpos[g_i].ang = g_sp->ang;
#endif
if (g_sp->statnum == 1) if (g_sp->statnum == 1)
{ {
if (badguy(g_sp)) if (badguy(g_sp))

View file

@ -1875,6 +1875,7 @@ cheat_for_port_credits:
"Thanks to the following people for their contributions:", "Thanks to the following people for their contributions:",
"", "",
"Adam Fazakerley", "Adam Fazakerley",
"Charlie Honig",
"Ed Coolidge", "Ed Coolidge",
"James Bentler", "James Bentler",
"Javier Martinez", "Javier Martinez",
@ -1884,7 +1885,7 @@ cheat_for_port_credits:
"Lachlan McDonald", "Lachlan McDonald",
"Matthew Palmer", "Matthew Palmer",
"Peter Green", "Peter Green",
"Ryan C. Gordon", "Ryan Gordon",
"", "",
"EDuke originally by Matt Saettler", "EDuke originally by Matt Saettler",
"", "",