From 15020ae01d1819e27af1a39f5eed434f8dd8cf71 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sat, 3 Nov 2018 10:57:43 -0400
Subject: [PATCH] Removed TextPrompt-specific code for `text-prompt` branch
---
src/st_stuff.c | 19 -------------------
src/v_video.c | 19 -------------------
src/v_video.h | 1 -
3 files changed, 39 deletions(-)
diff --git a/src/st_stuff.c b/src/st_stuff.c
index d4c710e977..fa13e008a0 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -2465,21 +2465,6 @@ static void ST_overlayDrawer(void)
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)
{
#ifdef SEENAMES
@@ -2553,8 +2538,4 @@ void ST_Drawer(void)
ST_overlayDrawer();
}
}
-
- // Draw tutorial text over everything else
- if (tutorialmode)
- ST_drawTutorial();
}
diff --git a/src/v_video.c b/src/v_video.c
index 05401ce56f..765965ffdc 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -1480,25 +1480,6 @@ void V_DrawFadeConsBack(INT32 plines)
*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
//
static const UINT8 *V_GetStringColormap(INT32 colorflags)
diff --git a/src/v_video.h b/src/v_video.h
index 850206816f..6113d08ecd 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -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_DrawFadeConsBack(INT32 plines);
-void V_DrawTutorialBack(void);
// draw a single character
void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed);
--
GitLab