diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg
index fc734e15bd..ae079e8a43 100644
--- a/binaries/data/config/default.cfg
+++ b/binaries/data/config/default.cfg
@@ -44,7 +44,7 @@ bpp = 0
; System settings:
; if false, actors won't be rendered but anything entity will be.
-renderactors = false
+renderactors = true
waternormals = true
waterrealdepth = true
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index 845f92a94b..f6e5a5e7cd 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -932,6 +932,7 @@ function onGameAttributesChange()
var startingResources = getGUIObjectByName("startingResources");
var numPlayersText= getGUIObjectByName("numPlayersText");
+ var mapSizeDesc = getGUIObjectByName("mapSizeDesc");
var mapSizeText = getGUIObjectByName("mapSizeText");
var revealMapText = getGUIObjectByName("revealMapText");
var victoryConditionText = getGUIObjectByName("victoryConditionText");
@@ -959,6 +960,7 @@ function onGameAttributesChange()
switch (g_GameAttributes.mapType)
{
case "random":
+ mapSizeDesc.hidden = false;
if (g_IsController)
{
//Host
@@ -1016,6 +1018,8 @@ function onGameAttributesChange()
numPlayersText.caption = numPlayers;
numPlayersSelection.hidden = true;
mapSize.hidden = true;
+ mapSizeText.hidden = true;
+ mapSizeDesc.hidden = true;
if (g_IsController)
{
//Host
@@ -1026,7 +1030,6 @@ function onGameAttributesChange()
startingResources.hidden = false;
numPlayersText.hidden = false;
- mapSizeText.hidden = false;
revealMapText.hidden = true;
victoryConditionText.hidden = true;
lockTeamsText.hidden = true;
@@ -1045,7 +1048,6 @@ function onGameAttributesChange()
{
// Client
numPlayersText.hidden = false;
- mapSizeText.hidden = false;
revealMapText.hidden = false;
victoryConditionText.hidden = false;
lockTeamsText.hidden = false;
@@ -1070,7 +1072,8 @@ function onGameAttributesChange()
victoryCondition.hidden = true;
lockTeams.hidden = true;
numPlayersText.hidden = false;
- mapSizeText.hidden = false;
+ mapSizeText.hidden = true;
+ mapSizeDesc.hidden = true;
revealMapText.hidden = false;
victoryConditionText.hidden = false;
lockTeamsText.hidden = false;
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index 1acda2b11f..15c04f198a 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -103,7 +103,7 @@
-
+