created a new config constructor...

...that takes a string and creates a config with an empty child with
the name of that string

reorganized the server code (moving things around, renaming)

commented some (unnecessary?) #includes out

src/config.cpp

@@ -32,11 +32,16 @@ config::config() : values(), children(), ordered_children()
 {
 }
 
-config::config(const config& cfg)  : values(), children(), ordered_children()
+config::config(const config& cfg) : values(), children(), ordered_children()
 {
 	append(cfg);
 }
 
+config::config(const std::string& child) : values(), children(), ordered_children()
+{
+	add_child(child);
+}
+
 config::~config()
 {
 	clear();

src/config.hpp

@@ -46,6 +46,9 @@ public:
 	config();
 
 	config(const config& cfg);
+	
+	// Create a config with an empty child of name 'child'.
+	config(const std::string& child);
 	~config();
 
 	config& operator=(const config& cfg);

src/network.cpp

@@ -24,7 +24,7 @@
 #include "network.hpp"
 #include "network_worker.hpp"
 #include "thread.hpp"
-#include "util.hpp"
+//#include "util.hpp"
 #include "wassert.hpp"
 
 #include "SDL_net.h"

src/server/game.cpp

@@ -637,7 +637,7 @@ void game::add_player(network::connection player, bool observer)
 		cfg.add_child("start_game");
 		network::queue_data(cfg, player);
 
-		//send observer join of all the observers in the game to player
+		//send observer join of all the observers in the game to players
 		for(std::vector<network::connection>::const_iterator ob = observers_.begin(); ob != observers_.end(); ++ob) {
 			if(*ob != player) {
 				info = player_info_->find(*ob);