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

extend SayLine parse table param (still unknown if it's used in game)

Browse source
This commit is contained in:
Pawel Kolodziejski 2008-09-15 21:42:44 +00:00
parent 5a034fb209
commit 4cc525edb7
1 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

48
engine/lua.cpp
View file

@ -1603,29 +1603,53 @@ static void LocalizeString() {
} }
static void SayLine() { static void SayLine() {
int pan = 64, param_number = 2; int vol = 64, paramId = 2;
char msgId[32]; char msgId[32];
std::string msg = ""; std::string msg = "";
lua_Object param2; lua_Object paramObj;
Actor *act; Actor *act;
DEBUG_FUNCTION(); DEBUG_FUNCTION();
param2 = lua_getparam(param_number++); paramObj = lua_getparam(paramId++);
act = check_actor(1); act = check_actor(1);
if (!lua_isnil(param2)) { if (!lua_isnil(paramObj)) {
do { do {
if (lua_isstring(param2)) { if (lua_isstring(paramObj)) {
const char *tmpstr = lua_getstring(param2); const char *tmpstr = lua_getstring(paramObj);
msg = parseMsgText(tmpstr, msgId); msg = parseMsgText(tmpstr, msgId);
} else if (lua_isnumber(param2)) { } else if (lua_isnumber(paramObj)) {
pan = 64; // ignore
} else if (lua_istable(param2)) { } else if (lua_istable(paramObj)) {
warning("SayLine() param is table"); const char *key_text = NULL;
lua_Object key = LUA_NOOBJECT;
for (;;) {
lua_pushobject(paramObj);
if (key_text)
lua_pushobject(key);
else
lua_pushnil();
// If the call to "next" fails then register an error
if (lua_call("next") != 0) {
error("SayLine failed to get next key!\n");
return;
}
key = lua_getresult(1);
if (lua_isnil(key))
break;
warning("SayLine() not null table");
key_text = lua_getstring(key);
if (strmatch(key_text, "x"))
int x = atoi(lua_getstring(lua_getresult(2)));
else if (strmatch(key_text, "y"))
int y = atoi(lua_getstring(lua_getresult(2)));
else
error("Unknown SayLine key '%s'\n", key_text);
}
} else { } else {
error("SayLine() unknown type of param"); error("SayLine() unknown type of param");
} }
param2 = lua_getparam(param_number++); paramObj = lua_getparam(paramId++);
} while (!lua_isnil(param2)); } while (!lua_isnil(paramObj));
if (msg.empty()) { if (msg.empty()) {
if (debugLevel == DEBUG_WARN || debugLevel == DEBUG_ALL) if (debugLevel == DEBUG_WARN || debugLevel == DEBUG_ALL)
warning("SayLine: Did not find a message ID!"); warning("SayLine: Did not find a message ID!");