share/text: kill needless text_add_char param

git-svn-id: https://s.snth.net/svn/neverball/trunk@2986 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/ball/st_name.c b/ball/st_name.c
index 48a3816..d8d3fc4 100644 (file)
--- a/ball/st_name.c
+++ b/ball/st_name.c
@@ -84,7 +84,7 @@ static int name_action(int i)
         break;
 
     default:
-        if (text_add_char(i, player, MAXNAM, 17))
+        if (text_add_char(i, player, sizeof (player)))
             gui_set_label(name_id, player);
     }
     return 1;

diff --git a/ball/st_save.c b/ball/st_save.c
index 6b35a79..8a84671 100644 (file)
--- a/ball/st_save.c
+++ b/ball/st_save.c
@@ -96,8 +96,7 @@ static int save_action(int i)
         break;
 
     default:
-        if (text_add_char(i, filename, sizeof (filename) - 1,
-                                       sizeof (filename) - 1))
+        if (text_add_char(i, filename, sizeof (filename)))
             gui_set_label(file_id, filename);
     }
     return 1;

diff --git a/share/text.c b/share/text.c
index 9692318..4fcfdb1 100644 (file)
--- a/share/text.c
+++ b/share/text.c
@@ -17,7 +17,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-int text_add_char(Uint32 unicode, char *string, int maxbytes, int maxchars)
+int text_add_char(Uint32 unicode, char *string, int maxbytes)
 {
     size_t pos = strlen(string);
     int l;
@@ -27,7 +27,7 @@ int text_add_char(Uint32 unicode, char *string, int maxbytes, int maxchars)
     else if (unicode < 0x10000) l = 3;
     else                        l = 4;
 
-    if ((pos + l >= maxbytes) || (text_length(string) + 1 >= maxchars))
+    if (pos + l >= maxbytes)
         return 0;
 
     if (unicode < 0x80)

diff --git a/share/text.h b/share/text.h
index 0c0a500..2521a97 100644 (file)
--- a/share/text.h
+++ b/share/text.h
@@ -5,7 +5,7 @@
 
 /*---------------------------------------------------------------------------*/
 
-int text_add_char(Uint32, char *, int, int);
+int text_add_char(Uint32, char *, int);
 int text_del_char(char *);
 int text_length(const char *);