diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-06-21 18:41:45 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-06-21 18:41:45 +0000 |
| commit | c2a830c71ef0e271e48ef57a80ee5b00a977a4de (patch) | |
| tree | 9c8f13688ddbf159a34640ad4cf4fdda3eb20ecf /src/gui | |
| parent | c392a1aa234b304b634c4ace6375ad96397a30b9 (diff) | |
| download | mana-c2a830c71ef0e271e48ef57a80ee5b00a977a4de.tar.gz mana-c2a830c71ef0e271e48ef57a80ee5b00a977a4de.tar.bz2 mana-c2a830c71ef0e271e48ef57a80ee5b00a977a4de.tar.xz mana-c2a830c71ef0e271e48ef57a80ee5b00a977a4de.zip | |
Image loader now automatically determines whether to use masked drawing or
an alpha layer.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/equipment.cpp | 2 | ||||
| -rw-r--r-- | src/gui/itemcontainer.cpp | 4 | ||||
| -rw-r--r-- | src/gui/minimap.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/equipment.cpp b/src/gui/equipment.cpp index 32af0c5a..b954eec7 100644 --- a/src/gui/equipment.cpp +++ b/src/gui/equipment.cpp @@ -36,7 +36,7 @@ EquipmentWindow::EquipmentWindow(): setPosition(40, 40); ResourceManager *resman = ResourceManager::getInstance(); - Image *itemImg = resman->getImage("graphics/sprites/items.png", IMG_ALPHA); + Image *itemImg = resman->getImage("graphics/sprites/items.png"); if (!itemImg) logger->error("Unable to load items.png"); itemset = new Spriteset(itemImg, 32, 32); diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp index 1a95c857..f66a6eff 100644 --- a/src/gui/itemcontainer.cpp +++ b/src/gui/itemcontainer.cpp @@ -29,12 +29,12 @@ ItemContainer::ItemContainer() { ResourceManager *resman = ResourceManager::getInstance(); - Image *itemImg = resman->getImage("graphics/sprites/items.png", IMG_ALPHA); + Image *itemImg = resman->getImage("graphics/sprites/items.png"); if (!itemImg) logger->error("Unable to load items.png"); itemset = new Spriteset(itemImg, 32, 32); itemImg->decRef(); - selImg = resman->getImage("graphics/gui/selection.png", IMG_ALPHA); + selImg = resman->getImage("graphics/gui/selection.png"); if (!selImg) logger->error("Unable to load selection.png"); selectedItem = -1; // No item selected diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index 98ef8338..58e8df80 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -52,7 +52,7 @@ void Minimap::setMap(Map *map) if (map->hasProperty("minimap")) { ResourceManager *resman = ResourceManager::getInstance(); - mMapImage = resman->getImage(map->getProperty("minimap"), IMG_ALPHA); + mMapImage = resman->getImage(map->getProperty("minimap")); if (mMapImage != NULL) { |