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

Minor change of scope of a couple variables. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5668 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2016-03-14 00:07:58 +00:00
parent 7b0a4fb965
commit 76d318ab1b
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
polymer/eduke32/source/screens.c
View file

@ -1654,28 +1654,6 @@ void G_DoOrderScreen(void)
static void G_BonusCutscenes(void) static void G_BonusCutscenes(void)
{ {
int32_t bonuscnt=0;
int32_t t;
int32_t breathe [] =
{
0, 30, VICTORY1+1, 176, 59,
30, 60, VICTORY1+2, 176, 59,
60, 90, VICTORY1+1, 176, 59,
90, 120, 0, 176, 59
};
int32_t bossmove [] =
{
0, 120, VICTORY1+3, 86, 59,
220, 260, VICTORY1+4, 86, 59,
260, 290, VICTORY1+5, 86, 59,
290, 320, VICTORY1+6, 86, 59,
320, 350, VICTORY1+7, 86, 59,
350, 380, VICTORY1+8, 86, 59,
350, 380, VICTORY1+8, 86, 59 // duplicate row to alleviate overflow in the for loop below "boss"
};
if (!(numplayers < 2 && ud.eog && ud.from_bonus == 0)) if (!(numplayers < 2 && ud.eog && ud.from_bonus == 0))
return; return;
@ -1687,6 +1665,18 @@ static void G_BonusCutscenes(void)
if (ud.lockout == 0 && !(G_GetLogoFlags() & LOGO_NOE1BONUSSCENE)) if (ud.lockout == 0 && !(G_GetLogoFlags() & LOGO_NOE1BONUSSCENE))
{ {
int32_t bonuscnt=0;
int32_t const bossmove [] =
{
0, 120, VICTORY1+3, 86, 59,
220, 260, VICTORY1+4, 86, 59,
260, 290, VICTORY1+5, 86, 59,
290, 320, VICTORY1+6, 86, 59,
320, 350, VICTORY1+7, 86, 59,
350, 380, VICTORY1+8, 86, 59,
350, 380, VICTORY1+8, 86, 59 // duplicate row to alleviate overflow in the for loop below "boss"
};
P_SetGamePalette(g_player[myconnectindex].ps, ENDINGPAL, 8+2+1); // JBF 20040308 P_SetGamePalette(g_player[myconnectindex].ps, ENDINGPAL, 8+2+1); // JBF 20040308
clearallviews(0L); clearallviews(0L);
rotatesprite_fs(0, 50<<16, 65536L, 0, VICTORY1, 0, 0, 2+8+16+64+128+BGSTRETCH); rotatesprite_fs(0, 50<<16, 65536L, 0, VICTORY1, 0, 0, 2+8+16+64+128+BGSTRETCH);
@ -1703,7 +1693,7 @@ static void G_BonusCutscenes(void)
// boss // boss
if (totalclock > 390 && totalclock < 780) if (totalclock > 390 && totalclock < 780)
for (t=0; t<35; t+=5) if (bossmove[t+2] && (totalclock%390) > bossmove[t] && (totalclock%390) <= bossmove[t+1]) for (int t=0; t<35; t+=5) if (bossmove[t+2] && (totalclock%390) > bossmove[t] && (totalclock%390) <= bossmove[t+1])
{ {
if (t==10 && bonuscnt == 1) if (t==10 && bonuscnt == 1)
{ {
@ -1717,6 +1707,14 @@ static void G_BonusCutscenes(void)
// Breathe // Breathe
if (totalclock < 450 || totalclock >= 750) if (totalclock < 450 || totalclock >= 750)
{ {
int32_t const breathe [] =
{
0, 30, VICTORY1+1, 176, 59,
30, 60, VICTORY1+2, 176, 59,
60, 90, VICTORY1+1, 176, 59,
90, 120, 0, 176, 59
};
if (totalclock >= 750) if (totalclock >= 750)
{ {
rotatesprite_fs(86<<16, 59<<16, 65536L, 0, VICTORY1+8, 0, 0, 2+8+16+64+128+BGSTRETCH); rotatesprite_fs(86<<16, 59<<16, 65536L, 0, VICTORY1+8, 0, 0, 2+8+16+64+128+BGSTRETCH);
@ -1727,7 +1725,7 @@ static void G_BonusCutscenes(void)
} }
} }
for (t=0; t<20; t+=5) for (int t=0; t<20; t+=5)
if (breathe[t+2] && (totalclock%120) > breathe[t] && (totalclock%120) <= breathe[t+1]) if (breathe[t+2] && (totalclock%120) > breathe[t] && (totalclock%120) <= breathe[t+1])
{ {
if (t==5 && bonuscnt == 0) if (t==5 && bonuscnt == 0)
@ -1814,7 +1812,7 @@ static void G_BonusCutscenes(void)
fadepal(0, 0, 0, 252, 0, -4); fadepal(0, 0, 0, 252, 0, -4);
I_ClearAllInput(); I_ClearAllInput();
t = Anim_Play("vol4e1.anm"); int t = Anim_Play("vol4e1.anm");
clearallviews(0L); clearallviews(0L);
nextpage(); nextpage();
if (t) if (t)