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

generic commit message describing nothing

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1514 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2009-10-01 05:05:19 +00:00
parent 642e8685f5
commit 252df802fb
5 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
polymer/eduke32/source/game.c
View file

@ -3491,6 +3491,7 @@ void G_DisplayRest(int32_t smoothratio)
int32_t cposx, cposy, cang; int32_t cposx, cposy, cang;
#if defined(USE_OPENGL) && defined(POLYMOST) #if defined(USE_OPENGL) && defined(POLYMOST)
// this takes care of fullscreen tint for OpenGL // this takes care of fullscreen tint for OpenGL
if (getrendermode() >= 3) if (getrendermode() >= 3)
{ {
@ -5410,6 +5411,8 @@ int32_t A_Spawn(int32_t j, int32_t pn)
else if (sp->picnum == BURNING || sp->picnum == BURNING2) else if (sp->picnum == BURNING || sp->picnum == BURNING2)
sp->xrepeat = sp->yrepeat = 4; sp->xrepeat = sp->yrepeat = 4;
sp->cstat |= 8192;
if (j >= 0) if (j >= 0)
{ {
x = getflorzofslope(sp->sectnum,sp->x,sp->y); x = getflorzofslope(sp->sectnum,sp->x,sp->y);
@ -6641,6 +6644,7 @@ void G_DoSpriteAnimations(int32_t x,int32_t y,int32_t a,int32_t smoothratio)
{ {
case NATURALLIGHTNING__STATIC: case NATURALLIGHTNING__STATIC:
t->shade = -127; t->shade = -127;
t->cstat |= 8192;
break; break;
case FEM1__STATIC: case FEM1__STATIC:
case FEM2__STATIC: case FEM2__STATIC:
@ -7294,6 +7298,7 @@ PALONLY:
//g_restorePalette = 1; // JBF 20040101: why? //g_restorePalette = 1; // JBF 20040101: why?
} }
t->shade = -127; t->shade = -127;
t->cstat |= 8192;
break; break;
case FIRE__STATIC: case FIRE__STATIC:
case FIRE2__STATIC: case FIRE2__STATIC:
@ -7302,9 +7307,11 @@ PALONLY:
if (sprite[s->owner].picnum != TREE1 && sprite[s->owner].picnum != TREE2) if (sprite[s->owner].picnum != TREE1 && sprite[s->owner].picnum != TREE2)
t->z = sector[t->sectnum].floorz; t->z = sector[t->sectnum].floorz;
t->shade = -127; t->shade = -127;
t->cstat |= 8192;
break; break;
case COOLEXPLOSION1__STATIC: case COOLEXPLOSION1__STATIC:
t->shade = -127; t->shade = -127;
t->cstat |= 8192;
t->picnum += (s->shade>>1); t->picnum += (s->shade>>1);
break; break;
case PLAYERONWATER__STATIC: case PLAYERONWATER__STATIC:

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" #include "duke3d.h"
const char *s_buildDate = "20090927"; const char *s_buildDate = "20090930";
char *MusicPtr = NULL; char *MusicPtr = NULL;
int32_t g_musicSize; int32_t g_musicSize;

3
polymer/eduke32/source/jaudiolib/src/driver_directsound.c
View file

@ -342,7 +342,8 @@ int32_t DirectSoundDrv_PCM_Init(int32_t *mixrate, int32_t *numchannels, int32_t
return DSErr_Error; return DSErr_Error;
} }
bufdesc.dwFlags = DSBCAPS_CTRLPOSITIONNOTIFY | bufdesc.dwFlags = DSBCAPS_LOCSOFTWARE |
DSBCAPS_CTRLPOSITIONNOTIFY |
DSBCAPS_GETCURRENTPOSITION2; DSBCAPS_GETCURRENTPOSITION2;
bufdesc.dwBufferBytes = wfex.nBlockAlign * 2048 * 2; bufdesc.dwBufferBytes = wfex.nBlockAlign * 2048 * 2;
bufdesc.lpwfxFormat = &wfex; bufdesc.lpwfxFormat = &wfex;

14
polymer/eduke32/source/menus.c
View file

@ -920,16 +920,6 @@ void M_DisplayMenus(void)
mgametext(d+70,yy,ud.weaponswitch&2?"On":"Off",MENUHIGHLIGHT(io),2+8+16); mgametext(d+70,yy,ud.weaponswitch&2?"On":"Off",MENUHIGHLIGHT(io),2+8+16);
break; break;
case 7:
#ifdef RANCID_NETWORKING
// enet network backend doesn't have a packet rate mechanism
mgametext(d+70,yy,"n/a", MENUHIGHLIGHT(io),2+8+16);
#else
Bsprintf(tempbuf,"%d",packetrate);
mgametext(d+70,yy,tempbuf,MENUHIGHLIGHT(io),2+8+16);
#endif
break;
default: default:
break; break;
} }
@ -952,7 +942,7 @@ void M_DisplayMenus(void)
if (x == -1) if (x == -1)
{ {
ChangeToMenu(20002); ChangeToMenu(20002);
probey = 8; probey = 7;
} }
else if (x >= 0 && x <= 9) else if (x >= 0 && x <= 9)
{ {
@ -4552,7 +4542,7 @@ cheat_for_port_credits:
break; break;
case 4: case 4:
{ {
int32_t rates[] = { 8000, 11025, 16000, 22050, 32000, 44100, 48000 }; int32_t rates[] = { 11025, 16000, 22050, 32000, 44100, 48000 };
int32_t j = (sizeof(rates)/sizeof(rates[0])); int32_t j = (sizeof(rates)/sizeof(rates[0]));
for (i = 0; i<j; i++) for (i = 0; i<j; i++)

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

@ -2725,7 +2725,7 @@ CHECKINV1:
p->wantweaponfire = j; p->wantweaponfire = j;
p->kickback_pic = 0; p->kickback_pic = 0;
} }
if ((int32_t)j != -1 && p->last_pissed_time <= (GAMETICSPERSEC*218) && p->show_empty_weapon == 0 && p->kickback_pic == 0 && p->quick_kick == 0 && sprite[p->i].xrepeat > 32 && p->access_incs == 0 && p->knee_incs == 0) if ((int32_t)j != -1 && p->last_pissed_time <= (GAMETICSPERSEC*218) && p->show_empty_weapon == 0 /*&& p->kickback_pic == 0*/ && p->quick_kick == 0 && sprite[p->i].xrepeat > 32 && p->access_incs == 0 && p->knee_incs == 0)
{ {
// if( ( p->weapon_pos == 0 || ( p->holster_weapon && p->weapon_pos == -9 ) )) // if( ( p->weapon_pos == 0 || ( p->holster_weapon && p->weapon_pos == -9 ) ))
{ {