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

Removed TextPrompt-specific code for text-prompt branch

Browse source
This commit is contained in:
mazmazz 2018-11-03 10:57:43 -04:00
parent 16c7c264a5
commit 15020ae01d
3 changed files with 0 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/st_stuff.c
View file

@ -2465,21 +2465,6 @@ static void ST_overlayDrawer(void)
ST_drawDebugInfo(); ST_drawDebugInfo();
} }
static void ST_drawTutorial(void)
{
INT32 charheight = 8;
INT32 y = BASEVIDHEIGHT - ((charheight * 4) + (charheight/2)*4);
char *test;
//INT32 i;
// Nothing, ...yet
// Except this for now, just to check it works
//V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2, 0, "Tutorial placeholder");
V_DrawTutorialBack();
//for (i = 0; i < 4; i++, y += 12)
test = V_WordWrap(4, BASEVIDWIDTH-4, 0, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum");
V_DrawString(4, y, V_SNAPTOBOTTOM, test);
}
void ST_Drawer(void) void ST_Drawer(void)
{ {
#ifdef SEENAMES #ifdef SEENAMES
@ -2553,8 +2538,4 @@ void ST_Drawer(void)
ST_overlayDrawer(); ST_overlayDrawer();
} }
} }
// Draw tutorial text over everything else
if (tutorialmode)
ST_drawTutorial();
} }

19
src/v_video.c
View file

@ -1480,25 +1480,6 @@ void V_DrawFadeConsBack(INT32 plines)
*buf = consolebgmap[*buf]; *buf = consolebgmap[*buf];
} }
// Very similar to F_DrawFadeConsBack, except we draw from the middle(-ish) of the screen to the bottom.
void V_DrawTutorialBack(void)
{
INT32 charheight = 8*vid.dupy;
UINT8 *deststop, *buf;
#ifdef HWRENDER
if (rendermode != render_soft) // no support for OpenGL yet
return;
#endif
// heavily simplified -- we don't need to know x or y position,
// just the start and stop positions
deststop = screens[0] + vid.rowbytes * vid.height;
buf = deststop - vid.rowbytes * ((charheight * 4) + (charheight/2)*5); // 4 lines of space plus gaps between and some leeway
for (; buf < deststop; ++buf)
*buf = consolebgmap[*buf];
}
// Gets string colormap, used for 0x80 color codes // Gets string colormap, used for 0x80 color codes
// //
static const UINT8 *V_GetStringColormap(INT32 colorflags) static const UINT8 *V_GetStringColormap(INT32 colorflags)

1
src/v_video.h
View file

@ -158,7 +158,6 @@ void V_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatnum);
void V_DrawFadeScreen(UINT16 color, UINT8 strength); void V_DrawFadeScreen(UINT16 color, UINT8 strength);
void V_DrawFadeConsBack(INT32 plines); void V_DrawFadeConsBack(INT32 plines);
void V_DrawTutorialBack(void);
// draw a single character // draw a single character
void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed); void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed);