Ensure lua context is used for image drawing and string sizes (#6765)

Author: MjnMixael

code/graphics/render.cpp

@@ -242,7 +242,7 @@ void gr_aabitmap(int x, int y, int resize_mode, bool mirror, float scale_factor)
 					   resize_mode,
 					   true,
 					   mirror,
-					   &gr_screen.current_color,
+					   &GR_CURRENT_COLOR,
 					   scale_factor);
 }
 void gr_aabitmap_ex(int x, int y, int w, int h, int sx, int sy, int resize_mode, bool mirror, float scale_factor) {
@@ -383,7 +383,7 @@ void gr_aabitmap_ex(int x, int y, int w, int h, int sx, int sy, int resize_mode,
 		resize_mode,
 		true,
 		mirror,
-		&gr_screen.current_color,
+		&GR_CURRENT_COLOR,
 		scale_factor);
 }
 //these are penguins bitmap functions
@@ -1439,7 +1439,7 @@ void gr_aabitmap_list(bitmap_rect_list* list, int n_bm, int resize_mode, float a
 	render_mat.set_blend_mode(ALPHA_BLEND_ALPHA_BLEND_ALPHA);
 	render_mat.set_depth_mode(ZBUFFER_TYPE_NONE);
 	render_mat.set_texture_map(TM_BASE_TYPE, gr_screen.current_bitmap);
-	render_mat.set_color(gr_screen.current_color);
+	render_mat.set_color(GR_CURRENT_COLOR);
 	render_mat.set_cull_mode(false);
 	render_mat.set_texture_type(material::TEX_TYPE_AABITMAP);
 

code/graphics/software/FontManager.cpp

@@ -53,7 +53,8 @@ namespace font
 
 	FSFont *FontManager::getCurrentFont()
 	{
-		return getFont(currentFontIndex);
+		int id = gr_lua_context_active() ? gr_lua_screen.current_font_index : currentFontIndex;
+		return getFont(id);
 	}
 
 	int FontManager::getCurrentFontIndex()

code/scripting/api/libs/graphics.cpp

@@ -1559,6 +1559,8 @@ ADE_FUNC(getStringWidth, l_Graphics, "string String", "Gets string width", "numb
 	if(!ade_get_args(L, "s", &s))
 		return ade_set_error(L, "i", 0);
 
+	LuaScreenContext context;
+
 	int w;
 	gr_get_string_size(&w, nullptr, s);
 
@@ -1574,6 +1576,8 @@ ADE_FUNC(getStringHeight, l_Graphics, "string String", "Gets string height", "nu
 	if(!ade_get_args(L, "s", &s))
 		return ade_set_error(L, "i", 0);
 
+	LuaScreenContext context;
+
 	int h;
 	gr_get_string_size(nullptr, &h, s);
 
@@ -1589,6 +1593,8 @@ ADE_FUNC(getStringSize, l_Graphics, "string String", "Gets string width and heig
 	if(!ade_get_args(L, "s", &s))
 		return ade_set_error(L, "ii", 0, 0);
 
+	LuaScreenContext context;
+
 	int w, h;
 	gr_get_string_size(&w, &h, s);
 
@@ -1708,6 +1714,8 @@ ADE_FUNC(drawImage,
 	if(!Gr_inited)
 		return ade_set_error(L, "b", false);
 
+	LuaScreenContext context;
+
 	int idx;
 	int x1 = 0;
 	int y1 = 0;
@@ -1798,6 +1806,8 @@ ADE_FUNC(drawImageCentered,
 	if(!Gr_inited)
 		return ade_set_error(L, "b", false);
 
+	LuaScreenContext context;
+
 	int idx;
 	int x = 0;
 	int y = 0;
@@ -1889,6 +1899,8 @@ ADE_FUNC_DEPRECATED(drawMonochromeImage,
 	if(!Gr_inited)
 		return ade_set_error(L, "b", false);
 
+	LuaScreenContext context;
+
 	int idx;
 	int x,y;
 	int x2=INT_MAX;