Merge branch 'master' into develop

Conflicts:
	todo.txt

README.txt

@@ -14,9 +14,10 @@ Both a game server and game client are included in this package.
 Instructions For Setup
 -------------------------
 
-1. To create a server, simply run server.exe.
+1. To create a server, simply run server.exe
-2. To join that server, run client.exe with config settings not already in use.
+	(a public server is provided by default)
-    (Note: This process will be streamlined later).
+2. To join a server, your player information must be input into rsc/config.cfg
+	(NOTE: This process will be streamlined later)
 3. To change the config settings, open rsc/config.cfg
 4. These settings must be unique for each player:
 
@@ -28,7 +29,7 @@ Instructions For Setup
 * client.avatar = elliot2.bmp #male
 * client.avatar = coa2.bmp    #female
 
-6. When you've correctly set these values (good luck), select 'Start' from the
+6. When you've correctly set these values, run client.exe, and select 'Start'
-    main menu; this displays the list of available servers.
+	from the main menu; this displays the list of available servers.
-7. Select the name of your server (default is 'local') and select 'Join'.
+7. Select the name of a server (default is 'Public') and select 'Join'.
 8. Welcome to Tortuga, enjoy your stay.

rsc/config.cfg

@@ -12,8 +12,8 @@ server.dbname = database.db
 #client.screen.h = 600
 client.screen.f = false
 
-client.username = Kayne Ruse
+client.username = username
-client.handle = Ratstail91
+client.handle = handle
 client.avatar = elliot2.bmp
 
 #directories

todo.txt

@@ -7,6 +7,9 @@ TODO: Account passwords (list)
 	* ...
 	* salts & hashes
 
+TODO: Split config.cfg in two, one for the server and the client
+TODO: Add the "home" parameter to the server's config file
+TODO: Waypoints, with positions and trigger zones (collision areas) for doors, monster spawns, etc.
 TODO: Fix shoddy movement
 TODO: Periodic mass server saves
 TODO: Remove the big "Shut Down" button (currently broken...)