fix IS_PRINT so that we really do only allow input in characters we c…

…an display
doughdemon · Apr 10, 2007 · 785daac · 785daac
1 parent 3f702b8
commit 785daac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/asc.h b/asc.h
@@ -17,9 +17,9 @@ extern "C" {
 
 /*!
  * Check if a character is printable. In this context, that means
- * printable ascii, or non-ascii if it's not a color code
+ * printable ascii, or non-ascii if we know what symbol to use
  */
-#define IS_PRINT(c) (((c) >= 32 && (c) <= 126) || ((c) >= SPECIALCHAR_LBOUND && (c) <= SPECIALCHAR_UBOUND))
+#define IS_PRINT(c) (get_font_char(c) >= 0)
 
 /*!
  * A macro for the my_xmlstrncopy function that copies and converts an xml-string. Sets the length to 0, hence it will copy untill \\0 is reached.

diff --git a/font.c b/font.c
@@ -43,7 +43,6 @@ int	chat_font=0;
 int	name_font=0;
 int	book_font=0;
 
-int get_font_char(unsigned char cur_char);
 int get_font_width(int cur_char);
 int get_nstring_width(const unsigned char *str, int len);
 int set_font_parameters (int num);

diff --git a/font.h b/font.h
@@ -255,6 +255,8 @@ void reload_fonts();
 
 void cleanup_fonts(void);
 
+int get_font_char(unsigned char cur_char);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif