*) Fixed broken font for error string if using Apples Font rendering

gessl · Mar 5, 2013 · ce78f00 · ce78f00
1 parent c4602ba
commit ce78f00
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Classes/EAGLView.mm b/Classes/EAGLView.mm
@@ -1372,7 +1372,11 @@ - (void)awakeFromNib
 	// path to the default font
     g_storagePath = [resourcePath UTF8String];
 //    errorfontPath = storagePath + "/arial.ttf";
+#ifndef UISTRINGS
     errorfontPath = storagePath + "/DroidSansMono.ttf";
+#else
+    errorfontPath = "Helvetica";
+#endif
 
     // Hide top navigation bar
 	[[UIApplication sharedApplication] setStatusBarHidden:YES animated:NO];
@@ -4687,7 +4691,7 @@ - (void)drawView {
         shadowColors[3] = 80;
         errorStrTex = [[Texture2D alloc] initWithString:[NSString stringWithUTF8String:errorstr.c_str()]
                                                             dimensions:CGSizeMake(SCREEN_WIDTH, 128) alignment:UITextAlignmentCenter
-                                                              fontName:@"DroidSansMono.ttf" fontSize:14 lineBreakMode:UILineBreakModeWordWrap
+                                               fontName:[NSString stringWithUTF8String:errorfontPath.c_str()] fontSize:14 lineBreakMode:UILineBreakModeWordWrap
                                                           shadowOffset:CGSizeMake(0,0) shadowBlur:2 shadowColor:shadowColors];
 #else
         errorStrTex = new urTexture(errorstr.c_str(),errorfontPath.c_str(),20,SCREEN_WIDTH,128);
@@ -4712,7 +4716,7 @@ - (void)drawView {
         shadowColors[3] = 80;
         errorStrTex = [[Texture2D alloc] initWithString:[NSString stringWithUTF8String:errorstr.c_str()]
                                              dimensions:CGSizeMake(SCREEN_WIDTH, 128) alignment:UITextAlignmentCenter
-                                               fontName:@"DroidSansMono.ttf" fontSize:14 lineBreakMode:UILineBreakModeWordWrap
+                                               fontName:[NSString stringWithUTF8String:errorfontPath.c_str()] fontSize:14 lineBreakMode:UILineBreakModeWordWrap
                                            shadowOffset:CGSizeMake(0,0) shadowBlur:2 shadowColor:shadowColors];
 #else
         errorStrTex = new urTexture(errorstr.c_str(),errorfontPath.c_str(),20,SCREEN_WIDTH,128);