teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-16 01:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
terminx 2008-02-06 03:49:35 +00:00
parent a1f0b9aff2
commit 86d4bace1d
4 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
polymer/build/src/engine.c
View file

@ -6753,6 +6753,12 @@ int loadboard(char *filename, char fromwhere, int *daposx, int *daposy, int *dap
sprite[i].lotag = B_LITTLE16(sprite[i].lotag); sprite[i].lotag = B_LITTLE16(sprite[i].lotag);
sprite[i].hitag = B_LITTLE16(sprite[i].hitag); sprite[i].hitag = B_LITTLE16(sprite[i].hitag);
sprite[i].extra = B_LITTLE16(sprite[i].extra); sprite[i].extra = B_LITTLE16(sprite[i].extra);
if(sprite[i].sectnum<0||sprite[i].sectnum>=MYMAXSECTORS)
{
initprintf("Map error: sprite #%d(%d,%d) with wrong sector(%d)\n",i,sprite[i].x,sprite[i].y,sprite[i].sectnum);
sprite[i].sectnum=MYMAXSECTORS-1;
}
} }
for (i=0;i<numsprites;i++) for (i=0;i<numsprites;i++)
@ -7778,10 +7784,11 @@ void nextpage(void)
#ifdef USE_OPENGL #ifdef USE_OPENGL
omdtims = mdtims; mdtims = getticks(); omdtims = mdtims; mdtims = getticks();
if(mdpause)
{ {
int i; int i;
for(i=0;i<MAXSPRITES;i++)if(spriteext[i].mdanimtims)spriteext[i].mdanimtims+=mdtims-omdtims; for(i=0;i<MAXSPRITES;i++)
if((mdpause&&spriteext[i].mdanimtims)||(spriteext[i].flags & SPREXT_NOMDANIM))
spriteext[i].mdanimtims+=mdtims-omdtims;
} }
#endif #endif

2
polymer/build/src/mdsprite.c
View file

@ -1085,7 +1085,7 @@ static void updateanimation(md2model *m, spritetype *tspr)
} }
} }
if (anim && (((int)spriteext[tspr->owner].mdanimcur) != anim->startframe || (spriteext[tspr->owner].flags & SPREXT_NOMDANIM))) if (anim && (((int)spriteext[tspr->owner].mdanimcur) != anim->startframe))
{ {
//if (spriteext[tspr->owner].flags & SPREXT_NOMDANIM) OSD_Printf("SPREXT_NOMDANIM\n"); //if (spriteext[tspr->owner].flags & SPREXT_NOMDANIM) OSD_Printf("SPREXT_NOMDANIM\n");
//OSD_Printf("smooth launched ! oldanim %i new anim %i\n", spriteext[tspr->owner].mdanimcur, anim->startframe); //OSD_Printf("smooth launched ! oldanim %i new anim %i\n", spriteext[tspr->owner].mdanimcur, anim->startframe);

4
polymer/build/src/winlayer.c
View file

@ -57,6 +57,7 @@ static BOOL window_class_registered = FALSE;
static HANDLE instanceflag = NULL; static HANDLE instanceflag = NULL;
int backgroundidle = 1; int backgroundidle = 1;
int is_vista = 0;
static WORD sysgamma[3][256]; static WORD sysgamma[3][256];
extern int curbrightness, gammabrightness; extern int curbrightness, gammabrightness;
@ -476,7 +477,10 @@ static void print_os_version(void)
break; break;
} }
if (osv.dwMajorVersion == 6 && osv.dwMinorVersion == 0) if (osv.dwMajorVersion == 6 && osv.dwMinorVersion == 0)
{
ver = "Vista"; ver = "Vista";
is_vista = 1;
}
break; break;
case VER_PLATFORM_WIN32_WINDOWS: case VER_PLATFORM_WIN32_WINDOWS:

13
polymer/eduke32/source/jaudiolib/multivoc.c
View file

@ -134,8 +134,8 @@ int MV_ErrorCode = MV_Ok;
void ClearBuffer_DW(void *ptr, int data, int length) void ClearBuffer_DW(void *ptr, int data, int length)
{ {
int *pptr = ptr; int *pptr = ptr;
for (; length>0; length--) *(pptr++) = data; for (; length>0; length--) *(pptr++) = data;
} }
@ -254,6 +254,15 @@ static unsigned MV_GetBufferSize(unsigned samplerate)
lastsr = samplerate; lastsr = samplerate;
lastbufsz = (samplerate*BASEBUFSZ/22050)&(~15); lastbufsz = (samplerate*BASEBUFSZ/22050)&(~15);
#ifdef RENDERTYPEWIN
{
extern int is_vista;
if (is_vista)
lastbufsz = (samplerate*BASEBUFSZ/22050*2)&(~15);
}
#endif
return lastbufsz; return lastbufsz;
} }