Added detection for stupid mistakes people make with the 'move' command and doubled the CACHE1D size when not using JFAud.

git-svn-id: https://svn.eduke32.com/eduke32@253 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-08-02 20:51:50 +00:00
parent 665a322312
commit 5b211422da
4 changed files with 22 additions and 3 deletions

View file

@ -451,6 +451,11 @@ static int defsparser(scriptfile *script)
if(xsiz >= 0) tilesizx[tile] = xsiz; if(xsiz >= 0) tilesizx[tile] = xsiz;
if(ysiz >= 0) tilesizy[tile] = ysiz; if(ysiz >= 0) tilesizy[tile] = ysiz;
invalidatetile(tile,-1,-1); invalidatetile(tile,-1,-1);
if (waloff[tile] == 0)
{
walock[tile] = 199;
allocache(&waloff[tile],xsiz*ysiz,&walock[tile]);
}
break; break;
} }
case T_DUMMYTILERANGE: case T_DUMMYTILERANGE:
@ -476,6 +481,11 @@ static int defsparser(scriptfile *script)
if(xsiz >= 0) tilesizx[i] = xsiz; if(xsiz >= 0) tilesizx[i] = xsiz;
if(ysiz >= 0) tilesizy[i] = ysiz; if(ysiz >= 0) tilesizy[i] = ysiz;
invalidatetile(i,-1,-1); invalidatetile(i,-1,-1);
if (waloff[i] == 0)
{
walock[i] = 199;
allocache(&waloff[i],xsiz*ysiz,&walock[i]);
}
} }
} }
} }

View file

@ -92,8 +92,6 @@ extern int conversion, shareware, gametype;
#define TICRATE (120) #define TICRATE (120)
#define TICSPERFRAME (TICRATE/26) #define TICSPERFRAME (TICRATE/26)
#define MAXCACHE1DSIZE (16*1048576)
// #define GC (TICSPERFRAME*44) // #define GC (TICSPERFRAME*44)
#define NUM_SOUNDS 1500 #define NUM_SOUNDS 1500

View file

@ -113,6 +113,12 @@ short user_quote_time[MAXUSERQUOTES];
char user_quote[MAXUSERQUOTES][178]; char user_quote[MAXUSERQUOTES][178];
// char typebuflen,typebuf[41]; // char typebuflen,typebuf[41];
#ifdef JFAUD
#define MAXCACHE1DSIZE (16*1048576)
#else
#define MAXCACHE1DSIZE (32*1048576)
#endif
long tempwallptr; long tempwallptr;
long nonsharedtimer; long nonsharedtimer;

View file

@ -2247,7 +2247,12 @@ char parsecommand(void)
{ {
if(!CheckEventSync(current_event)) if(!CheckEventSync(current_event))
ReportError(WARNING_EVENTSYNC); ReportError(WARNING_EVENTSYNC);
transnum(LABEL_MOVE);
if((transnum(LABEL_MOVE) != LABEL_MOVE) && (*(scriptptr-1) != 0))
{
error++;
ReportError(ERROR_SYNTAXERROR);
}
j = 0; j = 0;
while(keyword() == -1) while(keyword() == -1)