summaryrefslogtreecommitdiff
path: root/src/graphic/graphic.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-01-02 16:31:19 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-01-02 16:31:19 +0000
commite76a6e3d2cc40e382e2ca1c7348e36a4082a221b (patch)
tree5608d032613e083d86923ad7b339352e9f157498 /src/graphic/graphic.cpp
parent40b4ecacd44bd3040d9600d6304422bdd7e2e4c4 (diff)
downloadMana-e76a6e3d2cc40e382e2ca1c7348e36a4082a221b.tar.gz
Mana-e76a6e3d2cc40e382e2ca1c7348e36a4082a221b.tar.bz2
Mana-e76a6e3d2cc40e382e2ca1c7348e36a4082a221b.tar.xz
Mana-e76a6e3d2cc40e382e2ca1c7348e36a4082a221b.zip
Got rid of hairset.dat and playerset.dat.
Diffstat (limited to 'src/graphic/graphic.cpp')
-rw-r--r--src/graphic/graphic.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index 40a00aa4..20649d3c 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -203,14 +203,12 @@ GraphicEngine::GraphicEngine() {
gui_bitmap = this->buffer;
emotionset = new Spriteset("./data/graphic/emotionset.dat");
- hairset = new Spriteset("./data/graphic/hairset.dat");
npcset = new Spriteset("./data/graphic/npcset.dat");
- playerset = new Spriteset("./data/graphic/playerset.dat");
tileset = new Spriteset("./data/graphic/tileset.dat");
BITMAP *monsterbitmap = load_bitmap("data/graphic/monsterset.bmp", NULL);
if (!monsterbitmap) error("Unable to load monsterset.bmp");
- monsterset = new Spriteset(monsterbitmap, 60, 60);
+ monsterset = new Spriteset(monsterbitmap, 60, 60, 30, 40);
}
GraphicEngine::~GraphicEngine() {
@@ -291,18 +289,18 @@ void GraphicEngine::refresh() {
playerset->spriteset[4 * pf + dir]->draw(buffer,
node->text_x - 64, node->text_y - 80);
- hairset->spriteset[hf]->draw(
- buffer, node->text_x - 2 + 2 * hairtable[pf][dir][0],
- node->text_y - 50 + 2 * hairtable[pf][dir][1]);
+ hairset->spriteset[hf]->draw(buffer,
+ node->text_x - 2 + 2 * hairtable[pf][dir][0],
+ node->text_y - 50 + 2 * hairtable[pf][dir][1]);
}
else {
int pf = node->frame + node->action;
playerset->spriteset[4 * pf + dir]->draw(buffer,
node->text_x - 64, node->text_y - 80);
- hairset->spriteset[hf]->draw(
- buffer, node->text_x - 2 + 2 * hairtable[pf][dir][0],
- node->text_y - 50 + 2 * hairtable[pf][dir][1]);
+ hairset->spriteset[hf]->draw(buffer,
+ node->text_x - 2 + 2 * hairtable[pf][dir][0],
+ node->text_y - 50 + 2 * hairtable[pf][dir][1]);
}
if (node->emotion != 0) {
emotionset->spriteset[node->emotion - 1]->draw(buffer,