diff options
author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2004-09-26 14:21:39 +0000 |
---|---|---|
committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2004-09-26 14:21:39 +0000 |
commit | 6d29b471df7c0f53ba4ab786f2f4b80bc154ed0d (patch) | |
tree | 8b73ab560171fce81587f09891c7346580149139 | |
parent | 0f26f569f5775c77c53e1ebf0b9d5ec972bc31cc (diff) | |
download | mana-client-6d29b471df7c0f53ba4ab786f2f4b80bc154ed0d.tar.gz mana-client-6d29b471df7c0f53ba4ab786f2f4b80bc154ed0d.tar.bz2 mana-client-6d29b471df7c0f53ba4ab786f2f4b80bc154ed0d.tar.xz mana-client-6d29b471df7c0f53ba4ab786f2f4b80bc154ed0d.zip |
*** empty log message ***
-rw-r--r-- | src/game.cpp | 10 | ||||
-rw-r--r-- | src/graphic/graphic.cpp | 10 | ||||
-rw-r--r-- | src/gui/char_select.cpp | 2 | ||||
-rw-r--r-- | src/gui/char_select.h | 2 | ||||
-rw-r--r-- | src/gui/char_server.h | 2 | ||||
-rw-r--r-- | src/gui/gui.cpp | 2 | ||||
-rw-r--r-- | src/gui/inventory.h | 2 | ||||
-rw-r--r-- | src/gui/login.cpp | 2 | ||||
-rw-r--r-- | src/gui/login.h | 2 |
9 files changed, 13 insertions, 21 deletions
diff --git a/src/game.cpp b/src/game.cpp index 754c637c..5f4aced4 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -90,8 +90,6 @@ void game() { while(state!=EXIT) { status("INPUT"); do_input(); - status("LOGIC"); - do_logic(); if(refresh) { status("GRAPHIC"); do_graphic(); @@ -112,7 +110,7 @@ void do_init() { if(!load_map(map_path))error("Could not find map file"); - sound.StartMOD("Sound/Mods/somemp.xm",-1); + sound.StartMOD(".data/sound/mods/somemp.xm", -1); // Initialize timers tick_time = 0; @@ -286,12 +284,6 @@ void do_input() { } - - -/** Update game logic */ -void do_logic() { -} - /** Calculate packet length */ int get_packet_length(short id) { int len = get_length(id); diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp index 575f6b3e..02848d7e 100644 --- a/src/graphic/graphic.cpp +++ b/src/graphic/graphic.cpp @@ -140,7 +140,7 @@ void do_graphic(void) { if(get_tile(i+camera_x, j+camera_y, 1)!=0)draw_rle_sprite(buffer, (RLE_SPRITE *)tileset[get_tile(i+camera_x, j+camera_y, 1)].dat, i*16-offset_x, j*16-offset_y); } - NODE *node = get_head(); + /*NODE *node = get_head(); NODE *old_node = NULL; while(node) { if((node->job>=100)&&(node->job<=110)) { // Draw a NPC @@ -171,7 +171,7 @@ void do_graphic(void) { } else if(node->job==45) { // Draw a warp //rectfill(buffer, (get_x(node->coordinates)-map_x)*16-player_x-get_x_offset(node->frame, get_direction(node->coordinates)), (get_y(node->coordinates)-map_y)*16-player_y-get_y_offset(node->frame, get_direction(node->coordinates)), (get_x(node->coordinates)-map_x)*16-player_x-get_x_offset(node->frame, get_direction(node->coordinates))+16, (get_y(node->coordinates)-map_y)*16-player_y-get_y_offset(node->frame, get_direction(node->coordinates))+16, makecol(0,0,255)); - } else { // Draw a monster + }/* else { // Draw a monster node->text_x = (get_x(node->coordinates)-camera_x)*16-20+get_x_offset(node)-offset_x; node->text_y = (get_y(node->coordinates)-camera_y)*16-25+get_y_offset(node)-offset_y; @@ -194,12 +194,12 @@ void do_graphic(void) { } } } - } - old_node = node; + }*/ + /* old_node = node; node = node->next; if(old_node->action==MONSTER_DEAD && old_node->frame>=4) remove_node(old_node->id); - } + }*/ /*for(int j=0;j<20;j++) for(int i=0;i<26;i++) { diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index e58a8d73..ac35cac9 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -22,7 +22,7 @@ */ #include "char_select.h" -#include "../Graphic/graphic.h" +#include "../graphic/graphic.h" char button_state[3]; char address[41]; diff --git a/src/gui/char_select.h b/src/gui/char_select.h index 94a8e820..32c801e0 100644 --- a/src/gui/char_select.h +++ b/src/gui/char_select.h @@ -31,7 +31,7 @@ #include <allegro.h> #include "../main.h" -#include "../Net/network.h" +#include "../net/network.h" #include "gui.h" void char_select(); diff --git a/src/gui/char_server.h b/src/gui/char_server.h index 866f5070..af39a744 100644 --- a/src/gui/char_server.h +++ b/src/gui/char_server.h @@ -31,7 +31,7 @@ #include <allegro.h> #include "../main.h" -#include "../Net/network.h" +#include "../net/network.h" #include "gui.h" void char_server(); diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index cb43c47b..93bc3188 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -25,7 +25,7 @@ #include "allegro/internal/aintern.h" #include <math.h> #include <alfont.h> -#include "../Sound/sound.h" +#include "../sound/sound.h" #ifndef WIN32 #define __cdecl __attribute__((cdecl)) diff --git a/src/gui/inventory.h b/src/gui/inventory.h index 75939950..f72bdb64 100644 --- a/src/gui/inventory.h +++ b/src/gui/inventory.h @@ -34,7 +34,7 @@ #include "../main.h" #include "../game.h" #include "../log.h" -#include "../Net/network.h" +#include "../net/network.h" #include "gui.h" struct itemHolder { // the holder of a item diff --git a/src/gui/login.cpp b/src/gui/login.cpp index e3cb6195..b27a0dab 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -22,7 +22,7 @@ */ #include "login.h" -#include "../Graphic/graphic.h" +#include "../graphic/graphic.h" /** Display login GUI */ void login() { diff --git a/src/gui/login.h b/src/gui/login.h index c181e0eb..3b51ae9d 100644 --- a/src/gui/login.h +++ b/src/gui/login.h @@ -34,7 +34,7 @@ #endif #include "../main.h" #include "../log.h" -#include "../Net/network.h" +#include "../net/network.h" #include "gui.h" void login(); |