zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
terminx 2008-10-20 04:00:00 +00:00
parent 4074884ac2
commit a7da07bcdf
9 changed files with 75 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/build/src/engine.c
View file

@ -11247,7 +11247,7 @@ void draw2dscreen(int posxe, int posye, short ange, int zoome, short gride)
#if 1
do
{
/* drawline16(halfxdim16+xp1-pointsize,midydim16+yp1+pointsize,halfxdim16+xp1+pointsize,midydim16+yp1+pointsize,col);
/* drawline16(halfxdim16+xp1-pointsize,midydim16+yp1+pointsize,halfxdim16+xp1+pointsize,midydim16+yp1+pointsize,col);
drawline16(halfxdim16+xp1+pointsize,midydim16+yp1+pointsize,halfxdim16+xp1+pointsize,midydim16+yp1-pointsize,col);
drawline16(halfxdim16+xp1+pointsize,midydim16+yp1-pointsize,halfxdim16+xp1-pointsize,midydim16+yp1-pointsize,col);
drawline16(halfxdim16+xp1-pointsize,midydim16+yp1-pointsize,halfxdim16+xp1-pointsize,midydim16+yp1+pointsize,col); */

6
polymer/eduke32/build/src/mdsprite.c
View file

@ -693,7 +693,7 @@ int mdloadskin(md2model *m, int number, int pal, int surf)
if ((int)sk->palette == pal && sk->skinnum == number && sk->surfnum == surf)
{
skinfile = sk->fn;
texidx = &sk->texid[(globalnoeffect)?0:(hictinting[pal].f&HICEFFECTMASK) ];
texidx = &sk->texid[(globalnoeffect)?0:(hictinting[pal].f&HICEFFECTMASK)];
strcpy(fn,skinfile);
//OSD_Printf("Using exact match skin (pal=%d,skinnum=%d,surfnum=%d) %s\n",pal,number,surf,skinfile);
break;
@ -713,7 +713,7 @@ int mdloadskin(md2model *m, int number, int pal, int surf)
if (skzero)
{
skinfile = skzero->fn;
texidx = &skzero->texid[(globalnoeffect)?0:(hictinting[pal].f&HICEFFECTMASK) ];
texidx = &skzero->texid[(globalnoeffect)?0:(hictinting[pal].f&HICEFFECTMASK)];
strcpy(fn,skinfile);
//OSD_Printf("Using def skin 0,0 as fallback, pal=%d\n", pal);
}
@ -721,7 +721,7 @@ int mdloadskin(md2model *m, int number, int pal, int surf)
{
if ((unsigned)number >= (unsigned)m->numskins) number = 0;
skinfile = m->skinfn + number*64;
texidx = &m->texid[ number * (HICEFFECTMASK+1) + (globalnoeffect)?0:(hictinting[pal].f&HICEFFECTMASK) ];
texidx = &m->texid[ number * (HICEFFECTMASK+1) + (globalnoeffect)?0:(hictinting[pal].f&HICEFFECTMASK)];
strcpy(fn,m->basepath); strcat(fn,skinfile);
//OSD_Printf("Using MD2/MD3 skin (%d) %s, pal=%d\n",number,skinfile,pal);
}

2
polymer/eduke32/build/src/winlayer.c
View file

@ -1539,7 +1539,7 @@ static void GetKeyNames(void)
tbuf[0] = 0;
GetKeyNameText((i>128?(i+128):i)<<16, tbuf, sizeof(keynames[i])-1);
// initprintf("%d %15s %15s\n",i,keynames[i],tbuf);
if(*tbuf)strncpy(&keynames[i][0], tbuf, sizeof(keynames[i])-1);
if (*tbuf)strncpy(&keynames[i][0], tbuf, sizeof(keynames[i])-1);
}
}

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

@ -2283,17 +2283,17 @@ BOLT:
static void bounce(int i)
{
int daang, dax, day, daz, xvect, yvect, zvect;
int dax, day, daz = 4096;
spritetype *s = &sprite[i];
int hitsect = s->sectnum;
int k = sector[hitsect].wallptr;
int l = wall[k].point2;
xvect = mulscale10(s->xvel,sintable[(s->ang+512)&2047]);
yvect = mulscale10(s->xvel,sintable[s->ang&2047]);
zvect = s->zvel;
int xvect = mulscale10(s->xvel,sintable[(s->ang+512)&2047]);
int yvect = mulscale10(s->xvel,sintable[s->ang&2047]);
int zvect = s->zvel;
daang = getangle(wall[l].x-wall[k].x,wall[l].y-wall[k].y);
int daang = getangle(wall[l].x-wall[k].x,wall[l].y-wall[k].y);
if (s->z < (hittype[i].floorz+hittype[i].ceilingz)>>1)
k = sector[hitsect].ceilingheinum;
@ -2302,7 +2302,6 @@ static void bounce(int i)
dax = mulscale14(k,sintable[(daang)&2047]);
day = mulscale14(k,sintable[(daang+1536)&2047]);
daz = 4096;
k = xvect*dax+yvect*day+zvect*daz;
l = dax*dax+day*day+daz*daz;

2
polymer/eduke32/source/astub.c
View file

@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <shellapi.h>
#endif
#define BUILDDATE " 20081017"
#define BUILDDATE " 20081019"
#define VERSION " 1.2.0devel"
static int floor_over_floor;

2
polymer/eduke32/source/global.c
View file

@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//-------------------------------------------------------------------------
#include "duke3d.h"
char *s_builddate = "20081018";
char *s_builddate = "20081019";
char *MusicPtr = NULL;
int Musicsize;