move network-related code to network/

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@6634 8aca7d54-2c30-db11-9de9-000461428c89
aburch · Aug 7, 2013 · aad1518 · aad1518
1 parent 325f2a6
commit aad1518
Show file tree

Hide file tree

Showing 75 changed files with 162 additions and 165 deletions.
diff --git a/Makefile b/Makefile
@@ -208,20 +208,9 @@ SOURCES += dataobj/koord.cc
 SOURCES += dataobj/koord3d.cc
 SOURCES += dataobj/loadsave.cc
 SOURCES += dataobj/marker.cc
-SOURCES += dataobj/network.cc
-SOURCES += dataobj/network_address.cc
-SOURCES += dataobj/network_cmd.cc
-SOURCES += dataobj/network_cmd_ingame.cc
-SOURCES += dataobj/network_cmd_scenario.cc
-SOURCES += dataobj/network_cmp_pakset.cc
-SOURCES += dataobj/network_file_transfer.cc
-SOURCES += dataobj/network_packet.cc
-SOURCES += dataobj/network_socket_list.cc
-SOURCES += dataobj/pakset_info.cc
 SOURCES += dataobj/powernet.cc
 SOURCES += dataobj/ribi.cc
 SOURCES += dataobj/route.cc
-SOURCES += dataobj/pwd_hash.cc
 SOURCES += dataobj/scenario.cc
 SOURCES += dataobj/tabfile.cc
 SOURCES += dataobj/translator.cc
@@ -341,6 +330,19 @@ SOURCES += gui/thing_info.cc
 SOURCES += gui/trafficlight_info.cc
 SOURCES += gui/welt.cc
 SOURCES += gui/werkzeug_waehler.cc
+SOURCES += network/checksum.cc
+SOURCES += network/memory_rw.cc
+SOURCES += network/network.cc
+SOURCES += network/network_address.cc
+SOURCES += network/network_cmd.cc
+SOURCES += network/network_cmd_ingame.cc
+SOURCES += network/network_cmd_scenario.cc
+SOURCES += network/network_cmp_pakset.cc
+SOURCES += network/network_file_transfer.cc
+SOURCES += network/network_packet.cc
+SOURCES += network/network_socket_list.cc
+SOURCES += network/pakset_info.cc
+SOURCES += network/pwd_hash.cc
 SOURCES += old_blockmanager.cc
 SOURCES += player/ai.cc
 SOURCES += player/ai_goods.cc
@@ -420,10 +422,8 @@ SOURCES += simworld.cc
 SOURCES += sucher/platzsucher.cc
 SOURCES += unicode.cc
 SOURCES += utils/cbuffer_t.cc
-SOURCES += utils/checksum.cc
 SOURCES += utils/csv.cc
 SOURCES += utils/log.cc
-SOURCES += utils/memory_rw.cc
 SOURCES += utils/searchfolder.cc
 SOURCES += utils/sha1.cc
 SOURCES += utils/simstring.cc

diff --git a/Nettool.vcproj b/Nettool.vcproj
@@ -184,35 +184,35 @@
 				>
 			</File>
 			<File
-				RelativePath=".\utils\memory_rw.cc"
+				RelativePath=".\network\memory_rw.cc"
 				>
 			</File>
 			<File
 				RelativePath=".\nettools\nettool.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network.cc"
+				RelativePath=".\network\network.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_address.cc"
+				RelativePath=".\network\network_address.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_cmd.cc"
+				RelativePath=".\network\network_cmd.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_file_transfer.cc"
+				RelativePath=".\network\network_file_transfer.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_packet.cc"
+				RelativePath=".\network\network_packet.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_socket_list.cc"
+				RelativePath=".\network\network_socket_list.cc"
 				>
 			</File>
 			<File
@@ -246,35 +246,35 @@
 				>
 			</File>
 			<File
-				RelativePath=".\utils\memory_rw.h"
+				RelativePath=".\network\memory_rw.h"
 				>
 			</File>
 			<File
 				RelativePath=".\nettools\nettool.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network.h"
+				RelativePath=".\network\network.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_address.h"
+				RelativePath=".\network\network_address.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_cmd.h"
+				RelativePath=".\network\network_cmd.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_file_transfer.h"
+				RelativePath=".\network\network_file_transfer.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_packet.h"
+				RelativePath=".\network\network_packet.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_socket_list.h"
+				RelativePath=".\network\network_socket_list.h"
 				>
 			</File>
 			<File

diff --git a/Simutrans.vcproj b/Simutrans.vcproj
@@ -335,7 +335,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\utils\checksum.cc"
+				RelativePath=".\network\checksum.cc"
 				>
 			</File>
 			<File
@@ -763,7 +763,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\utils\memory_rw.cc"
+				RelativePath=".\network\memory_rw.cc"
 				>
 			</File>
 			<File
@@ -803,39 +803,39 @@
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network.cc"
+				RelativePath=".\network\network.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_address.cc"
+				RelativePath=".\network\network_address.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_cmd.cc"
+				RelativePath=".\network\network_cmd.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_cmd_ingame.cc"
+				RelativePath=".\network\network_cmd_ingame.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_cmd_scenario.cc"
+				RelativePath=".\network\network_cmd_scenario.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_cmp_pakset.cc"
+				RelativePath=".\network\network_cmp_pakset.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_file_transfer.cc"
+				RelativePath=".\network\network_file_transfer.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_packet.cc"
+				RelativePath=".\network\network_packet.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_socket_list.cc"
+				RelativePath=".\network\network_socket_list.cc"
 				>
 			</File>
 			<File
@@ -855,7 +855,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\pakset_info.cc"
+				RelativePath=".\network\pakset_info.cc"
 				>
 			</File>
 			<File
@@ -887,7 +887,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\pwd_hash.cc"
+				RelativePath=".\network\pwd_hash.cc"
 				>
 			</File>
 			<File
@@ -1495,7 +1495,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\utils\checksum.h"
+				RelativePath=".\network\checksum.h"
 				>
 			</File>
 			<File
@@ -1975,7 +1975,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\utils\memory_rw.h"
+				RelativePath=".\network\memory_rw.h"
 				>
 			</File>
 			<File
@@ -2023,39 +2023,39 @@
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network.h"
+				RelativePath=".\network\network.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_address.h"
+				RelativePath=".\network\network_address.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_cmd.h"
+				RelativePath=".\network\network_cmd.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_cmd_ingame.h"
+				RelativePath=".\network\network_cmd_ingame.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_cmd_scenario.h"
+				RelativePath=".\network\network_cmd_scenario.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_cmp_pakset.h"
+				RelativePath=".\network\network_cmp_pakset.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_file_transfer.h"
+				RelativePath=".\network\network_file_transfer.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_packet.h"
+				RelativePath=".\network\network_packet.h"
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\network_socket_list.h"
+				RelativePath=".\network\network_socket_list.h"
 				>
 			</File>
 			<File
@@ -2095,7 +2095,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\pakset_info.h"
+				RelativePath=".\utils\pakset_info.h"
 				>
 			</File>
 			<File
@@ -2139,7 +2139,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\dataobj\pwd_hash.h"
+				RelativePath=".\utils\pwd_hash.h"
 				>
 			</File>
 			<File