*** empty log message ***

9 files changed, 36 insertions, 34 deletions

diff --git a/src/being.h b/src/being.h
index d1dcdb31..9903371f 100644
--- a/src/being.h
+++ b/src/being.h
@@ -24,7 +24,7 @@
 #ifndef _BEING_H
 #define _BEING_H
 
-#include "./Net/protocol.h"
+#include "./net/protocol.h"
 
 #define ACTION_NODE  0
 #define PLAYER_NODE  1
diff --git a/src/game.cpp b/src/game.cpp
index ac90b56b..754c637c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -24,12 +24,12 @@
 #include "map.h"
 #include "being.h"
 #include "log.h"
-#include "./Gui/chat.h"
-#include "./Gui/gui.h"
-#include "./Gui/inventory.h"
-#include "./Graphic/SuperEagle.h"
-#include "./Graphic/graphic.h"
-#include "./Sound/sound.h"
+#include "./gui/chat.h"
+#include "./gui/gui.h"
+#include "./gui/inventory.h"
+#include "./graphic/super_eagle.h"
+#include "./graphic/graphic.h"
+#include "./sound/sound.h"
 
 char map_path[480];
 
@@ -52,8 +52,6 @@ volatile bool refresh = false, action_time = false;
 		2 = Walking with confirm */
 char walk_status = 0;
 
-
-
 void refresh_time(void) {
 	tick_time++;
 	if(tick_time==MAX_TIME)tick_time = 0;
diff --git a/src/game.h b/src/game.h
index 8a48d046..88728279 100644
--- a/src/game.h
+++ b/src/game.h
@@ -32,9 +32,9 @@
 #include <stdio.h>
 
 #include "main.h"
-#include "./Gui/gui.h"
-#include "./Gui/skill.h"
-#include "./Graphic/SuperEagle.h"
+#include "./gui/gui.h"
+#include "./gui/skill.h"
+#include "./graphic/super_eagle.h"
 
 #define SPEECH_TIME 40
 #define EMOTION_TIME 40
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index 3a6e71a3..575f6b3e 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -36,9 +36,9 @@
 #include "../game.h"
 #include "../map.h"
 #include "../being.h"
-#include "../Gui/chat.h"
-#include "../Gui/inventory.h"
-#include "../data/graphic/gfx_data.h"
+#include "../gui/chat.h"
+#include "../gui/inventory.h"
+#include "../../data/graphic/gfx_data.h"
 
 BITMAP *buffer, *double_buffer, *chat_background;
 DATAFILE *tileset;
@@ -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
@@ -201,15 +201,19 @@ void do_graphic(void) {
 			remove_node(old_node->id);
 	}
 
-	for(int j=0;j<20;j++)
+	/*for(int j=0;j<20;j++)
 		for(int i=0;i<26;i++) {
 			if(get_tile(i+camera_x, j+camera_y, 2)!=0)draw_rle_sprite(buffer, (RLE_SPRITE *)tileset[get_tile(i+camera_x, j+camera_y, 2)].dat, i*16-offset_x, j*16-offset_y);
-		}
+		}*/
+
+		
 
 	stretch_blit(buffer, double_buffer, 0, 0, 400, 300, 0, 0, 800, 600);
 
+	
+
 	// Draw player speech
-  node = get_head();
+  /*node = get_head();
   while(node) {
     if(node->speech!=NULL) {
       alfont_textprintf_aa(double_buffer, gui_font, node->text_x+260-alfont_text_length(gui_font, node->speech)/2, node->text_y+100, node->speech_color, "%s", node->speech);
@@ -221,7 +225,7 @@ void do_graphic(void) {
       }
     }
     node = node->next;
-  }
+  }	
 
 	inventory.draw(double_buffer);
 
@@ -242,7 +246,7 @@ void do_graphic(void) {
 	}
   
 
-	alfont_textprintf_aa(double_buffer, gui_font, 0, 0, MAKECOL_WHITE, "FPS:%i", fps);
+	alfont_textprintf_aa(double_buffer, gui_font, 0, 0, MAKECOL_WHITE, "FPS:%i", fps);*/
 
 	blit(double_buffer, screen, 0, 0, 0, 0, 800, 600);
 
diff --git a/src/graphic/graphic.h b/src/graphic/graphic.h
index c50def22..f8b477ee 100644
--- a/src/graphic/graphic.h
+++ b/src/graphic/graphic.h
@@ -31,8 +31,8 @@
 #endif
 
 #include <allegro.h>
-#include "../Gui/chat.h"
-#include "../Gui/inventory.h"
+#include "../gui/chat.h"
+#include "../gui/inventory.h"
 
 extern BITMAP *buffer, *double_buffer;
 extern char speech[255];
diff --git a/src/graphic/super_eagle.cpp b/src/graphic/super_eagle.cpp
index 78bb6fea..e48723d9 100644
--- a/src/graphic/super_eagle.cpp
+++ b/src/graphic/super_eagle.cpp
@@ -21,7 +21,7 @@
 
 */
 
-#include "SuperEagle.h"
+#include "super_eagle.h"
 
 static uint32 colorMask = 0xF7DEF7DE;
 static uint32 lowPixelMask = 0x08210821;
diff --git a/src/main.cpp b/src/main.cpp
index 937c40f6..3741b680 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,8 +22,8 @@
 */
 
 #include "main.h"
-#include "./Sound/sound.h"
-#include "./Graphic/graphic.h"
+#include "./sound/sound.h"
+#include "./graphic/graphic.h"
 
 /* Account infos */
 int account_ID, session_ID1, session_ID2;
diff --git a/src/main.h b/src/main.h
index 0b4eb87a..5f22e0cb 100644
--- a/src/main.h
+++ b/src/main.h
@@ -34,13 +34,13 @@
 
 #include "log.h"
 #include "game.h" 
-#include "./Net/protocol.h"
-#include "./Gui/login.h"
-#include "./Gui/gui.h"
-#include "./Gui/char_server.h"
-#include "./Gui/char_select.h"
-#include "./Graphic/SuperEagle.h"
-#include "./data/graphic/gfx_data.h"
+#include "./net/protocol.h"
+#include "./gui/login.h"
+#include "./gui/gui.h"
+#include "./gui/char_server.h"
+#include "./gui/char_select.h"
+#include "./graphic/super_eagle.h"
+#include "../data/graphic/gfx_data.h"
 
 #define EXIT        0
 #define LOGIN       1
diff --git a/src/map.cpp b/src/map.cpp
index c8fc3612..1efca5d7 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -29,7 +29,7 @@
 #ifdef WIN32
 #include <windows.h>
 #else
-#include "./Net/win2linux.h"
+#include "./src/net/win2linux.h"
 #endif
 
 MAP map;