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

Fix the blacked out bonus screen and run game.c through astyle

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1918 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2011-06-25 16:37:10 +00:00
parent 6509f45dd6
commit 26cd2b309c
1 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -186,7 +186,7 @@ int32_t kopen4loadfrommod(const char *filename, char searchfirst)
return r; return r;
} }
char * defaultconfile(void) char *defaultconfile(void)
{ {
int32_t i; int32_t i;
@ -1898,7 +1898,11 @@ void G_FadePalette(int32_t r,int32_t g,int32_t b,int32_t e)
void fadepal(int32_t r, int32_t g, int32_t b, int32_t start, int32_t end, int32_t step) void fadepal(int32_t r, int32_t g, int32_t b, int32_t start, int32_t end, int32_t step)
{ {
if (getrendermode() >= 3) return; if (getrendermode() >= 3)
{
G_FadePalette(r, g, b, end);
return;
}
if (step > 0) if (step > 0)
{ {
@ -6321,7 +6325,7 @@ PALONLY:
else else
#endif #endif
switch (l) switch (l)
{ {
case 2: case 2:
k = (((s->ang+3072+128-a)&2047)>>8)&1; k = (((s->ang+3072+128-a)&2047)>>8)&1;
break; break;
@ -6364,20 +6368,20 @@ PALONLY:
default: default:
k = 0; k = 0;
break; break;
} }
t->picnum += k + (*(intptr_t *)t4) + l * t3; t->picnum += k + (*(intptr_t *)t4) + l * t3;
if (l > 0) while (tilesizx[t->picnum] == 0 && t->picnum > 0) if (l > 0) while (tilesizx[t->picnum] == 0 && t->picnum > 0)
t->picnum -= l; //Hack, for actors t->picnum -= l; //Hack, for actors
if (actor[i].dispicnum >= 0) if (actor[i].dispicnum >= 0)
actor[i].dispicnum = t->picnum; actor[i].dispicnum = t->picnum;
} }
// else if (display_mirror == 1) // else if (display_mirror == 1)
// t->cstat |= 4; // t->cstat |= 4;
/* completemirror() already reverses the drawn frame, so the above isn't necessary. /* completemirror() already reverses the drawn frame, so the above isn't necessary.
* Even Polymost's and Polymer's mirror seems to function correctly this way. */ * Even Polymost's and Polymer's mirror seems to function correctly this way. */
skip: skip:
if (g_player[screenpeek].ps->inv_amount[GET_HEATS] > 0 && g_player[screenpeek].ps->heat_on && if (g_player[screenpeek].ps->inv_amount[GET_HEATS] > 0 && g_player[screenpeek].ps->heat_on &&
@ -8395,7 +8399,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
{ {
Bstrcpy(defaultduke3dgrp, "nam.grp"); Bstrcpy(defaultduke3dgrp, "nam.grp");
Bstrcpy(defsfilename, "nam.def"); Bstrcpy(defsfilename, "nam.def");
// Bstrcpy(g_defNamePtr, "nam.def"); // Bstrcpy(g_defNamePtr, "nam.def");
Bstrcpy(defaultconfilename[0], "nam.con"); Bstrcpy(defaultconfilename[0], "nam.con");
g_gameType = GAME_NAM; g_gameType = GAME_NAM;
i++; i++;
@ -8405,7 +8409,7 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
{ {
Bstrcpy(defaultduke3dgrp, "ww2gi.grp"); Bstrcpy(defaultduke3dgrp, "ww2gi.grp");
Bstrcpy(defsfilename, "ww2gi.def"); Bstrcpy(defsfilename, "ww2gi.def");
// Bstrcpy(g_defNamePtr, "ww2gi.def"); // Bstrcpy(g_defNamePtr, "ww2gi.def");
Bstrcpy(defaultconfilename[0], "ww2gi.con"); Bstrcpy(defaultconfilename[0], "ww2gi.con");
g_gameType = GAME_WW2; g_gameType = GAME_WW2;
i++; i++;
@ -9725,7 +9729,7 @@ int32_t app_main(int32_t argc,const char **argv)
// something different, they get what they asked for // something different, they get what they asked for
Bstrcpy(defaultduke3dgrp, WW2GI ? "ww2gi.grp" : "nam.grp"); Bstrcpy(defaultduke3dgrp, WW2GI ? "ww2gi.grp" : "nam.grp");
Bstrcpy(defsfilename, WW2GI ? "ww2gi.def" : "nam.def"); Bstrcpy(defsfilename, WW2GI ? "ww2gi.def" : "nam.def");
// Bstrcpy(g_defNamePtr, WW2GI ? "ww2gi.def" : "nam.def"); // Bstrcpy(g_defNamePtr, WW2GI ? "ww2gi.def" : "nam.def");
Bstrcpy(defaultconfilename[0], WW2GI ? "ww2gi.con" : "nam.con"); Bstrcpy(defaultconfilename[0], WW2GI ? "ww2gi.con" : "nam.con");
Bstrcpy(GametypeNames[0],"GRUNTMATCH (SPAWN)"); Bstrcpy(GametypeNames[0],"GRUNTMATCH (SPAWN)");