diff options
| -rw-r--r-- | src/game.cpp | 3 | ||||
| -rw-r--r-- | src/game.h | 2 | ||||
| -rw-r--r-- | src/graphic/graphic.cpp | 18 |
3 files changed, 13 insertions, 10 deletions
diff --git a/src/game.cpp b/src/game.cpp index aa815f78..0a50dd44 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -224,6 +224,7 @@ void do_input() { else if(player_node->action==SIT) action(3, 0); action_time = false; + //alert("","","","","",0,0); } if(key[KEY_ENTER]) { @@ -647,7 +648,7 @@ void do_parse() { node->frame = 0; if(RFIFOB(26)==2) { node->action = SIT; - alert("","","","","",0,0); + //alert("","","","","",0,0); walk_status = 0; } else if(RFIFOB(26)==3) @@ -51,7 +51,7 @@ #define GET_STANDING_SPEECH_YCOORDS ((get_y(node->coordinates)-map_y+6)*16-55-player_y) #define PLAYERSETS 4 -#define SIT 17 +#define SIT 9 #define STAND 0 #define WALK 1 #define MONSTER_ATTACK 5 diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp index ca082ce7..9a323379 100644 --- a/src/graphic/graphic.cpp +++ b/src/graphic/graphic.cpp @@ -107,17 +107,18 @@ DIALOG chat_dialog[] = { { NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL } }; -char hairtable[9][4][2] = { +char hairtable[10][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, 0}, {-1, 2}, {-1, 2}, {0, 2} }, // STAND + { { 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, 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 + { { 0, 2}, {-4, 3}, {0, 4}, {3, 3} }, // ATTACK 4th frame + { { 0, 4}, {-1, 6}, {-1, 6}, {0, 6} }, // SIT }; void set_npc_dialog(int show) { @@ -216,6 +217,7 @@ void do_graphic(void) { } else if(node->job<10) { // Draw a player 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; + 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); //alfont_textprintf(buffer, gui_font, 0, 20, MAKECOL_WHITE, "%i %i", node->text_x,node->text_y); |