corrade-vassal – Diff between revs 3 and 4

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 3 Rev 4
Line 1135... Line 1135...
1135 private void VassalShown(object sender, EventArgs e) 1135 private void VassalShown(object sender, EventArgs e)
1136 { 1136 {
1137 // Set the version 1137 // Set the version
1138 vassalForm.Version.Text = @"v" + VASSAL_CONSTANTS.VASSAL_VERSION; 1138 vassalForm.Version.Text = @"v" + VASSAL_CONSTANTS.VASSAL_VERSION;
Line -... Line 1139...
-   1139  
-   1140 // Disable estate manager tabs since we will enable these dynamically.
-   1141 TopScriptsTab.Enabled = false;
-   1142 TopCollidersTab.Enabled = false;
1139   1143  
1140 // Get the configuration file settings if it exists. 1144 // Get the configuration file settings if it exists.
1141 if (File.Exists(VASSAL_CONSTANTS.VASSAL_CONFIGURATION_FILE)) 1145 if (File.Exists(VASSAL_CONSTANTS.VASSAL_CONFIGURATION_FILE))
-   1146 {
1142 { 1147 // Load the configuration.
1143 VassalConfiguration.Load(VASSAL_CONSTANTS.VASSAL_CONFIGURATION_FILE, ref vassalConfiguration); 1148 VassalConfiguration.Load(VASSAL_CONSTANTS.VASSAL_CONFIGURATION_FILE, ref vassalConfiguration);
Line 1144... Line 1149...
1144 } 1149 }
1145   1150  
Line 1216... Line 1221...
1216 "FPS", 1221 "FPS",
1217 "PhysicsFPS", 1222 "PhysicsFPS",
1218 "ActiveScripts", 1223 "ActiveScripts",
1219 "ScriptTime", 1224 "ScriptTime",
1220 "Objects", 1225 "Objects",
1221 "Name" 1226 "Name",
-   1227 "IsEstateManager"
1222 }) 1228 })
1223 } 1229 }
1224 }), vassalConfiguration.DataTimeout); 1230 }), vassalConfiguration.DataTimeout);
Line 1225... Line 1231...
1225   1231  
Line 1232... Line 1238...
1232 if (data.Count.Equals(0)) 1238 if (data.Count.Equals(0))
1233 throw new Exception(); 1239 throw new Exception();
Line 1234... Line 1240...
1234   1240  
1235 vassalForm.Invoke((MethodInvoker) (() => 1241 vassalForm.Invoke((MethodInvoker) (() =>
-   1242 {
-   1243 // Drop access to features if we are not estate managers.
-   1244 bool isEstateManager;
-   1245 switch (
-   1246 bool.TryParse(data[data.IndexOf("IsEstateManager") + 1], out isEstateManager) &&
-   1247 isEstateManager)
-   1248 {
-   1249 case true: // we are an estate manager
-   1250 TopScriptsTab.Enabled = true;
-   1251 TopCollidersTab.Enabled = true;
-   1252 break;
-   1253 default:
-   1254 TopScriptsTab.Enabled = false;
-   1255 TopCollidersTab.Enabled = false;
-   1256 break;
-   1257 }
1236 { 1258  
1237 // Show the region name. 1259 // Show the region name.
1238 vassalForm.CurrentRegionName.Text = data[data.IndexOf("Name") + 1]; 1260 vassalForm.CurrentRegionName.Text = data[data.IndexOf("Name") + 1];
1239 vassalForm.CurrentRegionAt.Visible = true; 1261 vassalForm.CurrentRegionAt.Visible = true;