thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

EMI: part of pull 214: disabled loadComponentEMI, and EMI case for load font in setTextObjectParams

Browse source
This commit is contained in:
Pawel Kolodziejski 2011-06-06 07:27:13 +02:00
parent f32dfe9a5d
commit 6d31f42477
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/grim/lua_v1_text.cpp
View file

@ -30,6 +30,7 @@
#include "engines/grim/lipsync.h"
#include "engines/grim/savegame.h"
#include "engines/grim/colormap.h"
#include "engines/grim/resource.h"
#include "engines/grim/imuse/imuse.h"
@ -211,7 +212,9 @@ void setTextObjectParams(TextObjectCommon *textObject, lua_Object tableObj) {
lua_pushobject(lua_getref(refTextObjectFont));
keyObj = lua_gettable();
if (keyObj) {
if (lua_isuserdata(keyObj) && lua_tag(keyObj) == MKTAG('F','O','N','T')) {
if (g_grim->getGameType() == GType_MONKEY4 && lua_isstring(keyObj)) {
textObject->setFont(g_resourceloader->getFont(lua_getstring(keyObj)));
else if (lua_isuserdata(keyObj) && lua_tag(keyObj) == MKTAG('F','O','N','T')) {
textObject->setFont(getfont(keyObj));
}
}