aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNipun Garg2019-06-20 18:15:29 +0530
committerEugene Sandulenko2019-09-03 17:16:52 +0200
commit0aee0d4ebc879c7576bbc00eb20c42dd2e8777ee (patch)
treeb50d2f010f1591fabe2bfb90afcb75440afe908e
parent89ceed279876b4fd39272c504055c4729e24549e (diff)
downloadscummvm-rg350-0aee0d4ebc879c7576bbc00eb20c42dd2e8777ee.tar.gz
scummvm-rg350-0aee0d4ebc879c7576bbc00eb20c42dd2e8777ee.tar.bz2
scummvm-rg350-0aee0d4ebc879c7576bbc00eb20c42dd2e8777ee.zip
HDB: Remove cineMoveEntity stub
-rw-r--r--engines/hdb/ai-cinematic.cpp2
-rw-r--r--engines/hdb/ai.h2
-rw-r--r--engines/hdb/lua-script.cpp11
3 files changed, 12 insertions, 3 deletions
diff --git a/engines/hdb/ai-cinematic.cpp b/engines/hdb/ai-cinematic.cpp
index 6d0c2b3c6e..cb4f1a83d5 100644
--- a/engines/hdb/ai-cinematic.cpp
+++ b/engines/hdb/ai-cinematic.cpp
@@ -178,7 +178,7 @@ void AI::processCines() {
complete = true;
}
}
-
+ break;
case C_USEENTITY:
_cine[i]->e = locateEntity(_cine[i]->string);
warning("STUB: PROCESSCINES: USEENTITY: HDBGame::useEntity required;");
diff --git a/engines/hdb/ai.h b/engines/hdb/ai.h
index 8c620ad445..65f6b9f928 100644
--- a/engines/hdb/ai.h
+++ b/engines/hdb/ai.h
@@ -436,7 +436,7 @@ struct CineCommand {
int start, end;
uint32 delay;
int speed;
- char *title;
+ const char *title;
const char *string;
char *id;
AIEntity *e;
diff --git a/engines/hdb/lua-script.cpp b/engines/hdb/lua-script.cpp
index f240bcb030..ba37b41848 100644
--- a/engines/hdb/lua-script.cpp
+++ b/engines/hdb/lua-script.cpp
@@ -234,7 +234,16 @@ static int cineRemoveEntity(lua_State *L) {
}
static int cineMoveEntity(lua_State *L) {
- warning("STUB: CINE MOVE ENTITY");
+ const char *entName = lua_tostring(L, 1);
+ double x = lua_tonumber(L, 2);
+ double y = lua_tonumber(L, 3);
+ double level = lua_tonumber(L, 4);
+ double speed = lua_tonumber(L, 5);
+
+ g_hdb->_lua->checkParameters("cineMoveEntity", 5);
+
+ lua_pop(L, 5);
+ g_hdb->_ai->cineMoveEntity(entName, (int)x, (int)y, (int)level, (int)speed);
return 0;
}