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

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

Browse source
This commit is contained in:
terminx 2006-09-07 17:46:00 +00:00
parent e2ccbf6870
commit f14861b77a
3 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6302,6 +6302,12 @@ PALONLY:
t->cstat |= 4;
}
if( ps[screenpeek].heat_amount > 0 && ps[screenpeek].heat_on && (badguy(s) || checkspriteflags(t->owner,SPRITE_FLAG_NVG) || s->picnum == APLAYER || s->statnum == 13))
{
t->pal = 6;
t->shade = 0;
}
if( s->statnum == 13 || badguy(s) || checkspriteflags(t->owner,SPRITE_FLAG_SHADOW) || (s->picnum == APLAYER && s->owner >= 0) )
if(t->statnum != 99 && s->picnum != EXPLOSION2 && s->picnum != HANGLIGHT && s->picnum != DOMELITE)
if(s->picnum != HOTMEAT)
@ -6363,12 +6369,6 @@ PALONLY:
spritesortcnt++;
}
}
if( ps[screenpeek].heat_amount > 0 && ps[screenpeek].heat_on && (badguy(s) || checkspriteflags(t->owner,SPRITE_FLAG_NVG) || s->picnum == APLAYER || s->statnum == 13))
{
t->pal = 6;
t->shade = 0;
}
}
switch(dynamictostatic[s->picnum])

30
polymer/eduke32/source/gamedef.c
View file

@ -4310,7 +4310,7 @@ repeatcase:
transnum(LABEL_DEFINE);
scriptptr--;
j = *scriptptr;
skipcomments();
while( *textptr == ' ' || *textptr == '\t') textptr++;
if (j < 0 || j > MAXVOLUMES-1)
{
@ -4343,7 +4343,7 @@ repeatcase:
transnum(LABEL_DEFINE);
scriptptr--;
j = *scriptptr;
skipcomments();
while( *textptr == ' ' || *textptr == '\t' ) textptr++;
if (j < 0 || j > NUMGAMEFUNCTIONS-1)
{
@ -4377,7 +4377,7 @@ repeatcase:
transnum(LABEL_DEFINE);
scriptptr--;
j = *scriptptr;
skipcomments();
while( *textptr == ' ' || *textptr == '\t' ) textptr++;
if (j < 0 || j > 4)
{
@ -4414,7 +4414,7 @@ repeatcase:
scriptptr--; //remove it from compiled code
gametype_flags[j] = *scriptptr; //put it into the flags
skipcomments();
while( *textptr == ' ' || *textptr == '\t' ) textptr++;
if (j < 0 || j > MAXGAMETYPES-1)
{
@ -4450,7 +4450,7 @@ repeatcase:
transnum(LABEL_DEFINE);
scriptptr--;
k = *scriptptr;
skipcomments();
while( *textptr == ' ' || *textptr == '\t' ) textptr++;
if (j < 0 || j > MAXVOLUMES-1)
{
@ -4469,7 +4469,7 @@ repeatcase:
}
i = 0;
while( *textptr != ' ' && *textptr != 0x0d && *textptr != 0x0a )
while( *textptr != ' ' && *textptr != '\t' && *textptr != 0x0a )
{
level_file_names[j*11+k][i] = *textptr;
textptr++,i++;
@ -4477,27 +4477,27 @@ repeatcase:
{
initprintf("%s:%ld: error: level file name exceeds limit of %d characters.\n",compilefile,line_number,BMAX_PATH);
error++;
while( *textptr != ' ') textptr++;
while( *textptr != ' ' && *textptr != '\t') textptr++;
break;
}
}
level_names[j*11+k][i] = '\0';
skipcomments();
while( *textptr == ' ' || *textptr == '\t' ) textptr++;
partime[j*11+k] =
(((*(textptr+0)-'0')*10+(*(textptr+1)-'0'))*26*60)+
(((*(textptr+3)-'0')*10+(*(textptr+4)-'0'))*26);
textptr += 5;
skipcomments();
while( *textptr == ' ' || *textptr == '\t') textptr++;
designertime[j*11+k] =
(((*(textptr+0)-'0')*10+(*(textptr+1)-'0'))*26*60)+
(((*(textptr+3)-'0')*10+(*(textptr+4)-'0'))*26);
textptr += 5;
skipcomments();
while( *textptr == ' ' || *textptr == '\t') textptr++;
i = 0;
@ -4545,7 +4545,8 @@ repeatcase:
i = 0;
skipcomments();
while( *textptr == ' ' || *textptr == '\t' )
textptr++;
if (tw == CON_REDEFINEQUOTE)
{
@ -4613,9 +4614,8 @@ repeatcase:
}
scriptptr--;
i = 0;
skipcomments();
while( *textptr == ' ' || *textptr == '\t' )
textptr++;
while( *textptr != 0x0a && *textptr != 0x0d && *textptr != 0 && *textptr != ' ')
{
cheatquotes[k][i] = *textptr;
@ -4644,7 +4644,7 @@ repeatcase:
i = 0;
skipcomments();
while( *textptr != ' ' && *textptr != 0x0d && *textptr != 0x0a)
while( *textptr != ' ' || *textptr == '\t' )
{
sounds[k][i] = *textptr;
textptr++,i++;

4
polymer/eduke32/source/jfaud_sounds.cpp
View file

@ -61,11 +61,7 @@ static int osdcmd_setsoundfilter(const osdfuncparm_t *parm);
# include <cmath>
#endif
#ifdef JFAUD
#define MAXCACHE1DSIZE (16*1048576)
#else
#define MAXCACHE1DSIZE (32*1048576)
#endif
class KenFile : public JFAudFile {
private: