zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-31 04:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Don't warn when an Inventory item's Icon is set to "".

Browse source 
SVN r3720 (trunk)
This commit is contained in:
Randy Heit 2012-07-01 02:57:00 +00:00
parent 93a480f52f
commit ce8ca26bc9
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/textures/textures.h
View file

@ -27,6 +27,7 @@ public:
bool isValid() const { return texnum > 0; } bool isValid() const { return texnum > 0; }
bool Exists() const { return texnum >= 0; } bool Exists() const { return texnum >= 0; }
void SetInvalid() { texnum = -1; } void SetInvalid() { texnum = -1; }
void SetNull() { texnum = 0; }
bool operator ==(const FTextureID &other) const { return texnum == other.texnum; } bool operator ==(const FTextureID &other) const { return texnum == other.texnum; }
bool operator !=(const FTextureID &other) const { return texnum != other.texnum; } bool operator !=(const FTextureID &other) const { return texnum != other.texnum; }
FTextureID operator +(int offset) throw(); FTextureID operator +(int offset) throw();

23
src/thingdef/thingdef_properties.cpp
View file

@ -1473,16 +1473,23 @@ DEFINE_CLASS_PROPERTY(icon, S, Inventory)
{ {
PROP_STRING_PARM(i, 0); PROP_STRING_PARM(i, 0);
defaults->Icon = TexMan.CheckForTexture(i, FTexture::TEX_MiscPatch); if (i == NULL || i[0] == '\0')
if (!defaults->Icon.isValid())
{ {
// Don't print warnings if the item is for another game or if this is a shareware IWAD. defaults->Icon.SetNull();
// Strife's teaser doesn't contain all the icon graphics of the full game. }
if ((info->GameFilter == GAME_Any || info->GameFilter & gameinfo.gametype) && else
!(gameinfo.flags&GI_SHAREWARE) && Wads.GetLumpFile(bag.Lumpnum) != 0) {
defaults->Icon = TexMan.CheckForTexture(i, FTexture::TEX_MiscPatch);
if (!defaults->Icon.isValid())
{ {
bag.ScriptPosition.Message(MSG_WARNING, // Don't print warnings if the item is for another game or if this is a shareware IWAD.
"Icon '%s' for '%s' not found\n", i, info->Class->TypeName.GetChars()); // Strife's teaser doesn't contain all the icon graphics of the full game.
if ((info->GameFilter == GAME_Any || info->GameFilter & gameinfo.gametype) &&
!(gameinfo.flags&GI_SHAREWARE) && Wads.GetLumpFile(bag.Lumpnum) != 0)
{
bag.ScriptPosition.Message(MSG_WARNING,
"Icon '%s' for '%s' not found\n", i, info->Class->TypeName.GetChars());
}
} }
} }
} }