zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-28 18:00:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- properly tabified everything.

Browse source
This commit is contained in:
Christoph Oelckers 2020-07-20 23:21:27 +02:00
parent ba7997b611
commit 7eb158bf72
29 changed files with 5091 additions and 5091 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/games/duke/src/dispatch.cpp
View file

@ -61,16 +61,16 @@ bool ceilingspace_d(int sectnum);
bool ceilingspace_r(int sectnum);
bool floorspace_d(int sectnum);
bool floorspace_r(int sectnum);
void addweapon_d(struct player_struct *p, int weapon);
void addweapon_r(struct player_struct *p, int weapon);
void addweapon_d(struct player_struct* p, int weapon);
void addweapon_r(struct player_struct* p, int weapon);
void hitradius_d(short i, int r, int hp1, int hp2, int hp3, int hp4);
void hitradius_r(short i, int r, int hp1, int hp2, int hp3, int hp4);
int movesprite_d(short spritenum, int xchange, int ychange, int zchange, unsigned int cliptype);
int movesprite_r(short spritenum, int xchange, int ychange, int zchange, unsigned int cliptype);
void lotsofmoney_d(spritetype *s, short n);
void lotsofmail_d(spritetype *s, short n);
void lotsofpaper_d(spritetype *s, short n);
void lotsoffeathers_r(spritetype *s, short n);
void lotsofmoney_d(spritetype* s, short n);
void lotsofmail_d(spritetype* s, short n);
void lotsofpaper_d(spritetype* s, short n);
void lotsoffeathers_r(spritetype* s, short n);
void guts_d(spritetype* s, short gtype, short n, short p);
void guts_r(spritetype* s, short gtype, short n, short p);
void gutsdir_d(spritetype* s, short gtype, short n, short p);

12
source/games/duke/src/game.cpp
View file

@ -106,7 +106,7 @@ static void genspriteremaps(void)
uint8_t paldata[768];
for (j=1; j<=5; j++)
for (j = 1; j <= 5; j++)
{
if (fr.Read(paldata, 768) != 768)
return;
@ -121,8 +121,8 @@ static void genspriteremaps(void)
{
// swap red and blue channels.
paldata[i * 3] = GPalette.BaseColors[i].b;
paldata[i * 3+1] = GPalette.BaseColors[i].g;
paldata[i * 3+2] = GPalette.BaseColors[i].r;
paldata[i * 3 + 1] = GPalette.BaseColors[i].g;
paldata[i * 3 + 2] = GPalette.BaseColors[i].r;
}
paletteSetColorTable(DRUGPAL, paldata, false, false); // todo: implement this as a shader effect (swap R and B in postprocessing.)
@ -298,7 +298,7 @@ static void ticker(void)
static void loaddefs()
{
const char *defsfile = G_DefFile();
const char* defsfile = G_DefFile();
cycle_t deftimer;
deftimer.Reset();
deftimer.Clock();
@ -399,9 +399,9 @@ static void Startup(void)
screenpeek = myconnectindex;
ps[myconnectindex].palette = BASEPAL;
for (int j=numplayers; j<ud.multimode; j++)
for (int j = numplayers; j < ud.multimode; j++)
{
mysnprintf(ud.user_name[j], sizeof(ud.user_name[j]),"%s %d", GStrings("PLAYER"),j+1);
mysnprintf(ud.user_name[j], sizeof(ud.user_name[j]), "%s %d", GStrings("PLAYER"), j + 1);
ps[j].weaponswitch = 3;
ps[j].auto_aim = 0;
}