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

Changed const char * to const Common::String &.

Browse source
This commit is contained in:
Joel Teichroeb 2011-05-22 12:02:20 +08:00 • committed by Pawel Kolodziejski
parent 830e9ca765
commit 733b34febc
30 changed files with 100 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/grim/bitmap.cpp
View file

@ -89,7 +89,7 @@ char *makeBitmapFromTile(char **bits, int width, int height, int bpp) {
return fullImage;
}
BitmapData *BitmapData::getBitmapData(const char *fname, const char *data, int len) {
BitmapData *BitmapData::getBitmapData(const Common::String &fname, const char *data, int len) {
Common::String str(fname);
if (_bitmaps && _bitmaps->contains(str)) {
BitmapData *b = (*_bitmaps)[str];
@ -105,11 +105,11 @@ BitmapData *BitmapData::getBitmapData(const char *fname, const char *data, int l
return b;
}
BitmapData::BitmapData(const char *fname, const char *data, int len) {
BitmapData::BitmapData(const Common::String &fname, const char *data, int len) {
_fname = fname;
_refCount = 1;
if (len > 4 && memcmp(data, "\x1f\x8b\x08\0", 4) == 0) {
loadTile(fname, data, len);
loadTile(data, len);
return;
} else if (len < 8 || memcmp(data, "BM F\0\0\0", 8) != 0) {
if (gDebugLevel == DEBUG_BITMAPS || gDebugLevel == DEBUG_ERROR || gDebugLevel == DEBUG_ALL)
@ -208,7 +208,7 @@ BitmapData::~BitmapData() {
}
}
bool BitmapData::loadTile(const char *filename, const char *data, int len) {
bool BitmapData::loadTile(const char *data, int len) {
_x = 0;
_y = 0;
_format = 1;
@ -269,7 +269,7 @@ char *BitmapData::getImageData(int num) const {
// Bitmap
Bitmap::Bitmap(const char *fname, const char *data, int len) :
Bitmap::Bitmap(const Common::String &fname, const char *data, int len) :
Object() {
_data = BitmapData::getBitmapData(fname, data, len);
_x = _data->_x;