mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 11:10:47 +00:00
I guess this is an optimization as well
git-svn-id: https://svn.eduke32.com/eduke32@394 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
d0ef9e1133
commit
d48c66b7ad
6 changed files with 469 additions and 469 deletions
|
@ -1108,7 +1108,7 @@ void moveplayers(void) //Players
|
||||||
otherx = 0;
|
otherx = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
execute(i,s->yvel,otherx);
|
execute(&i,&s->yvel,&otherx);
|
||||||
|
|
||||||
if (ud.multimode > 1)
|
if (ud.multimode > 1)
|
||||||
if (sprite[ps[otherp].i].extra > 0)
|
if (sprite[ps[otherp].i].extra > 0)
|
||||||
|
@ -2341,11 +2341,11 @@ CLEAR_THE_BOLT:
|
||||||
case STEAM__STATIC:
|
case STEAM__STATIC:
|
||||||
case CEILINGSTEAM__STATIC:
|
case CEILINGSTEAM__STATIC:
|
||||||
p = findplayer(s, &x);
|
p = findplayer(s, &x);
|
||||||
execute(i,p,x);
|
execute(&i,&p,&x);
|
||||||
goto BOLT;
|
goto BOLT;
|
||||||
case WATERBUBBLEMAKER__STATIC:
|
case WATERBUBBLEMAKER__STATIC:
|
||||||
p = findplayer(s, &x);
|
p = findplayer(s, &x);
|
||||||
execute(i,p,x);
|
execute(&i,&p,&x);
|
||||||
goto BOLT;
|
goto BOLT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2812,7 +2812,7 @@ void moveweapons(void)
|
||||||
if (thisprojectile[i].workslike & PROJECTILE_FLAG_HITSCAN)
|
if (thisprojectile[i].workslike & PROJECTILE_FLAG_HITSCAN)
|
||||||
{
|
{
|
||||||
p = findplayer(s,&x);
|
p = findplayer(s,&x);
|
||||||
execute(i,p,x);
|
execute(&i,&p,&x);
|
||||||
goto BOLT;
|
goto BOLT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3183,7 +3183,7 @@ void moveweapons(void)
|
||||||
|
|
||||||
case SHOTSPARK1__STATIC:
|
case SHOTSPARK1__STATIC:
|
||||||
p = findplayer(s,&x);
|
p = findplayer(s,&x);
|
||||||
execute(i,p,x);
|
execute(&i,&p,&x);
|
||||||
goto BOLT;
|
goto BOLT;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4842,7 +4842,7 @@ DETONATEB:
|
||||||
|
|
||||||
p = findplayer(s,&x);
|
p = findplayer(s,&x);
|
||||||
|
|
||||||
execute(i,p,x);
|
execute(&i,&p,&x);
|
||||||
|
|
||||||
BOLT:
|
BOLT:
|
||||||
|
|
||||||
|
@ -5283,7 +5283,7 @@ void moveexplosions(void) // STATNUM 5
|
||||||
case TRANSPORTERSTAR__STATIC:
|
case TRANSPORTERSTAR__STATIC:
|
||||||
case TRANSPORTERBEAM__STATIC:
|
case TRANSPORTERBEAM__STATIC:
|
||||||
p = findplayer(s,&x);
|
p = findplayer(s,&x);
|
||||||
execute(i,p,x);
|
execute(&i,&p,&x);
|
||||||
goto BOLT;
|
goto BOLT;
|
||||||
|
|
||||||
case SHELL__STATIC:
|
case SHELL__STATIC:
|
||||||
|
|
|
@ -170,7 +170,7 @@ extern void alterang(short a);
|
||||||
extern void move(void);
|
extern void move(void);
|
||||||
extern void parseifelse(long condition);
|
extern void parseifelse(long condition);
|
||||||
extern char parse(void);
|
extern char parse(void);
|
||||||
extern void execute(short sActor,short sPlayer,long lDist);
|
extern void execute(const short *sActor,const short *sPlayer,const long *lDist);
|
||||||
extern void overwritesprite(long thex,long they,short tilenum,signed char shade,char stat,char dapalnum);
|
extern void overwritesprite(long thex,long they,short tilenum,signed char shade,char stat,char dapalnum);
|
||||||
extern void timerhandler(void);
|
extern void timerhandler(void);
|
||||||
extern int gametext(int x,int y,char *t,char s,short dabits);
|
extern int gametext(int x,int y,char *t,char s,short dabits);
|
||||||
|
@ -328,7 +328,7 @@ extern void sanitizegametype();
|
||||||
extern void setupdynamictostatic();
|
extern void setupdynamictostatic();
|
||||||
extern void processnames(char *szLabel, long lValue);
|
extern void processnames(char *szLabel, long lValue);
|
||||||
|
|
||||||
extern void LoadActor(short sActor, short sPlayer, long lDist);
|
extern void LoadActor(long sActor);
|
||||||
|
|
||||||
extern long GetGameVar(char *szGameLabel, long lDefault, short sActor, short sPlayer);
|
extern long GetGameVar(char *szGameLabel, long lDefault, short sActor, short sPlayer);
|
||||||
extern void DumpGameVars(FILE *fp);
|
extern void DumpGameVars(FILE *fp);
|
||||||
|
@ -358,6 +358,6 @@ extern void sendquit(void);
|
||||||
extern void adduserquote(char *daquote);
|
extern void adduserquote(char *daquote);
|
||||||
extern char *strip_color_codes(char *t);
|
extern char *strip_color_codes(char *t);
|
||||||
|
|
||||||
extern void get_level_from_filename(char *fn, char *volume, char *level);
|
extern void get_level_from_filename(char *fn, int *volume, int *level);
|
||||||
|
|
||||||
#endif // __funct_h__
|
#endif // __funct_h__
|
||||||
|
|
|
@ -9594,7 +9594,7 @@ int load_script(char *szScript)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void get_level_from_filename(char *fn, char *volume, char *level)
|
void get_level_from_filename(char *fn, int *volume, int *level)
|
||||||
{
|
{
|
||||||
for ((*volume)=0;(*volume)<MAXVOLUMES;(*volume)++)
|
for ((*volume)=0;(*volume)<MAXVOLUMES;(*volume)++)
|
||||||
{
|
{
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -181,4 +181,4 @@ proj_struct projectile[MAXTILES], thisprojectile[MAXSPRITES], defaultprojectile[
|
||||||
char cheatkey[2] = { sc_D, sc_N };
|
char cheatkey[2] = { sc_D, sc_N };
|
||||||
char setupfilename[BMAX_PATH]= "duke3d.cfg";
|
char setupfilename[BMAX_PATH]= "duke3d.cfg";
|
||||||
|
|
||||||
void get_level_from_filename(char *fn, char *volume, char *level);
|
void get_level_from_filename(char *fn, int *volume, int *level);
|
||||||
|
|
|
@ -813,7 +813,7 @@ void prelevel(char g)
|
||||||
{
|
{
|
||||||
nexti = nextspritestat[i];
|
nexti = nextspritestat[i];
|
||||||
ResetActorGameVars(i);
|
ResetActorGameVars(i);
|
||||||
LoadActor(i, -1, -1);
|
LoadActor(i);
|
||||||
if (sprite[i].lotag == -1 && (sprite[i].cstat&16))
|
if (sprite[i].lotag == -1 && (sprite[i].cstat&16))
|
||||||
{
|
{
|
||||||
ps[0].exitx = SX;
|
ps[0].exitx = SX;
|
||||||
|
@ -1615,7 +1615,7 @@ int enterlevel(char g)
|
||||||
|
|
||||||
if (boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0)
|
if (boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0)
|
||||||
{
|
{
|
||||||
char volume, level;
|
int volume, level;
|
||||||
|
|
||||||
get_level_from_filename(boardfilename,&volume,&level);
|
get_level_from_filename(boardfilename,&volume,&level);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue