* Fixed a few compile errors from previous rebase.

src/char/char_mapif.c

@@ -1380,7 +1380,7 @@ int chmapif_bonus_script_save(int fd) {
 		uint32 cid = RFIFOL(fd,4);
 		uint8 count = RFIFOB(fd,8);
 
-		if (SQL_ERROR == Sql_Query(sql_handle,"DELETE FROM `%s` WHERE `char_id` = '%d'", schema_config.bonus_script_db, cid))
+		if (SQL_ERROR == Sql_Query(sql_handle,"DELETE FROM `%s` WHERE `char_id` = '%d'", charserv_table(bonus_script_table), cid))
 			Sql_ShowDebug(sql_handle);
 
 		if (count > 0) {

src/map/chrif.c

@@ -585,7 +585,7 @@ int chrif_sendmapack(int fd) {
 
 	// Server name
 	memcpy(map_config.wisp_server_name, RFIFOP(fd,5), NAME_LENGTH);
-	ShowStatus("Map-server connected to char-server '"CL_WHITE"%s"CL_RESET"'.\n", wisp_server_name);
+	ShowStatus("Map-server connected to char-server '"CL_WHITE"%s"CL_RESET"'.\n", map_config.wisp_server_name);
 
 	// Default map
 	memcpy(map_default.mapname, RFIFOP(fd, (offs+=NAME_LENGTH)), MAP_NAME_LENGTH);

src/map/map.h

@@ -74,7 +74,6 @@ struct MapServer_Schema {
 	StringBuf *roulette_table;			///< Roulette table
 	StringBuf *vendings_table;		    ///< Vending table (vendor & autotrader)
 	StringBuf *vending_items_table;	    ///< Vending items table (vendor & autotrader)
-	StringBuf *mapreg_table;		    ///< Mapreg table, used in mapreg.c
 };
 extern struct MapServer_Schema mapserv_schema_config; /// map-server tables
 /// Get map-server table value. Table names @see MapServer_Schema
@@ -869,6 +868,11 @@ void map_setgatcell(int16 m, int16 x, int16 y, int gat);
 extern struct map_data map[];
 extern int map_num;
 
+struct s_map_default {
+	char mapname[MAP_NAME_LENGTH];
+	unsigned short x;
+	unsigned short y;
+};
 extern struct s_map_default map_default;
 
 /// Type of 'save_settings'