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

fix warnings

Browse source
This commit is contained in:
Pawel Kolodziejski 2009-10-17 12:48:23 +00:00
parent 9d2b149b1e
commit 788713d3b4
23 changed files with 192 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

18
engines/grim/bitmap.cpp
View file

@ -33,15 +33,15 @@ namespace Grim {
static void decompress_codec3(const char *compressed, char *result);
Bitmap::Bitmap(const char *filename, const char *data, int len) {
_fname = filename;
Bitmap::Bitmap(const char *fname, const char *data, int len) {
_fname = fname;
if (len < 8 || memcmp(data, "BM F\0\0\0", 8) != 0) {
if (gDebugLevel == DEBUG_BITMAPS || gDebugLevel == DEBUG_ERROR || gDebugLevel == DEBUG_ALL)
error("Invalid magic loading bitmap");
}
strcpy(_filename, filename);
strcpy(_filename, fname);
int codec = READ_LE_UINT32(data + 8);
// _paletteIncluded = READ_LE_UINT32(data + 12);
@ -85,17 +85,17 @@ Bitmap::Bitmap(const char *filename, const char *data, int len) {
g_driver->createBitmap(this);
}
Bitmap::Bitmap(const char *data, int width, int height, const char *filename) {
_fname = filename;
Bitmap::Bitmap(const char *data, int w, int h, const char *fname) {
_fname = fname;
if (gDebugLevel == DEBUG_BITMAPS || gDebugLevel == DEBUG_NORMAL || gDebugLevel == DEBUG_ALL)
printf("New bitmap loaded: %s\n", filename);
strcpy(_filename, filename);
printf("New bitmap loaded: %s\n", fname);
strcpy(_filename, fname);
_currImage = 1;
_numImages = 1;
_x = 0;
_y = 0;
_width = width;
_height = height;
_width = w;
_height = h;
_format = 1;
_numTex = 0;
_texIds = NULL;