Fixes to Linux-specific portions of the engine

Fraser Gordon · Fraser Gordon · commit de5bdc005b80 · 2013-10-29T14:24:25.000Z
diff --git a/engine/src/customprinter.cpp b/engine/src/customprinter.cpp
@@ -1032,7 +1032,7 @@ void MCCustomMetaContext::dotextmark(MCMark *p_mark)
 	extern MCFontlist *MCFontlistGetCurrent(void);
 	const char *t_name;
 	uint2 t_size, t_style;
-	MCFontlistGetCurrent() -> getfontreqs(p_mark -> text . font, t_name, t_size, t_style);
+    MCFontlistGetCurrent() -> getfontreqs(f, t_name, t_size, t_style);
 	t_state . font_size = t_size;
 #endif
 
diff --git a/engine/src/lnxpsprinter.cpp b/engine/src/lnxpsprinter.cpp
@@ -1218,7 +1218,7 @@ void MCPSMetaContext::drawtext(MCMark * p_mark )
 	uint4 x = p_mark -> text . position . x ;
 	uint4 y = p_mark -> text . position . y ;
 	uint2 l = p_mark -> text . length ;
-	MCFontStruct *f = p_mark -> text . font ;
+    MCFontStruct *f = MCFontGetFontStruct(p_mark -> text . font);
 
 	if ( f != oldfont )
 	{
@@ -1233,8 +1233,7 @@ void MCPSMetaContext::drawtext(MCMark * p_mark )
 	char *text = new char[l + 1];
 	memcpy(text, p_mark -> text . data , l);
 	
-	uint2 w = MCscreen->textwidth(f, text, l);
-	
+    uint2 w = MCFontMeasureText(p_mark -> text . font, text, l, false);
 	
 	text[l] = '\0';
 	const char *sptr = text;
