summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2004-12-17 21:48:30 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2004-12-17 21:48:30 +0000
commit439a484f437b61c82aef2a09b9ac40e06cf10a2c (patch)
tree69ccac66d4dd8286b2c31d6079f2cb8118cba2b9 /src
parent850fdc264ef1df1c1da9ed8482ffc67de7807d54 (diff)
downloadmana-client-439a484f437b61c82aef2a09b9ac40e06cf10a2c.tar.gz
mana-client-439a484f437b61c82aef2a09b9ac40e06cf10a2c.tar.bz2
mana-client-439a484f437b61c82aef2a09b9ac40e06cf10a2c.tar.xz
mana-client-439a484f437b61c82aef2a09b9ac40e06cf10a2c.zip
Finish image.h class renames.
Diffstat (limited to 'src')
-rw-r--r--src/graphic/graphic.cpp13
-rw-r--r--src/graphic/image.h2
2 files changed, 8 insertions, 7 deletions
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index 6bdcf9ba..91745901 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -70,7 +70,8 @@ void ChatListener::action(const std::string& eventId)
}
-SPRITESET *new_tileset, *new_playerset, *new_npcset, *new_emotionset, *new_monsterset;
+Spriteset *new_tileset, *new_playerset, *new_npcset, *new_emotionset;
+Spriteset *new_monsterset;
DIALOG npc_dialog[] = {
/* (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) (dp2) (dp3) */
@@ -280,11 +281,11 @@ void init_graphic() {
gui_bitmap = vpage[page_num];
- new_emotionset = new SPRITESET("./data/graphic/emotionset.dat");
- new_tileset = new SPRITESET("./data/graphic/desert.dat");
- new_npcset = new SPRITESET("./data/graphic/npcset.dat");
- new_playerset = new SPRITESET("./data/graphic/playerset.dat");
- new_monsterset = new SPRITESET("./data/graphic/monsterset.dat");
+ new_emotionset = new Spriteset("./data/graphic/emotionset.dat");
+ new_tileset = new Spriteset("./data/graphic/desert.dat");
+ new_npcset = new Spriteset("./data/graphic/npcset.dat");
+ new_playerset = new Spriteset("./data/graphic/playerset.dat");
+ new_monsterset = new Spriteset("./data/graphic/monsterset.dat");
}
diff --git a/src/graphic/image.h b/src/graphic/image.h
index 9543d774..c798fae0 100644
--- a/src/graphic/image.h
+++ b/src/graphic/image.h
@@ -84,7 +84,7 @@ class Spriteset {
if(!datafile)error("Unable to load graphic file: " + filename);
int i = 0;
while(datafile[i].type!=DAT_END) {
- IMAGE *temp_image;
+ Image *temp_image;
if(gfx_capabilities & GFX_HW_VRAM_BLIT) {
BITMAP *temp_video_bitmap = create_video_bitmap(((RLE_SPRITE *)datafile[i].dat)->w, ((RLE_SPRITE *)datafile[i].dat)->h);