cleanup of drawing init text

diff --git a/src/init.c b/src/init.c
index b0cad9db4e52552bfef20c0bd733c7cf6939e92b..8aef3415c1fc7c9c092d20b6d7cd6e301c9e801e 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -5017,12 +5017,11 @@ void InitGfx()
 
   font_height = getFontHeight(FC_RED);
 
-  DrawInitTextAlways(getProgramInitString(), 20, FC_YELLOW);
-  DrawInitTextAlways(PROGRAM_COPYRIGHT_STRING, 50, FC_RED);
-  DrawInitTextAlways(PROGRAM_WEBSITE_STRING, WIN_YSIZE - 20 - font_height,
-                    FC_RED);
+  DrawInitText(getProgramInitString(), 20, FC_YELLOW);
+  DrawInitText(PROGRAM_COPYRIGHT_STRING, 50, FC_RED);
+  DrawInitText(PROGRAM_WEBSITE_STRING, WIN_YSIZE - 20 - font_height, FC_RED);
 
-  DrawInitTextAlways("Loading graphics", 120, FC_GREEN);
+  DrawInitText("Loading graphics", 120, FC_GREEN);
 
   /* initialize busy animation with default values */
   int parameter[NUM_GFX_ARGS];

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 68875eb6de6da08aaa0834809bab859154844eba..e60c8424f5409b67334bc5894912ae4390877212 100644 (file)
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -2875,8 +2875,7 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first,
     (leveldir_new->user_defined || !leveldir_new->handicap ?
      leveldir_new->last_level : leveldir_new->first_level);
 
-  DrawInitTextExt(leveldir_new->name, 150, FC_YELLOW,
-                 leveldir_new->level_group);
+  DrawInitText(leveldir_new->name, 150, FC_YELLOW);
 
   pushTreeInfo(node_first, leveldir_new);
 
@@ -3342,8 +3341,7 @@ void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node,
        setArtworkInfoCacheEntry(artwork_new, level_node, type);
     }
 
-    DrawInitTextExt(level_node->name, 150, FC_YELLOW,
-                   level_node->level_group);
+    DrawInitText(level_node->name, 150, FC_YELLOW);
 
     if (level_node->node_group != NULL)
       LoadArtworkInfoFromLevelInfo(artwork_node, level_node->node_group);

diff --git a/src/libgame/text.c b/src/libgame/text.c
index 4c3f30ff143b2434cf66cc4f9d6dd135c6f69d56..78e79b4d030b18e75c59c60a163b781129107f58 100644 (file)
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -118,7 +118,7 @@ int maxWordLengthInString(char *text)
 /* simple text drawing functions                                             */
 /* ========================================================================= */
 
-void DrawInitTextExt(char *text, int ypos, int font_nr, boolean force)
+void DrawInitText(char *text, int ypos, int font_nr)
 {
   LimitScreenUpdates(TRUE);
 
@@ -141,22 +141,6 @@ void DrawInitTextExt(char *text, int ypos, int font_nr, boolean force)
   }
 }
 
-void DrawInitText(char *text, int ypos, int font_nr)
-{
-  // DrawInitTextExt(text, ypos, font_nr, TRUE);
-  DrawInitTextExt(text, ypos, font_nr, FALSE);
-}
-
-void DrawInitTextAlways(char *text, int ypos, int font_nr)
-{
-  DrawInitTextExt(text, ypos, font_nr, TRUE);
-}
-
-void DrawInitTextIfNeeded(char *text, int ypos, int font_nr)
-{
-  DrawInitTextExt(text, ypos, font_nr, FALSE);
-}
-
 void DrawTextF(int x, int y, int font_nr, char *format, ...)
 {
   char buffer[MAX_OUTPUT_LINESIZE + 1];

diff --git a/src/libgame/text.h b/src/libgame/text.h
index 08d14cdb6eb56d72a77a3fe90644d0aa0fcdaf0a..d57b6d728fb40deb6794030e31c18a2e1fd33eeb 100644 (file)
--- a/src/libgame/text.h
+++ b/src/libgame/text.h
@@ -90,9 +90,6 @@ void getFontCharSource(int, char, Bitmap **, int *, int *);
 int maxWordLengthInString(char *);
 
 void DrawInitText(char *, int, int);
-void DrawInitTextAlways(char *, int, int);
-void DrawInitTextIfNeeded(char *, int, int);
-void DrawInitTextExt(char *, int, int, boolean);
 
 void DrawTextF(int, int, int, char *, ...);
 void DrawTextFCentered(int, int, char *, ...);