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

EMI: Stub more lua functions and fix some text stuff (pull request #232)

Browse source
This commit is contained in:
Pawel Kolodziejski 2011-07-03 10:53:57 +02:00
parent 75d222d1e9
commit cd8d8cb84e
3 changed files with 147 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/grim/lua_v1_text.cpp
View file

@ -194,7 +194,11 @@ void setTextObjectParams(TextObjectCommon *textObject, lua_Object tableObj) {
keyObj = lua_gettable();
if (keyObj) {
if (lua_isnumber(keyObj)) {
textObject->setX((int)lua_getnumber(keyObj));
float num = lua_getnumber(keyObj);
if (g_grim->getGameType() == GType_MONKEY4)
textObject->setX(num * 640);
else
textObject->setX((int)num);
}
}
@ -203,7 +207,11 @@ void setTextObjectParams(TextObjectCommon *textObject, lua_Object tableObj) {
keyObj = lua_gettable();
if (keyObj) {
if (lua_isnumber(keyObj)) {
textObject->setY((int)lua_getnumber(keyObj));
float num = lua_getnumber(keyObj);
if (g_grim->getGameType() == GType_MONKEY4)
textObject->setY(num * 480);
else
textObject->setY((int)num);
}
}
@ -212,7 +220,7 @@ void setTextObjectParams(TextObjectCommon *textObject, lua_Object tableObj) {
keyObj = lua_gettable();
if (keyObj) {
if (g_grim->getGameType() == GType_MONKEY4 && lua_isstring(keyObj)) {
textObject->setFont(g_resourceloader->getFont(lua_getstring(keyObj)));
textObject->setFont(g_resourceloader->loadFont(lua_getstring(keyObj)));
} else if (lua_isuserdata(keyObj) && lua_tag(keyObj) == MKTAG('F','O','N','T')) {
textObject->setFont(getfont(keyObj));
}