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

ALL: disabled compiler warnings

Browse source
This commit is contained in:
Paweł Kołodziejski 2012-04-12 02:54:10 +02:00
parent 07ee34ae3f
commit 640889b805
7 changed files with 33 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/grim/bitmap.cpp
View file

@ -327,10 +327,9 @@ bool BitmapData::loadTile(Common::SeekableReadStream *o) {
o->seek(0, SEEK_SET);
//warning("Loading TILE: %s",fname.c_str());
uint32 id, bmoffset;
id = o->readUint32LE();
/*uint32 id = */o->readUint32LE();
// Should check that we actually HAVE a TIL
bmoffset = o->readUint32LE();
uint32 bmoffset = o->readUint32LE();
o->seek(bmoffset + 16);
int numSubImages = o->readUint32LE();
if (numSubImages < 5)

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

@ -524,8 +524,8 @@ void Lua_V2::PlayActorChore() {
lua_Object actorObj = lua_getparam(1);
lua_Object choreObj = lua_getparam(2);
lua_Object costumeObj = lua_getparam(3);
lua_Object modeObj = lua_getparam(4);
lua_Object paramObj = lua_getparam(5);
// lua_Object modeObj = lua_getparam(4);
// lua_Object paramObj = lua_getparam(5);
if (!lua_isuserdata(actorObj) || lua_tag(actorObj) != MKTAG('A','C','T','R'))
return;
@ -535,7 +535,7 @@ void Lua_V2::PlayActorChore() {
if (!lua_isstring(choreObj) || !lua_isstring(costumeObj))
lua_pushnil();
bool mode = false;
/* bool mode = false;
float param = 0.0;
if (!lua_isnil(modeObj)) {
@ -544,7 +544,7 @@ void Lua_V2::PlayActorChore() {
if (!lua_isnil(paramObj))
if (lua_isnumber(paramObj))
param = lua_getnumber(paramObj);
}
}*/
const char *choreName = lua_getstring(choreObj);
const char *costumeName = lua_getstring(costumeObj);

6
engines/grim/gfx_tinygl.cpp
View file

@ -986,13 +986,13 @@ void GfxTinyGL::createMaterial(Texture *material, const char *data, const CMap *
}
TGLuint format = 0;
TGLuint internalFormat = 0;
// TGLuint internalFormat = 0;
if (material->_colorFormat == BM_RGBA) {
format = TGL_RGBA;
internalFormat = TGL_RGBA;
// internalFormat = TGL_RGBA;
} else { // The only other colorFormat we load right now is BGR
format = TGL_BGR;
internalFormat = TGL_RGB;
// internalFormat = TGL_RGB;
}
TGLuint *textures = (TGLuint *)material->_texture;

7
engines/grim/lua_v1.cpp
View file

@ -295,11 +295,8 @@ void Lua_V1::SetHardwareState() {
}
void Lua_V1::SetVideoDevices() {
int devId;
int modeId;
devId = (int)lua_getnumber(lua_getparam(1));
modeId = (int)lua_getnumber(lua_getparam(2));
/*int devId = (int)*/lua_getnumber(lua_getparam(1));
/*int modeId = (int)*/lua_getnumber(lua_getparam(2));
// ignore setting video devices
}

32
engines/grim/lua_v1_graphics.cpp
View file

@ -158,7 +158,7 @@ void Lua_V1::DrawPolygon() {
return;
}
int layer = 2;
//int layer = 2;
lua_Object tableObj2 = lua_getparam(2);
if (lua_istable(tableObj2)) {
lua_pushobject(tableObj2);
@ -171,7 +171,7 @@ void Lua_V1::DrawPolygon() {
lua_pushstring("layer");
lua_Object layerObj = lua_gettable();
if (lua_isnumber(layerObj))
layer = (int)lua_getnumber(layerObj);
/*layer = (int)*/lua_getnumber(layerObj);
}
// This code support static 4 points polygon as game doesn't use other than that.
@ -233,7 +233,7 @@ void Lua_V1::DrawLine() {
p2.x = (int)lua_getnumber(x2Obj);
p2.y = (int)lua_getnumber(y2Obj);
int layer = 2;
//int layer = 2;
if (lua_istable(tableObj)) {
lua_pushobject(tableObj);
lua_pushstring("color");
@ -245,7 +245,7 @@ void Lua_V1::DrawLine() {
lua_pushstring("layer");
lua_Object layerObj = lua_gettable();
if (lua_isnumber(layerObj))
layer = (int)lua_getnumber(layerObj);
/*layer = (int)*/lua_getnumber(layerObj);
}
PrimitiveObject *p = new PrimitiveObject();
@ -289,12 +289,12 @@ void Lua_V1::ChangePrimitive() {
lua_pushstring("yoffset");
lua_Object yoffset = lua_gettable();
if (lua_isnumber(xoffset) || lua_isnumber(yoffset)) {
int x = 0;
int y = 0;
//int x = 0;
//int y = 0;
if (lua_isnumber(xoffset))
x = (int)lua_getnumber(xoffset);
/*x = (int)*/lua_getnumber(xoffset);
if (lua_isnumber(yoffset))
y = (int)lua_getnumber(yoffset);
/*y = (int)*/lua_getnumber(yoffset);
// TODO pmodify->setOffets(x, y);
assert(0);
}
@ -322,12 +322,12 @@ void Lua_V1::ChangePrimitive() {
lua_pushstring("y2");
lua_Object y2 = lua_gettable();
if (lua_isnumber(x2) || lua_isnumber(y2)) {
int x = -1;
int y = -1;
//int x = -1;
//int y = -1;
if (lua_isnumber(x2))
x = (int)lua_getnumber(x2);
/*x = (int)*/lua_getnumber(x2);
if (lua_isnumber(y2))
y = (int)lua_getnumber(y2);
/*y = (int)*/lua_getnumber(y2);
// TODO pmodify->setSize(x, y);
assert(0);
}
@ -339,12 +339,12 @@ void Lua_V1::ChangePrimitive() {
lua_pushstring("height");
lua_Object height = lua_gettable();
if (lua_isnumber(width) || lua_isnumber(height)) {
int x = -1;
int y = -1;
//int x = -1;
//int y = -1;
if (lua_isnumber(width))
x = (int)lua_getnumber(width);
/*x = (int)*/lua_getnumber(width);
if (lua_isnumber(height))
y = (int)lua_getnumber(height);
/*y = (int)*/lua_getnumber(height);
// TODO pmodify->setSize(x, y);
assert(0);
}

5
engines/grim/movie/codecs/smush_decoder.cpp
View file

@ -370,15 +370,14 @@ void SmushDecoder::handleFramesHeader() {
bool SmushDecoder::setupAnimDemo() {
uint32 tag;
int32 size;
tag = _file->readUint32BE();
assert(tag == MKTAG('A','N','I','M'));
size = _file->readUint32BE();
_file->readUint32BE();
tag = _file->readUint32BE();
assert(tag == MKTAG('A','H','D','R'));
size = _file->readUint32BE();
_file->readUint32BE();
_file->readUint16BE(); // version
_nbframes = _file->readUint16LE();

8
engines/myst3/puzzles.cpp
View file

@ -1108,17 +1108,17 @@ void Puzzles::journalSaavedro(int16 move) {
}
uint16 nodeRight;
uint16 nodeLeft;
//uint16 nodeLeft;
if (page || !chapter) {
nodeRight = chapterStartNode + page;
nodeLeft = chapterStartNode + page;
//nodeLeft = chapterStartNode + page;
} else {
nodeRight = chapterStartNode + page;
uint16 chapterLeft = _journalSaavedroNextChapter(chapter, false);
/*uint16 chapterLeft = _journalSaavedroNextChapter(chapter, false);
if (chapterLeft > 0)
nodeLeft = _journalSaavedroGetNode(chapterLeft + 1);
else
nodeLeft = 2;
nodeLeft = 2;*/
}
_vm->_state->setJournalSaavedroClosed(closed);