stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 04:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

indentation sucks and so do datatypes

Browse source
This commit is contained in:
yellowtd 2017-03-11 19:01:16 -05:00
parent 55b31841d5
commit 191bd8ec41
4 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/d_main.c
View file

@ -483,23 +483,21 @@ static void D_Display(void)
if (rendermode != render_none)
{
// miru: we can use the mapheaderinfo to change the forced wipe the instant the map loads
if (!mapheaderinfo[gamemap-1]->postlevelwipe)
{
F_WipeEndScreen();
F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK);
}
else
{
if (mapheaderinfo[gamemap-1]->postlevelwipe < 100)
{
F_WipeStartScreen();
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, mapheaderinfo[gamemap-1]->wipecolor);
F_WipeEndScreen();
F_RunWipe(mapheaderinfo[gamemap-1]->postlevelwipe, gamestate != GS_TIMEATTACK);
}
}
//F_WipeEndScreen();
//F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK);
if (!mapheaderinfo[gamemap-1]->postlevelwipe)
{
F_WipeEndScreen();
F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK);
}
else
{
if (mapheaderinfo[gamemap-1]->postlevelwipe < 100)
{
F_WipeStartScreen();
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, mapheaderinfo[gamemap-1]->wipecolor);
F_WipeEndScreen();
F_RunWipe(mapheaderinfo[gamemap-1]->postlevelwipe, gamestate != GS_TIMEATTACK);
}
}
}
}

8
src/doomstat.h
View file

@ -248,10 +248,10 @@ typedef struct
UINT8 numGradedMares; ///< Internal. For grade support.
nightsgrades_t *grades; ///< NiGHTS grades. Allocated dynamically for space reasons. Be careful.
// miru: to use custom mapheaderinfo options, we need to add them to the struct first
INT16 levelwipe;
INT16 postlevelwipe;
INT16 wipecolor;
// miru: to use custom mapheaderinfo options, we need to add them to the struct first
UINT8 levelwipe;
UINT8 postlevelwipe;
UINT8 wipecolor;
// Lua stuff.
// (This is not ifdeffed so the map header structure can stay identical, just in case.)

13
src/g_game.c
View file

@ -1623,17 +1623,8 @@ void G_DoLoadLevel(boolean resetplayer)
levelstarttic = gametic; // for time calculation
// miru: postlevelwipe - just in case
if (!mapheaderinfo[gamemap-1]->postlevelwipe)
{
if (wipegamestate == GS_LEVEL)
wipegamestate = -1; // force a wipe
}
else
{
if (wipegamestate == GS_LEVEL)
wipegamestate = -1; // force a wipe
}
if (wipegamestate == GS_LEVEL)
wipegamestate = -1; // force a wipe
if (gamestate == GS_INTERMISSION)
Y_EndIntermission();

2
src/p_setup.c
View file

@ -229,7 +229,7 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
mapheaderinfo[num]->levelwipe = 0;
DEH_WriteUndoline("POSTLEVELWIPE", va("%d", mapheaderinfo[num]->postlevelwipe), UNDO_NONE);
mapheaderinfo[num]->postlevelwipe = 0;
DEH_WriteUndoline("WIPECOLOR", va("%d", mapheaderinfo[num]->wipecolor), UNDO_NONE);
DEH_WriteUndoline("WIPECOLOR", va("%d", mapheaderinfo[num]->wipecolor), UNDO_NONE);
mapheaderinfo[num]->wipecolor = 31;
// TODO grades support for delfile (pfft yeah right)