*** empty log message ***

11 files changed, 106 insertions, 124 deletions

diff --git a/ManaWorld.vcproj b/ManaWorld.vcproj
index 75ff47d1..b487b7e7 100644
--- a/ManaWorld.vcproj
+++ b/ManaWorld.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="ManaWorld"
+	Name="TheManaWorld"
 	ProjectGUID="{DE31E83E-62BD-460E-8E6A-648CF98CC5A4}"
 	RootNamespace="ManaWorld"
 	Keyword="Win32Proj">
@@ -153,156 +153,136 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\astar.cpp">
+				RelativePath=".\src\astar.cpp">
 			</File>
 			<File
-				RelativePath=".\being.cpp">
+				RelativePath=".\src\astar.h">
 			</File>
 			<File
-				RelativePath=".\game.cpp">
+				RelativePath=".\src\being.cpp">
 			</File>
 			<File
-				RelativePath=".\Graphic\graphic.cpp">
+				RelativePath=".\src\being.h">
 			</File>
 			<File
-				RelativePath=".\log.cpp">
+				RelativePath=".\src\game.cpp">
 			</File>
 			<File
-				RelativePath=".\main.cpp">
+				RelativePath=".\src\game.h">
 			</File>
 			<File
-				RelativePath=".\map.cpp">
+				RelativePath=".\src\log.cpp">
 			</File>
 			<File
-				RelativePath=".\Sound\sound.cpp">
+				RelativePath=".\src\log.h">
 			</File>
 			<File
-				RelativePath=".\Graphic\SuperEagle.cpp">
+				RelativePath=".\src\main.cpp">
+			</File>
+			<File
+				RelativePath=".\src\main.h">
+			</File>
+			<File
+				RelativePath=".\src\map.cpp">
+			</File>
+			<File
+				RelativePath=".\src\map.h">
 			</File>
 			<Filter
-				Name="Net"
+				Name="graphic"
 				Filter="">
 				<File
-					RelativePath=".\Net\network.cpp">
+					RelativePath=".\src\graphic\graphic.cpp">
 				</File>
 				<File
-					RelativePath=".\Net\protocol.cpp">
+					RelativePath=".\src\graphic\graphic.h">
+				</File>
+				<File
+					RelativePath=".\src\graphic\super_eagle.cpp">
+				</File>
+				<File
+					RelativePath=".\src\graphic\super_eagle.h">
 				</File>
 			</Filter>
 			<Filter
-				Name="Gui"
+				Name="net"
 				Filter="">
 				<File
-					RelativePath=".\Gui\char_select.cpp">
+					RelativePath=".\src\net\network.cpp">
 				</File>
 				<File
-					RelativePath=".\Gui\char_server.cpp">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Profile|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-					</FileConfiguration>
+					RelativePath=".\src\net\network.h">
 				</File>
 				<File
-					RelativePath=".\Gui\chat.cpp">
+					RelativePath=".\src\net\protocol.cpp">
 				</File>
 				<File
-					RelativePath=".\Gui\gui.cpp">
+					RelativePath=".\src\net\protocol.h">
 				</File>
 				<File
-					RelativePath=".\Gui\inventory.cpp">
+					RelativePath=".\src\net\win2linux.h">
 				</File>
 				<File
-					RelativePath=".\Gui\login.cpp">
+					RelativePath=".\src\net\win2mac.cpp">
 				</File>
 				<File
-					RelativePath=".\Gui\skill.cpp">
+					RelativePath=".\src\net\win2mac.h">
 				</File>
 			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath=".\astar.h">
-			</File>
-			<File
-				RelativePath=".\being.h">
-			</File>
-			<File
-				RelativePath=".\game.h">
-			</File>
-			<File
-				RelativePath=".\Graphic\graphic.h">
-			</File>
-			<File
-				RelativePath=".\log.h">
-			</File>
-			<File
-				RelativePath=".\main.h">
-			</File>
-			<File
-				RelativePath=".\map.h">
-			</File>
-			<File
-				RelativePath=".\resrc1.h">
-			</File>
-			<File
-				RelativePath=".\Sound\sound.h">
-			</File>
-			<File
-				RelativePath=".\Graphic\SuperEagle.h">
-			</File>
 			<Filter
-				Name="Net"
+				Name="gui"
 				Filter="">
 				<File
-					RelativePath=".\Net\network.h">
+					RelativePath=".\src\gui\char_select.cpp">
 				</File>
 				<File
-					RelativePath=".\Net\protocol.h">
+					RelativePath=".\src\gui\char_select.h">
 				</File>
-			</Filter>
-			<Filter
-				Name="Gui"
-				Filter="">
 				<File
-					RelativePath=".\Gui\char_select.h">
+					RelativePath=".\src\gui\char_server.cpp">
 				</File>
 				<File
-					RelativePath=".\Gui\char_server.h">
+					RelativePath=".\src\gui\char_server.h">
 				</File>
 				<File
-					RelativePath=".\Gui\chat.h">
+					RelativePath=".\src\gui\chat.cpp">
 				</File>
 				<File
-					RelativePath=".\Graphic\datGraphics.h">
+					RelativePath=".\src\gui\chat.h">
 				</File>
 				<File
-					RelativePath=".\Gui\gui.h">
+					RelativePath=".\src\gui\gui.cpp">
 				</File>
 				<File
-					RelativePath=".\Gui\inventory.h">
+					RelativePath=".\src\gui\gui.h">
 				</File>
 				<File
-					RelativePath=".\Gui\login.h">
+					RelativePath=".\src\gui\inventory.cpp">
+				</File>
+				<File
+					RelativePath=".\src\gui\inventory.h">
+				</File>
+				<File
+					RelativePath=".\src\gui\login.cpp">
+				</File>
+				<File
+					RelativePath=".\src\gui\login.h">
+				</File>
+				<File
+					RelativePath=".\src\gui\skill.cpp">
+				</File>
+				<File
+					RelativePath=".\src\gui\skill.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="sound"
+				Filter="">
+				<File
+					RelativePath=".\src\sound\sound.cpp">
 				</File>
 				<File
-					RelativePath=".\Gui\skill.h">
+					RelativePath=".\src\sound\sound.h">
 				</File>
 			</Filter>
 		</Filter>
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;
diff --git a/tmw.ini b/tmw.ini
index cd1d0eb3..882c3193 100644
--- a/tmw.ini
+++ b/tmw.ini
@@ -28,4 +28,4 @@ stretch = 1
 
 [login]
 remember = 1
-username = test2
+username = elven