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

verified MakeTextObject, SetTextSpeed

Browse source
This commit is contained in:
Pawel Kolodziejski 2009-05-24 13:57:26 +00:00
parent 1f6ba5aa37
commit 58e1758b04
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
engine/lua.cpp
View file

@ -2201,32 +2201,29 @@ static void GetTextSpeed() {
} }
static void SetTextSpeed() { static void SetTextSpeed() {
int speed; lua_Object speedObj = lua_getparam(1);
if (!lua_isnumber(speedObj)
return;
speed = lua_getnumber(lua_getparam(1)); int speed = lua_getnumber(speedObj);
g_grim->setTextSpeed(speed); g_grim->setTextSpeed(speed);
} }
static void MakeTextObject() { static void MakeTextObject() {
TextObject *textObject = new TextObject(false); TextObject *textObject = new TextObject(false);
lua_Object tableObj; lua_Object textObj = lua_getparam(1);
const char *line; if (!lua_isstring(textObj))
return;
line = lua_getstring(lua_getparam(1)); const char *line = lua_getstring(textObj);
Common::String text = line; Common::String text = line;
tableObj = lua_getparam(2);
textObject->setDefaults(&blastTextDefaults);
textObject->setDefaults(&blastTextDefaults);
lua_Object tableObj = lua_getparam(2);
if (lua_istable(tableObj)) if (lua_istable(tableObj))
setTextObjectParams(textObject, tableObj); setTextObjectParams(textObject, tableObj);
while (TextObjectExists((char *)text.c_str()))
text += TEXT_NULL;
//printf("Make: %s\n", (char *)text.c_str());
textObject->setText((char *)text.c_str()); textObject->setText((char *)text.c_str());
textObject->createBitmap(); textObject->createBitmap();
g_grim->registerTextObject(textObject); g_grim->registerTextObject(textObject);