diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-01-04 18:24:40 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-01-04 18:24:40 +0000 |
| commit | a8d207e6889cd353dd11736b5690aa54ac6de993 (patch) | |
| tree | 1979e3fbfcafebc4426ea72ed055e2db072800e8 /src/graphic | |
| parent | ae4e9076051a736e2bbbce91e7fd58cb27448f24 (diff) | |
| download | mana-a8d207e6889cd353dd11736b5690aa54ac6de993.tar.gz mana-a8d207e6889cd353dd11736b5690aa54ac6de993.tar.bz2 mana-a8d207e6889cd353dd11736b5690aa54ac6de993.tar.xz mana-a8d207e6889cd353dd11736b5690aa54ac6de993.zip | |
Got rid of last 5 Allegro datafiles.
Diffstat (limited to 'src/graphic')
| -rw-r--r-- | src/graphic/graphic.cpp | 19 | ||||
| -rw-r--r-- | src/graphic/image.h | 4 |
2 files changed, 17 insertions, 6 deletions
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp index 4537ee12..dd5df45b 100644 --- a/src/graphic/graphic.cpp +++ b/src/graphic/graphic.cpp @@ -195,9 +195,17 @@ GraphicEngine::GraphicEngine() { // Initialize the gui bitmap to the page that will be drawn first gui_bitmap = this->buffer; - emotionset = new Spriteset("./data/graphic/emotionset.dat"); - npcset = new Spriteset("./data/graphic/npcset.dat"); - tileset = new Spriteset("./data/graphic/tileset.dat"); + BITMAP *npcbmp = load_bitmap("data/graphic/npcset.bmp", NULL); + if (!npcbmp) error("Unable to load npcset.bmp"); + npcset = new Spriteset(npcbmp, 80, 50, 0, 0); + + BITMAP *emotionbmp = load_bitmap("data/graphic/emotionset.bmp", NULL); + if (!emotionbmp) error("Unable to load emotionset.bmp"); + emotionset = new Spriteset(emotionbmp, 19, 19, 0, 0); + + BITMAP *tilesetbmp = load_bitmap("data/graphic/tileset.bmp", NULL); + if (!tilesetbmp) error("Unable to load tileset.bmp"); + tileset = new Spriteset(tilesetbmp, 32, 32, 0, 0); BITMAP *monsterbitmap = load_bitmap("data/graphic/monsterset.bmp", NULL); if (!monsterbitmap) error("Unable to load monsterset.bmp"); @@ -213,7 +221,10 @@ GraphicEngine::~GraphicEngine() { delete npcTextDialog; delete skillDialog; - //delete tileset; + delete tileset; + delete monsterset; + delete npcset; + delete emotionset; } void GraphicEngine::refresh() { diff --git a/src/graphic/image.h b/src/graphic/image.h index fd3000f6..60e04eac 100644 --- a/src/graphic/image.h +++ b/src/graphic/image.h @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * By ElvenProgrammer aka Eugenio Favalli (umperio@users.sourceforge.net) + * $Id$ */ #ifndef _IMAGE_H @@ -119,7 +119,7 @@ class VideoImage : public Image { class Spriteset { public: // Vector storing the whole spriteset. - std::vector<Image *> spriteset; + std::vector<Image*> spriteset; /** * Load a datafile containing the spriteset |