libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 11:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix warnings and compilation

Browse Source
This commit is contained in:
Pawel Kolodziejski 2006-01-07 12:37:03 +00:00
parent 83a7df08c8
commit 026d446d9f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
costume.cpp
View File

@ -640,7 +640,7 @@ Costume::Costume(const char *filename, const char *data, int len, Costume *prevC
ts.scanString(" %d '%c%c%c%c'", 5, &which, &t[0], &t[1], &t[2], &t[3]);
// Force characters to upper case
for (int j = 0; j < 4; j++)
t[j] = std::toupper(t[j]);
t[j] = toupper(t[j]);
std::memcpy(&tags[which], t, sizeof(tag32));
}
@ -720,7 +720,7 @@ Costume::~Costume() {
}
Costume::Component::Component(Component *parent, int parentID, tag32 tag) {
_visible = -1;
_visible = true;
_previousCmap = NULL;
_cmap = NULL;
_cost = NULL;
@ -740,7 +740,7 @@ void Costume::Component::setColormap(CMap *c) {
}
bool Costume::Component::visible() {
if (_visible == -1 && _parent != NULL)
if (_visible && _parent != NULL)
return _parent->visible();
return _visible;
}

3
costume.h
View File

@ -78,7 +78,8 @@ public:
protected:
ResPtr<CMap> _cmap, _previousCmap;
tag32 _tag;
int _parentID, _visible;
int _parentID;
bool _visible;
Component *_parent, *_child, *_sibling;
Matrix4 _matrix;
Costume *_cost;