summaryrefslogtreecommitdiff
path: root/src/graphic/graphic.cpp
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2004-11-12 18:45:04 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2004-11-12 18:45:04 +0000
commitedf872e4b6d3d689338305d749ba3972d77f7eb8 (patch)
treeffcbc634334f426736e0fdf77ecd580cdd5389a8 /src/graphic/graphic.cpp
parent526f9a301caa29d1922561104de9aea8bc213b65 (diff)
downloadmana-edf872e4b6d3d689338305d749ba3972d77f7eb8.tar.gz
mana-edf872e4b6d3d689338305d749ba3972d77f7eb8.tar.bz2
mana-edf872e4b6d3d689338305d749ba3972d77f7eb8.tar.xz
mana-edf872e4b6d3d689338305d749ba3972d77f7eb8.zip
Hair styles
Diffstat (limited to 'src/graphic/graphic.cpp')
-rw-r--r--src/graphic/graphic.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index cc4ec179..1cf86f25 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -230,7 +230,7 @@ void do_graphic(void) {
node->text_y = (get_y(node->coordinates)-camera_y)*16-36+get_y_offset(node)-offset_y;
if(node->action==SIT)node->frame = 0;
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);
+ masked_blit(hairset, buffer, 20*(node->hair_color-1), 20*(get_direction(node->coordinates)/2+4*(node->hair_style-1)), 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) {
@@ -244,11 +244,11 @@ void do_graphic(void) {
node->frame = (get_elapsed_time(node->tick_time)*4)/(node->speed);
if(node->frame>=4) {
node->frame = 0;
- if(node->action==WALK)
+ /*if(node->action==WALK)
if(walk_status==1) {
set_coordinates(player_node->coordinates, src_x, src_y, direction);
walk_status = 0;
- }
+ } */
node->action = STAND;
// node->tick_time;
if(node->id==player_node->id)