diff options
author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2004-11-06 18:24:02 +0000 |
---|---|---|
committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2004-11-06 18:24:02 +0000 |
commit | 6ae05cf7032a0a70e4953f6b53304f9658319f66 (patch) | |
tree | 8741a0789ffac237fa15d685e537bbf01e45ddc7 /src/graphic | |
parent | 8684a97f4a531c8e08fd1235ecfab2286ac68d5f (diff) | |
download | mana-6ae05cf7032a0a70e4953f6b53304f9658319f66.tar.gz mana-6ae05cf7032a0a70e4953f6b53304f9658319f66.tar.bz2 mana-6ae05cf7032a0a70e4953f6b53304f9658319f66.tar.xz mana-6ae05cf7032a0a70e4953f6b53304f9658319f66.zip |
Added possibility to choose the color of hair
Diffstat (limited to 'src/graphic')
-rw-r--r-- | src/graphic/graphic.cpp | 52 | ||||
-rw-r--r-- | src/graphic/graphic.h | 1 |
2 files changed, 34 insertions, 19 deletions
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp index af32dc63..ca082ce7 100644 --- a/src/graphic/graphic.cpp +++ b/src/graphic/graphic.cpp @@ -2,24 +2,24 @@ The Mana World Copyright 2004 The Mana World Development Team - - This file is part of The Mana World. - - The Mana World is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - any later version. - - The Mana World is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - 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) + + This file is part of The Mana World. + + The Mana World is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + any later version. + + The Mana World is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + 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) */ @@ -107,6 +107,19 @@ DIALOG chat_dialog[] = { { NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL } }; +char hairtable[9][4][2] = { + // S(x,y) W(x,y) N(x,y) E(x,y) + { { 0, 0}, {-1, 2}, {-1, 2}, {0, 2} }, // STAND 1st frame + { { 0, 2}, {-2, 3}, {-1, 2}, {1, 3} }, // WALK 1st frame + { { 0, 3}, {-2, 4}, {-1, 3}, {1, 4} }, // WALK 2nd frame + { { 0, 1}, {-2, 2}, {-1, 2}, {1, 2} }, // WALK 3rd frame + { { 0, 2}, {-2, 3}, {-1, 2}, {1, 3} }, // WALK 4th frame + { { 0, 1}, {1, 2}, {-1, 3}, {-2, 2} }, // ATTACK 1st frame + { { 0, 1}, {-1, 2}, {-1, 3}, {0, 2} }, // ATTACK 2nd frame + { { 0, 2}, {-4, 3}, {0, 4}, {3, 3} }, // ATTACK 3rd frame + { { 0, 2}, {-4, 3}, {0, 4}, {3, 3} } // ATTACK 4th frame +}; + void set_npc_dialog(int show) { show_npc_dialog = show; } @@ -204,6 +217,7 @@ void do_graphic(void) { node->text_x = (get_x(node->coordinates)-camera_x)*16-34+get_x_offset(node)-offset_x; node->text_y = (get_y(node->coordinates)-camera_y)*16-36+get_y_offset(node)-offset_y; masked_blit((BITMAP *)graphic[PLAYERSET_BMP].dat, buffer, 80*(get_direction(node->coordinates)/2), 60*(node->frame+node->action), node->text_x, node->text_y, 80, 60); + masked_blit(hairset, buffer, 20*(node->hair_color-1), 20*(get_direction(node->coordinates)/2), node->text_x+31+hairtable[node->action+node->frame][get_direction(node->coordinates)/2][0], node->text_y+15+hairtable[node->action+node->frame][get_direction(node->coordinates)/2][1], 20, 20); //alfont_textprintf(buffer, gui_font, 0, 20, MAKECOL_WHITE, "%i %i", node->text_x,node->text_y); if(node->emotion!=0) { @@ -438,7 +452,7 @@ void do_graphic(void) { update_stats_dialog(); gui_update(stats_player); - alfont_textprintf(double_buffer, gui_font, 0, 0, MAKECOL_WHITE, "FPS:%i", fps); + alfont_textprintf(double_buffer, gui_font, 0, 0, MAKECOL_WHITE, "FPS:%i %i %i", fps, player_node->frame, player_node->action); //alfont_textprintf(double_buffer, gui_font, 0, 20, MAKECOL_WHITE, "%i", show_npc_dialog); diff --git a/src/graphic/graphic.h b/src/graphic/graphic.h index e35d7b85..a652b5cf 100644 --- a/src/graphic/graphic.h +++ b/src/graphic/graphic.h @@ -50,6 +50,7 @@ extern bool show_skill_dialog, show_skill_list_dialog; extern int show_npc_dialog; extern TmwInventory inventory; extern int map_x, map_y, camera_x, camera_y; +extern BITMAP *hairset; void set_npc_dialog(int show); void do_graphic(void); |