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

GRIM/EMI: Fix compile warnings

Browse source
This commit is contained in:
Christian Krause 2013-12-31 15:30:15 +01:00
parent cc2cc0fdf8
commit 446f56eb67
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/grim/emi/lua_v2.cpp
View file

@ -438,13 +438,13 @@ void Lua_V2::NewLayer() {
lua_Object param3 = lua_getparam(3); lua_Object param3 = lua_getparam(3);
const char *til = NULL; const char *til = NULL;
int sortorder = 0, zero = 0; int sortorder = 0; // zero = 0;
if (lua_isstring(param1) && lua_isnumber(param2) && lua_isnumber(param3)) { if (lua_isstring(param1) && lua_isnumber(param2) && lua_isnumber(param3)) {
til = lua_getstring(param1); til = lua_getstring(param1);
sortorder = (int)lua_getnumber(param2); sortorder = (int)lua_getnumber(param2);
//This one is always specified, but also always 0... //This one is always specified, but also always 0...
zero = (int)lua_getnumber(param3); //zero = (int)lua_getnumber(param3);
Layer *layer = new Layer(til, sortorder); Layer *layer = new Layer(til, sortorder);

11
engines/grim/emi/lua_v2_actor.cpp
View file

@ -641,12 +641,13 @@ bool Lua_V2::findCostume(lua_Object costumeObj, Actor *actor, Costume **costume)
return (*costume != NULL); return (*costume != NULL);
} }
// TODO: Implement, verify, and rename unknown 5th parameter
void Lua_V2::PlayActorChore() { void Lua_V2::PlayActorChore() {
lua_Object actorObj = lua_getparam(1); lua_Object actorObj = lua_getparam(1);
lua_Object choreObj = lua_getparam(2); lua_Object choreObj = lua_getparam(2);
lua_Object costumeObj = lua_getparam(3); lua_Object costumeObj = lua_getparam(3);
lua_Object modeObj = lua_getparam(4); lua_Object modeObj = lua_getparam(4);
lua_Object paramObj = lua_getparam(5); /* lua_Object paramObj = */ lua_getparam(5);
if (!lua_isuserdata(actorObj) || lua_tag(actorObj) != MKTAG('A','C','T','R')) if (!lua_isuserdata(actorObj) || lua_tag(actorObj) != MKTAG('A','C','T','R'))
return; return;
@ -657,14 +658,14 @@ void Lua_V2::PlayActorChore() {
lua_pushnil(); lua_pushnil();
bool mode = false; bool mode = false;
float param = 0.0; // float param = 0.0;
if (!lua_isnil(modeObj)) { if (!lua_isnil(modeObj)) {
if (lua_getnumber(modeObj) != 0.0) if (lua_getnumber(modeObj) != 0.0)
mode = true; mode = true;
if (!lua_isnil(paramObj)) //if (!lua_isnil(paramObj))
if (lua_isnumber(paramObj)) // if (lua_isnumber(paramObj))
param = lua_getnumber(paramObj); // param = lua_getnumber(paramObj);
} }
const char *choreName = lua_getstring(choreObj); const char *choreName = lua_getstring(choreObj);

2
engines/grim/gfx_opengl.cpp
View file

@ -402,7 +402,7 @@ void GfxOpenGL::getBoundingBoxPos(const EMIModel *model, int *x1, int *y1, int *
glGetDoublev(GL_PROJECTION_MATRIX, projection); glGetDoublev(GL_PROJECTION_MATRIX, projection);
glGetIntegerv(GL_VIEWPORT, viewPort); glGetIntegerv(GL_VIEWPORT, viewPort);
for (int i = 0; i < model->_numFaces; i++) { for (uint i = 0; i < model->_numFaces; i++) {
int *indices = (int *)model->_faces[i]._indexes; int *indices = (int *)model->_faces[i]._indexes;
for (uint j = 0; j < model->_faces[i]._faceLength * 3; j++) { for (uint j = 0; j < model->_faces[i]._faceLength * 3; j++) {

2
engines/grim/gfx_tinygl.cpp
View file

@ -534,7 +534,7 @@ void GfxTinyGL::getBoundingBoxPos(const EMIModel *model, int *x1, int *y1, int *
tglGetFloatv(TGL_PROJECTION_MATRIX, projection); tglGetFloatv(TGL_PROJECTION_MATRIX, projection);
tglGetIntegerv(TGL_VIEWPORT, viewPort); tglGetIntegerv(TGL_VIEWPORT, viewPort);
for (int i = 0; i < model->_numFaces; i++) { for (uint i = 0; i < model->_numFaces; i++) {
int *indices = (int *)model->_faces[i]._indexes; int *indices = (int *)model->_faces[i]._indexes;
for (uint j = 0; j < model->_faces[i]._faceLength * 3; j++) { for (uint j = 0; j < model->_faces[i]._faceLength * 3; j++) {