diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2004-11-12 20:05:46 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2004-11-12 20:05:46 +0000 |
| commit | 7e136ff3317cea53a8ecc6d21029b29562a04a34 (patch) | |
| tree | 4779c08e66e675155f97bbe48fa2f26f209a1be7 | |
| parent | edf872e4b6d3d689338305d749ba3972d77f7eb8 (diff) | |
| download | mana-7e136ff3317cea53a8ecc6d21029b29562a04a34.tar.gz mana-7e136ff3317cea53a8ecc6d21029b29562a04a34.tar.bz2 mana-7e136ff3317cea53a8ecc6d21029b29562a04a34.tar.xz mana-7e136ff3317cea53a8ecc6d21029b29562a04a34.zip | |
Hair styles
| -rw-r--r-- | The Mana World.dev | 2 | ||||
| -rw-r--r-- | src/game.cpp | 5 | ||||
| -rw-r--r-- | src/game.h | 2 | ||||
| -rw-r--r-- | src/graphic/graphic.cpp | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/The Mana World.dev b/The Mana World.dev index 3db57a1e..87d63d45 100644 --- a/The Mana World.dev +++ b/The Mana World.dev @@ -33,7 +33,7 @@ CompilerSettings=0000001001001000001101 Major=0 Minor=0 Release=8 -Build=64 +Build=71 LanguageID=1033 CharsetID=1252 CompanyName=The Mana World Development Team diff --git a/src/game.cpp b/src/game.cpp index ab0501c2..8b14202b 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -48,7 +48,7 @@ bool refresh_beings = false; unsigned char keyb_state; volatile int tick_time; volatile bool refresh = false, action_time = false; -int current_npc; +int current_npc, server_tick; #define MAX_TIME 10000 @@ -386,7 +386,10 @@ void do_parse() { if(get_src_y(RFIFOP(6))==src_y) if(get_dest_x(RFIFOP(6))==get_x(player_node->coordinates)) if(get_dest_y(RFIFOP(6))==get_y(player_node->coordinates))*/ + if(RFIFOL(2)>server_tick) { walk_status = 2; + server_tick = RFIFOL(2); + } } break; // Add new being / stop monster @@ -75,7 +75,7 @@ extern DIALOG stats_dialog[]; extern int fps, frame, current_npc; extern char walk_status; extern unsigned short src_x, src_y, x, y; -extern volatile int tick_time; +extern volatile int tick_time, server_tick; void game(); void do_init(); diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp index 1cf86f25..bbac9532 100644 --- a/src/graphic/graphic.cpp +++ b/src/graphic/graphic.cpp @@ -491,7 +491,7 @@ void do_graphic(void) { update_stats_dialog(); gui_update(stats_player); - alfont_textprintf(double_buffer, gui_font, 0, 0, MAKECOL_WHITE, "FPS:%i %i %i %i %i", fps, get_x(player_node->coordinates), get_y(player_node->coordinates),src_x,src_y); + alfont_textprintf(double_buffer, gui_font, 0, 0, MAKECOL_WHITE, "FPS:%i %i %i %i %i %i", fps, get_x(player_node->coordinates), get_y(player_node->coordinates),src_x,src_y,server_tick); //alfont_textprintf(double_buffer, gui_font, 0, 20, MAKECOL_WHITE, "%i", show_npc_dialog); |