From 996de77eb7c0d9fc0985356fdba22c9477be5cf0 Mon Sep 17 00:00:00 2001 From: Nyerguds Date: Fri, 9 Jun 2023 11:44:39 +0200 Subject: [PATCH] Whitespace and changelog fixes --- CHANGELOG.md | 15 +++++------ .../Controls/BasicSettings.Designer.cs | 24 +++++++++--------- CnCTDRAMapEditor/Controls/BasicSettings.cs | 16 ++++++------ .../Controls/BriefingSettings.Designer.cs | 24 +++++++++--------- CnCTDRAMapEditor/Controls/BriefingSettings.cs | 16 ++++++------ .../Controls/CrateSettings.Designer.cs | 24 +++++++++--------- .../Controls/ImageTooltip.Designer.cs | 18 ++++++------- CnCTDRAMapEditor/Controls/ImageTooltip.cs | 16 ++++++------ .../Controls/MapPanel.Designer.cs | 24 +++++++++--------- CnCTDRAMapEditor/Controls/MapPanel.cs | 16 ++++++------ .../Controls/MenuButton.Designer.cs | 24 +++++++++--------- CnCTDRAMapEditor/Controls/MenuButton.cs | 16 ++++++------ .../MissionItemControl.Designer.cs | 8 +++--- .../MissionsList/MissionItemControl.cs | 3 +-- .../Controls/ObjectProperties.Designer.cs | 22 ++++++++-------- CnCTDRAMapEditor/Controls/ObjectProperties.cs | 24 +++++++++--------- .../Controls/PlayerSettings.Designer.cs | 24 +++++++++--------- CnCTDRAMapEditor/Controls/PlayerSettings.cs | 16 ++++++------ .../Controls/PropertiesComboBox.Designer.cs | 24 +++++++++--------- .../Controls/PropertiesComboBox.cs | 16 ++++++------ .../Controls/RulesSettings.Designer.cs | 24 +++++++++--------- CnCTDRAMapEditor/Controls/RulesSettings.cs | 16 ++++++------ .../Controls/ScenarioSettings.Designer.cs | 24 +++++++++--------- CnCTDRAMapEditor/Controls/ScenarioSettings.cs | 16 ++++++------ .../Controls/SmudgeProperties.Designer.cs | 24 +++++++++--------- CnCTDRAMapEditor/Controls/SmudgeProperties.cs | 18 ++++++------- .../TeamsList/TeamItemControl.Designer.cs | 8 +++--- .../Controls/TeamsList/TeamItemControl.cs | 1 - .../Controls/TerrainProperties.Designer.cs | 22 ++++++++-------- .../Controls/TerrainProperties.cs | 18 ++++++------- CnCTDRAMapEditor/Controls/TypeListBox.cs | 2 +- .../Dialogs/ErrorMessageBox.Designer.cs | 16 ++++++------ CnCTDRAMapEditor/Dialogs/ErrorMessageBox.cs | 16 ++++++------ CnCTDRAMapEditor/Dialogs/ImageExportDialog.cs | 1 - .../Dialogs/InviteMessageBox.Designer.cs | 16 ++++++------ CnCTDRAMapEditor/Dialogs/InviteMessageBox.cs | 16 ++++++------ .../Dialogs/MapSettingsDialog.Designer.cs | 16 ++++++------ CnCTDRAMapEditor/Dialogs/MapSettingsDialog.cs | 17 ++++++------- .../Dialogs/NewFromImageDialog.cs | 9 ++----- .../Dialogs/NewMapDialog.Designer.cs | 16 ++++++------ CnCTDRAMapEditor/Dialogs/NewMapDialog.cs | 16 ++++++------ .../Dialogs/SteamDialog.Designer.cs | 16 ++++++------ CnCTDRAMapEditor/Dialogs/SteamDialog.cs | 18 ++++++------- .../Dialogs/TeamTypesDialog.Designer.cs | 16 ++++++------ CnCTDRAMapEditor/Dialogs/TeamTypesDialog.cs | 25 ++++++++----------- .../Dialogs/TriggersDialog.Designer.cs | 16 ++++++------ CnCTDRAMapEditor/Dialogs/TriggersDialog.cs | 20 +++++++-------- CnCTDRAMapEditor/Event/RenderEventArgs.cs | 16 ++++++------ CnCTDRAMapEditor/Event/UndoRedoEventArgs.cs | 16 ++++++------ CnCTDRAMapEditor/Globals.cs | 16 ++++++------ CnCTDRAMapEditor/Interface/IBrowsableType.cs | 16 ++++++------ CnCTDRAMapEditor/Interface/ICellOccupier.cs | 16 ++++++------ CnCTDRAMapEditor/Interface/ICellOverlapper.cs | 16 ++++++------ CnCTDRAMapEditor/Interface/IGamePlugin.cs | 16 ++++++------ CnCTDRAMapEditor/Interface/INamedType.cs | 16 ++++++------ CnCTDRAMapEditor/Interface/ITeamColor.cs | 10 +------- .../Interface/ITeamColorManager.cs | 10 +------- CnCTDRAMapEditor/Interface/ITechno.cs | 2 +- CnCTDRAMapEditor/Interface/ITechnoType.cs | 16 ++++++------ CnCTDRAMapEditor/Interface/ITool.cs | 16 ++++++------ CnCTDRAMapEditor/Interface/IWidget.cs | 16 ++++++------ CnCTDRAMapEditor/MainForm.Designer.cs | 16 ++++++------ CnCTDRAMapEditor/MainForm.cs | 19 +++++++------- CnCTDRAMapEditor/Model/BasicSection.cs | 16 ++++++------ CnCTDRAMapEditor/Model/BriefingSection.cs | 16 ++++++------ CnCTDRAMapEditor/Model/Building.cs | 16 ++++++------ CnCTDRAMapEditor/Model/BuildingType.cs | 18 ++++++------- CnCTDRAMapEditor/Model/CellGrid.cs | 17 ++++++------- CnCTDRAMapEditor/Model/CellMetrics.cs | 16 ++++++------ CnCTDRAMapEditor/Model/CellTrigger.cs | 16 ++++++------ CnCTDRAMapEditor/Model/DirectionType.cs | 16 ++++++------ CnCTDRAMapEditor/Model/DirectionTypes.cs | 16 ++++++------ CnCTDRAMapEditor/Model/House.cs | 16 ++++++------ CnCTDRAMapEditor/Model/HouseType.cs | 16 ++++++------ CnCTDRAMapEditor/Model/Infantry.cs | 17 ++++++------- CnCTDRAMapEditor/Model/InfantryType.cs | 16 ++++++------ CnCTDRAMapEditor/Model/Map.cs | 19 +++++++------- CnCTDRAMapEditor/Model/MapSection.cs | 16 ++++++------ CnCTDRAMapEditor/Model/OccupierSet.cs | 16 ++++++------ CnCTDRAMapEditor/Model/OverlapperSet.cs | 16 ++++++------ CnCTDRAMapEditor/Model/Overlay.cs | 16 ++++++------ CnCTDRAMapEditor/Model/OverlayType.cs | 16 ++++++------ CnCTDRAMapEditor/Model/Smudge.cs | 16 ++++++------ CnCTDRAMapEditor/Model/SmudgeType.cs | 16 ++++++------ CnCTDRAMapEditor/Model/SteamSection.cs | 16 ++++++------ CnCTDRAMapEditor/Model/TeamType.cs | 16 ++++++------ CnCTDRAMapEditor/Model/Template.cs | 16 ++++++------ CnCTDRAMapEditor/Model/TemplateType.cs | 21 ++++++++-------- CnCTDRAMapEditor/Model/Terrain.cs | 16 ++++++------ CnCTDRAMapEditor/Model/TerrainType.cs | 16 ++++++------ CnCTDRAMapEditor/Model/TheaterType.cs | 16 ++++++------ CnCTDRAMapEditor/Model/Trigger.cs | 16 ++++++------ CnCTDRAMapEditor/Model/TypeItem.cs | 16 ++++++------ CnCTDRAMapEditor/Model/Unit.cs | 16 ++++++------ CnCTDRAMapEditor/Model/UnitType.cs | 16 ++++++------ CnCTDRAMapEditor/Model/Waypoint.cs | 16 ++++++------ CnCTDRAMapEditor/Program.cs | 18 ++++++------- CnCTDRAMapEditor/Properties/AssemblyInfo.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/ActionDataTypes.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/ActionTypes.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/BasicSection.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/BuildingTypes.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/Constants.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/EventTypes.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/GamePluginRA.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/House.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/HouseTypes.cs | 20 +++++++-------- CnCTDRAMapEditor/RedAlert/InfantryTypes.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/MissionTypes.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/OverlayTypes.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/SmudgeTypes.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/TeamMissionTypes.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/TemplateTypes.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/TerrainTypes.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/TheaterTypes.cs | 16 ++++++------ CnCTDRAMapEditor/RedAlert/UnitTypes.cs | 16 ++++++------ CnCTDRAMapEditor/Render/MapRenderer.cs | 20 +++++++-------- .../SoleSurvivor/CratesSection.cs | 16 ++++++------ CnCTDRAMapEditor/SoleSurvivor/GamePluginSS.cs | 2 +- CnCTDRAMapEditor/SoleSurvivor/OverlayTypes.cs | 1 - CnCTDRAMapEditor/TiberianDawn/ActionTypes.cs | 16 ++++++------ CnCTDRAMapEditor/TiberianDawn/BasicSection.cs | 16 ++++++------ .../TiberianDawn/BuildingTypes.cs | 16 ++++++------ CnCTDRAMapEditor/TiberianDawn/Constants.cs | 16 ++++++------ CnCTDRAMapEditor/TiberianDawn/EventTypes.cs | 16 ++++++------ CnCTDRAMapEditor/TiberianDawn/GamePluginTD.cs | 23 ++++++++--------- CnCTDRAMapEditor/TiberianDawn/House.cs | 16 ++++++------ CnCTDRAMapEditor/TiberianDawn/HouseTypes.cs | 16 ++++++------ .../TiberianDawn/InfantryTypes.cs | 16 ++++++------ CnCTDRAMapEditor/TiberianDawn/MissionTypes.cs | 16 ++++++------ CnCTDRAMapEditor/TiberianDawn/OverlayTypes.cs | 17 ++++++------- CnCTDRAMapEditor/TiberianDawn/SmudgeTypes.cs | 16 ++++++------ .../TiberianDawn/TeamMissionTypes.cs | 16 ++++++------ .../TiberianDawn/TemplateTypes.cs | 16 ++++++------ CnCTDRAMapEditor/TiberianDawn/TerrainTypes.cs | 16 ++++++------ CnCTDRAMapEditor/TiberianDawn/TheaterTypes.cs | 16 ++++++------ CnCTDRAMapEditor/TiberianDawn/UnitTypes.cs | 16 ++++++------ CnCTDRAMapEditor/Tools/BuildingTool.cs | 18 ++++++------- CnCTDRAMapEditor/Tools/CellTriggersTool.cs | 18 ++++++------- .../CellTriggersToolDialog.Designer.cs | 16 ++++++------ .../Tools/Dialogs/CellTriggersToolDialog.cs | 18 ++++++------- .../Dialogs/GenericToolDialog.Designer.cs | 16 ++++++------ .../Tools/Dialogs/GenericToolDialog.cs | 16 ++++++------ .../Dialogs/ObjectToolDialog.Designer.cs | 16 ++++++------ .../Tools/Dialogs/ObjectToolDialog.cs | 16 ++++++------ .../Dialogs/ResourcesToolDialog.Designer.cs | 16 ++++++------ .../Tools/Dialogs/ResourcesToolDialog.cs | 16 ++++++------ .../Dialogs/SmudgeToolDialog.Designer.cs | 16 ++++++------ .../Dialogs/TemplateToolDialog.Designer.cs | 16 ++++++------ .../Tools/Dialogs/TemplateToolDialog.cs | 16 ++++++------ .../Dialogs/TerrainToolDialog.Designer.cs | 16 ++++++------ .../Tools/Dialogs/TerrainToolDialog.cs | 20 +++++++-------- CnCTDRAMapEditor/Tools/Dialogs/ToolDialog.cs | 2 +- .../Dialogs/WaypointsToolDialog.Designer.cs | 16 ++++++------ .../Tools/Dialogs/WaypointsToolDialog.cs | 16 ++++++------ CnCTDRAMapEditor/Tools/InfantryTool.cs | 18 ++++++------- CnCTDRAMapEditor/Tools/OverlaysTool.cs | 16 ++++++------ CnCTDRAMapEditor/Tools/ResourcesTool.cs | 16 ++++++------ CnCTDRAMapEditor/Tools/SmudgeTool.cs | 16 ++++++------ CnCTDRAMapEditor/Tools/TemplateTool.cs | 16 ++++++------ CnCTDRAMapEditor/Tools/TerrainTool.cs | 16 ++++++------ CnCTDRAMapEditor/Tools/UnitTool.cs | 16 ++++++------ CnCTDRAMapEditor/Tools/ViewTool.cs | 16 ++++++------ CnCTDRAMapEditor/Tools/WallsTool.cs | 16 ++++++------ CnCTDRAMapEditor/Tools/WaypointsTool.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/CRC.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/ExtensionMethods.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/GameTextManager.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/GeneralUtils.cs | 2 +- CnCTDRAMapEditor/Utility/INI.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/ImageUtils.cs | 1 - CnCTDRAMapEditor/Utility/MRU.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/Megafile.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/MegafileBuilder.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/MegafileManager.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/PropertyTracker.cs | 18 ++++++------- .../Utility/SimpleMultiThreading.cs | 2 +- CnCTDRAMapEditor/Utility/SteamworksUGC.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/TGASharpLib.cs | 22 ++++++++-------- CnCTDRAMapEditor/Utility/TeamColor.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/TeamColorManager.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/TextureManager.cs | 18 ++++++------- CnCTDRAMapEditor/Utility/Tileset.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/TilesetManager.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/ToolTipFixer.cs | 2 +- CnCTDRAMapEditor/Utility/UndoRedoList.cs | 16 ++++++------ CnCTDRAMapEditor/Utility/WWCompression.cs | 16 ++++++------ CnCTDRAMapEditor/Widgets/NavigationWidget.cs | 24 ++++++++++-------- License.txt | 4 +-- 189 files changed, 1476 insertions(+), 1514 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c430dbc..74a4b1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ Released on 08 Jul 2022 at 21:37 UTC * Fixed overlay height overflow bug in Rampa's new UI. * Fixed map tiles list duplicating every time the "Map" tool window is opened in Rampa's version. * Split off internal overlay type "decoration", used for pavements and civilian buildings. -* Added CONC and ROAD pavement. They have no graphics, but at least now they are accepted by the editor and not discarded as errors. +* Added CONC and ROAD pavement to TD. They have no graphics, but at least now they are accepted by the editor and not discarded as errors. * Sorted all items in the lists (except map tiles) by key, which is usually a lot more straightforward. * Split off specific separate list for techno types usable in teamtypes. * Removed the Aircraft from the placeable units in TD. [NOTE: made into a setting in v1.4.3.0] @@ -43,8 +43,8 @@ Released on 13 Jul 2022 at 07:35 UTC * Added "All supported types (\*.ini;\*.bin;\*.mpr)" as default filter when opening files. * Added Drag & Drop support for opening map files. * Added command line file argument support, which allows setting the editor as application for opening ini/mpr files. +* Changed the order of the choices for the "Edge" setting of the Houses to a more logical North, East, South, West. * House Edge reading now corrects values with case differences so they show up in the dropdown. -* Centralised the House Edge array on the House class, and changed its order to a more logical North, East, South, West. * Fixed order of the Multi-House colors. It seems the error is not in the editor, but in bizarre mixed-up team color names in the remastered game itself. * Remapped Neutral (TD only) and Special as yellow, as they are in the game. * All tool windows will now save their position. @@ -84,9 +84,9 @@ Released on 14 Jul 2022 at 20:22 UTC * Damaged states now work correctly on all buildings, with a vastly simpler and more general internal logic. * Using the mouse wheel will now change the strength of objects in increments of 4. * IQ of all Houses in RA now defaults to 0. -* Fixed Gunboat facing and damage states logic. +* Fixed TD Gunboat facing and damage states logic. * Fixed bug causing bad refresh when previewing the placement of a single cell selected from a template with an empty top right corner cell. -* The "clear1" tile is now explicitly shown in the tiles list. It acts as eraser. +* The "clear1" tile is now explicitly shown in the tiles list. It acts as 1x1 eraser. * Teamtype "Priority" value (recruit priority) is now capped at 15. [NOTE: reverted in v1.4.0.3] ### v1.4.0.3: @@ -443,7 +443,7 @@ Released on 03 Apr 2023 at 19:20 GMT * Added character count to the briefing screen. if WriteClassicBriefing is enabled a warning wil be given if the amount exceeds the maximum the classic game can handle. If the warning is ignored, the classic briefing will truncated on the maximum it can handle, to prevent game crashes. * Fixed saving of Red Alert's classic briefing, to also obey the classic internal maximum, and to correctly split on line break @ characters. -### v1.4.5.1: +### v1.4.6.0: Unreleased @@ -456,11 +456,12 @@ Unreleased * Fixed mixup between actions and events in the TD trigger reading checks. * Resources outside the map are now always shown at their minimum size, and tinted red, to indicate they don't really have any impact on the map. This also updates on the fly when changing the map bounds. * The Resources tool no longer evaluates resources placed outside the map bounds. +* Fixed a bug in the resource value calculation for gems. * Rule errors that occur after closing the Map settings dialog will now show in a window with scrollable area, just like the errors shown when opening a maps. -* Added missing overlap checks to buildings on the rebuild-list. +* Added missing overlap checks to buildings on the rebuild-list, so they can no longer disappear on map load without any warning. * Fixed bug in Team Types window where the amount of added classes and orders would not unlock when maxed out on the previously selected item. * Added names to Overlay, Terrain, Smudge and Resources. -* Migrated resource randomisation from the map renderer to the density-update logic, so the actual objects don't always show as "TI01" / "GOLD01" / "GEM01". +* Migrated resource randomisation from the map renderer to the density-update logic, so the actual objects don't always show as "TI01" / "GOLD01" / "GEM01" if that's not the graphics they're showing. * Changed TD Technology Center to its real name, instead of "Prison". * Added reference to GraphicsFixesRA mod. * Added "EnforceObjectMaximums" setting that can be disabled to remove save checks on object maximums. diff --git a/CnCTDRAMapEditor/Controls/BasicSettings.Designer.cs b/CnCTDRAMapEditor/Controls/BasicSettings.Designer.cs index 19f46c9..f9e4820 100644 --- a/CnCTDRAMapEditor/Controls/BasicSettings.Designer.cs +++ b/CnCTDRAMapEditor/Controls/BasicSettings.Designer.cs @@ -1,27 +1,27 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Controls { partial class BasicSettings { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -36,8 +36,8 @@ namespace MobiusEditor.Controls #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/BasicSettings.cs b/CnCTDRAMapEditor/Controls/BasicSettings.cs index 70a4f38..cf34012 100644 --- a/CnCTDRAMapEditor/Controls/BasicSettings.cs +++ b/CnCTDRAMapEditor/Controls/BasicSettings.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Model; diff --git a/CnCTDRAMapEditor/Controls/BriefingSettings.Designer.cs b/CnCTDRAMapEditor/Controls/BriefingSettings.Designer.cs index b767a66..c659da4 100644 --- a/CnCTDRAMapEditor/Controls/BriefingSettings.Designer.cs +++ b/CnCTDRAMapEditor/Controls/BriefingSettings.Designer.cs @@ -1,27 +1,27 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Controls { partial class BriefingSettings { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -36,8 +36,8 @@ namespace MobiusEditor.Controls #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/BriefingSettings.cs b/CnCTDRAMapEditor/Controls/BriefingSettings.cs index 4bdc4d9..43bf2da 100644 --- a/CnCTDRAMapEditor/Controls/BriefingSettings.cs +++ b/CnCTDRAMapEditor/Controls/BriefingSettings.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Model; diff --git a/CnCTDRAMapEditor/Controls/CrateSettings.Designer.cs b/CnCTDRAMapEditor/Controls/CrateSettings.Designer.cs index 957cab1..97d7453 100644 --- a/CnCTDRAMapEditor/Controls/CrateSettings.Designer.cs +++ b/CnCTDRAMapEditor/Controls/CrateSettings.Designer.cs @@ -1,27 +1,27 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Controls { partial class CrateSettings { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -36,8 +36,8 @@ namespace MobiusEditor.Controls #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/ImageTooltip.Designer.cs b/CnCTDRAMapEditor/Controls/ImageTooltip.Designer.cs index 50eeddb..d15ec48 100644 --- a/CnCTDRAMapEditor/Controls/ImageTooltip.Designer.cs +++ b/CnCTDRAMapEditor/Controls/ImageTooltip.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Controls { @@ -37,7 +37,7 @@ namespace MobiusEditor.Controls #region Component Designer generated code /// - /// Required method for Designer support - do not modify + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/ImageTooltip.cs b/CnCTDRAMapEditor/Controls/ImageTooltip.cs index ab35752..ae6e9b5 100644 --- a/CnCTDRAMapEditor/Controls/ImageTooltip.cs +++ b/CnCTDRAMapEditor/Controls/ImageTooltip.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Drawing; diff --git a/CnCTDRAMapEditor/Controls/MapPanel.Designer.cs b/CnCTDRAMapEditor/Controls/MapPanel.Designer.cs index 3f90f19..6bd39fa 100644 --- a/CnCTDRAMapEditor/Controls/MapPanel.Designer.cs +++ b/CnCTDRAMapEditor/Controls/MapPanel.Designer.cs @@ -1,27 +1,27 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Controls { partial class MapPanel { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -36,8 +36,8 @@ namespace MobiusEditor.Controls #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/MapPanel.cs b/CnCTDRAMapEditor/Controls/MapPanel.cs index 5ff3adc..9b0227f 100644 --- a/CnCTDRAMapEditor/Controls/MapPanel.cs +++ b/CnCTDRAMapEditor/Controls/MapPanel.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Event; using MobiusEditor.Interface; diff --git a/CnCTDRAMapEditor/Controls/MenuButton.Designer.cs b/CnCTDRAMapEditor/Controls/MenuButton.Designer.cs index eb789bb..faaa4e1 100644 --- a/CnCTDRAMapEditor/Controls/MenuButton.Designer.cs +++ b/CnCTDRAMapEditor/Controls/MenuButton.Designer.cs @@ -1,27 +1,27 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Controls { partial class MenuButton { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -36,8 +36,8 @@ namespace MobiusEditor.Controls #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/MenuButton.cs b/CnCTDRAMapEditor/Controls/MenuButton.cs index 0838fef..b174bb1 100644 --- a/CnCTDRAMapEditor/Controls/MenuButton.cs +++ b/CnCTDRAMapEditor/Controls/MenuButton.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.ComponentModel; using System.Drawing; diff --git a/CnCTDRAMapEditor/Controls/MissionsList/MissionItemControl.Designer.cs b/CnCTDRAMapEditor/Controls/MissionsList/MissionItemControl.Designer.cs index 92d56ca..07889a1 100644 --- a/CnCTDRAMapEditor/Controls/MissionsList/MissionItemControl.Designer.cs +++ b/CnCTDRAMapEditor/Controls/MissionsList/MissionItemControl.Designer.cs @@ -2,12 +2,12 @@ { partial class MissionItemControl { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -22,8 +22,8 @@ #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/MissionsList/MissionItemControl.cs b/CnCTDRAMapEditor/Controls/MissionsList/MissionItemControl.cs index 6433469..a3688fe 100644 --- a/CnCTDRAMapEditor/Controls/MissionsList/MissionItemControl.cs +++ b/CnCTDRAMapEditor/Controls/MissionsList/MissionItemControl.cs @@ -23,7 +23,6 @@ namespace MobiusEditor.Controls public MissionItemControl() :this(null, null, null, null, 0, null) { - } public MissionItemControl(TeamTypeMission info, ListedControlController controller, IEnumerable missions, IEnumerable> waypoints, int mapSize, ToolTip tooltip) @@ -32,7 +31,7 @@ namespace MobiusEditor.Controls SetInfo(info, controller, missions, waypoints, mapSize, tooltip); } - public void SetInfo(TeamTypeMission info, ListedControlController controller, IEnumerable missions, IEnumerable> waypoints, int mapSize, ToolTip tooltip) + public void SetInfo(TeamTypeMission info, ListedControlController controller, IEnumerable missions, IEnumerable> waypoints, int mapSize, ToolTip tooltip) { try { diff --git a/CnCTDRAMapEditor/Controls/ObjectProperties.Designer.cs b/CnCTDRAMapEditor/Controls/ObjectProperties.Designer.cs index 048a5d6..1bd042a 100644 --- a/CnCTDRAMapEditor/Controls/ObjectProperties.Designer.cs +++ b/CnCTDRAMapEditor/Controls/ObjectProperties.Designer.cs @@ -1,30 +1,30 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Controls { partial class ObjectProperties { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/ObjectProperties.cs b/CnCTDRAMapEditor/Controls/ObjectProperties.cs index a1ef614..cb5bbdd 100644 --- a/CnCTDRAMapEditor/Controls/ObjectProperties.cs +++ b/CnCTDRAMapEditor/Controls/ObjectProperties.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Model; @@ -417,9 +417,9 @@ namespace MobiusEditor.Controls } ShowToolTip(target, tooltip); } - - private void ShowToolTip(Control target, string message) { - + + private void ShowToolTip(Control target, string message) + { if (target == null || message == null) { this.toolTip1.Hide(target); @@ -439,7 +439,7 @@ namespace MobiusEditor.Controls this.toolTip1.Hide(target); } - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. diff --git a/CnCTDRAMapEditor/Controls/PlayerSettings.Designer.cs b/CnCTDRAMapEditor/Controls/PlayerSettings.Designer.cs index 362f7cb..b40b0c6 100644 --- a/CnCTDRAMapEditor/Controls/PlayerSettings.Designer.cs +++ b/CnCTDRAMapEditor/Controls/PlayerSettings.Designer.cs @@ -1,27 +1,27 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Controls { partial class PlayerSettings { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -36,8 +36,8 @@ namespace MobiusEditor.Controls #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/PlayerSettings.cs b/CnCTDRAMapEditor/Controls/PlayerSettings.cs index 4f3030b..c43d742 100644 --- a/CnCTDRAMapEditor/Controls/PlayerSettings.cs +++ b/CnCTDRAMapEditor/Controls/PlayerSettings.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Model; diff --git a/CnCTDRAMapEditor/Controls/PropertiesComboBox.Designer.cs b/CnCTDRAMapEditor/Controls/PropertiesComboBox.Designer.cs index 70afac4..eed0580 100644 --- a/CnCTDRAMapEditor/Controls/PropertiesComboBox.Designer.cs +++ b/CnCTDRAMapEditor/Controls/PropertiesComboBox.Designer.cs @@ -1,27 +1,27 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Controls { partial class PropertiesComboBox { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -36,8 +36,8 @@ namespace MobiusEditor.Controls #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/PropertiesComboBox.cs b/CnCTDRAMapEditor/Controls/PropertiesComboBox.cs index 5098cee..c220d75 100644 --- a/CnCTDRAMapEditor/Controls/PropertiesComboBox.cs +++ b/CnCTDRAMapEditor/Controls/PropertiesComboBox.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Windows.Forms; diff --git a/CnCTDRAMapEditor/Controls/RulesSettings.Designer.cs b/CnCTDRAMapEditor/Controls/RulesSettings.Designer.cs index 6260105..bc4402e 100644 --- a/CnCTDRAMapEditor/Controls/RulesSettings.Designer.cs +++ b/CnCTDRAMapEditor/Controls/RulesSettings.Designer.cs @@ -1,27 +1,27 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Controls { partial class RulesSettings { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -36,8 +36,8 @@ namespace MobiusEditor.Controls #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/RulesSettings.cs b/CnCTDRAMapEditor/Controls/RulesSettings.cs index 610b14b..ed81346 100644 --- a/CnCTDRAMapEditor/Controls/RulesSettings.cs +++ b/CnCTDRAMapEditor/Controls/RulesSettings.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System; diff --git a/CnCTDRAMapEditor/Controls/ScenarioSettings.Designer.cs b/CnCTDRAMapEditor/Controls/ScenarioSettings.Designer.cs index 6ea52ed..f884711 100644 --- a/CnCTDRAMapEditor/Controls/ScenarioSettings.Designer.cs +++ b/CnCTDRAMapEditor/Controls/ScenarioSettings.Designer.cs @@ -1,27 +1,27 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Controls { partial class ScenarioSettings { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -36,8 +36,8 @@ namespace MobiusEditor.Controls #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/ScenarioSettings.cs b/CnCTDRAMapEditor/Controls/ScenarioSettings.cs index 6562792..6bcd3a0 100644 --- a/CnCTDRAMapEditor/Controls/ScenarioSettings.cs +++ b/CnCTDRAMapEditor/Controls/ScenarioSettings.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Model; diff --git a/CnCTDRAMapEditor/Controls/SmudgeProperties.Designer.cs b/CnCTDRAMapEditor/Controls/SmudgeProperties.Designer.cs index 1a9a9be..f353237 100644 --- a/CnCTDRAMapEditor/Controls/SmudgeProperties.Designer.cs +++ b/CnCTDRAMapEditor/Controls/SmudgeProperties.Designer.cs @@ -1,27 +1,27 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Controls { partial class SmudgeProperties { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -36,8 +36,8 @@ namespace MobiusEditor.Controls #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/SmudgeProperties.cs b/CnCTDRAMapEditor/Controls/SmudgeProperties.cs index 95196c2..95ce925 100644 --- a/CnCTDRAMapEditor/Controls/SmudgeProperties.cs +++ b/CnCTDRAMapEditor/Controls/SmudgeProperties.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Model; @@ -34,7 +34,7 @@ namespace MobiusEditor.Controls set { if (smudge == value) - return; + return; if (smudge != null) smudge.PropertyChanged -= Obj_PropertyChanged; smudge = value; diff --git a/CnCTDRAMapEditor/Controls/TeamsList/TeamItemControl.Designer.cs b/CnCTDRAMapEditor/Controls/TeamsList/TeamItemControl.Designer.cs index 1bddacd..04920f5 100644 --- a/CnCTDRAMapEditor/Controls/TeamsList/TeamItemControl.Designer.cs +++ b/CnCTDRAMapEditor/Controls/TeamsList/TeamItemControl.Designer.cs @@ -2,12 +2,12 @@ { partial class TeamItemControl { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. @@ -22,8 +22,8 @@ #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/TeamsList/TeamItemControl.cs b/CnCTDRAMapEditor/Controls/TeamsList/TeamItemControl.cs index eacf1db..fa79773 100644 --- a/CnCTDRAMapEditor/Controls/TeamsList/TeamItemControl.cs +++ b/CnCTDRAMapEditor/Controls/TeamsList/TeamItemControl.cs @@ -19,7 +19,6 @@ namespace MobiusEditor.Controls public TeamItemControl() :this(null, null, null) { - } public TeamItemControl(TeamTypeClass info, ListedControlController controller, IEnumerable technos) diff --git a/CnCTDRAMapEditor/Controls/TerrainProperties.Designer.cs b/CnCTDRAMapEditor/Controls/TerrainProperties.Designer.cs index 0c4d5a9..c1312c7 100644 --- a/CnCTDRAMapEditor/Controls/TerrainProperties.Designer.cs +++ b/CnCTDRAMapEditor/Controls/TerrainProperties.Designer.cs @@ -1,30 +1,30 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Controls { partial class TerrainProperties { - /// + /// /// Required designer variable. /// private System.ComponentModel.IContainer components = null; #region Component Designer generated code - /// - /// Required method for Designer support - do not modify + /// + /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() diff --git a/CnCTDRAMapEditor/Controls/TerrainProperties.cs b/CnCTDRAMapEditor/Controls/TerrainProperties.cs index c66c51f..b5c9ac3 100644 --- a/CnCTDRAMapEditor/Controls/TerrainProperties.cs +++ b/CnCTDRAMapEditor/Controls/TerrainProperties.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Model; @@ -142,7 +142,7 @@ namespace MobiusEditor.Controls this.toolTip1.Hide(target); } - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. diff --git a/CnCTDRAMapEditor/Controls/TypeListBox.cs b/CnCTDRAMapEditor/Controls/TypeListBox.cs index f0d7040..044b601 100644 --- a/CnCTDRAMapEditor/Controls/TypeListBox.cs +++ b/CnCTDRAMapEditor/Controls/TypeListBox.cs @@ -106,7 +106,7 @@ namespace MobiusEditor.Controls Invalidate(); } - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. diff --git a/CnCTDRAMapEditor/Dialogs/ErrorMessageBox.Designer.cs b/CnCTDRAMapEditor/Dialogs/ErrorMessageBox.Designer.cs index e9a8d69..2464cf7 100644 --- a/CnCTDRAMapEditor/Dialogs/ErrorMessageBox.Designer.cs +++ b/CnCTDRAMapEditor/Dialogs/ErrorMessageBox.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Dialogs { diff --git a/CnCTDRAMapEditor/Dialogs/ErrorMessageBox.cs b/CnCTDRAMapEditor/Dialogs/ErrorMessageBox.cs index 237c83b..72e0275 100644 --- a/CnCTDRAMapEditor/Dialogs/ErrorMessageBox.cs +++ b/CnCTDRAMapEditor/Dialogs/ErrorMessageBox.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/Dialogs/ImageExportDialog.cs b/CnCTDRAMapEditor/Dialogs/ImageExportDialog.cs index 2194c49..857eb9d 100644 --- a/CnCTDRAMapEditor/Dialogs/ImageExportDialog.cs +++ b/CnCTDRAMapEditor/Dialogs/ImageExportDialog.cs @@ -305,7 +305,6 @@ namespace MobiusEditor.Dialogs this.DialogResult = DialogResult.OK; } } - } private void EnableControls(Boolean enabled, String processingLabel) diff --git a/CnCTDRAMapEditor/Dialogs/InviteMessageBox.Designer.cs b/CnCTDRAMapEditor/Dialogs/InviteMessageBox.Designer.cs index c6eb363..ef0a91f 100644 --- a/CnCTDRAMapEditor/Dialogs/InviteMessageBox.Designer.cs +++ b/CnCTDRAMapEditor/Dialogs/InviteMessageBox.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Dialogs { diff --git a/CnCTDRAMapEditor/Dialogs/InviteMessageBox.cs b/CnCTDRAMapEditor/Dialogs/InviteMessageBox.cs index c5b57d5..efaf601 100644 --- a/CnCTDRAMapEditor/Dialogs/InviteMessageBox.cs +++ b/CnCTDRAMapEditor/Dialogs/InviteMessageBox.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Drawing; diff --git a/CnCTDRAMapEditor/Dialogs/MapSettingsDialog.Designer.cs b/CnCTDRAMapEditor/Dialogs/MapSettingsDialog.Designer.cs index c060be1..5e53e53 100644 --- a/CnCTDRAMapEditor/Dialogs/MapSettingsDialog.Designer.cs +++ b/CnCTDRAMapEditor/Dialogs/MapSettingsDialog.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Dialogs { diff --git a/CnCTDRAMapEditor/Dialogs/MapSettingsDialog.cs b/CnCTDRAMapEditor/Dialogs/MapSettingsDialog.cs index b011a62..ee6c40b 100644 --- a/CnCTDRAMapEditor/Dialogs/MapSettingsDialog.cs +++ b/CnCTDRAMapEditor/Dialogs/MapSettingsDialog.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Interface; @@ -312,7 +312,6 @@ namespace MobiusEditor.Dialogs e.Cancel = true; } } - } } } diff --git a/CnCTDRAMapEditor/Dialogs/NewFromImageDialog.cs b/CnCTDRAMapEditor/Dialogs/NewFromImageDialog.cs index 04142ba..ad57067 100644 --- a/CnCTDRAMapEditor/Dialogs/NewFromImageDialog.cs +++ b/CnCTDRAMapEditor/Dialogs/NewFromImageDialog.cs @@ -50,7 +50,7 @@ namespace MobiusEditor.Dialogs { Color col = value.Value; foreCol = col; - backCol = col.GetBrightness() > 0.5 ? Color.Black : Color.White; + backCol = col.GetBrightness() > 0.5 ? Color.Black : Color.White; } lblColorVal.ForeColor = foreCol; lblColorVal.BackColor = backCol; @@ -67,7 +67,7 @@ namespace MobiusEditor.Dialogs else { _selectedIcon = null; - } + } lstTemplates.SelectedItem = template.Name; RefreshPreviewPanel(); SelectMapping(); @@ -175,9 +175,7 @@ namespace MobiusEditor.Dialogs public NewFromImageDialog(IGamePlugin plugin, int width, int height, byte[] imageData, Dictionary mappings) { this.plugin = plugin; - InitializeComponent(); - foreach (KeyValuePair kvp in mappings) { string tileType = kvp.Value; @@ -421,7 +419,6 @@ namespace MobiusEditor.Dialogs } String col = String.Format("#{0:X6} ", selected.Value.ToArgb() & 0xFFFFFF); int mappings = lstMappings.Items.Count; - for (int i = 0; i < mappings; i++) { String entry = (lstMappings.Items[i] ?? String.Empty).ToString(); @@ -552,8 +549,6 @@ namespace MobiusEditor.Dialogs var rect = new Rectangle(new Point(padX + selectedIcon.X * cellSize.Width, padY + selectedIcon.Y * cellSize.Height), cellSize); e.Graphics.DrawRectangle(selectedIconPen, rect); } - - } private void templateTypeMapPanel_MouseDown(Object sender, MouseEventArgs e) diff --git a/CnCTDRAMapEditor/Dialogs/NewMapDialog.Designer.cs b/CnCTDRAMapEditor/Dialogs/NewMapDialog.Designer.cs index 49a75a9..5610d67 100644 --- a/CnCTDRAMapEditor/Dialogs/NewMapDialog.Designer.cs +++ b/CnCTDRAMapEditor/Dialogs/NewMapDialog.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Dialogs { diff --git a/CnCTDRAMapEditor/Dialogs/NewMapDialog.cs b/CnCTDRAMapEditor/Dialogs/NewMapDialog.cs index ba25da0..479e23d 100644 --- a/CnCTDRAMapEditor/Dialogs/NewMapDialog.cs +++ b/CnCTDRAMapEditor/Dialogs/NewMapDialog.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System; diff --git a/CnCTDRAMapEditor/Dialogs/SteamDialog.Designer.cs b/CnCTDRAMapEditor/Dialogs/SteamDialog.Designer.cs index 920f82c..2a3d60f 100644 --- a/CnCTDRAMapEditor/Dialogs/SteamDialog.Designer.cs +++ b/CnCTDRAMapEditor/Dialogs/SteamDialog.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Dialogs { diff --git a/CnCTDRAMapEditor/Dialogs/SteamDialog.cs b/CnCTDRAMapEditor/Dialogs/SteamDialog.cs index a4e9a35..ca2a562 100644 --- a/CnCTDRAMapEditor/Dialogs/SteamDialog.cs +++ b/CnCTDRAMapEditor/Dialogs/SteamDialog.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Interface; @@ -410,7 +410,7 @@ namespace MobiusEditor.Dialogs } try { previewDir.Delete(); } catch { /* ignore */} - } + } DirectoryInfo publishDir = new DirectoryInfo(PublishTempDirectory); if (publishDir.Exists) { diff --git a/CnCTDRAMapEditor/Dialogs/TeamTypesDialog.Designer.cs b/CnCTDRAMapEditor/Dialogs/TeamTypesDialog.Designer.cs index 4cfe9da..31565d6 100644 --- a/CnCTDRAMapEditor/Dialogs/TeamTypesDialog.Designer.cs +++ b/CnCTDRAMapEditor/Dialogs/TeamTypesDialog.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Windows.Forms; diff --git a/CnCTDRAMapEditor/Dialogs/TeamTypesDialog.cs b/CnCTDRAMapEditor/Dialogs/TeamTypesDialog.cs index 36fbba9..4500a54 100644 --- a/CnCTDRAMapEditor/Dialogs/TeamTypesDialog.cs +++ b/CnCTDRAMapEditor/Dialogs/TeamTypesDialog.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Controls.ControlsList; @@ -124,10 +124,8 @@ namespace MobiusEditor.Dialogs HashSet allowedTriggers = new HashSet(items); items = Trigger.None.Yield().Concat(plugin.Map.Triggers.Select(t => t.Name).Where(t => allowedTriggers.Contains(t)).Distinct()).ToArray(); cmbTrigger.DataSource = items; - defaultTeam = technoTypes.FirstOrDefault(); // Fix for case sensitivity issue in teamtype missions - TeamMission[] missions = plugin.Map.TeamMissionTypes; this.teamMissionTypes = missions.ToArray(); this.defaultMission = missions.FirstOrDefault(); @@ -206,7 +204,7 @@ namespace MobiusEditor.Dialogs maxAllowedNud.DataBindings.Add("Value", selected, "MaxAllowed"); selected.Fear = CheckBounds(selected.Fear, nudFear); nudFear.DataBindings.Add("Value", selected, "Fear"); - cmbWaypoint.DataBindings.Add("SelectedValue", selected, "Origin"); + cmbWaypoint.DataBindings.Add("SelectedValue", selected, "Origin"); //cmbWaypoint.DataBindings.Add("SelectedIndex", selected, "Origin"); cmbTrigger.DataBindings.Add("SelectedItem", selected, "Trigger"); @@ -589,8 +587,7 @@ namespace MobiusEditor.Dialogs } btnAddTeam.Enabled = SelectedTeamType.Classes.Count < Globals.MaxTeamClasses; tilTeams.TabStop = SelectedTeamType.Classes.Count > 0; - - } + } } private void BtnAddMission_Click(Object sender, EventArgs e) @@ -637,7 +634,7 @@ namespace MobiusEditor.Dialogs { CalcListColSizes(); } - + private void teamTypesListView_ColumnWidthChanging(Object sender, ColumnWidthChangingEventArgs e) { e.Cancel = true; diff --git a/CnCTDRAMapEditor/Dialogs/TriggersDialog.Designer.cs b/CnCTDRAMapEditor/Dialogs/TriggersDialog.Designer.cs index e19746e..0bb069b 100644 --- a/CnCTDRAMapEditor/Dialogs/TriggersDialog.Designer.cs +++ b/CnCTDRAMapEditor/Dialogs/TriggersDialog.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; diff --git a/CnCTDRAMapEditor/Dialogs/TriggersDialog.cs b/CnCTDRAMapEditor/Dialogs/TriggersDialog.cs index 0ee33d9..1b07de1 100644 --- a/CnCTDRAMapEditor/Dialogs/TriggersDialog.cs +++ b/CnCTDRAMapEditor/Dialogs/TriggersDialog.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Model; @@ -380,7 +380,7 @@ namespace MobiusEditor.Dialogs { AddTrigger(); } - + private void TsmiRenameTrigger_Click(object sender, EventArgs e) { if (SelectedItem != null) @@ -740,7 +740,7 @@ namespace MobiusEditor.Dialogs .Concat(plugin.Map.Houses.Select(t => new ListItem(t.Type.ID, t.Type.Name))).ToArray(); eventValueComboBox.DataSource = houseData; eventValueComboBox.DataBindings.Add("SelectedValue", triggerEvent, "Data"); - eventValueComboBox.SelectedValue = ListItem.CheckInList(data, houseData); + eventValueComboBox.SelectedValue = ListItem.CheckInList(data, houseData); break; case RedAlert.EventTypes.TEVENT_BUILDING_EXISTS: case RedAlert.EventTypes.TEVENT_BUILD: diff --git a/CnCTDRAMapEditor/Event/RenderEventArgs.cs b/CnCTDRAMapEditor/Event/RenderEventArgs.cs index 3acf60b..a1ad774 100644 --- a/CnCTDRAMapEditor/Event/RenderEventArgs.cs +++ b/CnCTDRAMapEditor/Event/RenderEventArgs.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/Event/UndoRedoEventArgs.cs b/CnCTDRAMapEditor/Event/UndoRedoEventArgs.cs index 047415b..8c4c265 100644 --- a/CnCTDRAMapEditor/Event/UndoRedoEventArgs.cs +++ b/CnCTDRAMapEditor/Event/UndoRedoEventArgs.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Interface; diff --git a/CnCTDRAMapEditor/Globals.cs b/CnCTDRAMapEditor/Globals.cs index e666be3..abbc6bb 100644 --- a/CnCTDRAMapEditor/Globals.cs +++ b/CnCTDRAMapEditor/Globals.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Utility; diff --git a/CnCTDRAMapEditor/Interface/IBrowsableType.cs b/CnCTDRAMapEditor/Interface/IBrowsableType.cs index b5ee317..ede2681 100644 --- a/CnCTDRAMapEditor/Interface/IBrowsableType.cs +++ b/CnCTDRAMapEditor/Interface/IBrowsableType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System; diff --git a/CnCTDRAMapEditor/Interface/ICellOccupier.cs b/CnCTDRAMapEditor/Interface/ICellOccupier.cs index cfeb494..7814d50 100644 --- a/CnCTDRAMapEditor/Interface/ICellOccupier.cs +++ b/CnCTDRAMapEditor/Interface/ICellOccupier.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Interface { diff --git a/CnCTDRAMapEditor/Interface/ICellOverlapper.cs b/CnCTDRAMapEditor/Interface/ICellOverlapper.cs index 4656591..48b5bb7 100644 --- a/CnCTDRAMapEditor/Interface/ICellOverlapper.cs +++ b/CnCTDRAMapEditor/Interface/ICellOverlapper.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.Drawing; diff --git a/CnCTDRAMapEditor/Interface/IGamePlugin.cs b/CnCTDRAMapEditor/Interface/IGamePlugin.cs index 764ecad..5791407 100644 --- a/CnCTDRAMapEditor/Interface/IGamePlugin.cs +++ b/CnCTDRAMapEditor/Interface/IGamePlugin.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System; diff --git a/CnCTDRAMapEditor/Interface/INamedType.cs b/CnCTDRAMapEditor/Interface/INamedType.cs index bfc7b0f..bfc5a27 100644 --- a/CnCTDRAMapEditor/Interface/INamedType.cs +++ b/CnCTDRAMapEditor/Interface/INamedType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Interface { diff --git a/CnCTDRAMapEditor/Interface/ITeamColor.cs b/CnCTDRAMapEditor/Interface/ITeamColor.cs index e13e3b8..b23c8e4 100644 --- a/CnCTDRAMapEditor/Interface/ITeamColor.cs +++ b/CnCTDRAMapEditor/Interface/ITeamColor.cs @@ -1,12 +1,4 @@ -// -// Copyright 2020 Electronic Arts Inc. -// -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, -// either version 3 of the License, or (at your option) any later version. - -using System.Drawing; +using System.Drawing; namespace MobiusEditor.Interface { diff --git a/CnCTDRAMapEditor/Interface/ITeamColorManager.cs b/CnCTDRAMapEditor/Interface/ITeamColorManager.cs index c07ac51..67acd3a 100644 --- a/CnCTDRAMapEditor/Interface/ITeamColorManager.cs +++ b/CnCTDRAMapEditor/Interface/ITeamColorManager.cs @@ -1,12 +1,4 @@ -// -// Copyright 2020 Electronic Arts Inc. -// -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, -// either version 3 of the License, or (at your option) any later version. - -using MobiusEditor.Model; +using MobiusEditor.Model; using System.Drawing; namespace MobiusEditor.Interface diff --git a/CnCTDRAMapEditor/Interface/ITechno.cs b/CnCTDRAMapEditor/Interface/ITechno.cs index cc45925..b3260d0 100644 --- a/CnCTDRAMapEditor/Interface/ITechno.cs +++ b/CnCTDRAMapEditor/Interface/ITechno.cs @@ -7,7 +7,7 @@ namespace MobiusEditor.Interface HouseType House { get; set; } int Strength { get; set; } - + string Trigger { get; set; } } } diff --git a/CnCTDRAMapEditor/Interface/ITechnoType.cs b/CnCTDRAMapEditor/Interface/ITechnoType.cs index 41fb40d..8b57530 100644 --- a/CnCTDRAMapEditor/Interface/ITechnoType.cs +++ b/CnCTDRAMapEditor/Interface/ITechnoType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Interface { diff --git a/CnCTDRAMapEditor/Interface/ITool.cs b/CnCTDRAMapEditor/Interface/ITool.cs index 529816b..5e57a06 100644 --- a/CnCTDRAMapEditor/Interface/ITool.cs +++ b/CnCTDRAMapEditor/Interface/ITool.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using MobiusEditor.Widgets; diff --git a/CnCTDRAMapEditor/Interface/IWidget.cs b/CnCTDRAMapEditor/Interface/IWidget.cs index fece616..729421d 100644 --- a/CnCTDRAMapEditor/Interface/IWidget.cs +++ b/CnCTDRAMapEditor/Interface/IWidget.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Drawing; diff --git a/CnCTDRAMapEditor/MainForm.Designer.cs b/CnCTDRAMapEditor/MainForm.Designer.cs index c9de095..ad11242 100644 --- a/CnCTDRAMapEditor/MainForm.Designer.cs +++ b/CnCTDRAMapEditor/MainForm.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor { diff --git a/CnCTDRAMapEditor/MainForm.cs b/CnCTDRAMapEditor/MainForm.cs index ee1e5e0..8fa780d 100644 --- a/CnCTDRAMapEditor/MainForm.cs +++ b/CnCTDRAMapEditor/MainForm.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Dialogs; @@ -975,7 +975,6 @@ namespace MobiusEditor MessageBox.Show(string.Format("Error loading {0}: the file was not found.", e.Name), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); mru.Remove(e); } - } private void MapPanel_MouseMove(object sender, MouseEventArgs e) @@ -2378,7 +2377,7 @@ namespace MobiusEditor case DialogResult.Cancel: return false; } - } + } if (!onlyAfterSave && nextAction != null) { nextAction(); diff --git a/CnCTDRAMapEditor/Model/BasicSection.cs b/CnCTDRAMapEditor/Model/BasicSection.cs index ba9332c..849e5bd 100644 --- a/CnCTDRAMapEditor/Model/BasicSection.cs +++ b/CnCTDRAMapEditor/Model/BasicSection.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Utility; using System; diff --git a/CnCTDRAMapEditor/Model/BriefingSection.cs b/CnCTDRAMapEditor/Model/BriefingSection.cs index 534351f..744dced 100644 --- a/CnCTDRAMapEditor/Model/BriefingSection.cs +++ b/CnCTDRAMapEditor/Model/BriefingSection.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.ComponentModel; diff --git a/CnCTDRAMapEditor/Model/Building.cs b/CnCTDRAMapEditor/Model/Building.cs index 4d58f70..70aff81 100644 --- a/CnCTDRAMapEditor/Model/Building.cs +++ b/CnCTDRAMapEditor/Model/Building.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System; diff --git a/CnCTDRAMapEditor/Model/BuildingType.cs b/CnCTDRAMapEditor/Model/BuildingType.cs index 14bc349..a39fe32 100644 --- a/CnCTDRAMapEditor/Model/BuildingType.cs +++ b/CnCTDRAMapEditor/Model/BuildingType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Render; @@ -141,7 +141,7 @@ namespace MobiusEditor.Model : this(id, name, textId, powerProd, powerUse, 0, width, height, occupyMask, ownerHouse, theaters, null, 0, null, flag) { } - + public BuildingType(sbyte id, string name, string textId, int powerProd, int powerUse, int storage, int width, int height, string occupyMask, string ownerHouse) : this(id, name, textId, powerProd, powerUse, storage, width, height, occupyMask, ownerHouse, null, null, 0, null, BuildingTypeFlag.None) { diff --git a/CnCTDRAMapEditor/Model/CellGrid.cs b/CnCTDRAMapEditor/Model/CellGrid.cs index 8fb6552..596cf4a 100644 --- a/CnCTDRAMapEditor/Model/CellGrid.cs +++ b/CnCTDRAMapEditor/Model/CellGrid.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections; @@ -125,7 +125,6 @@ namespace MobiusEditor.Model if (!metrics.GetLocation(cell, out Point location)) { return default; - } return metrics.Adjacent(location, facing, out Point adjacent) ? this[adjacent] : default; } diff --git a/CnCTDRAMapEditor/Model/CellMetrics.cs b/CnCTDRAMapEditor/Model/CellMetrics.cs index 7274c0c..f05d9ef 100644 --- a/CnCTDRAMapEditor/Model/CellMetrics.cs +++ b/CnCTDRAMapEditor/Model/CellMetrics.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Drawing; diff --git a/CnCTDRAMapEditor/Model/CellTrigger.cs b/CnCTDRAMapEditor/Model/CellTrigger.cs index 0fbf633..5f44145 100644 --- a/CnCTDRAMapEditor/Model/CellTrigger.cs +++ b/CnCTDRAMapEditor/Model/CellTrigger.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.Drawing; diff --git a/CnCTDRAMapEditor/Model/DirectionType.cs b/CnCTDRAMapEditor/Model/DirectionType.cs index 3721767..910bada 100644 --- a/CnCTDRAMapEditor/Model/DirectionType.cs +++ b/CnCTDRAMapEditor/Model/DirectionType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/Model/DirectionTypes.cs b/CnCTDRAMapEditor/Model/DirectionTypes.cs index 700b4c1..969a38e 100644 --- a/CnCTDRAMapEditor/Model/DirectionTypes.cs +++ b/CnCTDRAMapEditor/Model/DirectionTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.Collections.Generic; using System.Linq; diff --git a/CnCTDRAMapEditor/Model/House.cs b/CnCTDRAMapEditor/Model/House.cs index 291e9aa..30ca0ca 100644 --- a/CnCTDRAMapEditor/Model/House.cs +++ b/CnCTDRAMapEditor/Model/House.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Utility; using System; diff --git a/CnCTDRAMapEditor/Model/HouseType.cs b/CnCTDRAMapEditor/Model/HouseType.cs index e359fc7..f078efc 100644 --- a/CnCTDRAMapEditor/Model/HouseType.cs +++ b/CnCTDRAMapEditor/Model/HouseType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/Model/Infantry.cs b/CnCTDRAMapEditor/Model/Infantry.cs index 69f11a6..b8ec12d 100644 --- a/CnCTDRAMapEditor/Model/Infantry.cs +++ b/CnCTDRAMapEditor/Model/Infantry.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System; @@ -158,7 +158,6 @@ namespace MobiusEditor.Model public Rectangle OverlapBounds => new Rectangle(-1, -1, 3, 3); public bool[,] OpaqueMask => new bool[1, 1] { { true } }; - public bool[,] OccupyMask => new bool[1, 1] { { true } }; public readonly Infantry[] Infantry = new Infantry[Globals.NumInfantryStops]; diff --git a/CnCTDRAMapEditor/Model/InfantryType.cs b/CnCTDRAMapEditor/Model/InfantryType.cs index 938de3a..f66a40d 100644 --- a/CnCTDRAMapEditor/Model/InfantryType.cs +++ b/CnCTDRAMapEditor/Model/InfantryType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Render; diff --git a/CnCTDRAMapEditor/Model/Map.cs b/CnCTDRAMapEditor/Model/Map.cs index 9c94d23..3b252cc 100644 --- a/CnCTDRAMapEditor/Model/Map.cs +++ b/CnCTDRAMapEditor/Model/Map.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Event; using MobiusEditor.Interface; @@ -293,7 +293,7 @@ namespace MobiusEditor.Model public readonly OverlapperSet Overlappers; public readonly Waypoint[] Waypoints; - + public event EventHandler WaypointsUpdated; public void NotifyWaypointsUpdate() @@ -1339,7 +1339,6 @@ namespace MobiusEditor.Model blockingCell = -1; return null; } - ICellOccupier techno = this.Technos[targetCell]; ICellOccupier b = this.Buildings[targetCell]; if (techno != null || b != null) diff --git a/CnCTDRAMapEditor/Model/MapSection.cs b/CnCTDRAMapEditor/Model/MapSection.cs index 968f093..2d4b651 100644 --- a/CnCTDRAMapEditor/Model/MapSection.cs +++ b/CnCTDRAMapEditor/Model/MapSection.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.ComponentModel; diff --git a/CnCTDRAMapEditor/Model/OccupierSet.cs b/CnCTDRAMapEditor/Model/OccupierSet.cs index 92dc655..65f6a3b 100644 --- a/CnCTDRAMapEditor/Model/OccupierSet.cs +++ b/CnCTDRAMapEditor/Model/OccupierSet.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System; diff --git a/CnCTDRAMapEditor/Model/OverlapperSet.cs b/CnCTDRAMapEditor/Model/OverlapperSet.cs index c92f282..8bfca63 100644 --- a/CnCTDRAMapEditor/Model/OverlapperSet.cs +++ b/CnCTDRAMapEditor/Model/OverlapperSet.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Utility; diff --git a/CnCTDRAMapEditor/Model/Overlay.cs b/CnCTDRAMapEditor/Model/Overlay.cs index 7725cce..cc9b242 100644 --- a/CnCTDRAMapEditor/Model/Overlay.cs +++ b/CnCTDRAMapEditor/Model/Overlay.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System.Drawing; diff --git a/CnCTDRAMapEditor/Model/OverlayType.cs b/CnCTDRAMapEditor/Model/OverlayType.cs index d978647..5cb0246 100644 --- a/CnCTDRAMapEditor/Model/OverlayType.cs +++ b/CnCTDRAMapEditor/Model/OverlayType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Render; diff --git a/CnCTDRAMapEditor/Model/Smudge.cs b/CnCTDRAMapEditor/Model/Smudge.cs index 7eedf86..8a449c6 100644 --- a/CnCTDRAMapEditor/Model/Smudge.cs +++ b/CnCTDRAMapEditor/Model/Smudge.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System; diff --git a/CnCTDRAMapEditor/Model/SmudgeType.cs b/CnCTDRAMapEditor/Model/SmudgeType.cs index 121e2af..678b372 100644 --- a/CnCTDRAMapEditor/Model/SmudgeType.cs +++ b/CnCTDRAMapEditor/Model/SmudgeType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Render; diff --git a/CnCTDRAMapEditor/Model/SteamSection.cs b/CnCTDRAMapEditor/Model/SteamSection.cs index c264012..ba60ab5 100644 --- a/CnCTDRAMapEditor/Model/SteamSection.cs +++ b/CnCTDRAMapEditor/Model/SteamSection.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using Steamworks; using System.ComponentModel; diff --git a/CnCTDRAMapEditor/Model/TeamType.cs b/CnCTDRAMapEditor/Model/TeamType.cs index 4912651..f30f781 100644 --- a/CnCTDRAMapEditor/Model/TeamType.cs +++ b/CnCTDRAMapEditor/Model/TeamType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System; diff --git a/CnCTDRAMapEditor/Model/Template.cs b/CnCTDRAMapEditor/Model/Template.cs index bbf85d9..f07457f 100644 --- a/CnCTDRAMapEditor/Model/Template.cs +++ b/CnCTDRAMapEditor/Model/Template.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System.Drawing; diff --git a/CnCTDRAMapEditor/Model/TemplateType.cs b/CnCTDRAMapEditor/Model/TemplateType.cs index 2fe4687..01c9479 100644 --- a/CnCTDRAMapEditor/Model/TemplateType.cs +++ b/CnCTDRAMapEditor/Model/TemplateType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Render; @@ -156,7 +156,6 @@ namespace MobiusEditor.Model break; } } - } } @@ -258,7 +257,7 @@ namespace MobiusEditor.Model : this(id, name, iconWidth, iconHeight, theaters, TemplateTypeFlag.None, maskOverride) { } - + /// /// Creates a TemplateType object. /// @@ -325,7 +324,7 @@ namespace MobiusEditor.Model { Init(theater, false); } - + public void Init(TheaterType theater, bool forceDummy) { // This allows mods to add 'random' tiles to existing 1x1 tiles. Check excludes 'Clear' terrain and items already defined as random. diff --git a/CnCTDRAMapEditor/Model/Terrain.cs b/CnCTDRAMapEditor/Model/Terrain.cs index 95f0de7..ccad735 100644 --- a/CnCTDRAMapEditor/Model/Terrain.cs +++ b/CnCTDRAMapEditor/Model/Terrain.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/Model/TerrainType.cs b/CnCTDRAMapEditor/Model/TerrainType.cs index 51d3805..e343a60 100644 --- a/CnCTDRAMapEditor/Model/TerrainType.cs +++ b/CnCTDRAMapEditor/Model/TerrainType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Render; diff --git a/CnCTDRAMapEditor/Model/TheaterType.cs b/CnCTDRAMapEditor/Model/TheaterType.cs index 5be92f4..a949436 100644 --- a/CnCTDRAMapEditor/Model/TheaterType.cs +++ b/CnCTDRAMapEditor/Model/TheaterType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/Model/Trigger.cs b/CnCTDRAMapEditor/Model/Trigger.cs index e8c7d63..9bf2d0a 100644 --- a/CnCTDRAMapEditor/Model/Trigger.cs +++ b/CnCTDRAMapEditor/Model/Trigger.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Utility; diff --git a/CnCTDRAMapEditor/Model/TypeItem.cs b/CnCTDRAMapEditor/Model/TypeItem.cs index 824257f..14375e6 100644 --- a/CnCTDRAMapEditor/Model/TypeItem.cs +++ b/CnCTDRAMapEditor/Model/TypeItem.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; diff --git a/CnCTDRAMapEditor/Model/Unit.cs b/CnCTDRAMapEditor/Model/Unit.cs index a1c6423..7609c7b 100644 --- a/CnCTDRAMapEditor/Model/Unit.cs +++ b/CnCTDRAMapEditor/Model/Unit.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System; diff --git a/CnCTDRAMapEditor/Model/UnitType.cs b/CnCTDRAMapEditor/Model/UnitType.cs index 064dffb..6b36a3f 100644 --- a/CnCTDRAMapEditor/Model/UnitType.cs +++ b/CnCTDRAMapEditor/Model/UnitType.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Render; diff --git a/CnCTDRAMapEditor/Model/Waypoint.cs b/CnCTDRAMapEditor/Model/Waypoint.cs index a2dec13..dc37ef1 100644 --- a/CnCTDRAMapEditor/Model/Waypoint.cs +++ b/CnCTDRAMapEditor/Model/Waypoint.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System; diff --git a/CnCTDRAMapEditor/Program.cs b/CnCTDRAMapEditor/Program.cs index 7ff9b4c..db8bbdf 100644 --- a/CnCTDRAMapEditor/Program.cs +++ b/CnCTDRAMapEditor/Program.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection //#define CLASSICIMPLEMENTED @@ -49,7 +49,6 @@ namespace MobiusEditor { Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture("en-US"); } - Version version = Assembly.GetExecutingAssembly().GetName().Version; if (!Version.TryParse(Properties.Settings.Default.ApplicationVersion, out Version oldVersion) || oldVersion < version) { @@ -490,7 +489,6 @@ namespace MobiusEditor break; } } - string previousVersionConfigFile = previousSettingsDir == null ? null : string.Concat(previousSettingsDir.FullName, @"\", userConfigFileName); string currentVersionConfigFile = string.Concat(currentVersionConfigFileDir.FullName, @"\", userConfigFileName); if (!currentVersionConfigFileDir.Exists) diff --git a/CnCTDRAMapEditor/Properties/AssemblyInfo.cs b/CnCTDRAMapEditor/Properties/AssemblyInfo.cs index cdf668e..fa9c955 100644 --- a/CnCTDRAMapEditor/Properties/AssemblyInfo.cs +++ b/CnCTDRAMapEditor/Properties/AssemblyInfo.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.Reflection; using System.Runtime.InteropServices; diff --git a/CnCTDRAMapEditor/RedAlert/ActionDataTypes.cs b/CnCTDRAMapEditor/RedAlert/ActionDataTypes.cs index 1e85da2..218893d 100644 --- a/CnCTDRAMapEditor/RedAlert/ActionDataTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/ActionDataTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.RedAlert { diff --git a/CnCTDRAMapEditor/RedAlert/ActionTypes.cs b/CnCTDRAMapEditor/RedAlert/ActionTypes.cs index 0ae253e..91d987b 100644 --- a/CnCTDRAMapEditor/RedAlert/ActionTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/ActionTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.Collections.Generic; using System.Linq; diff --git a/CnCTDRAMapEditor/RedAlert/BasicSection.cs b/CnCTDRAMapEditor/RedAlert/BasicSection.cs index ccb2df1..dbed0f3 100644 --- a/CnCTDRAMapEditor/RedAlert/BasicSection.cs +++ b/CnCTDRAMapEditor/RedAlert/BasicSection.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Utility; using System.ComponentModel; diff --git a/CnCTDRAMapEditor/RedAlert/BuildingTypes.cs b/CnCTDRAMapEditor/RedAlert/BuildingTypes.cs index eed00a0..a0f2b71 100644 --- a/CnCTDRAMapEditor/RedAlert/BuildingTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/BuildingTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using MobiusEditor.Utility; diff --git a/CnCTDRAMapEditor/RedAlert/Constants.cs b/CnCTDRAMapEditor/RedAlert/Constants.cs index 088ece8..e98a9d2 100644 --- a/CnCTDRAMapEditor/RedAlert/Constants.cs +++ b/CnCTDRAMapEditor/RedAlert/Constants.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.Drawing; using System.IO; diff --git a/CnCTDRAMapEditor/RedAlert/EventTypes.cs b/CnCTDRAMapEditor/RedAlert/EventTypes.cs index dd4497b..9ccf2ae 100644 --- a/CnCTDRAMapEditor/RedAlert/EventTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/EventTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.Collections.Generic; using System.Linq; diff --git a/CnCTDRAMapEditor/RedAlert/GamePluginRA.cs b/CnCTDRAMapEditor/RedAlert/GamePluginRA.cs index 29d7fd1..ee438d1 100644 --- a/CnCTDRAMapEditor/RedAlert/GamePluginRA.cs +++ b/CnCTDRAMapEditor/RedAlert/GamePluginRA.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Model; diff --git a/CnCTDRAMapEditor/RedAlert/House.cs b/CnCTDRAMapEditor/RedAlert/House.cs index 9505fbe..2d04503 100644 --- a/CnCTDRAMapEditor/RedAlert/House.cs +++ b/CnCTDRAMapEditor/RedAlert/House.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Utility; using System.ComponentModel; diff --git a/CnCTDRAMapEditor/RedAlert/HouseTypes.cs b/CnCTDRAMapEditor/RedAlert/HouseTypes.cs index a959bf9..e6b3f9c 100644 --- a/CnCTDRAMapEditor/RedAlert/HouseTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/HouseTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; @@ -38,8 +38,8 @@ namespace MobiusEditor.RedAlert public static readonly HouseType Multi3 = new HouseType(14, "Multi3", WaypointFlag.PlayerStart3, "MULTI3"); // red public static readonly HouseType Multi4 = new HouseType(15, "Multi4", WaypointFlag.PlayerStart4, "MULTI4"); // green public static readonly HouseType Multi5 = new HouseType(16, "Multi5", WaypointFlag.PlayerStart5, "MULTI5"); // orange - public static readonly HouseType Multi6 = new HouseType(17, "Multi6", WaypointFlag.PlayerStart6, "MULTI7"); // purple; fixed to match actual game. - public static readonly HouseType Multi7 = new HouseType(18, "Multi7", WaypointFlag.PlayerStart7, "MULTI6"); // blue; fixed to match actual game. + public static readonly HouseType Multi6 = new HouseType(17, "Multi6", WaypointFlag.PlayerStart6, "MULTI7"); // purple; fixed to match actual game. + public static readonly HouseType Multi7 = new HouseType(18, "Multi7", WaypointFlag.PlayerStart7, "MULTI6"); // blue; fixed to match actual game. public static readonly HouseType Multi8 = new HouseType(19, "Multi8", WaypointFlag.PlayerStart8, "MULTI8"); // pink private static readonly HouseType[] Types; diff --git a/CnCTDRAMapEditor/RedAlert/InfantryTypes.cs b/CnCTDRAMapEditor/RedAlert/InfantryTypes.cs index 318bd53..4ac5a92 100644 --- a/CnCTDRAMapEditor/RedAlert/InfantryTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/InfantryTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/RedAlert/MissionTypes.cs b/CnCTDRAMapEditor/RedAlert/MissionTypes.cs index 9c90f03..b53c3ea 100644 --- a/CnCTDRAMapEditor/RedAlert/MissionTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/MissionTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/RedAlert/OverlayTypes.cs b/CnCTDRAMapEditor/RedAlert/OverlayTypes.cs index f78b04c..eb79a86 100644 --- a/CnCTDRAMapEditor/RedAlert/OverlayTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/OverlayTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/RedAlert/SmudgeTypes.cs b/CnCTDRAMapEditor/RedAlert/SmudgeTypes.cs index 5c97dd2..d2e3619 100644 --- a/CnCTDRAMapEditor/RedAlert/SmudgeTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/SmudgeTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/RedAlert/TeamMissionTypes.cs b/CnCTDRAMapEditor/RedAlert/TeamMissionTypes.cs index 7b2ea67..023ade2 100644 --- a/CnCTDRAMapEditor/RedAlert/TeamMissionTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/TeamMissionTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/RedAlert/TemplateTypes.cs b/CnCTDRAMapEditor/RedAlert/TemplateTypes.cs index 15b50fd..5c6dccd 100644 --- a/CnCTDRAMapEditor/RedAlert/TemplateTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/TemplateTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/RedAlert/TerrainTypes.cs b/CnCTDRAMapEditor/RedAlert/TerrainTypes.cs index 6301a73..2d58d01 100644 --- a/CnCTDRAMapEditor/RedAlert/TerrainTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/TerrainTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/RedAlert/TheaterTypes.cs b/CnCTDRAMapEditor/RedAlert/TheaterTypes.cs index b7f5730..0b25ea1 100644 --- a/CnCTDRAMapEditor/RedAlert/TheaterTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/TheaterTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using MobiusEditor.Utility; diff --git a/CnCTDRAMapEditor/RedAlert/UnitTypes.cs b/CnCTDRAMapEditor/RedAlert/UnitTypes.cs index 86e192e..35a5a21 100644 --- a/CnCTDRAMapEditor/RedAlert/UnitTypes.cs +++ b/CnCTDRAMapEditor/RedAlert/UnitTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/Render/MapRenderer.cs b/CnCTDRAMapEditor/Render/MapRenderer.cs index f3f7352..33c06f1 100644 --- a/CnCTDRAMapEditor/Render/MapRenderer.cs +++ b/CnCTDRAMapEditor/Render/MapRenderer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Model; @@ -693,7 +693,6 @@ namespace MobiusEditor.Render if (unit.Strength < 64) icon += 32; } - } else if (gameType == GameType.RedAlert) { @@ -873,7 +872,7 @@ namespace MobiusEditor.Render if (unit.Type.HasDoubleTurret) { turret2Adjust.Y += unit.Type.TurretY; - } + } Point center = new Point(renderBounds.Width / 2, renderBounds.Height / 2); void RenderTurret(Graphics ug, Tile turrTile, Point turrAdjust, Size tSize) @@ -1332,7 +1331,6 @@ namespace MobiusEditor.Render RenderWaypoint(gameType, false, map.Theater, tileSize, flagColors, wp).Item2(graphics); } } - public static void RenderAllFakeBuildingLabels(Graphics graphics, Map map, Size tileSize, double tileScale) { diff --git a/CnCTDRAMapEditor/SoleSurvivor/CratesSection.cs b/CnCTDRAMapEditor/SoleSurvivor/CratesSection.cs index 814b58f..12bd6a0 100644 --- a/CnCTDRAMapEditor/SoleSurvivor/CratesSection.cs +++ b/CnCTDRAMapEditor/SoleSurvivor/CratesSection.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.ComponentModel; diff --git a/CnCTDRAMapEditor/SoleSurvivor/GamePluginSS.cs b/CnCTDRAMapEditor/SoleSurvivor/GamePluginSS.cs index de55494..ed99a27 100644 --- a/CnCTDRAMapEditor/SoleSurvivor/GamePluginSS.cs +++ b/CnCTDRAMapEditor/SoleSurvivor/GamePluginSS.cs @@ -20,7 +20,7 @@ namespace MobiusEditor.SoleSurvivor { "WESTLOGO", }; - + protected static readonly IEnumerable themeTypesSole = new string[] { "No Theme", diff --git a/CnCTDRAMapEditor/SoleSurvivor/OverlayTypes.cs b/CnCTDRAMapEditor/SoleSurvivor/OverlayTypes.cs index 8a37e3f..c870cda 100644 --- a/CnCTDRAMapEditor/SoleSurvivor/OverlayTypes.cs +++ b/CnCTDRAMapEditor/SoleSurvivor/OverlayTypes.cs @@ -54,7 +54,6 @@ namespace MobiusEditor.SoleSurvivor (from field in typeof(OverlayTypes).GetFields(BindingFlags.Static | BindingFlags.Public) where field.IsInitOnly && typeof(OverlayType).IsAssignableFrom(field.FieldType) select field.GetValue(null) as OverlayType).Where(t => t.ID != 19).OrderBy(t => t.ID).ToArray(); - } public static IEnumerable GetTypes() diff --git a/CnCTDRAMapEditor/TiberianDawn/ActionTypes.cs b/CnCTDRAMapEditor/TiberianDawn/ActionTypes.cs index 17b3af1..e6f6229 100644 --- a/CnCTDRAMapEditor/TiberianDawn/ActionTypes.cs +++ b/CnCTDRAMapEditor/TiberianDawn/ActionTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.Collections.Generic; using System.Linq; diff --git a/CnCTDRAMapEditor/TiberianDawn/BasicSection.cs b/CnCTDRAMapEditor/TiberianDawn/BasicSection.cs index 657f4ef..cc26de6 100644 --- a/CnCTDRAMapEditor/TiberianDawn/BasicSection.cs +++ b/CnCTDRAMapEditor/TiberianDawn/BasicSection.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.ComponentModel; diff --git a/CnCTDRAMapEditor/TiberianDawn/BuildingTypes.cs b/CnCTDRAMapEditor/TiberianDawn/BuildingTypes.cs index cd41a97..725ec39 100644 --- a/CnCTDRAMapEditor/TiberianDawn/BuildingTypes.cs +++ b/CnCTDRAMapEditor/TiberianDawn/BuildingTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/TiberianDawn/Constants.cs b/CnCTDRAMapEditor/TiberianDawn/Constants.cs index b798ae4..e55e9d7 100644 --- a/CnCTDRAMapEditor/TiberianDawn/Constants.cs +++ b/CnCTDRAMapEditor/TiberianDawn/Constants.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.Drawing; using System.IO; diff --git a/CnCTDRAMapEditor/TiberianDawn/EventTypes.cs b/CnCTDRAMapEditor/TiberianDawn/EventTypes.cs index d2e94b5..b9c513e 100644 --- a/CnCTDRAMapEditor/TiberianDawn/EventTypes.cs +++ b/CnCTDRAMapEditor/TiberianDawn/EventTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.Collections.Generic; using System.Linq; diff --git a/CnCTDRAMapEditor/TiberianDawn/GamePluginTD.cs b/CnCTDRAMapEditor/TiberianDawn/GamePluginTD.cs index f9c28af..7f0a801 100644 --- a/CnCTDRAMapEditor/TiberianDawn/GamePluginTD.cs +++ b/CnCTDRAMapEditor/TiberianDawn/GamePluginTD.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Model; @@ -162,7 +162,7 @@ namespace MobiusEditor.TiberianDawn "TURTKILL", "VISOR", }; - + protected static readonly IEnumerable movieTypesAdditional = new string[] { "BODYBAGS (Classic only)", @@ -622,7 +622,7 @@ namespace MobiusEditor.TiberianDawn } // Only process the ini if any of the detected lines have a found amount of more than one. If references to literal ROAD2 are found, // also process the ini so they can be removed; we do not want those to be accepted as valid type by the editor. - if (foundAmounts.All(k => k.Value == 1) && !cellTypes.Values.Contains(OverlayTypes.Road2.Name, StringComparer.OrdinalIgnoreCase)) + if (foundAmounts.All(k => k.Value == 1) && !cellTypes.Values.Contains(OverlayTypes.Road2.Name, StringComparer.OrdinalIgnoreCase)) { return iniText; } @@ -2303,7 +2303,6 @@ namespace MobiusEditor.TiberianDawn briefingSection["Text"] = briefText.Replace("\n", "@"); if (Globals.WriteClassicBriefing) { - if (briefText.Length > maxBriefLengthClassic) { briefText = briefText.Substring(0, maxBriefLengthClassic); @@ -3002,7 +3001,7 @@ namespace MobiusEditor.TiberianDawn if (String.Equals(trigger.Name, "ZZZZ", StringComparison.OrdinalIgnoreCase)) zzzzExists = true; if (actionType == ActionTypes.ACTION_DESTROY_XXXX) delXExists = true; if (actionType == ActionTypes.ACTION_DESTROY_YYYY) delYExists = true; - if (actionType == ActionTypes.ACTION_DESTROY_ZZZZ) delZExists = true; + if (actionType == ActionTypes.ACTION_DESTROY_ZZZZ) delZExists = true; if (!Globals.Ignore106Scripting) { if (String.Equals(trigger.Name, "UUUU", StringComparison.OrdinalIgnoreCase)) uuuuExists = true; diff --git a/CnCTDRAMapEditor/TiberianDawn/House.cs b/CnCTDRAMapEditor/TiberianDawn/House.cs index 777b05a..3038046 100644 --- a/CnCTDRAMapEditor/TiberianDawn/House.cs +++ b/CnCTDRAMapEditor/TiberianDawn/House.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.TiberianDawn { diff --git a/CnCTDRAMapEditor/TiberianDawn/HouseTypes.cs b/CnCTDRAMapEditor/TiberianDawn/HouseTypes.cs index dfc2d99..a894c0d 100644 --- a/CnCTDRAMapEditor/TiberianDawn/HouseTypes.cs +++ b/CnCTDRAMapEditor/TiberianDawn/HouseTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/TiberianDawn/InfantryTypes.cs b/CnCTDRAMapEditor/TiberianDawn/InfantryTypes.cs index d497bda..295a205 100644 --- a/CnCTDRAMapEditor/TiberianDawn/InfantryTypes.cs +++ b/CnCTDRAMapEditor/TiberianDawn/InfantryTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/TiberianDawn/MissionTypes.cs b/CnCTDRAMapEditor/TiberianDawn/MissionTypes.cs index f34288e..34d7868 100644 --- a/CnCTDRAMapEditor/TiberianDawn/MissionTypes.cs +++ b/CnCTDRAMapEditor/TiberianDawn/MissionTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/TiberianDawn/OverlayTypes.cs b/CnCTDRAMapEditor/TiberianDawn/OverlayTypes.cs index b7244a0..c7e18f3 100644 --- a/CnCTDRAMapEditor/TiberianDawn/OverlayTypes.cs +++ b/CnCTDRAMapEditor/TiberianDawn/OverlayTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System; @@ -65,7 +65,6 @@ namespace MobiusEditor.TiberianDawn (from field in typeof(OverlayTypes).GetFields(BindingFlags.Static | BindingFlags.Public) where field.IsInitOnly && typeof(OverlayType).IsAssignableFrom(field.FieldType) select field.GetValue(null) as OverlayType).OrderBy(t => t.ID).ToArray(); - } public static IEnumerable GetTypes() diff --git a/CnCTDRAMapEditor/TiberianDawn/SmudgeTypes.cs b/CnCTDRAMapEditor/TiberianDawn/SmudgeTypes.cs index 6e8ad2c..27cacaa 100644 --- a/CnCTDRAMapEditor/TiberianDawn/SmudgeTypes.cs +++ b/CnCTDRAMapEditor/TiberianDawn/SmudgeTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/TiberianDawn/TeamMissionTypes.cs b/CnCTDRAMapEditor/TiberianDawn/TeamMissionTypes.cs index 3975330..68674f2 100644 --- a/CnCTDRAMapEditor/TiberianDawn/TeamMissionTypes.cs +++ b/CnCTDRAMapEditor/TiberianDawn/TeamMissionTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/TiberianDawn/TemplateTypes.cs b/CnCTDRAMapEditor/TiberianDawn/TemplateTypes.cs index 9a34f79..8380840 100644 --- a/CnCTDRAMapEditor/TiberianDawn/TemplateTypes.cs +++ b/CnCTDRAMapEditor/TiberianDawn/TemplateTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/TiberianDawn/TerrainTypes.cs b/CnCTDRAMapEditor/TiberianDawn/TerrainTypes.cs index a0dabbf..18d2d7f 100644 --- a/CnCTDRAMapEditor/TiberianDawn/TerrainTypes.cs +++ b/CnCTDRAMapEditor/TiberianDawn/TerrainTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/TiberianDawn/TheaterTypes.cs b/CnCTDRAMapEditor/TiberianDawn/TheaterTypes.cs index 5bdc148..69476ee 100644 --- a/CnCTDRAMapEditor/TiberianDawn/TheaterTypes.cs +++ b/CnCTDRAMapEditor/TiberianDawn/TheaterTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using MobiusEditor.Utility; diff --git a/CnCTDRAMapEditor/TiberianDawn/UnitTypes.cs b/CnCTDRAMapEditor/TiberianDawn/UnitTypes.cs index 87ac474..2e7fc90 100644 --- a/CnCTDRAMapEditor/TiberianDawn/UnitTypes.cs +++ b/CnCTDRAMapEditor/TiberianDawn/UnitTypes.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/Tools/BuildingTool.cs b/CnCTDRAMapEditor/Tools/BuildingTool.cs index fc4085f..f967a21 100644 --- a/CnCTDRAMapEditor/Tools/BuildingTool.cs +++ b/CnCTDRAMapEditor/Tools/BuildingTool.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; @@ -377,7 +377,7 @@ namespace MobiusEditor.Tools selectedBuildingEatenSmudge.Add(newBibPoint, oldSmudge); } } - } + } map.Buildings.Remove(toMove); // All bib points are restored initially, so the RestoreNearbySmudge logic can do its magic on them. if (allBibPoints != null && selectedBuildingEatenSmudge != null) diff --git a/CnCTDRAMapEditor/Tools/CellTriggersTool.cs b/CnCTDRAMapEditor/Tools/CellTriggersTool.cs index bf783aa..bf29111 100644 --- a/CnCTDRAMapEditor/Tools/CellTriggersTool.cs +++ b/CnCTDRAMapEditor/Tools/CellTriggersTool.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; @@ -127,7 +127,7 @@ namespace MobiusEditor.Tools } // Only process the one item. items = new string[] { updateItem }; - } + } if (updateItem == null) { // No item given: refresh all. diff --git a/CnCTDRAMapEditor/Tools/Dialogs/CellTriggersToolDialog.Designer.cs b/CnCTDRAMapEditor/Tools/Dialogs/CellTriggersToolDialog.Designer.cs index 6804a75..d4680a8 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/CellTriggersToolDialog.Designer.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/CellTriggersToolDialog.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Tools.Dialogs { diff --git a/CnCTDRAMapEditor/Tools/Dialogs/CellTriggersToolDialog.cs b/CnCTDRAMapEditor/Tools/Dialogs/CellTriggersToolDialog.cs index 1aa8ac2..a2a1875 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/CellTriggersToolDialog.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/CellTriggersToolDialog.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Drawing; @@ -72,7 +72,7 @@ namespace MobiusEditor.Tools.Dialogs this.toolTip1.Hide(target); } - /// + /// /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. diff --git a/CnCTDRAMapEditor/Tools/Dialogs/GenericToolDialog.Designer.cs b/CnCTDRAMapEditor/Tools/Dialogs/GenericToolDialog.Designer.cs index 8f3e635..01e1fb4 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/GenericToolDialog.Designer.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/GenericToolDialog.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Utility; diff --git a/CnCTDRAMapEditor/Tools/Dialogs/GenericToolDialog.cs b/CnCTDRAMapEditor/Tools/Dialogs/GenericToolDialog.cs index fe9e40b..4bebecb 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/GenericToolDialog.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/GenericToolDialog.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Interface; diff --git a/CnCTDRAMapEditor/Tools/Dialogs/ObjectToolDialog.Designer.cs b/CnCTDRAMapEditor/Tools/Dialogs/ObjectToolDialog.Designer.cs index bcc1e74..e900b8c 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/ObjectToolDialog.Designer.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/ObjectToolDialog.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Utility; diff --git a/CnCTDRAMapEditor/Tools/Dialogs/ObjectToolDialog.cs b/CnCTDRAMapEditor/Tools/Dialogs/ObjectToolDialog.cs index 5e783de..be8a5d0 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/ObjectToolDialog.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/ObjectToolDialog.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Interface; diff --git a/CnCTDRAMapEditor/Tools/Dialogs/ResourcesToolDialog.Designer.cs b/CnCTDRAMapEditor/Tools/Dialogs/ResourcesToolDialog.Designer.cs index 58a7992..bd1fe49 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/ResourcesToolDialog.Designer.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/ResourcesToolDialog.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Tools.Dialogs { diff --git a/CnCTDRAMapEditor/Tools/Dialogs/ResourcesToolDialog.cs b/CnCTDRAMapEditor/Tools/Dialogs/ResourcesToolDialog.cs index aea2be6..c991b93 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/ResourcesToolDialog.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/ResourcesToolDialog.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.Windows.Forms; using MobiusEditor.Controls; diff --git a/CnCTDRAMapEditor/Tools/Dialogs/SmudgeToolDialog.Designer.cs b/CnCTDRAMapEditor/Tools/Dialogs/SmudgeToolDialog.Designer.cs index e16329b..5582647 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/SmudgeToolDialog.Designer.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/SmudgeToolDialog.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; diff --git a/CnCTDRAMapEditor/Tools/Dialogs/TemplateToolDialog.Designer.cs b/CnCTDRAMapEditor/Tools/Dialogs/TemplateToolDialog.Designer.cs index 3280c4e..954ae7a 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/TemplateToolDialog.Designer.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/TemplateToolDialog.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Tools.Dialogs { diff --git a/CnCTDRAMapEditor/Tools/Dialogs/TemplateToolDialog.cs b/CnCTDRAMapEditor/Tools/Dialogs/TemplateToolDialog.cs index 4db0ef5..5abcbc7 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/TemplateToolDialog.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/TemplateToolDialog.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; diff --git a/CnCTDRAMapEditor/Tools/Dialogs/TerrainToolDialog.Designer.cs b/CnCTDRAMapEditor/Tools/Dialogs/TerrainToolDialog.Designer.cs index 40ea3d4..a2915d4 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/TerrainToolDialog.Designer.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/TerrainToolDialog.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; diff --git a/CnCTDRAMapEditor/Tools/Dialogs/TerrainToolDialog.cs b/CnCTDRAMapEditor/Tools/Dialogs/TerrainToolDialog.cs index f79ea33..b68b375 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/TerrainToolDialog.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/TerrainToolDialog.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; @@ -26,9 +26,9 @@ namespace MobiusEditor.Tools.Dialogs public partial class TerrainToolDialog : ToolDialog { public TypeListBox TerrainTypeListBox => terrainTypeListBox; - + public MapPanel TerrainTypeMapPanel => terrainTypeMapPanel; - + public TerrainProperties TerrainProperties => terrainProperties; public TerrainToolDialog(Form parentForm) diff --git a/CnCTDRAMapEditor/Tools/Dialogs/ToolDialog.cs b/CnCTDRAMapEditor/Tools/Dialogs/ToolDialog.cs index 792157c..5547088 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/ToolDialog.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/ToolDialog.cs @@ -97,7 +97,7 @@ namespace MobiusEditor.Tools.Dialogs // execute any further Shown event handlers base.OnShown(e); } - + private void ObjectToolDialog_FormClosing(System.Object sender, FormClosingEventArgs e) { // Prevent users from closing the form with Alt+F4, and pass the request to close through to the parent form. diff --git a/CnCTDRAMapEditor/Tools/Dialogs/WaypointsToolDialog.Designer.cs b/CnCTDRAMapEditor/Tools/Dialogs/WaypointsToolDialog.Designer.cs index f36649a..d0b0698 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/WaypointsToolDialog.Designer.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/WaypointsToolDialog.Designer.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection namespace MobiusEditor.Tools.Dialogs { diff --git a/CnCTDRAMapEditor/Tools/Dialogs/WaypointsToolDialog.cs b/CnCTDRAMapEditor/Tools/Dialogs/WaypointsToolDialog.cs index badfb8c..9c175f9 100644 --- a/CnCTDRAMapEditor/Tools/Dialogs/WaypointsToolDialog.cs +++ b/CnCTDRAMapEditor/Tools/Dialogs/WaypointsToolDialog.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System.ComponentModel; using System.Linq; diff --git a/CnCTDRAMapEditor/Tools/InfantryTool.cs b/CnCTDRAMapEditor/Tools/InfantryTool.cs index 8ab6bb2..2b0bc37 100644 --- a/CnCTDRAMapEditor/Tools/InfantryTool.cs +++ b/CnCTDRAMapEditor/Tools/InfantryTool.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; @@ -239,7 +239,7 @@ namespace MobiusEditor.Tools private void InfantryTypeComboBox_SelectedIndexChanged(object sender, EventArgs e) { SelectedInfantryType = infantryTypesBox.SelectedValue as InfantryType; - mockInfantry.Mission = map.GetDefaultMission(SelectedInfantryType, mockInfantry.Mission); + mockInfantry.Mission = map.GetDefaultMission(SelectedInfantryType, mockInfantry.Mission); } private void InfantryTool_KeyDown(object sender, KeyEventArgs e) diff --git a/CnCTDRAMapEditor/Tools/OverlaysTool.cs b/CnCTDRAMapEditor/Tools/OverlaysTool.cs index f1493b0..687a5c9 100644 --- a/CnCTDRAMapEditor/Tools/OverlaysTool.cs +++ b/CnCTDRAMapEditor/Tools/OverlaysTool.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; diff --git a/CnCTDRAMapEditor/Tools/ResourcesTool.cs b/CnCTDRAMapEditor/Tools/ResourcesTool.cs index 207acfc..134bdf2 100644 --- a/CnCTDRAMapEditor/Tools/ResourcesTool.cs +++ b/CnCTDRAMapEditor/Tools/ResourcesTool.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; diff --git a/CnCTDRAMapEditor/Tools/SmudgeTool.cs b/CnCTDRAMapEditor/Tools/SmudgeTool.cs index 737237c..921f688 100644 --- a/CnCTDRAMapEditor/Tools/SmudgeTool.cs +++ b/CnCTDRAMapEditor/Tools/SmudgeTool.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; diff --git a/CnCTDRAMapEditor/Tools/TemplateTool.cs b/CnCTDRAMapEditor/Tools/TemplateTool.cs index f2d7d9c..89a7535 100644 --- a/CnCTDRAMapEditor/Tools/TemplateTool.cs +++ b/CnCTDRAMapEditor/Tools/TemplateTool.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; diff --git a/CnCTDRAMapEditor/Tools/TerrainTool.cs b/CnCTDRAMapEditor/Tools/TerrainTool.cs index 56114cc..78d6a34 100644 --- a/CnCTDRAMapEditor/Tools/TerrainTool.cs +++ b/CnCTDRAMapEditor/Tools/TerrainTool.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; diff --git a/CnCTDRAMapEditor/Tools/UnitTool.cs b/CnCTDRAMapEditor/Tools/UnitTool.cs index 03f4630..5fba516 100644 --- a/CnCTDRAMapEditor/Tools/UnitTool.cs +++ b/CnCTDRAMapEditor/Tools/UnitTool.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; diff --git a/CnCTDRAMapEditor/Tools/ViewTool.cs b/CnCTDRAMapEditor/Tools/ViewTool.cs index 95761ea..c13d799 100644 --- a/CnCTDRAMapEditor/Tools/ViewTool.cs +++ b/CnCTDRAMapEditor/Tools/ViewTool.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; diff --git a/CnCTDRAMapEditor/Tools/WallsTool.cs b/CnCTDRAMapEditor/Tools/WallsTool.cs index c85463e..95c0ac3 100644 --- a/CnCTDRAMapEditor/Tools/WallsTool.cs +++ b/CnCTDRAMapEditor/Tools/WallsTool.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; diff --git a/CnCTDRAMapEditor/Tools/WaypointsTool.cs b/CnCTDRAMapEditor/Tools/WaypointsTool.cs index 8419d6e..ed2c606 100644 --- a/CnCTDRAMapEditor/Tools/WaypointsTool.cs +++ b/CnCTDRAMapEditor/Tools/WaypointsTool.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Event; diff --git a/CnCTDRAMapEditor/Utility/CRC.cs b/CnCTDRAMapEditor/Utility/CRC.cs index 7642489..a6abdc5 100644 --- a/CnCTDRAMapEditor/Utility/CRC.cs +++ b/CnCTDRAMapEditor/Utility/CRC.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; diff --git a/CnCTDRAMapEditor/Utility/ExtensionMethods.cs b/CnCTDRAMapEditor/Utility/ExtensionMethods.cs index 9b3a75a..230f7ae 100644 --- a/CnCTDRAMapEditor/Utility/ExtensionMethods.cs +++ b/CnCTDRAMapEditor/Utility/ExtensionMethods.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/Utility/GameTextManager.cs b/CnCTDRAMapEditor/Utility/GameTextManager.cs index 9099856..8b0d939 100644 --- a/CnCTDRAMapEditor/Utility/GameTextManager.cs +++ b/CnCTDRAMapEditor/Utility/GameTextManager.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/Utility/GeneralUtils.cs b/CnCTDRAMapEditor/Utility/GeneralUtils.cs index c73d9a7..dc42fb6 100644 --- a/CnCTDRAMapEditor/Utility/GeneralUtils.cs +++ b/CnCTDRAMapEditor/Utility/GeneralUtils.cs @@ -329,7 +329,7 @@ namespace MobiusEditor.Utility /// /// ArgumentException messes with the Message property, and dumps its own extra (localised) bit of - /// text with the argument onto the end of the message. This uses serialisation to retrieve the + /// text with the argument onto the end of the message. This uses serialisation to retrieve the /// original internal message of the exception without added junk. /// /// The ArgumentException to retrieve the message from diff --git a/CnCTDRAMapEditor/Utility/INI.cs b/CnCTDRAMapEditor/Utility/INI.cs index 9bfa288..10fbc31 100644 --- a/CnCTDRAMapEditor/Utility/INI.cs +++ b/CnCTDRAMapEditor/Utility/INI.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections; diff --git a/CnCTDRAMapEditor/Utility/ImageUtils.cs b/CnCTDRAMapEditor/Utility/ImageUtils.cs index e2e33a0..cb6364e 100644 --- a/CnCTDRAMapEditor/Utility/ImageUtils.cs +++ b/CnCTDRAMapEditor/Utility/ImageUtils.cs @@ -396,7 +396,6 @@ namespace MobiusEditor.Utility transColors.Add(i); } } - data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadWrite, dataFormat); var bytes = new byte[data.Stride * data.Height]; Marshal.Copy(data.Scan0, bytes, 0, bytes.Length); diff --git a/CnCTDRAMapEditor/Utility/MRU.cs b/CnCTDRAMapEditor/Utility/MRU.cs index 54a305c..49ec6e7 100644 --- a/CnCTDRAMapEditor/Utility/MRU.cs +++ b/CnCTDRAMapEditor/Utility/MRU.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using Microsoft.Win32; using System; diff --git a/CnCTDRAMapEditor/Utility/Megafile.cs b/CnCTDRAMapEditor/Utility/Megafile.cs index 15cf3ae..047e8ab 100644 --- a/CnCTDRAMapEditor/Utility/Megafile.cs +++ b/CnCTDRAMapEditor/Utility/Megafile.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections; diff --git a/CnCTDRAMapEditor/Utility/MegafileBuilder.cs b/CnCTDRAMapEditor/Utility/MegafileBuilder.cs index dd028b0..60b6178 100644 --- a/CnCTDRAMapEditor/Utility/MegafileBuilder.cs +++ b/CnCTDRAMapEditor/Utility/MegafileBuilder.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/Utility/MegafileManager.cs b/CnCTDRAMapEditor/Utility/MegafileManager.cs index f1f189c..61e5243 100644 --- a/CnCTDRAMapEditor/Utility/MegafileManager.cs +++ b/CnCTDRAMapEditor/Utility/MegafileManager.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System; diff --git a/CnCTDRAMapEditor/Utility/PropertyTracker.cs b/CnCTDRAMapEditor/Utility/PropertyTracker.cs index 5f15de3..d15db21 100644 --- a/CnCTDRAMapEditor/Utility/PropertyTracker.cs +++ b/CnCTDRAMapEditor/Utility/PropertyTracker.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections.Generic; @@ -92,7 +92,7 @@ namespace MobiusEditor.Utility public event PropertyChangedEventHandler PropertyChanged; public T Object { get; private set; } - + public PropertyTracker(T obj) { Object = obj; diff --git a/CnCTDRAMapEditor/Utility/SimpleMultiThreading.cs b/CnCTDRAMapEditor/Utility/SimpleMultiThreading.cs index 8434cbe..5297144 100644 --- a/CnCTDRAMapEditor/Utility/SimpleMultiThreading.cs +++ b/CnCTDRAMapEditor/Utility/SimpleMultiThreading.cs @@ -52,7 +52,7 @@ namespace MobiusEditor.Utility } /// - /// Executes a threaded operation while locking the UI. + /// Executes a threaded operation while locking the UI. /// /// The heavy processing function to run on a different thread. /// Optional function to call after returns a non-null result. diff --git a/CnCTDRAMapEditor/Utility/SteamworksUGC.cs b/CnCTDRAMapEditor/Utility/SteamworksUGC.cs index 5117629..24ee3f6 100644 --- a/CnCTDRAMapEditor/Utility/SteamworksUGC.cs +++ b/CnCTDRAMapEditor/Utility/SteamworksUGC.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Model; using Steamworks; diff --git a/CnCTDRAMapEditor/Utility/TGASharpLib.cs b/CnCTDRAMapEditor/Utility/TGASharpLib.cs index 92c1ebf..2f76cca 100644 --- a/CnCTDRAMapEditor/Utility/TGASharpLib.cs +++ b/CnCTDRAMapEditor/Utility/TGASharpLib.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection /* MIT License Copyright (c) 2017 TGASharpLib @@ -328,7 +328,7 @@ namespace TGASharpLib /// When working with a TrueVista card(ATVista or NuVista) you would select 24-bit(8 bits per /// primary) or 32-bit(8 bits per primary including Alpha channel) depending on your /// application’s use of look-up tables. It is suggested that when working with 16-bit and - /// 32-bit color images, you store them as True-Color images and do not use the color map + /// 32-bit color images, you store them as True-Color images and do not use the color map /// field to store look-up tables. Please refer to the TGA Extensions for fields better suited /// to storing look-up table information. /// @@ -1189,7 +1189,7 @@ namespace TGASharpLib /// When working with a TrueVista card(ATVista or NuVista) you would select 24-bit(8 bits per /// primary) or 32-bit(8 bits per primary including Alpha channel) depending on your /// application’s use of look-up tables. It is suggested that when working with 16-bit and - /// 32-bit color images, you store them as True-Color images and do not use the color map + /// 32-bit color images, you store them as True-Color images and do not use the color map /// field to store look-up tables. Please refer to the TGA Extensions for fields better suited /// to storing look-up table information. /// @@ -3643,7 +3643,7 @@ namespace TGASharpLib /// /// Job Name/ID - Field 14 (41 Bytes): - /// Bytes 379-419 - This field is an ASCII field of 41 bytes where the last byte must be + /// Bytes 379-419 - This field is an ASCII field of 41 bytes where the last byte must be /// a binary zero. This gives a total of 40 ASCII characters for the job name or the ID. /// If the field is used, it should contain a name or id tag which refers to the job with /// which the image was associated.This allows production companies (and others) to tie diff --git a/CnCTDRAMapEditor/Utility/TeamColor.cs b/CnCTDRAMapEditor/Utility/TeamColor.cs index dd7367a..a8a0584 100644 --- a/CnCTDRAMapEditor/Utility/TeamColor.cs +++ b/CnCTDRAMapEditor/Utility/TeamColor.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System; diff --git a/CnCTDRAMapEditor/Utility/TeamColorManager.cs b/CnCTDRAMapEditor/Utility/TeamColorManager.cs index 039121d..0a87969 100644 --- a/CnCTDRAMapEditor/Utility/TeamColorManager.cs +++ b/CnCTDRAMapEditor/Utility/TeamColorManager.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using MobiusEditor.Model; diff --git a/CnCTDRAMapEditor/Utility/TextureManager.cs b/CnCTDRAMapEditor/Utility/TextureManager.cs index a8a4772..de0d161 100644 --- a/CnCTDRAMapEditor/Utility/TextureManager.cs +++ b/CnCTDRAMapEditor/Utility/TextureManager.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using Newtonsoft.Json.Linq; using Pfim; @@ -274,7 +274,7 @@ namespace MobiusEditor.Utility bitmap.UnlockBits(bitmapData); bitmap.SetResolution(96, 96); return bitmap; - } + } } private (Bitmap, Rectangle) GetDummyImage() diff --git a/CnCTDRAMapEditor/Utility/Tileset.cs b/CnCTDRAMapEditor/Utility/Tileset.cs index 430e104..db9cf56 100644 --- a/CnCTDRAMapEditor/Utility/Tileset.cs +++ b/CnCTDRAMapEditor/Utility/Tileset.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System; diff --git a/CnCTDRAMapEditor/Utility/TilesetManager.cs b/CnCTDRAMapEditor/Utility/TilesetManager.cs index 7415e83..c5e3c20 100644 --- a/CnCTDRAMapEditor/Utility/TilesetManager.cs +++ b/CnCTDRAMapEditor/Utility/TilesetManager.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Interface; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/Utility/ToolTipFixer.cs b/CnCTDRAMapEditor/Utility/ToolTipFixer.cs index aa021d9..e17cd4d 100644 --- a/CnCTDRAMapEditor/Utility/ToolTipFixer.cs +++ b/CnCTDRAMapEditor/Utility/ToolTipFixer.cs @@ -12,7 +12,7 @@ namespace MobiusEditor.Utility private int showDuration; private List attachedControls; - public ToolTipFixer(Form form, ToolTip tooltip, int showDuration, Dictionary extraWidths) + public ToolTipFixer(Form form, ToolTip tooltip, int showDuration, Dictionary extraWidths) { this.tooltip = tooltip; this.showDuration = showDuration; diff --git a/CnCTDRAMapEditor/Utility/UndoRedoList.cs b/CnCTDRAMapEditor/Utility/UndoRedoList.cs index 4117a1a..e3e794b 100644 --- a/CnCTDRAMapEditor/Utility/UndoRedoList.cs +++ b/CnCTDRAMapEditor/Utility/UndoRedoList.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; using System.Collections.Generic; diff --git a/CnCTDRAMapEditor/Utility/WWCompression.cs b/CnCTDRAMapEditor/Utility/WWCompression.cs index 87ee85d..114458f 100644 --- a/CnCTDRAMapEditor/Utility/WWCompression.cs +++ b/CnCTDRAMapEditor/Utility/WWCompression.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using System; diff --git a/CnCTDRAMapEditor/Widgets/NavigationWidget.cs b/CnCTDRAMapEditor/Widgets/NavigationWidget.cs index 01a9f3b..1d3fc59 100644 --- a/CnCTDRAMapEditor/Widgets/NavigationWidget.cs +++ b/CnCTDRAMapEditor/Widgets/NavigationWidget.cs @@ -1,16 +1,16 @@ // // Copyright 2020 Electronic Arts Inc. // -// The Command & Conquer Map Editor and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, +// The Command & Conquer Map Editor and corresponding source code is free +// software: you can redistribute it and/or modify it under the terms of +// the GNU General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// The Command & Conquer Map Editor and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions +// The Command & Conquer Map Editor and corresponding source code is distributed +// in the hope that it will be useful, but with permitted additional restrictions +// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT +// distributed with this program. You should have received a copy of the +// GNU General Public License along with permitted additional restrictions // with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection using MobiusEditor.Controls; using MobiusEditor.Interface; @@ -112,7 +112,7 @@ namespace MobiusEditor.Widgets get { float mapScale = mapPanel.ClientSize.Width > mapPanel.ClientSize.Height - ? mapPanel.ClientSize.Width / (float)mapPanel.CameraBounds.Width + ? mapPanel.ClientSize.Width / (float)mapPanel.CameraBounds.Width : mapPanel.ClientSize.Height / (float)mapPanel.CameraBounds.Height; return new SizeF(mapScale * mapPanel.MapImage.Width / Metrics.Width, mapScale * mapPanel.MapImage.Height / Metrics.Height); } @@ -170,8 +170,10 @@ namespace MobiusEditor.Widgets { startScrollMouseLocation = (Size)mapPanel.PointToClient(Control.MousePosition); startScrollFromLocation = mapPanel.AutoScrollPosition; - if (mapPanel != null) + if (mapPanel != null) + { mapPanel.Cursor = Cursors.SizeAll; + } // Only return true if already dragging, not when initialising. return false; } @@ -199,7 +201,7 @@ namespace MobiusEditor.Widgets private void MapPanel_KeyUp(Object sender, KeyEventArgs e) { CheckIfDragging(); - } + } private void MapPanel_MouseMove(object sender, MouseEventArgs e) { diff --git a/License.txt b/License.txt index 53bf633..5e31a8c 100644 --- a/License.txt +++ b/License.txt @@ -1,5 +1,5 @@ -Electronic Arts Inc. released only TiberianDawn.dll, RedAlert.dll and -the Command & Conquer Map Editor and their corresponding source code +Electronic Arts Inc. released only TiberianDawn.dll, RedAlert.dll and +the Command & Conquer Map Editor and their corresponding source code under the GPL V3 below, with additional terms at the bottom. GNU GENERAL PUBLIC LICENSE