--- a/project_files/frontlib/net/netconn_internal.h	Thu Jul 05 22:22:48 2012 +0200
+++ b/project_files/frontlib/net/netconn_internal.h	Tue Jul 10 19:33:57 2012 +0200
@@ -26,7 +26,6 @@
 
 #include "netconn.h"
 #include "netbase.h"
-#include "../model/cfg.h"
 #include "../model/roomlist.h"
 #include "../model/map.h"
 #include "../model/team.h"
@@ -44,14 +43,14 @@
 	int netconnState;			// One of the NETCONN_STATE constants
 	bool isAdmin;				// Player is server administrator
 
-	flib_cfg_meta *metaCfg;
+	flib_metascheme *metaCfg;
 	flib_roomlist roomList;
 
 	bool isChief;				// Player can modify the current room
 	flib_map *map;
 	flib_teamlist pendingTeamlist;
 	flib_teamlist teamlist;
-	flib_cfg *scheme;
+	flib_scheme *scheme;
 	char *script;
 	flib_weaponset *weaponset;
 
@@ -106,7 +105,7 @@
 	void (*onLeaveRoomCb)(void *context, int reason, const char *message);
 	void *onLeaveRoomCtx;
 
-	void (*onTeamAddCb)(void *context, flib_team *team);
+	void (*onTeamAddCb)(void *context, const flib_team *team);
 	void *onTeamAddCtx;
 
 	void (*onTeamDeleteCb)(void *context, const char *teamname);
@@ -127,7 +126,7 @@
 	void (*onEngineMessageCb)(void *context, const uint8_t *message, size_t size);
 	void *onEngineMessageCtx;
 
-	void (*onCfgSchemeCb)(void *context, flib_cfg *scheme);
+	void (*onCfgSchemeCb)(void *context, const flib_scheme *scheme);
 	void *onCfgSchemeCtx;
 
 	void (*onMapChangedCb)(void *context, const flib_map *map, int changetype);
@@ -136,7 +135,7 @@
 	void (*onScriptChangedCb)(void *context, const char *script);
 	void *onScriptChangedCtx;
 
-	void (*onWeaponsetChangedCb)(void *context, flib_weaponset *weaponset);
+	void (*onWeaponsetChangedCb)(void *context, const flib_weaponset *weaponset);
 	void *onWeaponsetChangedCtx;
 
 	void (*onAdminAccessCb)(void *context);
@@ -154,6 +153,6 @@
 void netconn_setMap(flib_netconn *conn, const flib_map *map);
 void netconn_setWeaponset(flib_netconn *conn, const flib_weaponset *weaponset);
 void netconn_setScript(flib_netconn *conn, const char *script);
-void netconn_setScheme(flib_netconn *conn, const flib_cfg *scheme);
+void netconn_setScheme(flib_netconn *conn, const flib_scheme *scheme);
 
 #endif