string'd some stuff

1 files changed, 22 insertions, 22 deletions

diff --git a/include/ui.h b/include/ui.h
index 9523269..072d418 100644
--- a/include/ui.h
+++ b/include/ui.h
@@ -99,12 +99,12 @@ namespace ui {
 	/*
 	 *	These flags are used elsewhere.
 	*/
-	
+
 	extern unsigned int fontSize;
-	
+
 	extern bool debug;
 	extern bool posFlag;
-	
+
 	extern unsigned char dialogOptChosen;
 	extern bool 		 dialogBoxExists;
 	extern bool 		 dialogImportant;
@@ -117,54 +117,54 @@ namespace ui {
 	*/
 
 	void initFonts(void);
-	
+
 	void destroyFonts(void);
-	
+
 	/*
 	 *	Sets the current font/font size.
 	*/
-	
+
 	void setFontFace(const char *ttf);
 	void setFontSize(unsigned int size);
-	
+
 	/*
 	 *	Draw a centered string.
 	*/
-	
-	float putStringCentered(const float x,const float y,const char *s);
-	
+
+	float putStringCentered(const float x,const float y,std::string s);
+
 	/*
 	 *	Draws a formatted string at the given coordinates.
 	*/
-	
+
 	float putText(const float x,const float y,const char *str,...);
-	
+
 	/*
 	 *	Creates a dialogBox text string (format: `name`: `text`). This function simply sets up
 	 *	variables that are drawn in ui::draw(). When the dialog box exists player control is
 	 *	limited until a right click is given, closing the box.
 	*/
-	
+
 	void dialogBox(const char *name,const char *opt,bool passive,const char *text,...);
 	void merchantBox(const char *name,Trade trade,const char *opt,bool passive,const char *text,...);
 	void merchantBox();
 	void waitForDialog(void);
-	
+
 	void drawPage( std::string path );
-	
+
 	/*
 	 *	Draws a larger string in the center of the screen. Drawing is done inside this function.
 	*/
-	
+
 	void importantText(const char *text,...);
 	void passiveImportantText(int duration,const char *text,...);
-	
+
 	/*
 	 *	Draw various UI elements (dialogBox, player health)
 	*/
-	
+
 	void draw(void);
-	
+
 
 	/*
 	 *	Draw various menu items
@@ -177,17 +177,17 @@ namespace ui {
 	 *	Handle keyboard/mouse events.
 	*/
 	void handleEvents(void);
-	
+
 	/*
 	 *	Toggle the black overlay thing.
 	*/
-	
+
 	void toggleBlack(void);
 	void toggleBlackFast(void);
 	void toggleWhite(void);
 	void toggleWhiteFast(void);
 	void waitForCover(void);
-	
+
 }
 
 #endif // UI_H