fix bogus target lines being drawn to 0,0

.gitignore

@@ -7,12 +7,8 @@ obj
 *.suo
 *.user
 *.sln.cache
-*.manifest
 mods/*/*.dll
 
-# ReSharper crap
-_ReSharper.*/
-
 # Red Alert binary files
 mods/*/packages/*.[mM][iI][xX]
 
@@ -25,8 +21,6 @@ mods/*/packages/*.[mM][iI][xX]
 # backup files by various editors
 *~
 *.orig
-\#*
-.*.sw?
 # dependency DLLs (different for every platform!)
 cg.dll
 cgGL.dll
@@ -37,6 +31,8 @@ cgGL.dll
 *.pidb
 *.userprefs
 
+packaging/windows/*.exe
+
 # osx crap
 .DS_Store
 
@@ -48,13 +44,6 @@ packaging/osx/launcher/OpenRA.xcodeproj/*.mode1v3
 temp.c
 temp.o
 temp.s
-OpenRA.Launcher.Mac/build/
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.pbxuser
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
-OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
+
 *.config
 *.resources
-
-# KDE crap
-*.kate-swp
-*.directory

AUTHORS

@@ -1,39 +1,9 @@
-AUTHORS
-
-The OpenRA developers are:
-	* Alli Witheford	(alzeih)
-	* Caleb Anderson	(RobotCaleb)
-	* Chris Forbes		(chrisf)
-	* Curtis Shmyr		(hamb)
-	* Daniel Hernandez	(Mancano)
-	* Matthew Bowra-Dean	(beedee)
-	* Mike Bundy		(kehaar)
-
-Also thanks to:
-	* Akseli Virtanen       (RAGEQUIT)
-	* Andrew Riedi
-	* Barnaby Smith		(mvi)
-	* Bellator
-	* Christer Ulfsparre	(Holloweye)
-	* Erasmus Schroder	(rasco)
-	* Igor Popov		(ihptru)
-	* James Dunne		(jsd)
-	* Jeff Harris		(jeff_1amstudios)
-	* Joakim Lindberg	(booom3)
-	* Kenny Hoxworth	(hoxworth)
-	* Lawrence Wang
-	* Mark Olson		(markolson)
-	* Matthew Gatland	(mgatland)
-	* Matthias Mailänder	(Mailaender)
-	* Max Ugrumov		(katzsmile)
-	* Max621
-	* Nukem
-	* Paolo Chiodi		(paolochiodi)
-	* Paul Dovydaitis	(pdovy)
-	* Raymond Martineau	(mart0258)
-	* Riderr3
-	* Tim Mylemans		(gecko)
-
-Past developers included:
-	* Paul Chote		(pchote)
-	* Robert Pepperell	(ytinasni)
+AUTHORS
+
+The OpenRA developers are:
+	* Chris Forbes
+	* Robert Pepperell
+	* Matthew Bowra-Dean
+	* Paul Chote
+	* Alli Witheford
+	* Joakim Lindberg

CHANGELOG

@@ -1,884 +0,0 @@
-NEW:
-	Engine:
-		General performance improvements
-		Fixed minimap export breaking subsequent actions in the editor
-		Added owner chooser for new actors in the editor
-		Added actor info panel in the editor (doubleclick)
-		Added a Setup Default Players menu item to map editor
-	Both Mods:
-		Server lobbies upon creation use the previously played map
-		Added support for a Game.ConnectTo argument which allows clients to direct connect to a server when game is launched
-		Helicopters now bob slightly in flight
-		Bots now repair their own buildings
-		Fixed a bug where bots would be unable to set rallypoints for production buildings
-		Bots now maintain a level of aggro on enemy units
-		Made SpawnMPUnits' initial unit configurable
-		Added a dropdown list in the map editor for setting an actor's owner upon placement
-		Replaced the server browser with a new and awesome one
-		Fixed a bug where infantry squish sounds weren't positioned
-		Fixed a bug where actor priority wasn't correct for doubleclick
-
-	Red Alert:
-		Fixed a crash which occurred when playing an online game with Hard AI
-		Fixed a bug where planes could stack more than 1-per-airfield
-		Fixed a bug where planes would not rearm at airfields
-		Improved logic for sending planes and helicopters back to base
-		Changed MIG to fire 2 missiles per burst instead of 4
-		Changed HELI (longbow) to fire missiles in bursts of 2
-		Added a Show Shellmap setting
-		Changed team color picker to match C&C's
-		Fixed a bug where infantry could not pass over anti-tank mines, and vice versa
-		Fixed a bug where the shellmap would reload unnecessarily when disconnecting from a lobby that hasn't started
-		Added AutoTarget capability to submarines, but they are set to HoldFire stance by default
-		New Map: Bombardment Islands (Sprog)
-		New Map: Engagement (Nukem)
-		New Map: Man to Man (Nukem)
-		New Map: Asymetric Battle (Seru)
-	C&C:
-		Changed the bot spawn picker to match RA's
-		Reduced delay of tooltips
-
-20111013:
-	Engine:
-		Fixed broken client IDs if players drop before the game starts
-		Converted FileExtractor into --extract cmdlet for Utility.
-		Added --transparent option to --png cmdlet in Utility.
-		Fixed shortcut description on Linux
-		Fixed launcher crashes on Mac
-		Removed obsolete SequenceEditor tool
-		Added --tmp-png cmdlet in Utility, to convert terrain to PNG.
-	Both Mods:
-		Allow building repair by allies
-		Use player color to show who is repairing a building
-		Only units/structures being built or queued are shaded in the production palette
-		Aircraft smoke is no longer visible under fog
-		Added a Show Grid option to the Map Editor
-		Added multitap support - double clicking a unit selects all units of the same type on screen
-		Changed map choosers to be a filterable grid of maps
-		Added internal machinery for IFV-style units
-	Red Alert:
-		Added naval transport
-		Added an indicator over powered down buildings
-		Aircraft crashing into water now use large_splash
-		Destroyer now requires Radar Dome
-		Increased cost of Shipyard and Sub Pen
-		Fixed a crash when sending aircraft back to base
-		Husks no longer interfere with selection
-		Added more options for bots in game lobby
-		Changed AI behavior -- now has Easy/Normal/Hard difficulty
-		Increased range of FTUR by 1
-		Reduced cost of MEDI from 500 to 300
-		Reduced cost of SHOK from 800 to 500
-		Heavy vehicles (Tanks, Harvesters, MCV) now crush infantry
-		New map: Classic DropZone (Holloweye)
-		New map: DropZone Battle of Tikiaki (Knivesron)
-		New map: DropZone W (Riderr3)
-		New map: Seven Stairs (Tirili)
-		New map: Contact (Nukem)
-		New map: Encounter (Nukem)
-		New map: Mass Confliction (Nukem)
-		New map: Calm before the Storm (Nukem)
-		New map: Baywatch (Nukem)
-		New map: Winter Warzone (Nukem)
-		New map: Paramount (Nukem)
-		New map: Doubles (Nukem)
-		New map: Hectic (Nukem)
-		New map: Pandemonium (Nukem)
-		New map: Chokepoint (Nukem)
-		New map: HotZone (Nukem)
-		New map: No Fly Zone (RAGEQUIT)
-		New map: Strip Mine (RAGEQUIT)
-		New map: Doughnut Hole (RAGEQUIT)
-		New map: Vegetation (hamb/Chris Forbes)
-		New map: Arctic Triangle Affair (Bellator)
-		New map: Mad Scramble (Bellator)
-		New map: Free Coasts (Ihptru)
-		New map: Battle Lake (Bellator)
-	C&C:
-		Slightly increased Tiberium growth rate
-		Increased harvester unload time
-		Reduced Tiberium value by 20%
-		Changed FTNK armor type to Light
-		Fixed tank squish animations to show properly
-		New map: Tiberium Oasis (Bellator)
-
-
-20110906:
-	Engine:
-		Fixed compile failures under Windows
-		Improved platform detection
-		Modding support for custom fonts
-		Video memory leaks fixed
-		Improved error messages for unsupported graphics cards
-		Improved support for Intel graphics cards
-		Fixed incorrect resolution under some Linux systems
-		Write graphics.log on all graphics-related errors
-		Significant general performance improvements
-		Fix crashes when joining a game with no free player slots
-		Bots players are named after their AI type and pick better random colors
-		Map support for enforcing team and spawn choice
-		Fix resource-clearing weapons breaking custom terrain types (bridges)
-		Added a "Pixel double" mode to draw the world at 2x zoom.
-		Fixed broken mounting of map packages
-		Fixed crashes when loading broken maps
-		Fixed units being left alive but stranded on destroyed bridges
-		Fixed husks being created on water
-		Fixed AttackMove trying to send orders to units owned by others
-		Made LaserZap more flexible for modders
-	Both C&C and Red Alert:
-		Fixed desync when a player surrenders
-		Fixed installing from CD
-		Added Hotkey support:
-			escape to toggle ingame menu
-			escape to go up a level in menus / cancel prompts
-			return to confirm prompts
-		Changed shortcut for adding units to groups changed from ctrl->cmd on OSX to avoid conflicting with Spaces
-		Fixed Tooltips for spectators
-		Fixed cashticks when selling walls
-		Fixed show explosions when walls are sold
-		Fixed veteran units not repairing correctly at service depots
-		Fixed Rally-point color when a building is captured
-		Fixed selection box dragging behind ui elements
-		Added Mod support for passengers that take multiple slots
-		Added Mod support for custom tesla zap effects
-		Fixed desync when a support aircraft is killed after completing its task
-		Fixed bugs with selling refineries
-		Fixed superweapons being fired from disabled structures when multiple are available
-		Added "Mission Accomplished" / "Mission Failed" notifications when you win or lose a multiplayer game
-		Fixed husks jumping to the middle of a cell when a unit dies
-		Fixed decloak sound never being used
-		Improved HackyAI power management
-	C&C:
-		Completely overhauled UI
-		Added support for installing from original game disks
-		Added support for installing music from original game disks
-		Added support for Covert Ops music tracks
-		Added Skirmish mode (creates a local game against bots)
-		Added Configurable bot race/team/spawns
-		Fixed Rocket Launcher turret raising/lowering when attacking
-		Added muzzle flashes to Guard Tower / SAM site
-		Fixed firing offsets on all units and structures
-		Fixed Ion Cannon cursor
-		Fixed Apache artwork
-		Fixed uncapturable oil derricks
-		Added capturable Biolab tech structure: allows you build viceroids
-		All vehicles leave husks on death
-		Server/Skirmish creation selects the last played map by default
-		New animations for cloak and reveal map crates (from C&C Sole Survivor)
-		Added 8 new maps by Petrenko
-		Tweaked most existing maps
-		Removed East vs West 2 map
-		Fixed Harvester/Refinery docking animation beneath the fog of war
-		Improved Obelisk laser effect
-		Added a blue pip for harvested blue tiberium
-		Changed the Refinery tower lights to indicate the amount of stored tiberium
-		Fixed an exploit with Nod airfields on the right side of the map
-		Fixed bot color being saved as player color in lobby
-		Balance changes:
-			Refinery footprint changed, price decreased to $1500
-			Flame tank explodes on death, damage reduced by 40%
-			Stealth Tank damage increased, speed decreased
-			Rocket Launcher now fires 6 rockets, loses AA
-			Orca / Apache weapons reworked. Both now have limited volleys, but reload in the air. Both can attack other air units
-			APC weapons reworked. Now has a turret, but can attack air units only
-			Artillery given back to Nod
-			SSM launcher removed from Nod
-			Concrete walls require vehicle production to build
-			MCV, Harvester, Engineer can no longer level up (via crates)
-			MCV can no longer receive Cloak crates
-			Advanced Guard Tower range increased
-			SAM Site range decreased
-			Bridge HP halved
-			Infantry tiberium avoidance factor increased by 5x
-			Decrease tiberium damage to infantry
-			Rebalanced tiberium value / harvester capacity / harvesting speed
-			Reduced Grenadier death damage
-			Mammoth tank regen rate halved, Missile reload rate decreased
-			Building repair speed, price doubled
-			Recon Bike damage increased 16%
-			Infantry can be crushed by tanks
-			Removed build area radius around tech structures
-	Red Alert:
-		Fixed firing offsets on Flame trooper / Tesla trooper / Telsa tank / Tesla coil / Flame turret
-		Fixed bounties using incorrect unit value
-		Fixed parachute offsets
-		Added muzzle flashes to Pillbox / Camo Pillbox / SAM Site
-		Fixed map reveal when an ally is granted GPS
-		Added 16 new maps by buddha, hamb, seru
-		Fixed bounties of $0 displaying
-		Removed 3 obsolete maps
-		Fixed Minelayers not entering the Service Depot properly
-		Fixed Hind, Yak weapons being blocked by walls
-		Fixed phantom radar bin on subsequent games
-		Added new Oil Derrick artwork
-		Added support for Counterstrike & Aftermath music tracks
-		Added player color to diplomacy panel
-		Added capturable oil refinery tech structure
-		Added new harvester artwork for half-empty/empty states
-		Added new MCV husk artwork
-		Fixed spy disguise not working
-		Fixed hellfire missiles splashing back against helicopters
-		Fixed animation speed for Grenadier idle animations
-		Removed Lock Teams option
-		Fixed cursor while dragging selection box
-		Fixed accidental order issuing while dragging selection box
-		Fixed lobby "kick" buttons
-		Balance changes:
-			Medic cost reduced to $500
-			Mines are visible to friendlies and spectators
-			Friendly units don't trigger mines
-			Increased reload rate for aircraft
-			Missile sub submerge delay doubled, damage decreased by 25%
-			Longbow now requires Allied Tech Center
-			Reduced wall health
-			Increased cruiser accuracy
-			Increased Longbow missile speed by 50%
-			Increased SAM Site rate of fire
-	Utility:
-		Fixed --png mode for converting shp -> png
-	Editor:
-		Fixed actor rendering on OSX / Linux
-		Fixed crash relating to incorrect mix file location
-
-20110511:
-	Engine:
-		Fix hotkeys firing on both key down and key up
-		Allow C4 delay to be configurable
-		Text field support for home and end keys
-		Fix world actor being owned by Creeps player (causing Neutral to be hostile) on new maps
-		Include gpu vendor string in graphics.log for unsupported cards
-		Fix crash with some aud files
-		Fix a rare crash when a repairing building is killed
-		Improvements to HackyAI
-		Generalize capture logic to work for any actor types
-		Support RA2-style missile trails
-		Fix helicopters failing to attack targets in some situations
-		Fix 'exploit detected' when using hotkeys on another players units
-		Relinquish spawn point in the game lobby when entering a spectator slot
-		Fix maps with >8 spawnpoints in the game lobby
-		Yaml loader crashes correctly when trying to inherit from a nonexistant actor
-		Yaml loader crashes correctly when trying to remove a nonexistant trait
-		Modding support for multiple player palettes
-		Fix several crashes when installing packages
-		Many other general engine improvements
-	C&C:
-		Fix Viceroid target-scan radius
-		Fix map-placed SAM-sites not being able to attack
-		Commando voice clip when built
-		Commando voice clip after kills
-	RA:
-		New unit: Supply truck for donating funds to another player
-		Pilots (sometimes) parachute from shot down planes
-		Bounties on killed units
-		Use RA2 style missile trails
-		New GPS logic
-		New map: Pressure by seru
-	Packaging:
-		Utility writes a log to support dir when crashing
-		Support for Ubuntu 11.04
-		Fix osx crash when run from a path with spaces
-
-20110320
-	Engine:
-		Display range circles when placing defenses
-		Support a hostile creeps player for viceroids / dinosaurs / ants / etc
-		General refactoring and performance fixes
-		Stop/Scatter/Deploy orders give audio feedback
-		"Allow cheats" option moved into the game lobby, visible to all players
-		"Build anywhere" developer mode option
-		Improved pathfinding when collecting crates or crushing walls.
-		Refactor idle / prone infantry animations
-		Improve missile trail effects
-		Actors without health are not considered as dead
-		Health bars show recent damage as it is inflicted
-		Production structures and special powers show selection bars showing progress
-		Mouseover units to display healthbars etc
-		Fix shroud glitch when units exit transports
-		Fix bots jamming up their production structures
-		Direct connect will assume port 1234 if none is given
-		Chrome image mapping definitions changed from xml to yaml
-		Water explosion animations are not used for airborne explosions over water
-		Fix rendering of very large maps
-		Report GPU memory usage to debug.log
-		Massive improvements in repeated allocation / deallocation of memory
-		Fixed a desync with repairing buildings
-		Fixed a desync with aircraft (it now crashes deterministically instead)
-		Fixed a desync with KOTH maps
-		Fixed a bug where a slot is shown as closed when it contains a bot
-		Fix crash when spawning map actors owned by a nonexisting player
-		Fix crash when changing mod while playing music
-		Fix crash with perf graph
-		Fix crash in replay viewer if replays directory doesn't exist
-		Fix crash when selling civilian buildings
-		Fix crashes caused by blank game title / direct connect server textfields
-		Oil derricks, harvester unloading, selling structures shows cash indicator
-		Prerequisites system refactoring to allow non-building prerequisites
-		Fix shift+tab not cycling the build tabs
-		Fix bogus keyboard input in text fields
-		Don't change mods if the same one is selected in the dropdown
-		Support for remapping the control group addition modifier (ctrl) to any modifier key
-		Fix helicopters flying 1 cell off the right or bottom of the map
-
-	C&C:
-		Viceroids! Infantry killed by tiberium or chem warriors may turn into viceroids
-		Fixed death animations
-		Blue tiberium damages infantry
-		Map-placed SAM sites start closed
-		Engineers capturing enemy buildings gives enemy tech
-		Buildings emit minigunners and engineers when sold (no more technicians / civilians)
-		Civilians panic when attacked
-		Fix a rare crash with harvester docking
-		Fix a rare crash with stealth tank
-		New Map: East vs West 3 by pchote
-		Removed Maps: Wargames, Yellowstone II
-		Oil Derricks have a small sight range
-		Apaches have a muzzleflash
-	
-	RA:
-		Service depots repair units faster
-		Fix crash when telling a minelayer to create an empty minefield
-		Fixed interior tileset boxes
-		New Map: Styrian Mountains by ReFlex
-		New Map: Convergence by Arcturus
-		Updated Map: Seaside by nudalz
-		Longbow ammo increased from 6 to 8, description fixed
-		Hind cost decreased from 1500 to 1000, hp increased from 100 to 150, range decreased from 12 to 10
-		Service depot cost increased to from 700 to 1000
-		Radar dome cost increased from 1000 to 1400
-		Artillery now requires war factor and radar dome, inaccuracy decreased from 80 to 40
-		APC moved from Allies to Soviets, hp increased from 200 to 300, price increased from 800 to 850
-		Medium / Heavy / Mammoth tanks now require service depot to build
-		Heavy tank cost reduced from 1200 to 1150
-		Flame turret rate of fire increased from 45 to 65, fires 2 bursts
-		AA guns, flak trucks can now fire over walls
-		Jeeps can carry a single passenger
-		Base defenses no longer provide ground control
-		Vehicle speed on clear ground increased, speed on ore reduced
-		Grenadiers have a 50% chance of exploding when killed
-		Spys are ignored by enemy units when disguised, tooltips show as disguised unit
-		Fix crates being paradropped inside trees, buildings
-		Production hotkey for flame turret changed to t, tesla coil to u
-		Disguised spys now appear correctly on radar and tooltips
-		Fix GPS behavior when alliances change.
-		Aircraft now fly to a target location and circle instead of returning to base
-		Aircraft no longer fly off the map if their Airfield is destroyed
-
-	Editor:
-		New map format (version 5). Maps < Version 4 are no longer supported by the editor or game.
-		Waypoints and MP start locations are now actors
-		Importing C&C/RA maps fixed
-		New png loader to support future tools
-		Editor uses the correct icon under mono
-		Editor only saves non-default values for PlayerReferences in map files
-		Default player colours has been returned to neutral grey.
-		Maps can be loaded from the commandline
-		Option to show actor names
-		Support for veteran / elite actors to be defined in the map yaml
-	
-	Packaging:
-		Rename .deb package to use debian naming conventions
-		Improve linux package installation / elevation prompts (uses zenity, require mono >= 2.6.7)
-		Fix package installation crash on windows xp
-		Windowed mode now launches in the center of the screen under Windows
-
-20110207
-	Engine:
-		Informative drop messages - user is notified of kick vs game has started vs server unavailable
-		Fixed render errors with the build palette on the first game tick
-		Improved sync check performance
-		Shp writing capabilities for mod tools
-		Fixed desync due to floating point calculations in unit facing
-		Fixed idle animations
-		Removed launchers on all platforms
-		Asset download/install is now performed ingame
-		Mod selector is now available from the main menu
-		Fixed `lock teams' checkbox
-		Lots of misc. engine refactoring
-		Fixed exploit allowing stance changes when teams are locked
-		Fix crash when capturing last enemy silo
-		Fix units continuing to attack a building after it has been captured
-		Fix floating point issues with missiles (manifests as broken torpedos in ra)
-		Fix location calculation for flying units (manifests as invincible helicopters in cnc)
-		Infantry stack 5-to-a-cell like the original games
-		Craters and scorches smoke for a limited time
-		Added a scatter key (bound to `x')
-		
-	C&C:
-		Fixed commando c4
-		Fixed Airfield production notification ("Reinforcements have arrived")
-		Fixed palette bugs with Oil Derricks and walls
-		Fixed tech tree bugs after capturing enemy productions structures
-		"Repairing" eva
-		Proper "pop up" SAM sites. Closed SAMs receive a 50% armor bonus.
-		SAM sites require power to operate
-		Advanced Guard Tower requires power to operate
-		Support structures no longer grant build radius
-		Lower Barracks/Hand health
-		Increase Weapons Factory health
-		Increase rocket bike damage
-		New Map: Crossing the Rubicon (Arcturus)
-	
-	RA:
-		Game assets can be installed from one of the Red Alert cds
-		"Repairing" eva
-		GPS is now shared between allies
-		Submarines are no longer visible to everyone
-		Fixed paradrop flare, spyplane from capturing KOTH points
-		New Map: Nuclear Winter (nudalz)
-		New Map: Seaside (nudalz)
-	Editor:
-		Ability to switch mods after launch
-		Refactor hardcoded tools into a generic interface
-
-
-20110109
-	Launchers:
-	    New GTK based launcher for linux.
-	    Mod version, version check, and MOTD moved from the main menu into the launchers.
-	    Fixes for non-standard mono installations under OSX.
-	    Fixes for filepaths with spaces under OSX.
-
-	Map Editor / Maps:
-	    Fixed crash when using floodfill.
-	    New map format (version 4). Open and resave maps with the editor to upgrade them.
-	    Added support for compressed (.oramap or .zip) maps.
-	    Removed .uid files from maps -- compute the hash on demand now.
-
-	General:
-	    Mod versions are checked when joining a server. Clients with a different game version / wrong mods will not be able to join.
-	    Added 'Stop' command on 'S'.
-	    Stop units from autotargeting walls.
-	    Added different pip colour for gems vs ore.
-	    Fixed several exploits in support powers.
-	    Continue to show selected units when firing special powers.
-	    Fixed palette effects (nuke, chronoshift) being applied to fog / shroud.
-	    Added a replay viewer.
-	    Fixed building previews being rendered below bridges.
-	    Forced the AI to leave gaps between its buildings.
-	    Fixed captured buildings still drawing power from the original owner.
-	    Fixed various crashes in the editor when trying to make a new map.
-	    Support multiple bot types; added another bot difficulty.
-	    Removed option to not save syncreports.
-	    Fixed desync related to aircraft.
-	    Fixed sync not being checked on World traits.
-	    Pick a random available door on production structures with more than one (barracks, subpens, etc).
-	    Fixed some rare Harvester-related crashes.
-	    Added labels to the perf graph.
-	    Locked teams by default.
-	    Fixed "No games found" not being displayed when there was an in-progress (hidden) game detected.
-	    Added support for multiple shellmaps. Chooses randomly.
-	    Fixed dropdowns possibly getting stuck open when the host force-starts the game.
-	    Improved scrollpanels - added scrollbars and mousewheel support.
-	    Fixed potential desyncs in building refund calculation and unit repair.
-	    Added black outline to text drawn over the world, so it can be seen in all cases.
-	    Many performance improvements.
-
-	C&C:
-	    Fixed footprint of ATWR.
-	    Improved harvester docking.
-	    Made Oil Derricks capturable.
-	    Fixed nuke detonation sound.
-
-	RA:
-	    Fixed Tanya not having the correct pip color.
-	    Fixed helicopters spawning in the wrong place.
-	    Fixed Spy-related crashes when disguising as civilians.
-	    Allow using C4 on friendly buildings.
-	    Improved harvester docking.
-	    Added proper shareable/revokable GPS.
-	    Nerf 1tnk hard.
-	    Increase cost of 2tnk slightly, but increase its HP too.
-	    Require power to operate SAM sites.
-	    Fixed missing tooltips for SHOK and TTNK.
-	    Fixed chronoshift power requiring two clicks to cancel.
-	    Fixed desync related to chronoshift.
-	    Fixed bogus bottom-left spawnpoint on Central Conflict.
-	    Production tabs with an item ready now light up yellow.
-	    Fixed crash when a WEAP is half-destroyed before it finishes deploying.
-
-
-20101202
-	General:
-	    New launcher for Windows and OS X (Linux coming in a later release) for downloading and installing mods, and launching the game.
-	    Disable Surrender button when you win or lose.
-	    Fix Minimap orders outside viewport.
-	    Render building previews when placing a structure.
-	    Buttons offset their contents when pressed.
-	    Dropdown listboxes in the game lobby and diplomacy panel.
-	    Allow moving the cursor and editing anywhere in textfields.
-	    Don't render things outside the map.
-	    Render selection boxes / health bars, target lines above everything else
-	    Show "cannot move here" cursor when mousing over invalid terrain under the fog, or outside the map.
-	    Remove move flashes (they are obsoleted by target lines).
-	    Buildings are always visible under fog.
-	    Captured refineries no longer give cash to the original owner.
-	    New rally point artwork.
-	    Fix broken airstrike / parabomb special powers.
-	    Fix diplomacy cycling shroud exploit.
-	    Change the .rpm package to target Fedora.
-	    Fixed idle animations
-
-	RA:
-	    Added "A Path Beyond" map
-	    Fix crash when selling iron curtained buildings.
-	    Don't stack multiple Invuln render effect on an actor.
-	    Fix exploit in Iron Curtain, Chronosphere, Nuke.
-	    Fix paradrop flare remaining forever if drop plane is killed.
-	    Area of effect Iron Curtain.
-	    Area of effect Chronoshift.
-	    Remove sandbag in water of "Equal Opportunity" map.
-	    Allow chronoshifted and paradropped units to collect crates.
-	    Fixed medic crash.
-	    Removed end of game crash.
-	    Fix dog attack.
-	    Missile silo requires power but can be powered down.
-	    Fix shellmap low power and invalid gap generator position.
-	    Removed Naval Transport until it's cargo capabilities are fixed
-
-	CNC:
-	    Fix exploit in Ion Cannon, Nuke.
-	    Add some basic scripting to the shellmap.
-	    Fix invulnerable stealth tanks.
-	    Oil derricks spurt fire when killed.
-	    New load screen (unfinished).
-	    Fix observers.
-	    Helicopters automatically target enemy units
-
-	Engine:
-	    Refactored Orders to use less network bandwidth and remove duplication.
-	    Dump available extensions to graphics.log when GL Renderer fails to init.
-	    Fix Makefile constantly rebuilding, and refactor for readability.
-	    Display soft shroud around edge of map instead of hard border.
-	    Standardise engine naming of Theatre -> Tileset.
-	    Refactor map size queries to all use Map.Bounds.
-	    Move all widget delegate into the RA mod dll.
-	    Renamed ListBoxWidget -> ScrollPanelWidget.
-	    Fix ScrollPanelWidget scrolling beyond the start by 1 velocity tick.
-	    Removed duplication from target lines.
-	    Extensive refactoring of shroud.
-	    Refactor Scale trait to a property on Render*.
-	    Refactor idle behavior
-
-
-20101121-2
-	Bug fixes:
-	    Fixed Tesla causing an out of memory exception
-	    Fixed Tesla animations.
-	    All players can now see AI players in lobby.
-	    Weapon factory sell animation now plays correctly.
-	    Utility app now extracts downloaded content packages properly.
-	    Fixed helicopters landing in silly places.
-
-	New Features:
-	    New default renderer using GLSL instead of CG. Removes the dependency on the CG toolkit and fixes issues with Radeon graphics cards using latest drivers.
-	    Order queuing with <shift>
-	    Unlimited power option in dev mode.
-	    New King of the Hill game mode with two maps: Crossroads and Island Hoppers
-	    Smoke trails for damaged aircraft.
-
-
-20101107
-    Fix Engineer/Tanya/etc refusing to enter buildings in 2010-11-06.
-
-
-20101106
-	Bug Fixes:
-	    Fix crash when hosting a second game.
-	    Fixed exploit where you could place a building anywhere.
-	    Fix aircraft, infantry becoming invincible in some circumstances.
-	    Fix a common aircraft desync.
-	    Unmuted the shellmap; it's now at 25% volume.
-
-	Balance Changes:
-	    reduce cooldown on Chronosphere to 2 minutes (was 4 minutes)
-	    reduce cooldown on Iron Curtain to 2 minutes (was 6 minutes)
-	    reduce invulnerable time on Iron Curtain the 30 seconds (was 45 seconds)
-	    reduce anti-ground damage of rocket soldier to 50 (was 60) and anti-air damage to 40 (was 50)
-
-
-
-20101025
-    Fix crash in C&C when harvesters return to the refinery (sorry guys)
-    Fix crash in both mods when transports unload
-    Fix ore/tiberium growth not working correctly
-    Fix graphical glitches on screenshake, etc
-    Add contrails to RA planes
-    Added plane crashes in RA
-    Added explosions on impact for all RA aircraft
-    Added more scripting to the RA shellmap
-    Fix Tesla not doing the correct amount of damage
-    Lots of internal cleanup
-
-
-
-20101023
-	New C&C Maps:
-	    Into the River Below (6p)
-	    Algernon (4p)
-	    Wargames (4p)
-	    Yellowstone II (4p)
-
-	Bug Fixes:
-	    Client disconnects no longer "double-quit".
-	    Units can no longer move over certain water tiles.
-	    Checks for destroyed actors to ensure they don't try to perform actions after death.
-	    Loose files in mod folders take priority over ones in .mix packages.
-	    Fixes for syncing in replays.
-	    Fix Iron Curtain.
-	    Fixes for units entering a building from the east or south
-	    MOTD no longer spits out garbage when behind a proxy needing web authentication.
-
-	RA Balance Tweaks:
-	    Airfield cost reduced from 1100 to 300
-	    Yak cost increased from 800 to 1000
-	    Mig cost increased from 1200 to 2000
-	    Helipad cost reduced from 1500 to 300
-	    Longbow cost increased from 1200 to 2000
-	    Hind cost increased from 1200 to 1500
-	    Anti-air gun range increased from 6 to 10, spread increased from 3 to 5
-	    Flack truck range increased from 6 to 8, spread increased from 3 to 5
-
-
-20101017
-    Fix crash when repair indicator was visible, but the building got destroyed or sold
-    Fix crash if an actor got destroyed twice (blown up & sold, etc)
-    Fix putting units back in BADR and C17.
-    Fix C&C crates being invisible
-    Fix bogus overlapping of MINE with ore trucks
-    Add MCV, napalm, nuke crates to C&C.
-    Fix "(dead)" tags in chat
-    Mute shellmap combat
-    Fix FMV player
-    Fix bug in voice system which made it impossible to add extra sides (thanks raminator)
-    Fixed bogus Missile Silo cameo from RA
-    Fixed engineer goldwrench cursors being reversed
-    Add support for actors that give the owner a small flow of cash (to be used with Oil Derricks)
-    Make teamchat toggle more flexible
-    Fix cloakable units being untargetable while uncloaked (thanks pdovy)
-    Fix crash when clicking `repair` with no MCV
-    Fix unit crates spawning in inappropriate places
-    Updated 'The Sentinel' map
-    Add base cycling (backspace) in C&C (it previously worked only in RA)
-    Fix planes getting stuck on the edge of the map
-    Fix explosions in air being drawn at ground level
-    Allow map slots to disallow bots
-    Allow map slots to enforce race/color selection
-    Replace C&C LST art (thanks, KatzSmile)
-    Push HackyAI setup into system.yaml, fix HackyAI for C&C
-    Reduce effectiveness of RA GUN vs unarmored
-    Improved mod content download infrastructure for Linux
-    Nerf C&C Orca slightly
-    Nerf speed of C&C bggy/jeep/bike/apc
-    Add new C&C 1v1 map: 'Chokepoint' (thanks Tiberian)
-    Reduce bandwidth usage in multiplayer (1/2)
-    Fix version string showing up twice in bottom-right corner after a game
-    Buff arty damage slightly
-    Nerf V2 reload slightly
-    Add trails to C&C SAM missiles
-    Increase speed of most C&C AA missiles
-    Reduce power requirement for RA AFLD from 50 to 20
-
-
-20101013
-    Fix crash when ordering a helicopter to move while it was falling out of the sky
-    Add blue tiberium
-    Fix aircraft not showing up on radar
-    Fix canceling of production not quite working (would cancel 2 if one was half-built)
-    Fix base-cycling for mac
-    Fix leaks between shellmap world and ingame world
-    Fix crash when the network connection is lost
-    Run the shellmap behind the lobby
-    Fix host not being able to teamchat
-    Declaring war automatically breaks the alliance in both directions
-    Aircraft can attack from their airfields correctly now
-    Attack move added ('A' and then left-click)
-    Add Tiberian's 'The Sentinel' 1v1 C&C map
-    Show the server name in the lobby dialog title
-    Random actually means random
-    Fix crash when destroying a Refinery with docked harvester
-    Add pchote's 'Tundra' 1v1 C&C SNOW! map
-    Lots of internal engine improvements
-
-
-20101009
-    Fix 64bit Linux compatibility
-    Nerf C&C Attack Bike
-    Show mod info in server browser
-    Show MOTD in the main menu
-    Fixed exploit with selling walls
-    Fixed auto-attack not working properly
-    Add an example mod, which adds a single unit to RA.
-    Fix dogs eating walls
-    Fix crash on destroying ore storage buildings
-    Fix Obelisk missing moving target
-    Ban cloak crates for infantry
-    Add nuke "bad" crate
-    Prevent aircraft from firing while landed
-    Reduce nuke charge time from 13min to 9min
-    Reduce parabombs charge time to 1min
-    Add support for minimum ranges on weapons
-    Add support for excluding specific actor types from picking up certain crates
-    FIx silent nukes in RA if they didn't hit a building
-    Fix all AI players getting the same color
-    Fix AI players getting the same team setting as the host
-    Fix AI attacking each other
-    Prevent most awful-looking colors
-    Remove most of the debug spam for aircraft
-    Increase construction yard health (50% in RA, 25% in CNC)
-    AI players now build defenses
-    AI players no longer attack with medics (e1/e2/e3/1tnk/2tnk/3tnk)
-    Much improved order targeting system
-    Add crash animations for helicopters
-    Nerf Hind chainguns
-    Reduce cost of Cruisers from 3.2k to 2.4k
-    Fix CNC airdrop planes getting stuck if the Airfield goes away
-    Fix phantom voices for dead units in control groups
-    Fix dogs sometimes not killing infantry
-    Fix scroll jumping if opposite scroll inputs were applied
-    Fix bogus targeting lines being drawn to 0,0 sometimes
-    Fix VS2010 compatibility
-    Fix the game getting screwed up when people leave
-
-
-20101002
-    Fix various crashes
-    Fix CNC AI never building anything (it's still crap, but at least it does *something*)
-    Added shader fallbacks for Cg-2.1
-    Fix editor crashing on File->Open on Windows
-    Added scroll speed control (thanks, Gecko)
-
-
-20100922 through 20100922-4
-    Allow queueing of buildings when a building is ready to place
-    Change the pathfinder to use integers instead of floating point (fixes desync)
-    Create ui widgets on demand instead of at gamestart
-    Begin refactoring activity queuing for cleaner code
-    Reenable crates
-    Remove desync debug logging
-    Fix editor crash
-    Fix crash when a building being repaired is killed
-
-
-
-20100921 through 20100921-6
-    Add yet more logging to search for the packaged build desync
-
-
-20100920 through 20100920-7
-    Fix crash when building cnc weapons factory
-    Fix crash when harvester and refinery are killed by the same bullet (eg nuke)
-    Move several traits from engine into ra mod
-    Fix several editor bugs
-    Add a lot more logging to search for the packaged build desync
-
-
-20100919-2
-    Fix crash when un/deploying a damaged mcv
-
-
-20100919
-    Cache the power state of buildings for large performance gains
-    Changes to sync logging for large performance gains
-    Changes to shroud and ore rendering for large performace gains
-    Changes to renderer to fix several z-order bugs
-    Fix osx version string
-    Rename Repeat -> Loop in the music player
-    Fix team selection in the game lobby
-    Don't change production tab when selecting enemy structures
-
-
-20100918-2 through 20100918-4
-    Fix crashes in the map editor
-    Include menu and desktop shortcuts to the RPM package
-    Add debugging to track down a desync between packaged versions on .net vs packaged versions on mono
-
-
-20100918
-    Fixed lots of crashes
-    AI only tries to attack players that exist (and not itself)
-    Fixed speed of idle animations
-    Fixed exploit with A10 (infinite napalm)
-    Fixed exploits with remote building capturing/destroying
-    Added ability to change tilesize per-mod
-    Fixed delivering ore to an ally's proc
-    Fixed dog attacking ground forever (banned)
-    Fixed most z-order bugs
-    Fixed lots of editor usability problems
-    Fixed bogus XML generated by TSB
-    Added notification when cheats are used
-    Fixed exploit with reverse enter-transport order (didn't check if the passenger was compatible)
-    Fixed a bunch of techtree bugs
-    Fixed walkability of north rivermouth template in RA.
-    Added ability to export minimap as PNG from the editor
-
-
-20100914
-    Infantry idle sequences for ra mod
-    Enable music player by default (requires scores.mix to be installed manually)
-    Flak truck for soviets in ra mod
-    Give dog a selection voice
-    Only scroll when the game window is focused
-    Fixed cursor/order bugs (includes force-fire c4 on allied structures, harvesting ore under shroud, move orders for aircraft, etc)
-    Fixed a collection of crashes related to dead actors
-    Fixed broken rpm package
-    Create Debian packages
-
-
-20100910-2
-    Fixed attacking helipads
-    Deployed more mirrors
-    Added idle animations in C&C
-    Fixed an issue with the sidebar palette in C&C Desert
-    Integrated Jk's C&C Snow theater
-    Go back to classic C&C refinery model
-    Improve building explosions
-    Add nuke flash to C&C
-    Fix crash when losing FACT with a building ready to place
-    Remove unused MIX files
-    Add support for custom armor types
-    Adjust bounding boxes on vehicles
-    Windows installer prompts to install .NET if you don't have it
-    Windows installer remembers previous location for upgrades
-    Fix various crashes when refineries going away
-    Fix serious performace issue -- Actor leak when failing to spawn units
-    Add support for mobile production units
-    Remove splash damage from Tiberium
-    Fix a crash with actors dying with a projectile in-flight
-    Correctly clean up cargo when a transport dies
-    Fix client crash when the server disconnects
-    Right-clicking on a valid passenger with a transport loads cargo
-    Added zoom to editor
-    Convert sequences to yaml
-    Clean up the mod folders
-    Add a shellmap for C&C
-    Make pathfinder work with a MobileInfo rather than a live actor
-    Add a loadscreen for C&C
-    Correctly back up MIX files when upgrading windows installs
-
-
-20100907
-    Changed MiG prerequisites to AFLD+STEK
-    Removed KENN, build DOG directly from BARR now
-    Chronotank can only teleport when fully charged
-    Improved OpenGL error logging
-    Fixed targeting of FIX
-    Fixed crash when an engineer is trying to repair a building, but it dies/gets sold/etc.
-    Added muzzle flashes to Yak and Hind chainguns
-    Fixed bounding boxes on some units
-    Fixed accuracy of Tesla weapons
-    Changed ownership of GUN and GTWR in CNC to both
-    Fixed crash on destroying things that have a building reserved
-    If ordered to move to an unpathable cell, move somewhere nearby that is pathable instead
-    Fixed RPM linux package
-
-
-20100906-2
-    Shows game version in main menu screen for windows and linux
-
-
-20100906
-    Improvements to Render performance
-    Improved debugging for performance issues
-    "Give Exploration" developer-mode option
-    Check for .net framework on windows install
-    Allow the viewport to scroll past the map edge to prevent ui from blocking buildings

FileExtractor/FileExtractor.cs

@@ -0,0 +1,52 @@
+using System;
+using System.IO;
+using OpenRA.FileFormats;
+
+namespace FileExtractor
+{
+	public class FileExtractor
+	{
+		int Length = 256;
+		
+		public FileExtractor (string[] args)
+		{
+			if (args.Length != 2)
+			{
+				Console.WriteLine("usage: FileExtractor mod[,mod]* filename");
+				return;
+			}
+
+			var mods = args[0].Split(',');
+			var manifest = new Manifest(mods);
+			FileSystem.LoadFromManifest( manifest );
+			
+			try
+			{
+				var readStream = FileSystem.Open(args[1]);
+				var writeStream = new FileStream(args[1], FileMode.OpenOrCreate, FileAccess.Write);
+				
+				WriteOutFile(readStream, writeStream);
+				
+			} 
+			catch (FileNotFoundException) 
+			{
+				Console.WriteLine(String.Format("No Such File {0}", args[1]));
+			}
+		}
+		
+		void WriteOutFile (Stream readStream, Stream writeStream)
+		{
+   			Byte[] buffer = new Byte[Length];
+   			int bytesRead = readStream.Read(buffer,0,Length);
+
+ 			while( bytesRead > 0 ) 
+    		{
+        		writeStream.Write(buffer,0,bytesRead);
+        		bytesRead = readStream.Read(buffer,0,Length);
+    		}
+    		readStream.Close();
+    		writeStream.Close();
+		}
+	}
+}
+

FileExtractor/FileExtractor.csproj

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{210645C7-E99E-46B6-863E-E211AE6C7D70}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>FileExtractor</RootNamespace>
+    <AssemblyName>FileExtractor</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
+      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
+      <Name>OpenRA.FileFormats</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs" />
+    <Compile Include="FileExtractor.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>

FileExtractor/Main.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace FileExtractor
+{
+	public class MainClass
+	{
+		public static void Main (string[] args)
+		{
+			new FileExtractor(args);
+		}
+	}
+}
+

HACKING

@@ -3,7 +3,7 @@ HACKING
 There are n main sections to OpenRA: UI, Rendering, unit behaviour, ...
 
 All  units/structures/most things in the map are Actors. Actors contain a  collection of traits.
-Traits consist of an info class and a  class that does stuff. There is one instance of the infoclass shared across all actors of the same type. Each actor gets its own instance of the trait class itself. Infoclasses are responsible for instantiating their corresponding trait class -- see ITraitInfo, and TraitInfo<T> for the trivial implementation of this. In some cases the trait class's constructor needs some args, in which case TraitInfo<T> can't be used. This is a limitation of C# generics.
+Traits consist of an info class and a  class that does stuff
 
 Actor assembly is done via the mod's yaml files. A section  exists for each actor type, 
 and within that section we list the traits  the actor should have. 
@@ -15,10 +15,13 @@ which are automatically loaded into the corresponding fields on the trait's ITra
     as possible - all cross-trait references should be in terms of an interface from 
     TraitInterfaces.cs.
     
-- Things an actor can be *doing* are represented as Activity subclasses.
-    Actor has a queue of these. The standard set of activities are in OpenRA.Mods.RA/Activities. Ground vehicle movement is more complex, and has bits in OpenRA.Mods.RA/Move. Aircraft use different bits again, in OpenRA.Mods.RA/Air. There are some bits elsewhere for custom infantry behaviors, etc. In some cases, a trait or activity will maintain an internal subqueue of activities. This works exactly the same way as the actor's main activity queue -- its state is evolved by Util.RunActivity().
+- Things an actor can be *doing* are represented as IActivity implementations. 
+    Actor has a queue of these. There's a standard set of activities in 
+    OpenRa.Game/Traits/Activities, and mods tend to define more as they need them. (RA 
+    defines various special-infantry actions as activities).
 
-- Units offer orders they can perform (given context) through traits that implement IIssueOrder. There are two parts to this -- an Orders collection, which exposes IOrderTargeter objects, which describe orders that the actor *could* generate, and the rules for choosing which to perform when the "default action" button is pressed (RMB). The second part is IssueOrder() itself, which resolves an IOrderTargeter into an actual order object to be sent.
+- Units offer orders they can perform (given context) through traits that implement IIssueOrder. 
+  Every trait with this interface is given a chance to generate orders for the current context.
 
 - For more complex things that require modal UI (like special abilities, 
   RA-style sell/repair buttons, etc) we have IOrderGenerator implementations. This can 
@@ -49,27 +52,36 @@ containing art assets (typically .mix files), yaml files defining actor defintio
 and ini files containing legacy information that have yet to be ported over to 
 the (relatively new) yaml system.
 
-The unit artwork itself must be defined in one or more sequences files. These are specified in the manifest. RA puts everything in mods/ra/sequences.yaml.
-check mod.yaml for a list of what the mod uses); the format is self explanatory. 
+The unit artwork itself must be defined in a Sequences file (typically Sequences.xml; 
+check mod.yaml for a list of what the mod uses); the format is self explanatory. There is 
+also the SequenceEditor tool to make this easy.
 
 Chrome artwork is similarly defined in Chrome.xml. Chrome is already mod dependent. Sortof ;) 
 mod-dependent *behavior* would be nice too, not just skinning. This is a property of the traits
 however; once we port UI into traits this will become a non-issue.
 
+Rendering
+OpenRa.Game/Chrome.cs is the user interface. 
+Three renderers (SpriteRenderer, LineRenderer, Rgba?Renderer) render most stuff. Don't forget 
+to flush the renderer (if you want to see anything).
+
 UserSettings stores the data loaded from settings.ini (or defaults). Eventually we need to be 
 able to save values changed in game into settings.ini (not yet implemented)
 
-Bugs: There is a list of known bugs and features at http://bugs.open-ra.org/ .
+Bugs: There is a list of known bugs and features at http://red-bull.ijw.co.nz:3690/OpenRA .
 
 We also have a website at http://www.open-ra.org/ . 
 
 Our IRC channel is #openra on irc.freenode.net .
 
-As far as using git, get your own repository on github. Push your changes into your git repository, and it will/might :P be merged into http://github.com/OpenRA/OpenRA . 
+As far as using git, get your own repository on github. You probably want to set up the gitbot
+to spam irc when you make commits (its nice to know). Push your changes into your git 
+repository, and it will/might :P be merged into chrisforbes/OpenRA . 
 See http://help.github.com/ for working with GitHub and see http://progit.org/ for working 
 with Git.
 
 
+
 Other things we probably want to put in here:
     - A guide on how to add a generic unit via yaml using existing traits
         - and then introduce some element that requires a simple trait change.

INSTALL

@@ -1,66 +1,99 @@
-Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
-This file is part of OpenRA, which is free software. It is made 
-available to you under the terms of the GNU General Public License
-as published by the Free Software Foundation. For more information,
-see COPYING.
-
-To run OpenRA, several files are needed from the original game disks.
-These files are now downloaded and installed by the game,
-so so no explicit action is required.
-
-Dependencies - Make sure you have these installed, or you'll 
-have very strange errors.
-
-WINDOWS:
-
-* .NET Framework >= 3.5-SP1
-	(http://www.microsoft.com/downloads/details.aspx?FamilyID=AB99342F-5D1A-413D-8319-81DA479AB0D7&displaylang=en)
-* Tao Framework >= 2.1.0
-	This is now bundled with OpenRA, copy the files in thirdparty/Tao to the game root directory.
-* OpenAL >= 1.1
-	(http://connect.creativelabs.com/openal/Downloads/oalinst.zip)
-* Cg Toolkit >= 2.2
-	(http://developer.download.nvidia.com/cg/Cg_2.2/Cg-2.2_October2009_Setup.exe)
-
-To compile OpenRA, open the OpenRA.sln solution in the main folder,
-or build it from the command-line with MSBuild.
-
-Run the game with `OpenRA.Game.exe Game.Mods=ra` for Red Alert
-or `OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer
-
-
-UBUNTU (substitute comparable packages for other linux distros):
-* mono-runtime (>= 2.6.7),
-* mono-gmcs
-* freetype
-* libmono-corlib1.0-cil
-* libmono-winforms2.0-cil
-* libopenal1
-* libsdl1.2-dev
-* nvidia-cg-toolkit (for Cg renderer)
-
-OpenRA does not work with some older versions of Compiz. On affected systems, disable desktop effects before playing. This is fixed in Ubuntu Natty and later.
-
-The following dlls can also be installed into your system GAC. This is not
-recommended because we ship a custom Tao.FreeType that can conflict with
-other applications that use Tao:
-
-	gacutil -i Tao.Cg.dll
-	gacutil -i Tao.OpenGl.dll
-	gacutil -i Tao.OpenAl.dll
-	gacutil -i Tao.Sdl.dll
-	gacutil -i Tao.FreeType.dll
-	gacutil -i ICSharpCode.SharpZipLib.dll
-
-To compile OpenRA, run `make' from the command line.
-To install run 'make install'.
-Run the game with `mono OpenRA.Game.exe Game.Mods=ra` for Red Alert
-or `mono OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer
-
-SLACKWARE:
-
-The following packages from slackbuilds.org are required, on 13.37 32bit:
-* libgdiplus
-* mono
-* openAL
-* nvidia-cg-toolkit (for Cg renderer)
+Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+This file is part of OpenRA, which is free software. It is made 
+available to you under the terms of the GNU General Public License
+as published by the Free Software Foundation. For more information,
+see LICENSE.
+
+To run OpenRA, several files are needed from the original game disks.
+
+The required files for the Red Alert mod are:
+EITHER:
+	* conquer.mix
+	* temperat.mix
+	* interior.mix
+	* snow.mix
+	* sounds.mix
+	* allies.mix
+	* russian.mix
+OR:
+	* main.mix
+AND:
+	* redalert.mix
+
+These need to be copied into the mods/ra/packages/ directory.
+
+
+The required files for the Command and Conquer mod are:
+	* cclocal.mix
+	* speech.mix
+	* conquer.mix
+	* sounds.mix
+	* tempicnh.mix
+	* temperat.mix
+	* winter.mix
+	* desert.mix
+
+These need to be copied into the mods/cnc/packages/ directory.
+If you have a case-sensitive filesystem you must change the filenames to
+lower case.
+
+
+Red Alert and C&C have been released by EA Games as freeware. They can be
+downloaded from http://www.commandandconquer.com/classic
+Unfortunately the installer is 16-bit and so won’t run on 64-bit operating
+systems. This can be worked around by using the Red Alert Setup Manager 
+	(http://ra.afraid.org/html/downloads/utilities-3.html). 
+Make sure you apply the no-CD protection fix so all the files needed 
+are installed to the hard drive.
+
+Dependencies - Make sure you have these installed, or you'll 
+have very strange errors.
+
+
+WINDOWS:
+
+* .NET Framework >= 3.5-SP1
+	(http://www.microsoft.com/downloads/details.aspx?FamilyID=AB99342F-5D1A-413D-8319-81DA479AB0D7&displaylang=en)
+* Tao Framework >= 2.1.0
+	(http://sourceforge.net/projects/taoframework/)
+	(required libs: Tao.OpenGL, Tao.Cg, Tao.Platform.Windows)
+* OpenAL >= 1.1
+	(http://connect.creativelabs.com/openal/Downloads/oalinst.zip)
+* Cg Toolkit >= 2.2
+	(http://developer.download.nvidia.com/cg/Cg_2.2/Cg-2.2_October2009_Setup.exe)
+
+To compile OpenRA, open the OpenRA.sln solution in the main folder, 
+or build it from the command-line with MSBuild.
+
+Run the game with `OpenRA.Game.exe Game.Mods=ra` for Red Alert
+or `OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer
+
+
+UBUNTU (substitute comparable packages for other linux distros):
+
+* mono-gmcs
+* freetype
+* libmono-corlib1.0-cil
+* libmono-winforms2.0-cil
+* libopenal1
+* libsdl1.2-dev
+* nvidia-cg-toolkit (download the latest version from
+  http://developer.nvidia.com/object/cg_download.html)
+
+OpenRA is incompatible with Compiz, please disable desktop effects when trying
+to run OpenRA or the game will crash.
+
+You will need to copy the Tao dependencies (.dll and .config) from the
+thirdparty/Tao directory into the game root, or install them permanently into
+your GAC with the following script
+
+#!/bin/sh
+gacutil -i thirdparty/Tao/Tao.Cg.dll
+gacutil -i thirdparty/Tao/Tao.OpenGl.dll
+gacutil -i thirdparty/Tao/Tao.OpenAl.dll
+gacutil -i thirdparty/Tao/Tao.Sdl.dll
+gacutil -i thirdparty/Tao/Tao.FreeType.dll
+
+To compile OpenRA, run `make' from the command line.
+Run the game with `mono OpenRA.Game.exe Game.Mods=ra` for Red Alert
+or `mono OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer

Makefile

@@ -1,220 +1,105 @@
-CSC         = gmcs
-CSFLAGS     = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
-DEFINE      = DEBUG;TRACE
-COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll thirdparty/ICSharpCode.SharpZipLib.dll
-PHONY		= core tools package all mods clean distclean
+CSC     = gmcs
+CSFLAGS  = -nologo -warn:4 -debug:+ -debug:full -optimize- -codepage:utf8 -unsafe
+DEFINE  = DEBUG;TRACE
+PROGRAMS	=fileformats gl game ra cnc seqed editor ralint filex tsbuild
+prefix = /usr/local
+datarootdir = $(prefix)/share
+datadir = $(datarootdir)
+bindir = $(prefix)/bin
+BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
+INSTALL_DIR = $(DESTDIR)$(datadir)/openra
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL)
 
-.SUFFIXES:
-core: game renderers mods utility tsbuild
-tools: editor ralint tsbuild
-package: core editor
-mods: mod_ra mod_cnc mod_d2k
-all: core tools
-clean: 
-	@-rm -f *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
-distclean: clean
+COMMON_LIBS	= System.dll System.Core.dll System.Drawing.dll System.Xml.dll
 
-#
-# Core binaries
-#
-fileformats_SRCS	:= $(shell find OpenRA.FileFormats/ -iname '*.cs')
-fileformats_TARGET	= OpenRA.FileFormats.dll
-fileformats_KIND	= library
-fileformats_LIBS	= $(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll System.Windows.Forms.dll
-PROGRAMS 			= fileformats
-fileformats: $(fileformats_TARGET)
+fileformats_SRCS	=	$(shell find OpenRA.FileFormats/ -iname '*.cs')
+fileformats_TARGET	=	OpenRA.FileFormats.dll
+fileformats_KIND	=	library
+fileformats_LIBS	=	$(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll thirdparty/WindowsBase.dll
 
-game_SRCS			:= $(shell find OpenRA.Game/ -iname '*.cs')
+gl_SRCS				= $(shell find OpenRA.Gl/ -iname '*.cs')
+gl_TARGET			= OpenRA.Gl.dll
+gl_KIND				= library
+gl_DEPS				= $(fileformats_TARGET) $(game_TARGET)
+gl_LIBS				= $(COMMON_LIBS) System.Windows.Forms.dll \
+						thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
+						$(gl_DEPS) $(game_TARGET)
+
+game_SRCS			=	$(shell find OpenRA.Game/ -iname '*.cs')
 game_TARGET			= OpenRA.Game.exe
 game_KIND			= winexe
 game_DEPS			= $(fileformats_TARGET) 
 game_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \
 						thirdparty/Tao/Tao.OpenAl.dll thirdparty/Tao/Tao.FreeType.dll
 game_FLAGS			= -win32icon:OpenRA.Game/OpenRA.ico
-PROGRAMS 			+= game
-game: $(game_TARGET)
 
-#
-# Renderer dlls
-#
-rsdl_SRCS			:= $(shell find OpenRA.Renderer.SdlCommon/ -iname '*.cs')
-rsdl_TARGET			= OpenRA.Renderer.SdlCommon.dll
-rsdl_KIND			= library
-rsdl_DEPS			= $(fileformats_TARGET) $(game_TARGET)
-rsdl_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
-					thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
-					$(rsdl_DEPS)
+ra_SRCS				=	$(shell find OpenRA.Mods.RA/ -iname '*.cs')
+ra_TARGET			=	mods/ra/OpenRA.Mods.RA.dll
+ra_KIND				=	library
+ra_DEPS				= $(fileformats_TARGET) $(game_TARGET)
+ra_LIBS				= $(COMMON_LIBS) $(ra_DEPS)
 
-rcg_SRCS			:= $(shell find OpenRA.Renderer.Cg/ -iname '*.cs')
-rcg_TARGET			= OpenRA.Renderer.Cg.dll
-rcg_KIND			= library
-rcg_DEPS			= $(fileformats_TARGET) $(game_TARGET) $(rsdl_TARGET)
-rcg_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
-					thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
-					$(rcg_DEPS)
+cnc_SRCS			=	$(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
+cnc_TARGET			=	mods/cnc/OpenRA.Mods.Cnc.dll
+cnc_KIND			=	library
+cnc_DEPS			= $(fileformats_TARGET) $(game_TARGET) $(ra_TARGET)
+cnc_LIBS			= $(COMMON_LIBS) $(cnc_DEPS)
 
-rgl_SRCS			:= $(shell find OpenRA.Renderer.Gl/ -iname '*.cs')
-rgl_TARGET			= OpenRA.Renderer.Gl.dll
-rgl_KIND			= library
-rgl_DEPS			= $(fileformats_TARGET) $(game_TARGET) $(rsdl_TARGET)
-rgl_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
-					thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
-					$(rgl_DEPS)
+seqed_SRCS			= $(shell find SequenceEditor/ -iname '*.cs')
+seqed_TARGET		= SequenceEditor.exe
+seqed_KIND			= winexe
+seqed_DEPS			= $(fileformats_TARGET)
+seqed_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll $(seqed_DEPS)
+seqed_EXTRA			= -resource:SequenceEditor.Form1.resources
 
-rnull_SRCS			:= $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
-rnull_TARGET			= OpenRA.Renderer.Null.dll
-rnull_KIND			= library
-rnull_DEPS			= $(fileformats_TARGET) $(game_TARGET)
-rnull_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll \
-					$(rnull_DEPS)
-PROGRAMS 			+= rcg rgl rnull rsdl
-renderers: $(rcg_TARGET) $(rgl_TARGET) $(rnull_TARGET) $(rsdl_TARGET)
-
-#
-# Official Mods
-#
-# Red Alert
-
-STD_MOD_LIBS	= $(fileformats_TARGET) $(game_TARGET)
-STD_MOD_DEPS	= $(STD_MOD_LIBS) $(ralint_TARGET)
-
-mod_ra_SRCS			:= $(shell find OpenRA.Mods.RA/ -iname '*.cs')
-mod_ra_TARGET			= mods/ra/OpenRA.Mods.RA.dll
-mod_ra_KIND			= library
-mod_ra_DEPS			= $(STD_MOD_DEPS)
-mod_ra_LIBS			= $(COMMON_LIBS) $(STD_MOD_LIBS)
-mod_ra_EXTRA_CMDS		= mono --debug RALint.exe ra
-PROGRAMS 			+= mod_ra
-mod_ra: $(mod_ra_TARGET)
-
-# Command and Conquer
-mod_cnc_SRCS		:= $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
-mod_cnc_TARGET		= mods/cnc/OpenRA.Mods.Cnc.dll
-mod_cnc_KIND		= library
-mod_cnc_DEPS		= $(STD_MOD_DEPS) $(mod_ra_TARGET)
-mod_cnc_LIBS		= $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET)
-mod_cnc_EXTRA_CMDS	= mono --debug RALint.exe cnc
-PROGRAMS 		+= mod_cnc
-mod_cnc: $(mod_cnc_TARGET)
-
-# Dune 2000
-mod_d2k_SRCS		:= $(shell find OpenRA.Mods.D2k/ -iname '*.cs')
-mod_d2k_TARGET		= mods/d2k/OpenRA.Mods.D2k.dll
-mod_d2k_KIND		= library
-mod_d2k_DEPS		= $(STD_MOD_DEPS) $(mod_ra_TARGET) $(utility_TARGET)
-mod_d2k_LIBS		= $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET) $(utility_TARGET)
-mod_d2k_EXTRA_CMDS	= mono --debug RALint.exe d2k
-PROGRAMS 		+= mod_d2k
-mod_d2k: $(mod_d2k_TARGET)
-
-#
-# Tools
-#
-# Map Editor
-editor_SRCS			:= $(shell find OpenRA.Editor/ -iname '*.cs')
-editor_TARGET			= OpenRA.Editor.exe
+editor_SRCS			= $(shell find OpenRA.Editor/ -iname '*.cs')
+editor_TARGET		= OpenRA.Editor.exe
 editor_KIND			= winexe
 editor_DEPS			= $(fileformats_TARGET) $(game_TARGET)
 editor_LIBS			= $(COMMON_LIBS) System.Windows.Forms.dll System.Data.dll $(editor_DEPS)
 editor_EXTRA		= -resource:OpenRA.Editor.Form1.resources -resource:OpenRA.Editor.MapSelect.resources
-editor_FLAGS		= -win32icon:OpenRA.Editor/OpenRA.Editor.Icon.ico
 
-PROGRAMS 			+= editor
-OpenRA.Editor.MapSelect.resources:
-	resgen2 OpenRA.Editor/MapSelect.resx OpenRA.Editor.MapSelect.resources 1> /dev/null
-OpenRA.Editor.Form1.resources:
-	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
-editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
+ralint_SRCS		= $(shell find RALint/ -iname '*.cs')
+ralint_TARGET	= RALint.exe
+ralint_KIND		= winexe
+ralint_DEPS		= $(fileformats_TARGET) $(game_TARGET)
+ralint_LIBS		= $(COMMON_LIBS) $(ralint_DEPS)
 
-# Analyses mod yaml for easy to detect errors
-ralint_SRCS			:= $(shell find RALint/ -iname '*.cs')
-ralint_TARGET			= RALint.exe
-ralint_KIND			= exe
-ralint_DEPS			= $(fileformats_TARGET) $(game_TARGET)
-ralint_LIBS			= $(COMMON_LIBS) $(ralint_DEPS)
-PROGRAMS 			+= ralint
-ralint: $(ralint_TARGET)
+filex_SRCS		= $(shell find FileExtractor/ -iname '*.cs')
+filex_TARGET	= FileExtractor.exe
+filex_KIND		= winexe
+filex_DEPS		= $(fileformats_TARGET)
+filex_LIBS		= $(COMMON_LIBS) $(filex_DEPS)
 
-# Builds and exports tilesets from a bitmap
-tsbuild_SRCS		:= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
-tsbuild_TARGET		= OpenRA.TilesetBuilder.exe
+tsbuild_SRCS		= $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')
+tsbuild_TARGET		= TilesetBuilder.exe
 tsbuild_KIND		= winexe
 tsbuild_DEPS		= $(fileformats_TARGET) $(game_TARGET)
 tsbuild_LIBS		= $(COMMON_LIBS) $(tsbuild_DEPS) System.Windows.Forms.dll
-tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.frmBuilder.resources -resource:OpenRA.TilesetBuilder.frmNew.resources -resource:OpenRA.TilesetBuilder.Surface.resources
-PROGRAMS 			+= tsbuild
-OpenRA.TilesetBuilder.frmBuilder.resources:
-	resgen2 OpenRA.TilesetBuilder/frmBuilder.resx OpenRA.TilesetBuilder.frmBuilder.resources 1> /dev/null
-OpenRA.TilesetBuilder.frmNew.resources:
-	resgen2 OpenRA.TilesetBuilder/frmNew.resx OpenRA.TilesetBuilder.frmNew.resources 1> /dev/null
-OpenRA.TilesetBuilder.Surface.resources:
-	resgen2 OpenRA.TilesetBuilder/Surface.resx OpenRA.TilesetBuilder.Surface.resources 1> /dev/null
-tsbuild: OpenRA.TilesetBuilder.frmBuilder.resources OpenRA.TilesetBuilder.frmNew.resources OpenRA.TilesetBuilder.Surface.resources $(tsbuild_TARGET)
+tsbuild_EXTRA		= -resource:OpenRA.TilesetBuilder.Form1.resources
 
-#
-# Launchers / Utilities
-#
-# Patches binary headers to work around a mono bug
-fixheader.exe: packaging/fixheader.cs
-	@echo CSC fixheader.exe
-	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
+# -platform:x86
 
-# Backend for the launcher apps - queries game/mod info and applies actions to an install
-utility_SRCS		:= $(shell find OpenRA.Utility/ -iname '*.cs')
-utility_TARGET		= OpenRA.Utility.exe
-utility_KIND		= exe
-utility_DEPS        = $(fileformats_TARGET) $(game_TARGET)
-utility_LIBS        = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.SharpZipLib.dll System.Windows.Forms.dll
-PROGRAMS 			+= utility
-utility: $(utility_TARGET)
+.SUFFIXES:
+.PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed filex
 
-.PHONY: $(PHONY) $(PROGRAMS)
+game: $(fileformats_TARGET) $(gl_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET)
 
-#
-# Generate build rules for each target defined above in PROGRAMS
-#
-define BUILD_ASSEMBLY
+clean: 
+	@-rm *.exe *.dll *.mdb mods/**/*.dll mods/**/*.mdb *.resources
 
-$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader.exe
-	@echo CSC $$(@)
-	@$(CSC) $$($(1)_LIBS:%=-r:%) \
-		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
-		-define:"$(DEFINE)" \
-		-t:"$$($(1)_KIND)" \
-		$$($(1)_EXTRA) \
-		$$($(1)_SRCS)
-	@mono fixheader.exe $$(@) > /dev/null
-	@test `echo $$(@) | sed 's/^.*\.//'` = "dll" && chmod a-x $$(@) || ``
-	@$$($(1)_EXTRA_CMDS)
-endef
+distclean: clean
 
-$(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
-
-
-#
-# Install / Uninstall for *nix
-#
-prefix ?= /usr/local
-datarootdir ?= $(prefix)/share
-datadir ?= $(datarootdir)
-bindir ?= $(prefix)/bin
-BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
-INSTALL_DIR = $(DESTDIR)$(datadir)/openra
-INSTALL = install
-INSTALL_PROGRAM = $(INSTALL)
-CORE = fileformats rcg rgl rsdl rnull game editor utility tsbuild
+CORE = fileformats gl game editor
 
 install: all
 	@-echo "Installing OpenRA to $(INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)
 	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) $(INSTALL_DIR)
+		
 	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/cnc
-	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) $(INSTALL_DIR)/mods/cnc
-	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
-	@$(INSTALL_PROGRAM) $(mod_ra_TARGET) $(INSTALL_DIR)/mods/ra
-	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/d2k
-	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) $(INSTALL_DIR)/mods/d2k
-
+	@$(INSTALL_PROGRAM) $(cnc_TARGET) $(INSTALL_DIR)/mods/cnc
 	@-cp $(foreach f,$(shell ls mods/cnc --hide=*.dll),mods/cnc/$(f)) $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/maps $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/chrome $(INSTALL_DIR)/mods/cnc
@@ -223,7 +108,9 @@ install: all
 	@cp -r mods/cnc/sequences $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/tilesets $(INSTALL_DIR)/mods/cnc
 	@cp -r mods/cnc/uibits $(INSTALL_DIR)/mods/cnc
-
+	
+	@$(INSTALL_PROGRAM) -d $(INSTALL_DIR)/mods/ra
+	@$(INSTALL_PROGRAM) $(ra_TARGET) $(INSTALL_DIR)/mods/ra
 	@-cp $(foreach f,$(shell ls mods/ra --hide=*.dll),mods/ra/$(f)) $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/maps $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/bits $(INSTALL_DIR)/mods/ra
@@ -232,33 +119,68 @@ install: all
 	@cp -r mods/ra/tilesets $(INSTALL_DIR)/mods/ra
 	@cp -r mods/ra/uibits $(INSTALL_DIR)/mods/ra
 	
-	@-cp $(foreach f,$(shell ls mods/d2k --hide=*.dll),mods/d2k/$(f)) $(INSTALL_DIR)/mods/d2k
-	@cp -r mods/d2k/maps $(INSTALL_DIR)/mods/d2k
-	@cp -r mods/d2k/bits $(INSTALL_DIR)/mods/d2k
-	@cp -r mods/d2k/chrome $(INSTALL_DIR)/mods/d2k
-	@cp -r mods/d2k/rules $(INSTALL_DIR)/mods/d2k
-	@cp -r mods/d2k/tilesets $(INSTALL_DIR)/mods/d2k
-	@cp -r mods/d2k/uibits $(INSTALL_DIR)/mods/d2k
-
-	@cp -r glsl $(INSTALL_DIR)
-	@cp -r cg $(INSTALL_DIR)
+	@cp -r shaders $(INSTALL_DIR)
 	@cp *.ttf $(INSTALL_DIR)
-	@cp thirdparty/Tao/* $(INSTALL_DIR)
-	@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR)
-
+	@cp --parents -r thirdparty/Tao $(INSTALL_DIR)
+	@$(INSTALL_PROGRAM) thirdparty/WindowsBase.dll $(INSTALL_DIR)
+	@-$(INSTALL_PROGRAM) VERSION $(INSTALL_DIR)
+	
 	@echo "#!/bin/sh" > openra
 	@echo "cd "$(datadir)"/openra" >> openra
-	@echo "exec mono "$(datadir)"/openra/OpenRA.Game.exe \"$$""@\"" >> openra
-
-	@echo "#!/bin/sh" > openra-editor
-	@echo "cd "$(datadir)"/openra" >> openra-editor
-	@echo "exec mono "$(datadir)"/openra/OpenRA.Editor.exe \"$$""@\"" >> openra-editor
-
+	@echo "mono "$(datadir)"/openra/OpenRA.Game.exe SupportDir=~/.openra \"$$""@\"" >> openra
 	@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
 	@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)
-	@$(INSTALL_PROGRAM) -m +rx openra-editor $(BIN_INSTALL_DIR)
+		
+	@echo "OpenRA is now installed. You will now want to download"
+	@echo "http://open-ra.org/get-dependency.php?ra-packages and"
+	@echo "http://open-ra.org/get-dependency.php?cnc-packages"
+	@echo "and extract their contents to"
+	@echo "$(INSTALL_DIR)/mods/ra/packages and "
+	@echo "$(INSTALL_DIR)/mods/cnc/packages respectively."
+	@echo "It is also advised to install the contents of $(INSTALL_DIR)/thirdparty to the Mono Global Assembly Cache \
+	with gacutil."
 
 uninstall:
 	@-rm -r $(INSTALL_DIR)
 	@-rm $(DESTDIR)$(bindir)/openra
-	@-rm $(DESTDIR)$(bindir)/openra-editor
+
+mod_ra: $(ra_TARGET) $(ralint_TARGET)
+	mono RALint.exe ra
+mod_cnc: $(cnc_TARGET) $(ralint_TARGET)
+	mono RALint.exe cnc
+mods: mod_ra mod_cnc
+
+OpenRA.Editor.MapSelect.resources:
+	resgen2 OpenRA.Editor/MapSelect.resx OpenRA.Editor.MapSelect.resources 1> /dev/null
+
+OpenRA.Editor.Form1.resources:
+	resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
+editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
+ralint: $(ralint_TARGET)
+seqed: SequenceEditor.Form1.resources $(seqed_TARGET)
+SequenceEditor.Form1.resources:
+	resgen2 SequenceEditor/Form1.resx SequenceEditor.Form1.resources 1> /dev/null
+filex: $(filex_TARGET)
+tsbuild: OpenRA.TilesetBuilder.Form1.resources $(tsbuild_TARGET)
+OpenRA.TilesetBuilder.Form1.resources:
+	resgen2 OpenRA.TilesetBuilder/Form1.resx OpenRA.TilesetBuilder.Form1.resources 1> /dev/null
+tools: editor ralint seqed filex tsbuild
+all: game tools
+
+fixheader: packaging/fixheader.cs
+	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
+
+define BUILD_ASSEMBLY
+
+$$($(1)_TARGET): $$($(1)_SRCS) Makefile $$($(1)_DEPS) fixheader
+	@echo CSC $$(@)
+	@$(CSC) $$($(1)_LIBS:%=-r:%) \
+		-out:$$(@) $(CSFLAGS) $$($(1)_FLAGS) \
+		-define:"$(DEFINE)" \
+		-t:"$$($(1)_KIND)" \
+		$$($(1)_EXTRA) \
+		$$($(1)_SRCS)
+	@mono fixheader.exe $$(@)
+endef
+
+$(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))

OpenRA.Editor/ActorPropertiesDialog.cs

@@ -1,49 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using OpenRA.FileFormats;
-
-namespace OpenRA.Editor
-{
-	public partial class ActorPropertiesDialog : Form
-	{
-		public ActorPropertiesDialog()
-		{
-			InitializeComponent();
-		}
-
-		public void AddRow(string name, Control c)
-		{
-			flowLayoutPanel1.Controls.Add(new Label
-			{
-				Text = name,
-				Width = flowLayoutPanel1.Width * 3 / 10,
-				Height = 25,
-				TextAlign = ContentAlignment.MiddleLeft,
-			});
-
-			c.Width = flowLayoutPanel1.Width * 6 / 10 - 25;
-			c.Height = 25;
-			flowLayoutPanel1.Controls.Add(c);
-		}
-
-		public Control MakeEditorControl(Type t, Func<object> getter, Action<object> setter)
-		{
-			var r = new TextBox();
-			r.Text = FieldSaver.FormatValue(getter(), t);
-			r.LostFocus += (e,_) => setter(FieldLoader.GetValue("<editor internals>", t, r.Text));
-			r.Enabled = false;
-			return r;
-		}
-	}
-}

OpenRA.Editor/ActorTemplate.cs

@@ -1,36 +1,40 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Drawing;
-using OpenRA.GameRules;
-using OpenRA.Traits;
-
-namespace OpenRA.Editor
-{
-	class ActorTemplate
-	{
-		public Bitmap Bitmap;
-		public ActorInfo Info;
-		public EditorAppearanceInfo Appearance;
-	}
-
-	class BrushTemplate
-	{
-		public Bitmap Bitmap;
-		public ushort N;
-	}
-
-	class ResourceTemplate
-	{
-		public Bitmap Bitmap;
-		public ResourceTypeInfo Info;
-		public int Value;
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Drawing;
+using OpenRA.GameRules;
+using OpenRA.Traits;
+
+namespace OpenRA.Editor
+{
+	class ActorTemplate
+	{
+		public Bitmap Bitmap;
+		public ActorInfo Info;
+		public bool Centered;
+	}
+
+	class BrushTemplate
+	{
+		public Bitmap Bitmap;
+		public ushort N;
+	}
+
+	class ResourceTemplate
+	{
+		public Bitmap Bitmap;
+		public ResourceTypeInfo Info;
+		public int Value;
+	}
+
+	class WaypointTemplate
+	{
+	}
+}

OpenRA.Editor/ActorTool.cs

@@ -1,53 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Linq;
-using OpenRA.FileFormats;
-
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	class ActorTool : ITool
-	{
-		ActorTemplate Actor;
-		public ActorTool(ActorTemplate actor) { this.Actor = actor; }
-
-		public void Preview(Surface surface, SGraphics g)
-		{
-			surface.DrawActor(g, surface.GetBrushLocation(), Actor,
-				surface.GetPaletteForPlayer(surface.NewActorOwner));
-		}
-
-		public void Apply(Surface surface)
-		{
-			if (surface.Map.Actors.Value.Any(a => a.Value.Location() == surface.GetBrushLocation()))
-				return;
-
-			var owner = surface.NewActorOwner;
-			var id = NextActorName(surface);
-			surface.Map.Actors.Value[id] = new ActorReference(Actor.Info.Name.ToLowerInvariant())
-			{
-				new LocationInit( surface.GetBrushLocation() ),
-				new OwnerInit( owner)
-			};
-		}
-
-		string NextActorName(Surface surface)
-		{
-			var id = 0;
-			for (; ; )
-			{
-				var possible = "Actor{0}".F(id++);
-				if (!surface.Map.Actors.Value.ContainsKey(possible)) return possible;
-			}
-		}
-	}
-}

OpenRA.Editor/BrushTool.cs

@@ -1,123 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using OpenRA.FileFormats;
-
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	class BrushTool : ITool
-	{
-		BrushTemplate Brush;
-
-		public BrushTool(BrushTemplate brush) { this.Brush = brush; }
-
-		public void Apply(Surface surface)
-		{
-			// change the bits in the map
-			var template = surface.TileSet.Templates[Brush.N];
-			var tile = template.Data;
-			var pos = surface.GetBrushLocation();
-
-			if (surface.GetModifiers() == Keys.Shift)
-			{
-				FloodFillWithBrush(surface, pos);
-				return;
-			}
-
-			for (var u = 0; u < template.Size.X; u++)
-				for (var v = 0; v < template.Size.Y; v++)
-				{
-					if (surface.Map.IsInMap(new CVec(u, v) + pos))
-					{
-						var z = u + v * template.Size.X;
-						if (tile.TileBitmapBytes[z] != null)
-							surface.Map.MapTiles.Value[u + pos.X, v + pos.Y] =
-								new TileReference<ushort, byte>
-								{
-									type = Brush.N,
-									index = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4) * 4) : (byte)z,
-								};
-
-						var ch = new int2((pos.X + u) / Surface.ChunkSize, (pos.Y + v) / Surface.ChunkSize);
-						if (surface.Chunks.ContainsKey(ch))
-						{
-							surface.Chunks[ch].Dispose();
-							surface.Chunks.Remove(ch);
-						}
-					}
-				}
-		}
-
-		public void Preview(Surface surface, SGraphics g)
-		{
-			g.DrawImage(Brush.Bitmap,
-					surface.TileSet.TileSize * surface.GetBrushLocation().X * surface.Zoom + surface.GetOffset().X,
-					surface.TileSet.TileSize * surface.GetBrushLocation().Y * surface.Zoom + surface.GetOffset().Y,
-					Brush.Bitmap.Width * surface.Zoom,
-					Brush.Bitmap.Height * surface.Zoom);
-		}
-
-		void FloodFillWithBrush(Surface s, CPos pos)
-		{
-			var queue = new Queue<CPos>();
-			var replace = s.Map.MapTiles.Value[pos.X, pos.Y];
-			var touched = new bool[s.Map.MapSize.X, s.Map.MapSize.Y];
-
-			Action<int, int> maybeEnqueue = (x, y) =>
-			{
-				if (s.Map.IsInMap(x, y) && !touched[x, y])
-				{
-					queue.Enqueue(new CPos(x, y));
-					touched[x, y] = true;
-				}
-			};
-
-			queue.Enqueue(pos);
-			while (queue.Count > 0)
-			{
-				var p = queue.Dequeue();
-				if (!s.Map.MapTiles.Value[p.X, p.Y].Equals(replace))
-					continue;
-
-				var a = FindEdge(s, p, new CVec(-1, 0), replace);
-				var b = FindEdge(s, p, new CVec(1, 0), replace);
-
-				for (var x = a.X; x <= b.X; x++)
-				{
-					s.Map.MapTiles.Value[x, p.Y] = new TileReference<ushort, byte> { type = Brush.N, index = (byte)0 };
-					if (s.Map.MapTiles.Value[x, p.Y - 1].Equals(replace))
-						maybeEnqueue(x, p.Y - 1);
-					if (s.Map.MapTiles.Value[x, p.Y + 1].Equals(replace))
-						maybeEnqueue(x, p.Y + 1);
-				}
-			}
-
-			/* todo: optimize */
-			foreach (var ch in s.Chunks.Values) ch.Dispose();
-			s.Chunks.Clear();
-		}
-
-		CPos FindEdge(Surface s, CPos p, CVec d, TileReference<ushort, byte> replace)
-		{
-			for (; ; )
-			{
-				var q = p + d;
-				if (!s.Map.IsInMap(q)) return p;
-				if (!s.Map.MapTiles.Value[q.X, q.Y].Equals(replace)) return p;
-				p = q;
-			}
-		}
-	}
-}

OpenRA.Editor/ErrorListDialog.Designer.cs

@@ -1,100 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class ErrorListDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.label1 = new System.Windows.Forms.Label();
-			this.listBox1 = new System.Windows.Forms.ListBox();
-			this.button1 = new System.Windows.Forms.Button();
-			this.SuspendLayout();
-			//
-			// label1
-			//
-			this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.label1.Location = new System.Drawing.Point(10, 9);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(610, 23);
-			this.label1.TabIndex = 0;
-			this.label1.Text = "Your map import completed, but with errors:";
-			//
-			// listBox1
-			//
-			this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-						| System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.listBox1.FormattingEnabled = true;
-			this.listBox1.Location = new System.Drawing.Point(13, 30);
-			this.listBox1.Name = "listBox1";
-			this.listBox1.Size = new System.Drawing.Size(607, 316);
-			this.listBox1.TabIndex = 1;
-			//
-			// button1
-			//
-			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(545, 359);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 2;
-			this.button1.Text = "Close";
-			this.button1.UseVisualStyleBackColor = true;
-			//
-			// ErrorListDialog
-			//
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(632, 394);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.listBox1);
-			this.Controls.Add(this.label1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "ErrorListDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Map Import Errors";
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.ListBox listBox1;
-		private System.Windows.Forms.Button button1;
-	}
-}

OpenRA.Editor/ErrorListDialog.cs

@@ -1,25 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	public partial class ErrorListDialog : Form
-	{
-		public ErrorListDialog( IEnumerable<string> errors )
-		{
-			InitializeComponent();
-			foreach (var e in errors)
-				listBox1.Items.Add(e);
-		}
-	}
-}

OpenRA.Editor/Form1.cs

@@ -1,555 +1,425 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using OpenRA.Traits;
-
-namespace OpenRA.Editor
-{
-	public partial class Form1 : Form
-	{
-		public Form1(string[] args)
-		{
-			InitializeComponent();
-			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
-
-			currentMod = args.FirstOrDefault() ?? "ra";
-
-			toolStripComboBox1.Items.AddRange(Mod.AllMods.Keys.ToArray());
-
-			toolStripComboBox1.SelectedIndexChanged += (_, e) =>
-			{
-				tilePalette.SuspendLayout();
-				actorPalette.SuspendLayout();
-				resourcePalette.SuspendLayout();
-				tilePalette.Controls.Clear();
-				actorPalette.Controls.Clear();
-				resourcePalette.Controls.Clear();
-				tilePalette.ResumeLayout();
-				actorPalette.ResumeLayout();
-				resourcePalette.ResumeLayout();
-				surface1.Bind(null, null, null);
-				pmMiniMap.Image = null;
-				currentMod = toolStripComboBox1.SelectedItem as string;
-
-				Text = "OpenRA Editor (mod:{0})".F(currentMod);
-				Game.modData = new ModData(currentMod);
-				FileSystem.LoadFromManifest(Game.modData.Manifest);
-				Rules.LoadRules(Game.modData.Manifest, new Map());
-				loadedMapName = null;
-			};
-
-			toolStripComboBox1.SelectedItem = currentMod;
-
-			surface1.AfterChange += OnMapChanged;
-			surface1.MousePositionChanged += s => toolStripStatusLabelMousePosition.Text = s;
-			surface1.ActorDoubleClicked += ActorDoubleClicked;
-
-			if (args.Length >= 2)
-				LoadMap(args[1]);
-		}
-
-		void OnMapChanged()
-		{
-			MakeDirty();
-			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
-		}
-
-		void ActorDoubleClicked(KeyValuePair<string,ActorReference> kv)
-		{
-			using( var apd = new ActorPropertiesDialog() )
-			{
-				var name = kv.Key;
-				apd.AddRow("(Name)", apd.MakeEditorControl(typeof(string), () => name, v => name = (string)v));
-				apd.AddRow("(Type)", apd.MakeEditorControl(typeof(string), () => kv.Value.Type, v => kv.Value.Type = (string)v));
-
-				var objSaved = kv.Value.Save();
-
-				// TODO: make this work properly
-				foreach( var init in Rules.Info[kv.Value.Type].GetInitKeys() )
-					apd.AddRow(init.First,
-						apd.MakeEditorControl(init.Second,
-							() => objSaved.NodesDict.ContainsKey( init.First ) ? objSaved.NodesDict[init.First].Value : null,
-							_ => {}));
-
-				apd.ShowDialog();
-
-				// TODO: writeback
-			}
-		}
-
-		void MakeDirty() { dirty = true; }
-
-		string loadedMapName;
-		string currentMod = "ra";
-		TileSet tileset;
-		bool dirty = false;
-
-		void LoadMap(string mapname)
-		{
-			tilePalette.Controls.Clear();
-			actorPalette.Controls.Clear();
-			resourcePalette.Controls.Clear();
-
-			loadedMapName = mapname;
-
-			// load the map
-			var map = new Map(mapname);
-
-			// upgrade maps that have no player definitions. editor doesnt care,
-			// but this breaks the game pretty badly.
-			if (map.Players.Count == 0)
-				map.MakeDefaultPlayers();
-
-			PrepareMapResources(Game.modData.Manifest, map);
-
-			dirty = false;
-		}
-
-		void NewMap(Map map)
-		{
-			tilePalette.Controls.Clear();
-			actorPalette.Controls.Clear();
-			resourcePalette.Controls.Clear();
-
-			loadedMapName = null;
-			PrepareMapResources(Game.modData.Manifest, map);
-
-			MakeDirty();
-		}
-
-		// this code is insanely stupid, and mostly my fault -- chrisf
-		void PrepareMapResources(Manifest manifest, Map map)
-		{
-			Rules.LoadRules(manifest, map);
-			tileset = Rules.TileSets[map.Tileset];
-			tileset.LoadTiles();
-			int[] ShadowIndex = { 3, 4 };
-			var palette = new Palette(FileSystem.Open(tileset.Palette), ShadowIndex);
-
-			surface1.Bind(map, tileset, palette);
-			// construct the palette of tiles
-			var palettes = new[] { tilePalette, actorPalette, resourcePalette };
-			foreach (var p in palettes) { p.Visible = false; p.SuspendLayout(); }
-
-			foreach (var tc in tileset.Templates.GroupBy(t => t.Value.Category))
-			{
-				var category = tc.Key ?? "(Uncategorized)";
-				var categoryHeader = new Label
-				{
-					BackColor = SystemColors.Highlight,
-					ForeColor = SystemColors.HighlightText,
-					Text = category,
-					AutoSize = false,
-					Height = 24,
-					TextAlign = ContentAlignment.MiddleLeft,
-					Width = tilePalette.ClientSize.Width,
-				};
-				// hook this manually, anchoring inside FlowLayoutPanel is flaky.
-				tilePalette.Resize += (_,e) => categoryHeader.Width = tilePalette.ClientSize.Width;
-
-				if (tilePalette.Controls.Count > 0)
-					tilePalette.SetFlowBreak(
-						tilePalette.Controls[tilePalette.Controls.Count - 1], true);
-				tilePalette.Controls.Add(categoryHeader);
-
-				foreach( var t in tc )
-				{
-					try
-					{
-						var bitmap = tileset.RenderTemplate((ushort)t.Key, palette);
-						var ibox = new PictureBox
-						{
-							Image = bitmap,
-							Width = bitmap.Width / 2,
-							Height = bitmap.Height / 2,
-							SizeMode = PictureBoxSizeMode.StretchImage
-						};
-	
-						var brushTemplate = new BrushTemplate { Bitmap = bitmap, N = t.Key };
-						ibox.Click += (_, e) => surface1.SetTool(new BrushTool(brushTemplate));
-	
-						var template = t.Value;
-						tilePalette.Controls.Add(ibox);
-						tt.SetToolTip(ibox,
-							"{1}:{0} ({2}x{3})".F(
-							template.Image,
-							template.Id,
-							template.Size.X,
-							template.Size.Y));
-					}
-					catch { }
-				}
-			}
-
-			var actorTemplates = new List<ActorTemplate>();
-
-			foreach (var a in Rules.Info.Keys)
-			{
-				try
-				{
-					var info = Rules.Info[a];
-					if (!info.Traits.Contains<RenderSimpleInfo>()) continue;
-
-					var etf = info.Traits.GetOrDefault<EditorTilesetFilterInfo>();
-					if (etf != null && etf.ExcludeTilesets != null
-						&& etf.ExcludeTilesets.Contains(tileset.Id)) continue;
-					if (etf != null && etf.RequireTilesets != null
-						&& !etf.RequireTilesets.Contains(tileset.Id)) continue;
-
-					var template = RenderUtils.RenderActor(info, tileset, palette);
-					var ibox = new PictureBox
-					{
-						Image = template.Bitmap,
-						Width = 32,
-						Height = 32,
-						SizeMode = PictureBoxSizeMode.Zoom,
-						BorderStyle = BorderStyle.FixedSingle
-					};
-
-					ibox.Click += (_, e) => surface1.SetTool(new ActorTool(template));
-
-					actorPalette.Controls.Add(ibox);
-
-					tt.SetToolTip(ibox,
-						"{0}".F(
-						info.Name));
-
-					actorTemplates.Add(template);
-				}
-				catch { }
-			}
-
-			surface1.BindActorTemplates(actorTemplates);
-
-			var resourceTemplates = new List<ResourceTemplate>();
-
-			foreach (var a in Rules.Info["world"].Traits.WithInterface<ResourceTypeInfo>())
-			{
-				try
-				{
-					var template = RenderUtils.RenderResourceType(a, tileset.Extensions, palette);
-					var ibox = new PictureBox
-					{
-						Image = template.Bitmap,
-						Width = 32,
-						Height = 32,
-						SizeMode = PictureBoxSizeMode.Zoom,
-						BorderStyle = BorderStyle.FixedSingle
-					};
-
-
-
-					ibox.Click += (_, e) => surface1.SetTool(new ResourceTool(template));
-
-					resourcePalette.Controls.Add(ibox);
-
-					tt.SetToolTip(ibox,
-						"{0}:{1}cr".F(
-						template.Info.Name,
-						template.Info.ValuePerUnit));
-
-					resourceTemplates.Add(template);
-				}
-				catch { }
-			}
-
-			surface1.BindResourceTemplates(resourceTemplates);
-
-			foreach (var p in palettes)
-			{
-				p.Visible = true;
-				p.ResumeLayout();
-			}
-
-			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
-
-			propertiesToolStripMenuItem.Enabled = true;
-			resizeToolStripMenuItem.Enabled = true;
-			saveToolStripMenuItem.Enabled = true;
-			saveAsToolStripMenuItem.Enabled = true;
-			mnuMinimapToPNG.Enabled = true;	// todo: what is this VB naming bullshit doing here?
-
-			PopulateActorOwnerChooser();
-		}
-
-		void PopulateActorOwnerChooser()
-		{
-			actorOwnerChooser.Items.Clear();
-			actorOwnerChooser.Items.AddRange(surface1.Map.Players.Values.ToArray());
-			actorOwnerChooser.SelectedIndex = 0;
-			surface1.NewActorOwner = (actorOwnerChooser.SelectedItem as PlayerReference).Name;
-		}
-
-		void ResizeClicked(object sender, EventArgs e)
-		{
-			using (var rd = new ResizeDialog())
-			{
-				rd.width.Value = surface1.Map.MapSize.X;
-				rd.height.Value = surface1.Map.MapSize.Y;
-				rd.cordonLeft.Value = surface1.Map.Bounds.Left;
-				rd.cordonTop.Value = surface1.Map.Bounds.Top;
-				rd.cordonRight.Value = surface1.Map.Bounds.Right;
-				rd.cordonBottom.Value = surface1.Map.Bounds.Bottom;
-
-				if (DialogResult.OK != rd.ShowDialog())
-					return;
-
-				surface1.Map.ResizeCordon((int)rd.cordonLeft.Value,
-					(int)rd.cordonTop.Value,
-					(int)rd.cordonRight.Value,
-					(int)rd.cordonBottom.Value);
-
-				if ((int)rd.width.Value != surface1.Map.MapSize.X || (int)rd.height.Value != surface1.Map.MapSize.Y)
-				{
-					surface1.Map.Resize((int)rd.width.Value, (int)rd.height.Value);
-					surface1.Bind(surface1.Map, surface1.TileSet, surface1.Palette);	// rebind it to invalidate all caches
-				}
-
-				surface1.Invalidate();
-			}
-		}
-
-		void SaveClicked(object sender, EventArgs e)
-		{
-			if (loadedMapName == null)
-				SaveAsClicked(sender, e);
-			else
-			{
-				surface1.Map.Save(loadedMapName);
-				dirty = false;
-			}
-
-		}
-
-		void SaveAsClicked(object sender, EventArgs e)
-		{
-			using (var nms = new MapSelect(currentMod))
-			{
-				nms.txtNew.ReadOnly = false;
-				nms.btnOk.Text = "Save";
-				nms.txtNew.Text = "unnamed";
-				nms.txtPathOut.ReadOnly = false;
-
-				if (DialogResult.OK == nms.ShowDialog())
-				{
-					if (nms.txtNew.Text == "")
-						nms.txtNew.Text = "unnamed";
-
-					// TODO: Allow the user to choose map format (directory vs oramap)
-					loadedMapName = Path.Combine(nms.MapFolderPath, nms.txtNew.Text + ".oramap");
-					SaveClicked(sender, e);
-				}
-			}
-		}
-
-		void OpenClicked(object sender, EventArgs e)
-		{
-			using (var nms = new MapSelect(currentMod))
-			{
-				nms.txtNew.ReadOnly = true;
-				nms.txtPathOut.ReadOnly = true;
-				nms.btnOk.Text = "Open";
-
-				if (DialogResult.OK == nms.ShowDialog())
-					LoadMap(nms.txtNew.Tag as string);
-			}
-		}
-
-		void NewClicked(object sender, EventArgs e)
-		{
-			using (var nmd = new NewMapDialog())
-			{
-				nmd.theater.Items.Clear();
-				nmd.theater.Items.AddRange(Rules.TileSets.Select(a => a.Value.Id).ToArray());
-				nmd.theater.SelectedIndex = 0;
-
-				if (DialogResult.OK == nmd.ShowDialog())
-				{
-					var map = Map.FromTileset(nmd.theater.SelectedItem as string);
-
-					map.Resize((int)nmd.width.Value, (int)nmd.height.Value);
-					map.ResizeCordon((int)nmd.cordonLeft.Value, (int)nmd.cordonTop.Value,
-						(int)nmd.cordonRight.Value, (int)nmd.cordonBottom.Value);
-
-					map.MakeDefaultPlayers();
-
-					NewMap(map);
-				}
-			}
-		}
-
-		void PropertiesClicked(object sender, EventArgs e)
-		{
-			using (var pd = new PropertiesDialog())
-			{
-				pd.title.Text = surface1.Map.Title;
-				pd.desc.Text = surface1.Map.Description;
-				pd.author.Text = surface1.Map.Author;
-				pd.selectable.Checked = surface1.Map.Selectable;
-				pd.useAsShellmap.Checked = surface1.Map.UseAsShellmap;
-
-				if (DialogResult.OK != pd.ShowDialog())
-					return;
-
-				surface1.Map.Title = pd.title.Text;
-				surface1.Map.Description = pd.desc.Text;
-				surface1.Map.Author = pd.author.Text;
-				surface1.Map.Selectable = pd.selectable.Checked;
-				surface1.Map.UseAsShellmap = pd.useAsShellmap.Checked;
-			}
-		}
-
-		void Form1_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = true; }
-		void Form1_KeyUp(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = false; }
-
-		void CloseClicked(object sender, EventArgs e)
-		{
-			Close();
-		}
-
-		void ImportLegacyMapClicked(object sender, EventArgs e)
-		{
-			using (var ofd = new OpenFileDialog { RestoreDirectory = true,
-				Filter = "Legacy maps (*.ini;*.mpr)|*.ini;*.mpr" })
-				if (DialogResult.OK == ofd.ShowDialog())
-				{
-					/* massive hack: we should be able to call NewMap() with the imported Map object,
-					 * but something's not right internally in it, unless loaded via the real maploader */
-
-					var savePath = Path.Combine(Path.GetTempPath(), "OpenRA.Import");
-					Directory.CreateDirectory(savePath);
-
-					var errors = new List<string>();
-
-					var map = LegacyMapImporter.Import(ofd.FileName, a => errors.Add(a));
-
-					if (errors.Count > 0)
-						using (var eld = new ErrorListDialog(errors))
-							eld.ShowDialog();
-
-					map.MakeDefaultPlayers();
-
-					map.Save(savePath);
-					LoadMap(savePath);
-					loadedMapName = null;	/* editor needs to think this hasnt been saved */
-
-					Directory.Delete(savePath, true);
-					MakeDirty();
-				}
-		}
-
-		void OnFormClosing(object sender, FormClosingEventArgs e)
-		{
-			if (!dirty) return;
-
-			switch (MessageBox.Show("The map has been modified since it was last saved. " + "\r\n" + "Save changes now?",
-				"Unsaved Changes", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Exclamation))
-			{
-				case DialogResult.Yes: SaveClicked(null, EventArgs.Empty); break;
-				case DialogResult.No: break;
-				case DialogResult.Cancel: e.Cancel = true; break;
-			}
-		}
-
-		void ExportMinimap(object sender, EventArgs e)
-		{
-			using( var sfd = new SaveFileDialog() { 
-				InitialDirectory = Path.Combine(Environment.CurrentDirectory, "maps"),
-				DefaultExt = "*.png",
-				Filter = "PNG Image (*.png)|*.png",
-				Title = "Export Minimap to PNG",
-				FileName = Path.ChangeExtension(loadedMapName, ".png"),
-				RestoreDirectory = true } )
-				if (DialogResult.OK == sfd.ShowDialog())
-					pmMiniMap.Image.Save(sfd.FileName);
-		}
-
-		void ShowActorNamesClicked(object sender, EventArgs e)
-		{
-			showActorNamesToolStripMenuItem.Checked ^= true;
-			surface1.ShowActorNames = showActorNamesToolStripMenuItem.Checked;
-		}
-
-		void ShowGridClicked(object sender, EventArgs e)
-		{
-			showGridToolStripMenuItem.Checked ^= true;
-			surface1.ShowGrid = showGridToolStripMenuItem.Checked;
-			surface1.Chunks.Clear();
-		}
-
-		void FixOpenAreas(object sender, EventArgs e)
-		{
-			dirty = true;
-			var r = new Random();
-
-			for (var j = surface1.Map.Bounds.Top; j < surface1.Map.Bounds.Bottom; j++)
-				for (var i = surface1.Map.Bounds.Left; i < surface1.Map.Bounds.Right; i++)
-				{
-					var tr = surface1.Map.MapTiles.Value[i, j];
-					if (tr.type == 0xff || tr.type == 0xffff || tr.type == 1 || tr.type == 2)
-						tr.index = (byte)r.Next(0,
-							Rules.TileSets[surface1.Map.Tileset].Templates[tr.type].Data.TileBitmapBytes.Count);
-
-					surface1.Map.MapTiles.Value[i, j] = tr;
-				}
-
-			surface1.Chunks.Clear();
-			surface1.Invalidate();
-		}
-
-		void SetupDefaultPlayers(object sender, EventArgs e)
-		{
-			dirty = true;
-			surface1.Map.MakeDefaultPlayers();
-
-			surface1.Chunks.Clear();
-			surface1.Invalidate();
-
-			PopulateActorOwnerChooser();
-		}
-
-		void DrawPlayerListItem(object sender, DrawItemEventArgs e)
-		{
-			// color block
-			var player = e.Index >= 0 ? (PlayerReference)(sender as ComboBox).Items[e.Index] : null;
-
-			e.DrawBackground();
-			e.DrawFocusRectangle();
-
-			if (player == null)
-				return;
-
-			var color = player.ColorRamp.GetColor(0);
-			using( var brush = new SolidBrush(color) )
-				e.Graphics.FillRectangle( brush, e.Bounds.Left + 2, e.Bounds.Top + 2, e.Bounds.Height + 6, e.Bounds.Height - 4 );
-			using( var foreBrush = new SolidBrush(e.ForeColor) )
-				e.Graphics.DrawString( player.Name, e.Font, foreBrush, e.Bounds.Left + e.Bounds.Height + 12, e.Bounds.Top );
-		}
-
-		void OnSelectedPlayerChanged(object sender, EventArgs e)
-		{
-			var player = actorOwnerChooser.SelectedItem as PlayerReference;
-			surface1.NewActorOwner = player.Name;
-		}
-
-		private void copySelectionToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			surface1.CopySelection();
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Editor
+{
+	public partial class Form1 : Form
+	{
+		public Form1(string[] mods)
+		{
+			InitializeComponent();
+			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
+
+			currentMod = mods.FirstOrDefault() ?? "ra";
+
+			Text = "OpenRA Editor (mod:{0})".F(currentMod);
+
+			Game.modData = new ModData(currentMod);
+
+			Rules.LoadRules(Game.modData.Manifest, new Map());
+
+			surface1.AfterChange += MakeDirty;
+		}
+
+		void MakeDirty() { dirty = true; }
+		string loadedMapName;
+		string currentMod = "ra";
+		TileSet tileset;
+		bool dirty = false;
+
+		void LoadMap(string mapname)
+		{
+			tilePalette.Controls.Clear();
+			actorPalette.Controls.Clear();
+			resourcePalette.Controls.Clear();
+
+			loadedMapName = mapname;
+
+			Game.modData = new ModData(currentMod);
+
+			// load the map
+			var map = new Map(new Folder(mapname));
+
+			// upgrade maps that have no player definitions. editor doesnt care,
+			// but this breaks the game pretty badly.
+			if (map.Players.Count == 0)
+				map.Players.Add("Neutral", new PlayerReference("Neutral",
+						Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
+
+			PrepareMapResources(Game.modData.Manifest, map);
+
+			dirty = false;
+		}
+
+		void NewMap(Map map)
+		{
+			tilePalette.Controls.Clear();
+			actorPalette.Controls.Clear();
+			resourcePalette.Controls.Clear();
+
+			loadedMapName = null;
+
+			Game.modData = new ModData(currentMod);
+
+			PrepareMapResources(Game.modData.Manifest, map);
+
+			MakeDirty();
+		}
+
+		// this code is insanely stupid, and mostly my fault -- chrisf
+		void PrepareMapResources(Manifest manifest, Map map)
+		{
+			Rules.LoadRules(manifest, map);
+			tileset = Rules.TileSets[map.Theater];
+			tileset.LoadTiles();
+			var palette = new Palette(FileSystem.Open(tileset.Palette), true);
+
+
+			surface1.Bind(map, tileset, palette);
+			// construct the palette of tiles
+			var palettes = new[] { tilePalette, actorPalette, resourcePalette };
+			foreach (var p in palettes) { p.Visible = false; p.SuspendLayout(); }
+			foreach (var t in tileset.Templates)
+			{
+				try
+				{
+					var bitmap = RenderUtils.RenderTemplate(tileset, (ushort)t.Key, palette);
+					var ibox = new PictureBox
+					{
+						Image = bitmap,
+						Width = bitmap.Width / 2,
+						Height = bitmap.Height / 2,
+						SizeMode = PictureBoxSizeMode.StretchImage
+					};
+
+					var brushTemplate = new BrushTemplate { Bitmap = bitmap, N = t.Key };
+					ibox.Click += (_, e) => surface1.SetBrush(brushTemplate);
+
+					var template = t.Value;
+					tilePalette.Controls.Add(ibox);
+					tt.SetToolTip(ibox,
+						"{1}:{0} ({2}x{3})".F(
+						template.Image,
+						template.Id,
+						template.Size.X,
+						template.Size.Y));
+				}
+				catch { }
+			}
+
+			var actorTemplates = new List<ActorTemplate>();
+
+			foreach (var a in Rules.Info.Keys)
+			{
+				try
+				{
+					var info = Rules.Info[a];
+					if (!info.Traits.Contains<RenderSimpleInfo>()) continue;
+					var template = RenderUtils.RenderActor(info, tileset, palette);
+					var ibox = new PictureBox
+					{
+						Image = template.Bitmap,
+						Width = 32,
+						Height = 32,
+						SizeMode = PictureBoxSizeMode.Zoom,
+						BorderStyle = BorderStyle.FixedSingle
+					};
+
+
+					ibox.Click += (_, e) => surface1.SetActor(template);
+
+					actorPalette.Controls.Add(ibox);
+
+					tt.SetToolTip(ibox,
+						"{0}".F(
+						info.Name));
+
+					actorTemplates.Add(template);
+				}
+				catch { }
+			}
+
+			surface1.BindActorTemplates(actorTemplates);
+
+			var resourceTemplates = new List<ResourceTemplate>();
+
+			foreach (var a in Rules.Info["world"].Traits.WithInterface<ResourceTypeInfo>())
+			{
+				try
+				{
+					var template = RenderUtils.RenderResourceType(a, tileset.Extensions, palette);
+					var ibox = new PictureBox
+					{
+						Image = template.Bitmap,
+						Width = 32,
+						Height = 32,
+						SizeMode = PictureBoxSizeMode.Zoom,
+						BorderStyle = BorderStyle.FixedSingle
+					};
+
+
+
+					ibox.Click += (_, e) => surface1.SetResource(template);
+
+					resourcePalette.Controls.Add(ibox);
+
+					tt.SetToolTip(ibox,
+						"{0}:{1}cr".F(
+						template.Info.Name,
+						template.Info.ValuePerUnit));
+
+					resourceTemplates.Add(template);
+				}
+				catch { }
+			}
+
+			surface1.BindResourceTemplates(resourceTemplates);
+
+			foreach (var p in palettes)
+			{
+				p.Visible = true;
+				p.ResumeLayout();
+			}
+			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
+		}
+
+		void ResizeClicked(object sender, EventArgs e)
+		{
+			using (var rd = new ResizeDialog())
+			{
+				rd.width.Value = surface1.Map.MapSize.X;
+				rd.height.Value = surface1.Map.MapSize.Y;
+				rd.cordonLeft.Value = surface1.Map.TopLeft.X;
+				rd.cordonTop.Value = surface1.Map.TopLeft.Y;
+				rd.cordonRight.Value = surface1.Map.BottomRight.X;
+				rd.cordonBottom.Value = surface1.Map.BottomRight.Y;
+
+				if (DialogResult.OK != rd.ShowDialog())
+					return;
+
+				surface1.Map.TopLeft = new int2((int)rd.cordonLeft.Value, (int)rd.cordonTop.Value);
+				surface1.Map.BottomRight = new int2((int)rd.cordonRight.Value, (int)rd.cordonBottom.Value);
+
+				if ((int)rd.width.Value != surface1.Map.MapSize.X || (int)rd.height.Value != surface1.Map.MapSize.Y)
+				{
+					surface1.Map.Resize((int)rd.width.Value, (int)rd.height.Value);
+					surface1.Bind(surface1.Map, surface1.TileSet, surface1.Palette);	// rebind it to invalidate all caches
+				}
+
+				surface1.Invalidate();
+			}
+		}
+
+		void SaveClicked(object sender, EventArgs e)
+		{
+			if (loadedMapName == null)
+				SaveAsClicked(sender, e);
+			else
+			{
+				surface1.Map.PlayerCount = surface1.Map.Waypoints.Count;
+				surface1.Map.Package = new Folder(loadedMapName);
+				surface1.Map.Save(loadedMapName);
+				dirty = false;
+			}
+
+		}
+
+		void SaveAsClicked(object sender, EventArgs e)
+		{
+			using (var nms = new MapSelect())
+			{
+				nms.MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
+				.Aggregate(Path.Combine);
+
+				nms.txtNew.ReadOnly = false;
+				nms.btnOk.Text = "Save";
+				nms.txtNew.Text = "unnamed";
+				nms.txtPathOut.ReadOnly = false;
+
+				if (DialogResult.OK == nms.ShowDialog())
+				{
+					if (nms.txtNew.Text == "")
+						nms.txtNew.Text = "unnamed";
+
+					string mapfoldername = Path.Combine(nms.MapFolderPath, nms.txtNew.Text);
+					loadedMapName = mapfoldername;
+
+					try
+					{
+						Directory.CreateDirectory(mapfoldername);
+					}
+					catch (Exception ed)
+					{
+						MessageBox.Show("Directory creation failed: {0}", ed.ToString());
+					}
+
+					SaveClicked(sender, e);
+				}
+			}
+		}
+
+		void OpenClicked(object sender, EventArgs e)
+		{
+			using (var nms = new MapSelect())
+			{
+				nms.MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
+				.Aggregate(Path.Combine);
+
+				nms.txtNew.ReadOnly = true;
+				nms.txtPathOut.ReadOnly = true;
+				nms.btnOk.Text = "Open";
+
+				if (DialogResult.OK == nms.ShowDialog())
+				{
+					string mapfoldername = Path.Combine(nms.MapFolderPath, nms.txtNew.Text);
+					LoadMap(mapfoldername);
+				}
+			}
+		}
+
+		void NewClicked(object sender, EventArgs e)
+		{
+			using (var nmd = new NewMapDialog())
+			{
+				nmd.theater.Items.Clear();
+				nmd.theater.Items.AddRange(Rules.TileSets.Select(a => a.Value.Id).ToArray());
+				nmd.theater.SelectedIndex = 0;
+
+				if (DialogResult.OK == nmd.ShowDialog())
+				{
+					var map = new Map(nmd.theater.SelectedItem as string);
+
+					map.Resize((int)nmd.width.Value, (int)nmd.height.Value);
+
+					map.TopLeft = new int2((int)nmd.cordonLeft.Value, (int)nmd.cordonTop.Value);
+					map.BottomRight = new int2((int)nmd.cordonRight.Value, (int)nmd.cordonBottom.Value);
+					map.Players.Add("Neutral", new PlayerReference("Neutral", Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
+					NewMap(map);
+				}
+			}
+		}
+
+		void PropertiesClicked(object sender, EventArgs e)
+		{
+			using (var pd = new PropertiesDialog())
+			{
+				pd.title.Text = surface1.Map.Title;
+				pd.desc.Text = surface1.Map.Description;
+				pd.author.Text = surface1.Map.Author;
+				pd.selectable.Checked = surface1.Map.Selectable;
+
+				if (DialogResult.OK != pd.ShowDialog())
+					return;
+
+				surface1.Map.Title = pd.title.Text;
+				surface1.Map.Description = pd.desc.Text;
+				surface1.Map.Author = pd.author.Text;
+				surface1.Map.Selectable = pd.selectable.Checked;
+			}
+		}
+
+		void SpawnPointsClicked(object sender, EventArgs e) { surface1.SetWaypoint(new WaypointTemplate()); }
+		void Form1_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = true; }
+		void Form1_KeyUp(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Space) surface1.IsPanning = false; }
+
+		void CloseClicked(object sender, EventArgs e)
+		{
+			Close();
+		}
+
+		void ImportLegacyMapClicked(object sender, EventArgs e)
+		{
+			var currentDirectory = Directory.GetCurrentDirectory();
+			using (var ofd = new OpenFileDialog { Filter = "Legacy maps (*.ini;*.mpr)|*.ini;*.mpr" })
+				if (DialogResult.OK == ofd.ShowDialog())
+				{
+					Directory.SetCurrentDirectory( currentDirectory );
+					/* massive hack: we should be able to call NewMap() with the imported Map object,
+					 * but something's not right internally in it, unless loaded via the real maploader */
+
+					var savePath = Path.Combine(Path.GetTempPath(), "OpenRA.Import");
+					Directory.CreateDirectory(savePath);
+
+					var map = LegacyMapImporter.Import(ofd.FileName);
+					map.Package = new Folder(savePath);
+					map.Players.Add("Neutral", new PlayerReference("Neutral",
+						Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
+
+					map.Save(savePath);
+					LoadMap(savePath);
+					loadedMapName = null;	/* editor needs to think this hasnt been saved */
+
+					Directory.Delete(savePath, true);
+					MakeDirty();
+				}
+		}
+
+		void OnFormClosing(object sender, FormClosingEventArgs e)
+		{
+			if (!dirty) return;
+
+			switch (MessageBox.Show("The map has been modified since it was last saved. " + "\r\n" + "Save changes now?",
+				"Unsaved Changes", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Exclamation))
+			{
+				case DialogResult.Yes: SaveClicked(null, EventArgs.Empty); break;
+				case DialogResult.No: break;
+				case DialogResult.Cancel: e.Cancel = true; break;
+			}
+		}
+
+		private void layersFloaterToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var pb = new PaletteBox();
+			pb.Show();
+		}
+
+		private void OnSurfaceClicked(object sender, EventArgs e)
+		{
+			pmMiniMap.Image = Minimap.AddStaticResources(surface1.Map, Minimap.TerrainBitmap(surface1.Map, true));
+		}
+
+        private void mnuMinimapToPNG_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                saveFileDialog.InitialDirectory = new string[] { Environment.CurrentDirectory, "maps" }
+.Aggregate(Path.Combine);
+            
+            FileInfo file = new FileInfo(loadedMapName + ".png");
+            string name = file.Name;
+            saveFileDialog.FileName = name;
+
+            saveFileDialog.ShowDialog();
+            if (saveFileDialog.FileName == "")
+            {
+                saveFileDialog.FileName = name;
+            }
+            else
+            {
+                Bitmap png = new Bitmap(pmMiniMap.Image);
+
+                png.Save(saveFileDialog.FileName, System.Drawing.Imaging.ImageFormat.Png); 
+            }
+            
+            }
+            catch { }
+        }
+	}
+}

OpenRA.Editor/LegacyMapImporter.cs

@@ -1,459 +1,470 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using OpenRA.FileFormats;
-using OpenRA.Traits;
-
-namespace OpenRA.Editor
-{
-	public class LegacyMapImporter
-	{
-		// Mapping from ra overlay index to type string
-		static string[] raOverlayNames =
-		{
-			"sbag", "cycl", "brik", "fenc", "wood",
-			"gold01", "gold02", "gold03", "gold04",
-			"gem01", "gem02", "gem03", "gem04",
-			"v12", "v13", "v14", "v15", "v16", "v17", "v18",
-			"fpls", "wcrate", "scrate", "barb", "sbag",
-		};
-
-		static Dictionary<string, Pair<byte, byte>> overlayResourceMapping = new Dictionary<string, Pair<byte, byte>>()
-		{
-			// RA Gems, Gold
-			{ "gold01", new Pair<byte,byte>(1,0) },
-			{ "gold02", new Pair<byte,byte>(1,1) },
-			{ "gold03", new Pair<byte,byte>(1,2) },
-			{ "gold04", new Pair<byte,byte>(1,3) },
-
-			{ "gem01", new Pair<byte,byte>(2,0) },
-			{ "gem02", new Pair<byte,byte>(2,1) },
-			{ "gem03", new Pair<byte,byte>(2,2) },
-			{ "gem04", new Pair<byte,byte>(2,3) },
-
-			// cnc tiberium
-			{ "ti1", new Pair<byte,byte>(1,0) },
-			{ "ti2", new Pair<byte,byte>(1,1) },
-			{ "ti3", new Pair<byte,byte>(1,2) },
-			{ "ti4", new Pair<byte,byte>(1,3) },
-			{ "ti5", new Pair<byte,byte>(1,4) },
-			{ "ti6", new Pair<byte,byte>(1,5) },
-			{ "ti7", new Pair<byte,byte>(1,6) },
-			{ "ti8", new Pair<byte,byte>(1,7) },
-			{ "ti9", new Pair<byte,byte>(1,8) },
-			{ "ti10", new Pair<byte,byte>(1,9) },
-			{ "ti11", new Pair<byte,byte>(1,10) },
-			{ "ti12", new Pair<byte,byte>(1,11) },
-		};
-
-		static Dictionary<string, string> overlayActorMapping = new Dictionary<string, string>() {
-			// Fences
-			{"sbag","sbag"},
-			{"cycl","cycl"},
-			{"brik","brik"},
-			{"fenc","fenc"},
-			{"wood","wood"},
-
-			// Fields
-			{"v12","v12"},
-			{"v13","v13"},
-			{"v14","v14"},
-			{"v15","v15"},
-			{"v16","v16"},
-			{"v17","v17"},
-			{"v18","v18"},
-
-			// Crates
-//			{"wcrate","crate"},
-//			{"scrate","crate"},
-		};
-
-		// todo: fix this -- will have bitrotted pretty badly.
-		static Dictionary<string,Pair<Color,Color>> namedColorMapping = new Dictionary<string, Pair<Color, Color>>()
-		{
-			{"gold",Pair.New(Color.FromArgb(246,214,121),Color.FromArgb(40,32,8))},
-			{"blue",Pair.New(Color.FromArgb(226,230,246),Color.FromArgb(8,20,52))},
-			{"red",Pair.New(Color.FromArgb(255,20,0),Color.FromArgb(56,0,0))},
-			{"neutral",Pair.New(Color.FromArgb(238,238,238),Color.FromArgb(44,28,24))},
-			{"orange",Pair.New(Color.FromArgb(255,230,149),Color.FromArgb(56,0,0))},
-			{"teal",Pair.New(Color.FromArgb(93,194,165),Color.FromArgb(0,32,32))},
-			{"salmon",Pair.New(Color.FromArgb(210,153,125),Color.FromArgb(56,0,0))},
-			{"green",Pair.New(Color.FromArgb(160,240,140),Color.FromArgb(20,20,20))},
-			{"white",Pair.New(Color.FromArgb(255,255,255),Color.FromArgb(75,75,75))},
-			{"black",Pair.New(Color.FromArgb(80,80,80),Color.FromArgb(5,5,5))},
-		};
-
-		int MapSize;
-		int ActorCount = 0;
-		Map Map = new Map();
-		List<string> Players = new List<string>();
-		Action<string> errorHandler;
-
-		LegacyMapImporter(string filename, Action<string> errorHandler)
-		{
-			this.errorHandler = errorHandler;
-			ConvertIniMap(filename);
-		}
-
-		public static Map Import(string filename, Action<string> errorHandler)
-		{
-			var converter = new LegacyMapImporter(filename, errorHandler);
-			return converter.Map;
-		}
-
-		enum IniMapFormat { RedAlert = 3, /* otherwise, cnc (2 variants exist, we don't care to differentiate) */ };
-
-		public void ConvertIniMap(string iniFile)
-		{
-
-			var file = new IniFile(FileSystem.Open(iniFile));
-			var basic = file.GetSection("Basic");
-			var map = file.GetSection("Map");
-			var legacyMapFormat = (IniMapFormat)int.Parse(basic.GetValue("NewINIFormat", "0"));
-			var XOffset = int.Parse(map.GetValue("X", "0"));
-			var YOffset = int.Parse(map.GetValue("Y", "0"));
-			var Width = int.Parse(map.GetValue("Width", "0"));
-			var Height = int.Parse(map.GetValue("Height", "0"));
-			MapSize = (legacyMapFormat == IniMapFormat.RedAlert) ? 128 : 64;
-
-			Map.Title = basic.GetValue("Name", "(null)");
-			Map.Author = "Westwood Studios";
-			Map.Tileset = Truncate(map.GetValue("Theater", "TEMPERAT"), 8);
-			Map.MapSize.X = MapSize;
-			Map.MapSize.Y = MapSize;
-			Map.Bounds = Rectangle.FromLTRB(XOffset, YOffset, XOffset + Width, YOffset + Height);
-			Map.Selectable = true;
-
-			Map.Smudges = Lazy.New(() => new List<SmudgeReference>());
-			Map.Actors = Lazy.New(() => new Dictionary<string, ActorReference>());
-			Map.MapResources = Lazy.New(() => new TileReference<byte, byte>[MapSize, MapSize]);
-			Map.MapTiles = Lazy.New(() => new TileReference<ushort, byte>[MapSize, MapSize]);
-
-			if (legacyMapFormat == IniMapFormat.RedAlert)
-			{
-				UnpackRATileData(ReadPackedSection(file.GetSection("MapPack")));
-				UnpackRAOverlayData(ReadPackedSection(file.GetSection("OverlayPack")));
-				ReadRATrees(file);
-			}
-			else // CNC
-			{
-				UnpackCncTileData(FileSystem.Open(iniFile.Substring(0, iniFile.Length - 4) + ".bin"));
-				ReadCncOverlay(file);
-				ReadCncTrees(file);
-			}
-
-			LoadActors(file, "STRUCTURES");
-			LoadActors(file, "UNITS");
-			LoadActors(file, "INFANTRY");
-			LoadSmudges(file, "SMUDGE");
-
-			foreach (var p in Players)
-				LoadPlayer(file, p, (legacyMapFormat == IniMapFormat.RedAlert));
-
-			var wps = file.GetSection("Waypoints")
-					.Where(kv => int.Parse(kv.Value) > 0)
-					.Select(kv => Pair.New(int.Parse(kv.Key),
-						LocationFromMapOffset(int.Parse(kv.Value), MapSize)))
-					.ToArray();
-
-
-			// Add waypoint actors
-			foreach( var kv in wps )
-			{
-				var a = new ActorReference("mpspawn");
-				a.Add(new LocationInit((CPos)kv.Second));
-				a.Add(new OwnerInit("Neutral"));
-				Map.Actors.Value.Add("spawn" + kv.First, a);
-			}
-
-		}
-
-		static int2 LocationFromMapOffset(int offset, int mapSize)
-		{
-			return new int2(offset % mapSize, offset / mapSize);
-		}
-
-		static MemoryStream ReadPackedSection(IniSection mapPackSection)
-		{
-			var sb = new StringBuilder();
-			for (int i = 1; ; i++)
-			{
-				var line = mapPackSection.GetValue(i.ToString(), null);
-				if (line == null)
-					break;
-
-				sb.Append(line.Trim());
-			}
-
-			var data = Convert.FromBase64String(sb.ToString());
-			var chunks = new List<byte[]>();
-			var reader = new BinaryReader(new MemoryStream(data));
-
-			try
-			{
-				while (true)
-				{
-					var length = reader.ReadUInt32() & 0xdfffffff;
-					var dest = new byte[8192];
-					var src = reader.ReadBytes((int)length);
-
-					/*int actualLength =*/
-					Format80.DecodeInto(src, dest);
-
-					chunks.Add(dest);
-				}
-			}
-			catch (EndOfStreamException) { }
-
-			var ms = new MemoryStream();
-			foreach (var chunk in chunks)
-				ms.Write(chunk, 0, chunk.Length);
-
-			ms.Position = 0;
-
-			return ms;
-		}
-
-		static byte ReadByte(Stream s)
-		{
-			int ret = s.ReadByte();
-			if (ret == -1)
-				throw new NotImplementedException();
-			return (byte)ret;
-		}
-
-		static ushort ReadWord(Stream s)
-		{
-			ushort ret = ReadByte(s);
-			ret |= (ushort)(ReadByte(s) << 8);
-
-			return ret;
-		}
-
-		void UnpackRATileData(MemoryStream ms)
-		{
-			for (int i = 0; i < MapSize; i++)
-				for (int j = 0; j < MapSize; j++)
-					Map.MapTiles.Value[i, j] = new TileReference<ushort, byte>();
-
-			for (int j = 0; j < MapSize; j++)
-				for (int i = 0; i < MapSize; i++)
-					Map.MapTiles.Value[i, j].type = ReadWord(ms);
-
-			for (int j = 0; j < MapSize; j++)
-				for (int i = 0; i < MapSize; i++)
-					Map.MapTiles.Value[i, j].index = ReadByte(ms);
-		}
-
-		void UnpackRAOverlayData(MemoryStream ms)
-		{
-			for (int j = 0; j < MapSize; j++)
-				for (int i = 0; i < MapSize; i++)
-				{
-					byte o = ReadByte(ms);
-					var res = Pair.New((byte)0, (byte)0);
-
-					if (o != 255 && overlayResourceMapping.ContainsKey(raOverlayNames[o]))
-						res = overlayResourceMapping[raOverlayNames[o]];
-
-					Map.MapResources.Value[i, j] = new TileReference<byte, byte>(res.First, res.Second);
-
-					if (o != 255 && overlayActorMapping.ContainsKey(raOverlayNames[o]))
-						Map.Actors.Value.Add("Actor" + ActorCount++,
-							new ActorReference(overlayActorMapping[raOverlayNames[o]])
-							{
-								new LocationInit( new CPos(i, j) ),
-								new OwnerInit( "Neutral" )
-							});
-				}
-		}
-
-		void ReadRATrees(IniFile file)
-		{
-			var terrain = file.GetSection("TERRAIN", true);
-			if (terrain == null)
-				return;
-
-			foreach (KeyValuePair<string, string> kv in terrain)
-			{
-				var loc = int.Parse(kv.Key);
-				Map.Actors.Value.Add("Actor" + ActorCount++,
-					new ActorReference(kv.Value.ToLowerInvariant())
-					{
-						new LocationInit(new CPos(loc % MapSize, loc / MapSize)),
-						new OwnerInit("Neutral")
-					});
-			}
-		}
-
-		void UnpackCncTileData(Stream ms)
-		{
-			for (int i = 0; i < MapSize; i++)
-				for (int j = 0; j < MapSize; j++)
-					Map.MapTiles.Value[i, j] = new TileReference<ushort, byte>();
-
-			for (int j = 0; j < MapSize; j++)
-				for (int i = 0; i < MapSize; i++)
-				{
-					Map.MapTiles.Value[i, j].type = ReadByte(ms);
-					Map.MapTiles.Value[i, j].index = ReadByte(ms);
-				}
-		}
-
-		void ReadCncOverlay(IniFile file)
-		{
-			var overlay = file.GetSection("OVERLAY", true);
-			if (overlay == null)
-				return;
-
-			foreach (KeyValuePair<string, string> kv in overlay)
-			{
-				var loc = int.Parse(kv.Key);
-				var cell = new CPos(loc % MapSize, loc / MapSize);
-
-				var res = Pair.New((byte)0, (byte)0);
-				if (overlayResourceMapping.ContainsKey(kv.Value.ToLower()))
-					res = overlayResourceMapping[kv.Value.ToLower()];
-
-				Map.MapResources.Value[cell.X, cell.Y] = new TileReference<byte, byte>(res.First, res.Second);
-
-				if (overlayActorMapping.ContainsKey(kv.Value.ToLower()))
-					Map.Actors.Value.Add("Actor" + ActorCount++,
-						new ActorReference(overlayActorMapping[kv.Value.ToLower()])
-						{
-							new LocationInit(cell),
-							new OwnerInit("Neutral")
-						});
-			}
-		}
-
-		void ReadCncTrees(IniFile file)
-		{
-			var terrain = file.GetSection("TERRAIN", true);
-			if (terrain == null)
-				return;
-
-			foreach (KeyValuePair<string, string> kv in terrain)
-			{
-				var loc = int.Parse(kv.Key);
-				Map.Actors.Value.Add("Actor" + ActorCount++,
-					new ActorReference(kv.Value.Split(',')[0].ToLowerInvariant())
-					{
-						new LocationInit(new CPos(loc % MapSize, loc / MapSize)),
-						new OwnerInit("Neutral")
-					});
-			}
-		}
-
-		void LoadActors(IniFile file, string section)
-		{
-			foreach (var s in file.GetSection(section, true))
-			{
-				//Structures: num=owner,type,health,location,turret-facing,trigger
-				//Units: num=owner,type,health,location,facing,action,trigger
-				//Infantry: num=owner,type,health,location,subcell,action,facing,trigger
-
-				try
-				{
-
-					var parts = s.Value.Split(',');
-					var loc = int.Parse(parts[3]);
-					if (parts[0] == "")
-						parts[0] = "Neutral";
-
-					if (!Players.Contains(parts[0]))
-						Players.Add(parts[0]);
-
-					var actor = new ActorReference(parts[1].ToLowerInvariant())
-					{
-						new LocationInit(new CPos(loc % MapSize, loc / MapSize)),
-						new OwnerInit(parts[0]),
-						new HealthInit(float.Parse(parts[2], NumberFormatInfo.InvariantInfo)/256),
-						new FacingInit((section == "INFANTRY") ? int.Parse(parts[6]) : int.Parse(parts[4])),
-					};
-
-					if (section == "INFANTRY")
-						actor.Add(new SubCellInit(int.Parse(parts[4])));
-
-					if (!Rules.Info.ContainsKey(parts[1].ToLowerInvariant()))
-						errorHandler("Ignoring unknown actor type: `{0}`".F(parts[1].ToLowerInvariant()));
-					else
-						Map.Actors.Value.Add("Actor" + ActorCount++, actor);
-				}
-				catch (Exception)
-				{
-					errorHandler("Malformed actor definition: `{0}`".F(s));
-				}
-			}
-		}
-
-		void LoadSmudges(IniFile file, string section)
-		{
-			foreach (var s in file.GetSection(section, true))
-			{
-				//loc=type,loc,depth
-				var parts = s.Value.Split(',');
-				var loc = int.Parse(parts[1]);
-				Map.Smudges.Value.Add(new SmudgeReference(parts[0].ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize), int.Parse(parts[2])));
-			}
-		}
-
-		void LoadPlayer(IniFile file, string section, bool isRA)
-		{
-			var c = section == "BadGuy" ? "red" :
-						isRA ? "blue" : "gold";
-
-			var color = namedColorMapping[c];
-
-			var pr = new PlayerReference
-			{
-				Name = section,
-				OwnsWorld = section == "Neutral",
-				NonCombatant = section == "Neutral",
-				Race = isRA ? (section == "BadGuy" ? "soviet" : "allies") : (section == "BadGuy" ? "nod" : "gdi"),
-				ColorRamp = new ColorRamp(
-						(byte)((color.First.GetHue() / 360.0f) * 255),
-						(byte)(color.First.GetSaturation() * 255),
-						(byte)(color.First.GetBrightness() * 255),
-						(byte)(color.Second.GetBrightness() * 255))
-			};
-
-			var neutral = new [] {"Neutral"};
-			foreach (var s in file.GetSection(section, true))
-			{
-				Console.WriteLine(s.Key);
-				switch(s.Key)
-				{
-					case "Credits":
-						pr.InitialCash = int.Parse(s.Value);
-					break;
-					case "Allies":
-						pr.Allies = s.Value.Split(',').Intersect(Players).Except(neutral).ToArray();
-						pr.Enemies = s.Value.Split(',').SymmetricDifference(Players).Except(neutral).ToArray();
-					break;
-				}
-			}
-
-			Map.Players.Add(section, pr);
-		}
-
-		static string Truncate(string s, int maxLength)
-		{
-			return s.Length <= maxLength ? s : s.Substring(0, maxLength);
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using OpenRA;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
+using System.Drawing;
+using System.Globalization;
+
+namespace OpenRA.Editor
+{
+	public class LegacyMapImporter
+	{
+		// Mapping from ra overlay index to type string
+		static string[] raOverlayNames =
+		{
+			"sbag", "cycl", "brik", "fenc", "wood",
+			"gold01", "gold02", "gold03", "gold04",
+			"gem01", "gem02", "gem03", "gem04",
+			"v12", "v13", "v14", "v15", "v16", "v17", "v18",
+			"fpls", "wcrate", "scrate", "barb", "sbag",
+		};
+
+		static Dictionary<string, Pair<byte, byte>> overlayResourceMapping = new Dictionary<string, Pair<byte, byte>>()
+		{
+			// RA Gems, Gold
+			{ "gold01", new Pair<byte,byte>(1,0) },
+			{ "gold02", new Pair<byte,byte>(1,1) },
+			{ "gold03", new Pair<byte,byte>(1,2) },
+			{ "gold04", new Pair<byte,byte>(1,3) },
+			
+			{ "gem01", new Pair<byte,byte>(2,0) },
+			{ "gem02", new Pair<byte,byte>(2,1) },
+			{ "gem03", new Pair<byte,byte>(2,2) },
+			{ "gem04", new Pair<byte,byte>(2,3) },
+			
+			// cnc tiberium
+			{ "ti1", new Pair<byte,byte>(1,0) },
+			{ "ti2", new Pair<byte,byte>(1,1) },
+			{ "ti3", new Pair<byte,byte>(1,2) },
+			{ "ti4", new Pair<byte,byte>(1,3) },
+			{ "ti5", new Pair<byte,byte>(1,4) },
+			{ "ti6", new Pair<byte,byte>(1,5) },
+			{ "ti7", new Pair<byte,byte>(1,6) },
+			{ "ti8", new Pair<byte,byte>(1,7) },
+			{ "ti9", new Pair<byte,byte>(1,8) },
+			{ "ti10", new Pair<byte,byte>(1,9) },
+			{ "ti11", new Pair<byte,byte>(1,10) },
+			{ "ti12", new Pair<byte,byte>(1,11) },
+		};
+
+		static Dictionary<string, string> overlayActorMapping = new Dictionary<string, string>() {
+			// Fences
+			{"sbag","sbag"},
+			{"cycl","cycl"},
+			{"brik","brik"},
+			{"fenc","fenc"},
+			{"wood","wood"},
+			
+			// Fields
+			{"v12","v12"},
+			{"v13","v13"},
+			{"v14","v14"},
+			{"v15","v15"},
+			{"v16","v16"},
+			{"v17","v17"},
+			{"v18","v18"},
+			
+			// Crates
+//			{"wcrate","crate"},
+//			{"scrate","crate"},
+		};
+		
+		static Dictionary<string,Pair<Color,Color>> namedColorMapping = new Dictionary<string, Pair<Color, Color>>()
+		{
+			{"gold",Pair.New(Color.FromArgb(246,214,121),Color.FromArgb(40,32,8))},
+			{"blue",Pair.New(Color.FromArgb(226,230,246),Color.FromArgb(8,20,52))},
+			{"red",Pair.New(Color.FromArgb(255,20,0),Color.FromArgb(56,0,0))},
+			{"neutral",Pair.New(Color.FromArgb(238,238,238),Color.FromArgb(44,28,24))},
+			{"orange",Pair.New(Color.FromArgb(255,230,149),Color.FromArgb(56,0,0))},
+			{"teal",Pair.New(Color.FromArgb(93,194,165),Color.FromArgb(0,32,32))},
+			{"salmon",Pair.New(Color.FromArgb(210,153,125),Color.FromArgb(56,0,0))},
+			{"green",Pair.New(Color.FromArgb(160,240,140),Color.FromArgb(20,20,20))},
+			{"white",Pair.New(Color.FromArgb(255,255,255),Color.FromArgb(75,75,75))},
+			{"black",Pair.New(Color.FromArgb(80,80,80),Color.FromArgb(5,5,5))},
+		};
+		
+		int MapSize;
+		int ActorCount = 0;
+		Map Map = new Map();
+		List<string> Players = new List<string>();
+		
+		LegacyMapImporter(string filename)
+		{
+			ConvertIniMap(filename);
+		}
+
+		public static Map Import(string filename)
+		{
+			var converter = new LegacyMapImporter(filename);
+			return converter.Map;
+		}
+
+		enum IniMapFormat { RedAlert = 3, /* otherwise, cnc (2 variants exist, we don't care to differentiate) */ };
+		
+		public void ConvertIniMap(string iniFile)
+		{
+			var file = new IniFile(FileSystem.Open(iniFile));
+			var basic = file.GetSection("Basic");
+			var map = file.GetSection("Map");
+			var legacyMapFormat = (IniMapFormat)int.Parse(basic.GetValue("NewINIFormat", "0"));
+			var XOffset = int.Parse(map.GetValue("X", "0"));
+			var YOffset = int.Parse(map.GetValue("Y", "0"));
+			var Width = int.Parse(map.GetValue("Width", "0"));
+			var Height = int.Parse(map.GetValue("Height", "0"));
+			MapSize = (legacyMapFormat == IniMapFormat.RedAlert) ? 128 : 64;
+
+			Map.Title = basic.GetValue("Name", "(null)");
+			Map.Author = "Westwood Studios";
+			Map.Tileset = Truncate(map.GetValue("Theater", "TEMPERAT"), 8);
+			Map.MapSize.X = MapSize;
+			Map.MapSize.Y = MapSize;
+			Map.TopLeft = new int2(XOffset, YOffset);
+			Map.BottomRight = new int2(XOffset + Width, YOffset + Height);
+			Map.Selectable = true;
+
+			if (legacyMapFormat == IniMapFormat.RedAlert)
+			{
+				UnpackRATileData(ReadPackedSection(file.GetSection("MapPack")));
+				UnpackRAOverlayData(ReadPackedSection(file.GetSection("OverlayPack")));
+				ReadRATrees(file);
+			}
+			else // CNC
+			{
+				UnpackCncTileData(FileSystem.Open(iniFile.Substring(0, iniFile.Length - 4) + ".bin"));
+				ReadCncOverlay(file);
+				ReadCncTrees(file);
+			}
+
+			LoadActors(file, "STRUCTURES");
+			LoadActors(file, "UNITS");
+			LoadActors(file, "INFANTRY");
+			LoadSmudges(file, "SMUDGE");
+
+			foreach (var p in Players)
+				LoadPlayer(file, p, (legacyMapFormat == IniMapFormat.RedAlert));
+			
+			var wp = file.GetSection("Waypoints")
+					.Where(kv => int.Parse(kv.Value) > 0)
+					.Select(kv => Pair.New(int.Parse(kv.Key),
+						LocationFromMapOffset(int.Parse(kv.Value), MapSize)))
+					.ToArray();
+
+			Map.PlayerCount = wp.Count();
+
+			foreach (var kv in wp)
+				Map.Waypoints.Add("spawn" + kv.First, kv.Second);
+		}
+
+		static int2 LocationFromMapOffset(int offset, int mapSize)
+		{
+			return new int2(offset % mapSize, offset / mapSize);
+		}
+
+		static MemoryStream ReadPackedSection(IniSection mapPackSection)
+		{
+			StringBuilder sb = new StringBuilder();
+			for (int i = 1; ; i++)
+			{
+				string line = mapPackSection.GetValue(i.ToString(), null);
+				if (line == null)
+					break;
+
+				sb.Append(line.Trim());
+			}
+
+			byte[] data = Convert.FromBase64String(sb.ToString());
+			List<byte[]> chunks = new List<byte[]>();
+			BinaryReader reader = new BinaryReader(new MemoryStream(data));
+
+			try
+			{
+				while (true)
+				{
+					uint length = reader.ReadUInt32() & 0xdfffffff;
+					byte[] dest = new byte[8192];
+					byte[] src = reader.ReadBytes((int)length);
+
+					/*int actualLength =*/
+					Format80.DecodeInto(src, dest);
+
+					chunks.Add(dest);
+				}
+			}
+			catch (EndOfStreamException) { }
+
+			MemoryStream ms = new MemoryStream();
+			foreach (byte[] chunk in chunks)
+				ms.Write(chunk, 0, chunk.Length);
+
+			ms.Position = 0;
+
+			return ms;
+		}
+
+		static byte ReadByte(Stream s)
+		{
+			int ret = s.ReadByte();
+			if (ret == -1)
+				throw new NotImplementedException();
+			return (byte)ret;
+		}
+
+		static ushort ReadWord(Stream s)
+		{
+			ushort ret = ReadByte(s);
+			ret |= (ushort)(ReadByte(s) << 8);
+
+			return ret;
+		}
+
+		void UnpackRATileData(MemoryStream ms)
+		{
+			Map.MapTiles = new TileReference<ushort, byte>[MapSize, MapSize];
+			for (int i = 0; i < MapSize; i++)
+				for (int j = 0; j < MapSize; j++)
+					Map.MapTiles[i, j] = new TileReference<ushort, byte>();
+
+			for (int j = 0; j < MapSize; j++)
+				for (int i = 0; i < MapSize; i++)
+					Map.MapTiles[i, j].type = ReadWord(ms);
+
+			for (int j = 0; j < MapSize; j++)
+				for (int i = 0; i < MapSize; i++)
+				{
+					Map.MapTiles[i, j].index = ReadByte(ms);
+					if (Map.MapTiles[i, j].type == 0xff || Map.MapTiles[i, j].type == 0xffff)
+						Map.MapTiles[i, j].index = byte.MaxValue;
+				}
+		}
+
+		void UnpackRAOverlayData(MemoryStream ms)
+		{
+			Map.MapResources = new TileReference<byte, byte>[MapSize, MapSize];
+			for (int j = 0; j < MapSize; j++)
+				for (int i = 0; i < MapSize; i++)
+				{
+					byte o = ReadByte(ms);
+					var res = Pair.New((byte)0, (byte)0);
+
+					if (o != 255 && overlayResourceMapping.ContainsKey(raOverlayNames[o]))
+						res = overlayResourceMapping[raOverlayNames[o]];
+
+					Map.MapResources[i, j] = new TileReference<byte, byte>(res.First, res.Second);
+
+					if (o != 255 && overlayActorMapping.ContainsKey(raOverlayNames[o]))
+						Map.Actors.Add("Actor" + ActorCount++,
+							new ActorReference(overlayActorMapping[raOverlayNames[o]]) 
+							{ 
+								new LocationInit( new int2(i, j) ),
+								new OwnerInit( "Neutral" ) 
+							});
+				}
+		}
+
+		void ReadRATrees(IniFile file)
+		{
+			IniSection terrain = file.GetSection("TERRAIN", true);
+			if (terrain == null)
+				return;
+
+			foreach (KeyValuePair<string, string> kv in terrain)
+			{
+				var loc = int.Parse(kv.Key);
+				Map.Actors.Add("Actor" + ActorCount++, 
+					new ActorReference(kv.Value.ToLowerInvariant())
+					{
+						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+						new OwnerInit("Neutral")
+					});
+			}
+		}
+
+		void UnpackCncTileData(Stream ms)
+		{
+			Map.MapTiles = new TileReference<ushort, byte>[MapSize, MapSize];
+			for (int i = 0; i < MapSize; i++)
+				for (int j = 0; j < MapSize; j++)
+					Map.MapTiles[i, j] = new TileReference<ushort, byte>();
+
+			for (int j = 0; j < MapSize; j++)
+				for (int i = 0; i < MapSize; i++)
+				{
+					Map.MapTiles[i, j].type = ReadByte(ms);
+					Map.MapTiles[i, j].index = ReadByte(ms);
+
+					if (Map.MapTiles[i, j].type == 0xff)
+						Map.MapTiles[i, j].index = byte.MaxValue;
+				}
+		}
+
+		void ReadCncOverlay(IniFile file)
+		{
+			IniSection overlay = file.GetSection("OVERLAY", true);
+			if (overlay == null)
+				return;
+
+			Map.MapResources = new TileReference<byte, byte>[MapSize, MapSize];
+			foreach (KeyValuePair<string, string> kv in overlay)
+			{
+				var loc = int.Parse(kv.Key);
+				int2 cell = new int2(loc % MapSize, loc / MapSize);
+
+				var res = Pair.New((byte)0, (byte)0);
+				if (overlayResourceMapping.ContainsKey(kv.Value.ToLower()))
+					res = overlayResourceMapping[kv.Value.ToLower()];
+
+				Map.MapResources[cell.X, cell.Y] = new TileReference<byte, byte>(res.First, res.Second);
+
+				if (overlayActorMapping.ContainsKey(kv.Value.ToLower()))
+					Map.Actors.Add("Actor" + ActorCount++, 
+						new ActorReference(overlayActorMapping[kv.Value.ToLower()])
+						{
+							new LocationInit(cell),
+							new OwnerInit("Neutral")
+						});
+			}
+		}
+
+		void ReadCncTrees(IniFile file)
+		{
+			IniSection terrain = file.GetSection("TERRAIN", true);
+			if (terrain == null)
+				return;
+
+			foreach (KeyValuePair<string, string> kv in terrain)
+			{
+				var loc = int.Parse(kv.Key);
+				Map.Actors.Add("Actor" + ActorCount++,
+					new ActorReference(kv.Value.Split(',')[0].ToLowerInvariant())
+					{
+						new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+						new OwnerInit("Neutral")
+					});
+			}
+		}
+
+		void LoadActors(IniFile file, string section)
+		{
+			foreach (var s in file.GetSection(section, true))
+			{
+				//Structures: num=owner,type,health,location,turret-facing,trigger
+				//Units: num=owner,type,health,location,facing,action,trigger
+				//Infantry: num=owner,type,health,location,subcell,action,facing,trigger
+				var parts = s.Value.Split(',');
+				var loc = int.Parse(parts[3]);
+				if (parts[0] == "")
+					parts[0] = "Neutral";
+				
+				
+				if (!Players.Contains(parts[0]))
+					Players.Add(parts[0]);
+				
+				var stance = ActorStance.Stance.None;
+				switch(parts[5])
+				{
+					case "Area Guard":
+					case "Guard":
+						stance = ActorStance.Stance.Guard;
+					break;
+					case "Defend Base":
+						stance = ActorStance.Stance.Defend;
+					break;
+					case "Hunt":
+					case "Rampage":
+					case "Attack Base":
+					case "Attack Units":
+					case "Attack Civil.":
+					case "Attack Tarcom":
+						stance = ActorStance.Stance.Hunt;
+					break;
+					case "Retreat":
+					case "Return":
+						stance = ActorStance.Stance.Retreat;
+					break;
+					// do we care about `Harvest' and `Sticky'?
+				}
+				
+				var actor = new ActorReference(parts[1].ToLowerInvariant())
+				{
+					new LocationInit(new int2(loc % MapSize, loc / MapSize)),
+					new OwnerInit(parts[0]),
+					new HealthInit(float.Parse(parts[2], NumberFormatInfo.InvariantInfo)/256),
+					new FacingInit((section == "INFANTRY") ? int.Parse(parts[6]) : int.Parse(parts[4])),
+					new ActorStanceInit(stance),
+				};
+				
+				if (section == "INFANTRY")
+					actor.Add(new SubcellInit(int.Parse(parts[4])));
+				
+				Map.Actors.Add("Actor" + ActorCount++,actor);
+					
+			}
+		}
+
+		void LoadSmudges(IniFile file, string section)
+		{
+			foreach (var s in file.GetSection(section, true))
+			{
+				//loc=type,loc,depth
+				var parts = s.Value.Split(',');
+				var loc = int.Parse(parts[1]);
+				Map.Smudges.Add(new SmudgeReference(parts[0].ToLowerInvariant(), new int2(loc % MapSize, loc / MapSize), int.Parse(parts[2])));
+			}
+		}
+		
+		void LoadPlayer(IniFile file, string section, bool isRA)
+		{			
+			var c = (section == "BadGuy") ? "red" :
+						(isRA) ? "blue" : "gold";
+			
+			var color = namedColorMapping[c];
+			
+			var pr = new PlayerReference
+			{
+				Name = section,
+				OwnsWorld = (section == "Neutral"),
+				NonCombatant = (section == "Neutral"),
+				Race = (isRA) ? ((section == "BadGuy") ? "soviet" : "allies") : ((section == "BadGuy") ? "nod" : "gdi"),
+				Color = color.First,
+				Color2 = color.Second,
+			};
+			
+			var Neutral = new List<string>(){"Neutral"};
+			foreach (var s in file.GetSection(section, true))
+			{
+				Console.WriteLine(s.Key);
+				switch(s.Key)
+				{
+					case "Credits":
+						pr.InitialCash = int.Parse(s.Value);
+					break;
+					case "Allies":
+						pr.Allies = s.Value.Split(',').Intersect(Players).Except(Neutral).ToArray();
+						pr.Enemies = s.Value.Split(',').SymmetricDifference(Players).Except(Neutral).ToArray();
+					break;
+				}
+			}
+			
+			Map.Players.Add(section, pr);
+		}
+
+		static string Truncate(string s, int maxLength)
+		{
+			return s.Length <= maxLength ? s : s.Substring(0, maxLength);
+		}
+	}
+}

OpenRA.Editor/MapSelect.Designer.cs

@@ -1,385 +1,375 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class MapSelect
-	{
-		/// <summary>
-		/// TODO
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// TODO
-		/// </summary>
-		/// <param name="disposing">TODO</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Код, автоматически созданный конструктором форм Windows
-
-		/// <summary>
-		/// TODO
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapSelect));
-			this.MapList = new System.Windows.Forms.ListView();
-			this.colMapName = new System.Windows.Forms.ColumnHeader("(отсутствует)");
-			this.MapIconsList = new System.Windows.Forms.ImageList(this.components);
-			this.btnCancel = new System.Windows.Forms.Button();
-			this.btnOk = new System.Windows.Forms.Button();
-			this.lblNew = new System.Windows.Forms.Label();
-			this.txtNew = new System.Windows.Forms.TextBox();
-			this.pbMinimap = new System.Windows.Forms.PictureBox();
-			this.pnlBottom = new System.Windows.Forms.Panel();
-			this.txtPathOut = new System.Windows.Forms.TextBox();
-			this.lblPathOut = new System.Windows.Forms.Label();
-			this.lblPath = new System.Windows.Forms.Label();
-			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-			this.lblMapList = new System.Windows.Forms.Label();
-			this.txtDesc = new System.Windows.Forms.TextBox();
-			this.lblDesc = new System.Windows.Forms.Label();
-			this.txtTheater = new System.Windows.Forms.TextBox();
-			this.lblTheater = new System.Windows.Forms.Label();
-			this.txtAuthor = new System.Windows.Forms.TextBox();
-			this.lblAuthor = new System.Windows.Forms.Label();
-			this.txtTitle = new System.Windows.Forms.TextBox();
-			this.lblMapName = new System.Windows.Forms.Label();
-			this.lblMinimap = new System.Windows.Forms.Label();
-			this.pictureBox1 = new System.Windows.Forms.PictureBox();
-			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).BeginInit();
-			this.pnlBottom.SuspendLayout();
-			this.splitContainer1.Panel1.SuspendLayout();
-			this.splitContainer1.Panel2.SuspendLayout();
-			this.splitContainer1.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-			this.SuspendLayout();
-			//
-			// MapList
-			//
-			this.MapList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-			this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-			this.colMapName});
-			this.MapList.FullRowSelect = true;
-			this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
-			this.MapList.LargeImageList = this.MapIconsList;
-			this.MapList.Location = new System.Drawing.Point(15, 25);
-			this.MapList.MultiSelect = false;
-			this.MapList.Name = "MapList";
-			this.MapList.Size = new System.Drawing.Size(273, 294);
-			this.MapList.SmallImageList = this.MapIconsList;
-			this.MapList.StateImageList = this.MapIconsList;
-			this.MapList.TabIndex = 0;
-			this.MapList.UseCompatibleStateImageBehavior = false;
-			this.MapList.View = System.Windows.Forms.View.Details;
-			this.MapList.SelectedIndexChanged += new System.EventHandler(this.MapList_SelectedIndexChanged);
-			//
-			// colMapName
-			//
-			this.colMapName.Text = "Map name";
-			this.colMapName.Width = 240;
-			//
-			// MapIconsList
-			//
-			this.MapIconsList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
-			this.MapIconsList.ImageSize = new System.Drawing.Size(24, 24);
-			this.MapIconsList.TransparentColor = System.Drawing.Color.Transparent;
-			//
-			// btnCancel
-			//
-			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Location = new System.Drawing.Point(407, 35);
-			this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(75, 23);
-			this.btnCancel.TabIndex = 3;
-			this.btnCancel.Text = "Cancel";
-			this.btnCancel.UseVisualStyleBackColor = true;
-			//
-			// btnOk
-			//
-			this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.btnOk.Location = new System.Drawing.Point(326, 35);
-			this.btnOk.Name = "btnOk";
-			this.btnOk.Size = new System.Drawing.Size(75, 23);
-			this.btnOk.TabIndex = 2;
-			this.btnOk.Text = "Open";
-			this.btnOk.UseVisualStyleBackColor = true;
-			//
-			// lblNew
-			//
-			this.lblNew.AutoSize = true;
-			this.lblNew.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-			this.lblNew.Location = new System.Drawing.Point(12, 40);
-			this.lblNew.Name = "lblNew";
-			this.lblNew.Size = new System.Drawing.Size(69, 13);
-			this.lblNew.TabIndex = 3;
-			this.lblNew.Text = "Map name:";
-			//
-			// txtNew
-			//
-			this.txtNew.BackColor = System.Drawing.SystemColors.Window;
-			this.txtNew.Location = new System.Drawing.Point(88, 37);
-			this.txtNew.Name = "txtNew";
-			this.txtNew.ReadOnly = true;
-			this.txtNew.Size = new System.Drawing.Size(232, 20);
-			this.txtNew.TabIndex = 1;
-			//
-			// pbMinimap
-			//
-			this.pbMinimap.BackColor = System.Drawing.Color.Black;
-			this.pbMinimap.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-			this.pbMinimap.Location = new System.Drawing.Point(32, 25);
-			this.pbMinimap.Name = "pbMinimap";
-			this.pbMinimap.Size = new System.Drawing.Size(124, 124);
-			this.pbMinimap.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
-			this.pbMinimap.TabIndex = 5;
-			this.pbMinimap.TabStop = false;
-			//
-			// pnlBottom
-			//
-			this.pnlBottom.Controls.Add(this.pictureBox1);
-			this.pnlBottom.Controls.Add(this.txtPathOut);
-			this.pnlBottom.Controls.Add(this.lblPathOut);
-			this.pnlBottom.Controls.Add(this.lblPath);
-			this.pnlBottom.Controls.Add(this.btnCancel);
-			this.pnlBottom.Controls.Add(this.btnOk);
-			this.pnlBottom.Controls.Add(this.txtNew);
-			this.pnlBottom.Controls.Add(this.lblNew);
-			this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.pnlBottom.Location = new System.Drawing.Point(0, 332);
-			this.pnlBottom.MaximumSize = new System.Drawing.Size(0, 70);
-			this.pnlBottom.Name = "pnlBottom";
-			this.pnlBottom.Size = new System.Drawing.Size(494, 70);
-			this.pnlBottom.TabIndex = 6;
-			//
-			// txtPathOut
-			//
-			this.txtPathOut.BackColor = System.Drawing.SystemColors.Window;
-			this.txtPathOut.Location = new System.Drawing.Point(55, 10);
-			this.txtPathOut.Name = "txtPathOut";
-			this.txtPathOut.ReadOnly = true;
-			this.txtPathOut.Size = new System.Drawing.Size(265, 20);
-			this.txtPathOut.TabIndex = 0;
-			this.txtPathOut.TextChanged += new System.EventHandler(this.txtPathOut_TextChanged);
-			//
-			// lblPathOut
-			//
-			this.lblPathOut.AutoSize = true;
-			this.lblPathOut.Location = new System.Drawing.Point(55, 13);
-			this.lblPathOut.Name = "lblPathOut";
-			this.lblPathOut.Size = new System.Drawing.Size(0, 13);
-			this.lblPathOut.TabIndex = 6;
-			//
-			// lblPath
-			//
-			this.lblPath.AutoSize = true;
-			this.lblPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-			this.lblPath.Location = new System.Drawing.Point(12, 13);
-			this.lblPath.Name = "lblPath";
-			this.lblPath.Size = new System.Drawing.Size(37, 13);
-			this.lblPath.TabIndex = 5;
-			this.lblPath.Text = "Path:";
-			//
-			// splitContainer1
-			//
-			this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.splitContainer1.Location = new System.Drawing.Point(0, 0);
-			this.splitContainer1.Name = "splitContainer1";
-			//
-			// splitContainer1.Panel1
-			//
-			this.splitContainer1.Panel1.Controls.Add(this.lblMapList);
-			this.splitContainer1.Panel1.Controls.Add(this.MapList);
-			//
-			// splitContainer1.Panel2
-			//
-			this.splitContainer1.Panel2.Controls.Add(this.txtDesc);
-			this.splitContainer1.Panel2.Controls.Add(this.lblDesc);
-			this.splitContainer1.Panel2.Controls.Add(this.txtTheater);
-			this.splitContainer1.Panel2.Controls.Add(this.lblTheater);
-			this.splitContainer1.Panel2.Controls.Add(this.txtAuthor);
-			this.splitContainer1.Panel2.Controls.Add(this.lblAuthor);
-			this.splitContainer1.Panel2.Controls.Add(this.txtTitle);
-			this.splitContainer1.Panel2.Controls.Add(this.lblMapName);
-			this.splitContainer1.Panel2.Controls.Add(this.lblMinimap);
-			this.splitContainer1.Panel2.Controls.Add(this.pbMinimap);
-			this.splitContainer1.Size = new System.Drawing.Size(494, 332);
-			this.splitContainer1.SplitterDistance = 300;
-			this.splitContainer1.TabIndex = 7;
-			//
-			// lblMapList
-			//
-			this.lblMapList.AutoSize = true;
-			this.lblMapList.Location = new System.Drawing.Point(12, 9);
-			this.lblMapList.Name = "lblMapList";
-			this.lblMapList.Size = new System.Drawing.Size(81, 13);
-			this.lblMapList.TabIndex = 1;
-			this.lblMapList.Text = "Available maps:";
-			//
-			// txtDesc
-			//
-			this.txtDesc.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.txtDesc.Location = new System.Drawing.Point(16, 289);
-			this.txtDesc.Name = "txtDesc";
-			this.txtDesc.ReadOnly = true;
-			this.txtDesc.Size = new System.Drawing.Size(162, 20);
-			this.txtDesc.TabIndex = 14;
-			//
-			// lblDesc
-			//
-			this.lblDesc.AutoSize = true;
-			this.lblDesc.Location = new System.Drawing.Point(13, 273);
-			this.lblDesc.Name = "lblDesc";
-			this.lblDesc.Size = new System.Drawing.Size(63, 13);
-			this.lblDesc.TabIndex = 13;
-			this.lblDesc.Text = "Description:";
-			//
-			// txtTheater
-			//
-			this.txtTheater.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.txtTheater.Location = new System.Drawing.Point(16, 252);
-			this.txtTheater.Name = "txtTheater";
-			this.txtTheater.ReadOnly = true;
-			this.txtTheater.Size = new System.Drawing.Size(162, 20);
-			this.txtTheater.TabIndex = 12;
-			//
-			// lblTheater
-			//
-			this.lblTheater.AutoSize = true;
-			this.lblTheater.Location = new System.Drawing.Point(13, 236);
-			this.lblTheater.Name = "lblTheater";
-			this.lblTheater.Size = new System.Drawing.Size(47, 13);
-			this.lblTheater.TabIndex = 11;
-			this.lblTheater.Text = "Tileset:";
-			//
-			// txtAuthor
-			//
-			this.txtAuthor.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.txtAuthor.Location = new System.Drawing.Point(16, 214);
-			this.txtAuthor.Name = "txtAuthor";
-			this.txtAuthor.ReadOnly = true;
-			this.txtAuthor.Size = new System.Drawing.Size(162, 20);
-			this.txtAuthor.TabIndex = 10;
-			//
-			// lblAuthor
-			//
-			this.lblAuthor.AutoSize = true;
-			this.lblAuthor.Location = new System.Drawing.Point(13, 198);
-			this.lblAuthor.Name = "lblAuthor";
-			this.lblAuthor.Size = new System.Drawing.Size(41, 13);
-			this.lblAuthor.TabIndex = 9;
-			this.lblAuthor.Text = "Author:";
-			//
-			// txtTitle
-			//
-			this.txtTitle.BackColor = System.Drawing.SystemColors.ButtonFace;
-			this.txtTitle.Location = new System.Drawing.Point(16, 177);
-			this.txtTitle.Name = "txtTitle";
-			this.txtTitle.ReadOnly = true;
-			this.txtTitle.Size = new System.Drawing.Size(162, 20);
-			this.txtTitle.TabIndex = 8;
-			//
-			// lblMapName
-			//
-			this.lblMapName.AutoSize = true;
-			this.lblMapName.Location = new System.Drawing.Point(13, 161);
-			this.lblMapName.Name = "lblMapName";
-			this.lblMapName.Size = new System.Drawing.Size(30, 13);
-			this.lblMapName.TabIndex = 7;
-			this.lblMapName.Text = "Title:";
-			//
-			// lblMinimap
-			//
-			this.lblMinimap.AutoSize = true;
-			this.lblMinimap.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-			this.lblMinimap.Location = new System.Drawing.Point(29, 9);
-			this.lblMinimap.Name = "lblMinimap";
-			this.lblMinimap.Size = new System.Drawing.Size(71, 13);
-			this.lblMinimap.TabIndex = 6;
-			this.lblMinimap.Text = "Map preview:";
-			//
-			// pictureBox1
-			//
-			this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-			this.pictureBox1.Location = new System.Drawing.Point(336, -9);
-			this.pictureBox1.Name = "pictureBox1";
-			this.pictureBox1.Size = new System.Drawing.Size(54, 35);
-			this.pictureBox1.TabIndex = 7;
-			this.pictureBox1.TabStop = false;
-			this.pictureBox1.Visible = false;
-			//
-			// MapSelect
-			//
-			this.AcceptButton = this.btnOk;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.btnCancel;
-			this.ClientSize = new System.Drawing.Size(494, 402);
-			this.Controls.Add(this.splitContainer1);
-			this.Controls.Add(this.pnlBottom);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "MapSelect";
-			this.ShowIcon = false;
-			this.ShowInTaskbar = false;
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Select map";
-			this.Load += new System.EventHandler(this.MapSelect_Load);
-			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).EndInit();
-			this.pnlBottom.ResumeLayout(false);
-			this.pnlBottom.PerformLayout();
-			this.splitContainer1.Panel1.ResumeLayout(false);
-			this.splitContainer1.Panel1.PerformLayout();
-			this.splitContainer1.Panel2.ResumeLayout(false);
-			this.splitContainer1.Panel2.PerformLayout();
-			this.splitContainer1.ResumeLayout(false);
-			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-			this.ResumeLayout(false);
-
-		}
-
-		#endregion
-
-		public System.Windows.Forms.ListView MapList;
-		public System.Windows.Forms.Button btnCancel;
-		public System.Windows.Forms.Button btnOk;
-		public System.Windows.Forms.Label lblNew;
-		public System.Windows.Forms.TextBox txtNew;
-		public System.Windows.Forms.ColumnHeader colMapName;
-		public System.Windows.Forms.ImageList MapIconsList;
-		public System.Windows.Forms.PictureBox pbMinimap;
-		public System.Windows.Forms.Panel pnlBottom;
-		public System.Windows.Forms.SplitContainer splitContainer1;
-		public System.Windows.Forms.Label lblMinimap;
-		public System.Windows.Forms.TextBox txtTheater;
-		public System.Windows.Forms.Label lblTheater;
-		public System.Windows.Forms.TextBox txtAuthor;
-		public System.Windows.Forms.Label lblAuthor;
-		public System.Windows.Forms.TextBox txtTitle;
-		public System.Windows.Forms.Label lblMapName;
-		public System.Windows.Forms.TextBox txtDesc;
-		public System.Windows.Forms.Label lblDesc;
-		public System.Windows.Forms.Label lblMapList;
-		public System.Windows.Forms.Label lblPathOut;
-		public System.Windows.Forms.Label lblPath;
-		public System.Windows.Forms.TextBox txtPathOut;
-		private System.Windows.Forms.PictureBox pictureBox1;
-	}
+namespace OpenRA.Editor
+{
+    partial class MapSelect
+    {
+        /// <summary>
+        /// TODO
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// TODO
+        /// </summary>
+        /// <param name="disposing">TODO</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Код, автоматически созданный конструктором форм Windows
+
+        /// <summary>
+        /// TODO
+        /// </summary>
+        private void InitializeComponent()
+        {
+			this.components = new System.ComponentModel.Container();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MapSelect));
+			this.MapList = new System.Windows.Forms.ListView();
+			this.colMapName = new System.Windows.Forms.ColumnHeader("(отсутствует)");
+			this.MapIconsList = new System.Windows.Forms.ImageList(this.components);
+			this.btnCancel = new System.Windows.Forms.Button();
+			this.btnOk = new System.Windows.Forms.Button();
+			this.lblNew = new System.Windows.Forms.Label();
+			this.txtNew = new System.Windows.Forms.TextBox();
+			this.pbMinimap = new System.Windows.Forms.PictureBox();
+			this.pnlBottom = new System.Windows.Forms.Panel();
+			this.txtPathOut = new System.Windows.Forms.TextBox();
+			this.lblPathOut = new System.Windows.Forms.Label();
+			this.lblPath = new System.Windows.Forms.Label();
+			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+			this.lblMapList = new System.Windows.Forms.Label();
+			this.txtDesc = new System.Windows.Forms.TextBox();
+			this.lblDesc = new System.Windows.Forms.Label();
+			this.txtTheater = new System.Windows.Forms.TextBox();
+			this.lblTheater = new System.Windows.Forms.Label();
+			this.txtAuthor = new System.Windows.Forms.TextBox();
+			this.lblAuthor = new System.Windows.Forms.Label();
+			this.txtTitle = new System.Windows.Forms.TextBox();
+			this.lblMapName = new System.Windows.Forms.Label();
+			this.lblMinimap = new System.Windows.Forms.Label();
+			this.pictureBox1 = new System.Windows.Forms.PictureBox();
+			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).BeginInit();
+			this.pnlBottom.SuspendLayout();
+			this.splitContainer1.Panel1.SuspendLayout();
+			this.splitContainer1.Panel2.SuspendLayout();
+			this.splitContainer1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// MapList
+			// 
+			this.MapList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.MapList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.colMapName});
+			this.MapList.FullRowSelect = true;
+			this.MapList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+			this.MapList.LargeImageList = this.MapIconsList;
+			this.MapList.Location = new System.Drawing.Point(15, 25);
+			this.MapList.MultiSelect = false;
+			this.MapList.Name = "MapList";
+			this.MapList.Size = new System.Drawing.Size(273, 294);
+			this.MapList.SmallImageList = this.MapIconsList;
+			this.MapList.StateImageList = this.MapIconsList;
+			this.MapList.TabIndex = 0;
+			this.MapList.UseCompatibleStateImageBehavior = false;
+			this.MapList.View = System.Windows.Forms.View.Details;
+			this.MapList.SelectedIndexChanged += new System.EventHandler(this.MapList_SelectedIndexChanged);
+			// 
+			// colMapName
+			// 
+			this.colMapName.Text = "Map name";
+			this.colMapName.Width = 240;
+			// 
+			// MapIconsList
+			// 
+			this.MapIconsList.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
+			this.MapIconsList.ImageSize = new System.Drawing.Size(24, 24);
+			this.MapIconsList.TransparentColor = System.Drawing.Color.Transparent;
+			// 
+			// btnCancel
+			// 
+			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.btnCancel.Location = new System.Drawing.Point(407, 35);
+			this.btnCancel.Name = "btnCancel";
+			this.btnCancel.Size = new System.Drawing.Size(75, 23);
+			this.btnCancel.TabIndex = 3;
+			this.btnCancel.Text = "Cancel";
+			this.btnCancel.UseVisualStyleBackColor = true;
+			// 
+			// btnOk
+			// 
+			this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.btnOk.Location = new System.Drawing.Point(326, 35);
+			this.btnOk.Name = "btnOk";
+			this.btnOk.Size = new System.Drawing.Size(75, 23);
+			this.btnOk.TabIndex = 2;
+			this.btnOk.Text = "Open";
+			this.btnOk.UseVisualStyleBackColor = true;
+			// 
+			// lblNew
+			// 
+			this.lblNew.AutoSize = true;
+			this.lblNew.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lblNew.Location = new System.Drawing.Point(12, 40);
+			this.lblNew.Name = "lblNew";
+			this.lblNew.Size = new System.Drawing.Size(69, 13);
+			this.lblNew.TabIndex = 3;
+			this.lblNew.Text = "Map name:";
+			// 
+			// txtNew
+			// 
+			this.txtNew.BackColor = System.Drawing.SystemColors.Window;
+			this.txtNew.Location = new System.Drawing.Point(88, 37);
+			this.txtNew.Name = "txtNew";
+			this.txtNew.ReadOnly = true;
+			this.txtNew.Size = new System.Drawing.Size(232, 20);
+			this.txtNew.TabIndex = 1;
+			// 
+			// pbMinimap
+			// 
+			this.pbMinimap.BackColor = System.Drawing.Color.Black;
+			this.pbMinimap.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+			this.pbMinimap.Location = new System.Drawing.Point(32, 25);
+			this.pbMinimap.Name = "pbMinimap";
+			this.pbMinimap.Size = new System.Drawing.Size(124, 124);
+			this.pbMinimap.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+			this.pbMinimap.TabIndex = 5;
+			this.pbMinimap.TabStop = false;
+			// 
+			// pnlBottom
+			// 
+			this.pnlBottom.Controls.Add(this.pictureBox1);
+			this.pnlBottom.Controls.Add(this.txtPathOut);
+			this.pnlBottom.Controls.Add(this.lblPathOut);
+			this.pnlBottom.Controls.Add(this.lblPath);
+			this.pnlBottom.Controls.Add(this.btnCancel);
+			this.pnlBottom.Controls.Add(this.btnOk);
+			this.pnlBottom.Controls.Add(this.txtNew);
+			this.pnlBottom.Controls.Add(this.lblNew);
+			this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.pnlBottom.Location = new System.Drawing.Point(0, 332);
+			this.pnlBottom.MaximumSize = new System.Drawing.Size(0, 70);
+			this.pnlBottom.Name = "pnlBottom";
+			this.pnlBottom.Size = new System.Drawing.Size(494, 70);
+			this.pnlBottom.TabIndex = 6;
+			// 
+			// txtPathOut
+			// 
+			this.txtPathOut.BackColor = System.Drawing.SystemColors.Window;
+			this.txtPathOut.Location = new System.Drawing.Point(55, 10);
+			this.txtPathOut.Name = "txtPathOut";
+			this.txtPathOut.ReadOnly = true;
+			this.txtPathOut.Size = new System.Drawing.Size(265, 20);
+			this.txtPathOut.TabIndex = 0;
+			this.txtPathOut.TextChanged += new System.EventHandler(this.txtPathOut_TextChanged);
+			// 
+			// lblPathOut
+			// 
+			this.lblPathOut.AutoSize = true;
+			this.lblPathOut.Location = new System.Drawing.Point(55, 13);
+			this.lblPathOut.Name = "lblPathOut";
+			this.lblPathOut.Size = new System.Drawing.Size(0, 13);
+			this.lblPathOut.TabIndex = 6;
+			// 
+			// lblPath
+			// 
+			this.lblPath.AutoSize = true;
+			this.lblPath.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lblPath.Location = new System.Drawing.Point(12, 13);
+			this.lblPath.Name = "lblPath";
+			this.lblPath.Size = new System.Drawing.Size(37, 13);
+			this.lblPath.TabIndex = 5;
+			this.lblPath.Text = "Path:";
+			// 
+			// splitContainer1
+			// 
+			this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+			this.splitContainer1.Name = "splitContainer1";
+			// 
+			// splitContainer1.Panel1
+			// 
+			this.splitContainer1.Panel1.Controls.Add(this.lblMapList);
+			this.splitContainer1.Panel1.Controls.Add(this.MapList);
+			// 
+			// splitContainer1.Panel2
+			// 
+			this.splitContainer1.Panel2.Controls.Add(this.txtDesc);
+			this.splitContainer1.Panel2.Controls.Add(this.lblDesc);
+			this.splitContainer1.Panel2.Controls.Add(this.txtTheater);
+			this.splitContainer1.Panel2.Controls.Add(this.lblTheater);
+			this.splitContainer1.Panel2.Controls.Add(this.txtAuthor);
+			this.splitContainer1.Panel2.Controls.Add(this.lblAuthor);
+			this.splitContainer1.Panel2.Controls.Add(this.txtTitle);
+			this.splitContainer1.Panel2.Controls.Add(this.lblMapName);
+			this.splitContainer1.Panel2.Controls.Add(this.lblMinimap);
+			this.splitContainer1.Panel2.Controls.Add(this.pbMinimap);
+			this.splitContainer1.Size = new System.Drawing.Size(494, 332);
+			this.splitContainer1.SplitterDistance = 300;
+			this.splitContainer1.TabIndex = 7;
+			// 
+			// lblMapList
+			// 
+			this.lblMapList.AutoSize = true;
+			this.lblMapList.Location = new System.Drawing.Point(12, 9);
+			this.lblMapList.Name = "lblMapList";
+			this.lblMapList.Size = new System.Drawing.Size(81, 13);
+			this.lblMapList.TabIndex = 1;
+			this.lblMapList.Text = "Available maps:";
+			// 
+			// txtDesc
+			// 
+			this.txtDesc.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtDesc.Location = new System.Drawing.Point(16, 289);
+			this.txtDesc.Name = "txtDesc";
+			this.txtDesc.ReadOnly = true;
+			this.txtDesc.Size = new System.Drawing.Size(162, 20);
+			this.txtDesc.TabIndex = 14;
+			// 
+			// lblDesc
+			// 
+			this.lblDesc.AutoSize = true;
+			this.lblDesc.Location = new System.Drawing.Point(13, 273);
+			this.lblDesc.Name = "lblDesc";
+			this.lblDesc.Size = new System.Drawing.Size(63, 13);
+			this.lblDesc.TabIndex = 13;
+			this.lblDesc.Text = "Description:";
+			// 
+			// txtTheater
+			// 
+			this.txtTheater.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtTheater.Location = new System.Drawing.Point(16, 252);
+			this.txtTheater.Name = "txtTheater";
+			this.txtTheater.ReadOnly = true;
+			this.txtTheater.Size = new System.Drawing.Size(162, 20);
+			this.txtTheater.TabIndex = 12;
+			// 
+			// lblTheater
+			// 
+			this.lblTheater.AutoSize = true;
+			this.lblTheater.Location = new System.Drawing.Point(13, 236);
+			this.lblTheater.Name = "lblTheater";
+			this.lblTheater.Size = new System.Drawing.Size(47, 13);
+			this.lblTheater.TabIndex = 11;
+			this.lblTheater.Text = "Theater:";
+			// 
+			// txtAuthor
+			// 
+			this.txtAuthor.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtAuthor.Location = new System.Drawing.Point(16, 214);
+			this.txtAuthor.Name = "txtAuthor";
+			this.txtAuthor.ReadOnly = true;
+			this.txtAuthor.Size = new System.Drawing.Size(162, 20);
+			this.txtAuthor.TabIndex = 10;
+			// 
+			// lblAuthor
+			// 
+			this.lblAuthor.AutoSize = true;
+			this.lblAuthor.Location = new System.Drawing.Point(13, 198);
+			this.lblAuthor.Name = "lblAuthor";
+			this.lblAuthor.Size = new System.Drawing.Size(41, 13);
+			this.lblAuthor.TabIndex = 9;
+			this.lblAuthor.Text = "Author:";
+			// 
+			// txtTitle
+			// 
+			this.txtTitle.BackColor = System.Drawing.SystemColors.ButtonFace;
+			this.txtTitle.Location = new System.Drawing.Point(16, 177);
+			this.txtTitle.Name = "txtTitle";
+			this.txtTitle.ReadOnly = true;
+			this.txtTitle.Size = new System.Drawing.Size(162, 20);
+			this.txtTitle.TabIndex = 8;
+			// 
+			// lblMapName
+			// 
+			this.lblMapName.AutoSize = true;
+			this.lblMapName.Location = new System.Drawing.Point(13, 161);
+			this.lblMapName.Name = "lblMapName";
+			this.lblMapName.Size = new System.Drawing.Size(30, 13);
+			this.lblMapName.TabIndex = 7;
+			this.lblMapName.Text = "Title:";
+			// 
+			// lblMinimap
+			// 
+			this.lblMinimap.AutoSize = true;
+			this.lblMinimap.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+			this.lblMinimap.Location = new System.Drawing.Point(29, 9);
+			this.lblMinimap.Name = "lblMinimap";
+			this.lblMinimap.Size = new System.Drawing.Size(71, 13);
+			this.lblMinimap.TabIndex = 6;
+			this.lblMinimap.Text = "Map preview:";
+			// 
+			// pictureBox1
+			// 
+			this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+			this.pictureBox1.Location = new System.Drawing.Point(336, -9);
+			this.pictureBox1.Name = "pictureBox1";
+			this.pictureBox1.Size = new System.Drawing.Size(54, 35);
+			this.pictureBox1.TabIndex = 7;
+			this.pictureBox1.TabStop = false;
+			this.pictureBox1.Visible = false;
+			// 
+			// MapSelect
+			// 
+			this.AcceptButton = this.btnOk;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.btnCancel;
+			this.ClientSize = new System.Drawing.Size(494, 402);
+			this.Controls.Add(this.splitContainer1);
+			this.Controls.Add(this.pnlBottom);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "MapSelect";
+			this.ShowIcon = false;
+			this.ShowInTaskbar = false;
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Select map";
+			this.Load += new System.EventHandler(this.MapSelect_Load);
+			((System.ComponentModel.ISupportInitialize)(this.pbMinimap)).EndInit();
+			this.pnlBottom.ResumeLayout(false);
+			this.pnlBottom.PerformLayout();
+			this.splitContainer1.Panel1.ResumeLayout(false);
+			this.splitContainer1.Panel1.PerformLayout();
+			this.splitContainer1.Panel2.ResumeLayout(false);
+			this.splitContainer1.Panel2.PerformLayout();
+			this.splitContainer1.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+			this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        public System.Windows.Forms.ListView MapList;
+        public System.Windows.Forms.Button btnCancel;
+        public System.Windows.Forms.Button btnOk;
+        public System.Windows.Forms.Label lblNew;
+        public System.Windows.Forms.TextBox txtNew;
+        public System.Windows.Forms.ColumnHeader colMapName;
+        public System.Windows.Forms.ImageList MapIconsList;
+        public System.Windows.Forms.PictureBox pbMinimap;
+        public System.Windows.Forms.Panel pnlBottom;
+        public System.Windows.Forms.SplitContainer splitContainer1;
+        public System.Windows.Forms.Label lblMinimap;
+        public System.Windows.Forms.TextBox txtTheater;
+        public System.Windows.Forms.Label lblTheater;
+        public System.Windows.Forms.TextBox txtAuthor;
+        public System.Windows.Forms.Label lblAuthor;
+        public System.Windows.Forms.TextBox txtTitle;
+        public System.Windows.Forms.Label lblMapName;
+        public System.Windows.Forms.TextBox txtDesc;
+        public System.Windows.Forms.Label lblDesc;
+        public System.Windows.Forms.Label lblMapList;
+        public System.Windows.Forms.Label lblPathOut;
+        public System.Windows.Forms.Label lblPath;
+        public System.Windows.Forms.TextBox txtPathOut;
+		private System.Windows.Forms.PictureBox pictureBox1;
+    }
 }

OpenRA.Editor/MapSelect.cs

@@ -1,82 +1,66 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using OpenRA.Graphics;
-
-namespace OpenRA.Editor
-{
-	public partial class MapSelect : Form
-	{
-		public string MapFolderPath;
-
-		public MapSelect(string currentMod)
-		{
-			MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", currentMod, "maps" }
-				.Aggregate(Path.Combine);
-
-			InitializeComponent();
-			MapIconsList.Images.Add(pictureBox1.Image);
-		}
-
-		void MapSelect_Load(object sender, EventArgs e)
-		{
-			MapList.Items.Clear();
-			txtPathOut.Text = MapFolderPath;
-
-			foreach (var map in ModData.FindMapsIn(MapFolderPath))
-			{
-				ListViewItem map1 = new ListViewItem();
-				map1.Tag = map;
-				map1.Text = Path.GetFileNameWithoutExtension(map);
-				map1.ImageIndex = 0;
-				MapList.Items.Add(map1);
-			}
-
-			// hack
-			if (txtNew.Text != "unnamed")
-				MapList.Items[0].Selected = true;
-		}
-
-		void MapList_SelectedIndexChanged(object sender, EventArgs e)
-		{
-			if (MapList.SelectedItems.Count == 1)
-			{
-				txtNew.Text = MapList.SelectedItems[0].Text;
-				txtNew.Tag = MapList.SelectedItems[0].Tag;
-
-				var map = new Map(txtNew.Tag as string);
-				txtTitle.Text = map.Title;
-				txtAuthor.Text = map.Author;
-				txtTheater.Text = map.Tileset;
-				txtDesc.Text = map.Description;
-				pbMinimap.Image = null;
-
-				try
-				{
-					pbMinimap.Image = Minimap.AddStaticResources(map, Minimap.TerrainBitmap(map, true));
-				}
-				catch (Exception ed)
-				{
-					Console.WriteLine("No map preview image found: {0}", ed.ToString());
-				}
-				finally { }
-			}
-		}
-
-		void txtPathOut_TextChanged(object sender, EventArgs e)
-		{
-			MapFolderPath = txtPathOut.Text;
-		}
-	}
-}
+using System;
+using System.IO;
+using System.Windows.Forms;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+
+namespace OpenRA.Editor
+{
+    public partial class MapSelect : Form
+    {
+        public string MapFolderPath;
+
+        public MapSelect()
+        {
+            InitializeComponent();
+			MapIconsList.Images.Add(pictureBox1.Image);
+        }
+
+        void MapSelect_Load(object sender, EventArgs e)
+        {
+            DirectoryInfo directory = new DirectoryInfo(MapFolderPath);
+            DirectoryInfo[] directories = directory.GetDirectories();
+            MapList.Items.Clear();
+            txtPathOut.Text = MapFolderPath;
+            foreach (DirectoryInfo subDirectory in directories)
+            {
+                ListViewItem map1 = new ListViewItem(subDirectory.Name);
+                map1.ImageIndex = 0;
+                MapList.Items.Add(map1);
+            }
+            
+			// hack
+			if (txtNew.Text != "unnamed")
+                MapList.Items[0].Selected = true;
+        }
+
+        void MapList_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (MapList.SelectedItems.Count == 1)
+            {
+                txtNew.Text = MapList.SelectedItems[0].Text;
+                var map = new Map(new Folder(Path.Combine(MapFolderPath, MapList.SelectedItems[0].Text)));
+                txtTitle.Text = map.Title;
+                txtAuthor.Text = map.Author;
+                txtTheater.Text = map.Theater;
+                txtDesc.Text = map.Description;
+				pbMinimap.Image = null;
+                try
+                {
+					pbMinimap.Image = Minimap.AddStaticResources(map, Minimap.TerrainBitmap(map, true));
+                }
+                catch (Exception ed)
+                {
+                    Console.WriteLine("No map preview image found: {0}", ed.ToString());
+                }
+                finally { }
+            }
+        }
+
+        void txtPathOut_TextChanged(object sender, EventArgs e)
+        {
+            MapFolderPath = txtPathOut.Text;
+        }
+
+    }
+}

OpenRA.Editor/MapSelect.resx

@@ -1,177 +1,177 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="MapIconsList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAArjSURBVFhHrVcJUFRXFmVpkE0Wg0ZEMoIBl8RodGSMmVES
-        R0NiChVxCyIIAmFfhe6maeh9AZodZHFpUFQWcQmKisiuLKLEKFFEcIuljtZMYmI5Uc/c14EZYyapmpq8
-        qlP/9/+/373v3HPu+19P7/cf+jSlEWHCOEuzZfNn2Yvo3Pj3D/PTjCwYAwtgyeFwFk163Tos2tvtWJZw
-        zeUjmYFP6vL9fhw31vRPI8/9LnmMrtCWZhtPcJ7hbC/W8DwfnS0LR0t5NKoFazHcqsaprE3YGbMQLrYW
-        W/7fBAxogjGEd5wcXuPK4jxa60qD75VrfIbKMrYMD7VlPX/Ul49rp8RoyPbFIaEnhpuU6NRGoVa2HKuX
-        zEj/X8vAVmlIsDY2Nna2sjBd+ee5b7Yq4tfgfm8a7pxNw60OFa6e4uFmhxr/uFSIexfz0VsZh7PaIJzb
-        F42u8hAcV2/ANz3KF8Hub52kucb+Fv+jAccbm5quWOfxYX5y6Mcnq/IDh1oreX/vOcx9drdbjTudUgye
-        Tsb1piT0H4/DACUw0JiEh33ZePhlFi7UxOCLtI1o2x6IW2cUqM/egLtdediV9MnjSTYm60bE+Ys8rMzN
-        zd1c3/vLgVRV3lN1XjkqyzNoNaEUjIvrLXwMtQsw1JqEy/UxuHg0DJcp+KXj8bh0IobOucSGDA8vpqE6
-        +VNINixBU0kQbp5JJ8jxDSXdeyAE5arlAxTZ/BfRra2tS8Tqwh9L9tQhq6gSabm7odLkoP8oF90V/rjR
-        LsRgExc32oS40ZFCiQgw2Mgj+gW42pBI4OPSsUh6Jgn1mX4ojXJH865IXDzCx50uDe6fV+P8oQQ4Tx6r
-        pOATmVteKgdjXu/Mhk1h328rO4TMwn3gp2YhmquEX7gAfYfjcb4qGH0HQ3D5WAiunU7ApfpofH0ymhIS
-        UwkSqQRb6VoYvm6IZvXG7W4VBVbjwQU1/tanIQZkGDqtwOmSjzHXxXaLsZnZpy85QpdAnfunax/mllRD
-        ma2FQJyHxORMJAqzwBVpUJgtRLF8E7bxlqKjzA991QEYaIijgFwMt6VggJK60hCFr46F4sqprbjbLaf6
-        S0icIh1rwy1i3OvNQff+GEgj3r87/c1JLIGfjX1LP/F6KJDlIy1vN4SyQohVRdAU7IVIXQxuSiZ8/OOw
-        JYyP8EiqfV04Lh2JoHIwMSbiwoFgtO1ah97aTSTMKGIjDl/WhONWl5jKlYrbZ9OJGRWVIg/+axf8SK5a
-        8WoC5fPm//l2qqIIOaVVECm3QZG5C7L0HZCklYJLTCQKNUiWFYAnykJYRDRaywNxrTGRyhKNKyciiIEY
-        dFd743z1ZioT6eJkHK41kXDbRFSKbHzTpcJwsxoHc71fTLGzyBix+L/zUFlaWX+VTcFZ4NzSamQXV1Lw
-        EggkeeBRAsnSfKgyy6DKKcNnxEahIgRfHg5B/7EoDDYn4ma7FD0VAThfG4Cemi3EDI90IKWVq3GbHHKz
-        nUpCbrh6QokEr5mPTEw4773MQij9aPZY5fNYrC6hEhRAnrkTjJEkcS5ieWokS/IhUZdCrtlJbGQiIjQQ
-        /YeD0VMVhoTVbmgs8iVBctG11xtdlUHkDGpQpIN7velUAhmG2+W43spclI6K9JWY6TyxlGKOGxWjG53s
-        5HBMBpZ7+iI6UY44vhoiVTH4ohxCLoTyArqu1OlBll6CZHE20mI9EOjuis3L5uFCbTh6D4Wgu8offYeC
-        qSRccgcPD/qyMEiBb55VYahFgSuNckhjlr2YaGMqH2ntOiKmEAQGBgbnNviGPg2LFSM4UoiAUD78ghLo
-        yEVojBhRiQqEx0nAI5sKiBH/z+OgVfuic7c/Lh+NwZndfughDfQdCtL1hKFmEW51ymn1EjpSAh1ytFCL
-        Pl+nhKebY8XLTYn16DWEgzY2ttdzyI6yjB06+uP4acRANokvhzRRjBR5oe4aN4WupeYgNCIWZ2vj0b17
-        I/UKf3Tt34jOis9otTyyILmkORUDTRKyqxj9DSI07Y0k26Yhes38Roo3YVQH7OVhGiGR0K7O0epEqCRB
-        shKwRIQkQrZqMelAIM6ncihII9uQSCXZEi2HSMjDXvVqXKSGdTLbg6z6OVkwGcfLQvHB4jkYbJMS/UL0
-        1aeSM6So1Hg/oljTR93AupEVYSXhGE+soZa8X+cIlgALzFhg5/HJ6YhIzACXVs9EKiHRMmckSfMQGx0G
-        rXIldU4/dJSvJx3EoSDZC7OszHByTxTOfZGEq00y9B3lo70iElamhp4Ujy1eN8wIrEOd0BRW6DpiWEwq
-        giKSdYiIl5IOUskRKh39AmKECZNP7Mg0O6Ci59Pzd4O/NQK7FBvQULyGOmMUpBsX4KqjGTL5qzHQIqJy
-        iNG6Px5dtYlY7jqhmeKxvUE32C7FGKiP58uf5W6v0ekgPkmNrYIMor4YqcoinQBFdGQrl2ZsB4/cwBJR
-        Zml/+k0sxcQnQZzgDWHIIni9NQHSHU5IS15EPSEN11ok6G9UQs1dh/lvv/GdkZHR3NEETOhkIUE7zvb1
-        wRRFwYv0vD3UBTORJCEdSHMhydgFCXVHVnuWEGvZrDewjqmzKbHDNjHmFl5KBlasWokiFwtop5nhyL6p
-        2JO/CN2HBdSgMpHJ88GH82c8s7b4T1vmUPA3CFxCp19QzBPdtpxdRqon2kkDKRSYXeOJcyBUFMI7IJ70
-        kYsEgRLTXGbgrzNnwmWqC2Y4OsLZZjx43El4ggXI1zohy24MAFd4u9tj8YLpmD71DTiMtwGHY1A7ygB7
-        52N29CLULV7qeT+HnFCoPairu87/RC9rTjE8JYJoY/p4lR8lVQAp7Rc+/pHY7OKE61NN8a21MbQpfwC+
-        m4fbQ7MQNdcCfWMMsTPWDi2yyRgyNkDhOGPYGhpeo97jP5oAcwJjYQ4hk3DOyzvwn9v3HtUJjHXAzSFc
-        RHHlCAznIyAsCZa2k56u3xT2gtHPmGHCdXtnHh47mKBqjS1K5Q7ITrCjlf8RqXPM0bDUCr3bp2C9nj70
-        DDinKMYSwmujCbAjY4G9ZrN3tyMLP/D4IT1vP/J21CBeoKaa55MTUhAeK8J7i91v0DMdxqZmgw7Oc74N
-        iFQ8T5YX6ZzisWI9Uiebo8rKCOcsjLAv1Z72BydUxE5ElcTuKf2P9RunEeGzmD8bTIzsI0I7wc7xdgyf
-        NiayWVoueZ1qz7zPT8l5McnBqZieYZsYO/a4zF7yaKWP4HlASMKLj9xX4WrXWzhdMxUFlkaI1tPDAZE9
-        Htc4wWuhOas5Y/oXgUezYDdZdmK2N6zzCfuB1V1GFkulNswT5cFllms73f+QMIWwjCDjGJnUW1rbfu2z
-        wvXJk85pUH5gieNJdugvd8QV7RSc0TjgiMwevkvH3np1xa/+ZplZE9jecNh14UcPmO8VmnLyfzGr/feU
-        mB/dY7VjybItdSZhrb6+fvEYY6PuMWOMn7ZbGeILfQNYmnN+mO1o/OBdCw74HAMsMjR8NjL/r+Yx+p3H
-        XhjKZs93uxMZr4Z/uOb54qWf3bGf4pw3EpC1UPYsS3g0EU9K4uBsI86zYHPOY3MOp4zuRRLyDfT1O941
-        Mrzvb86Bob4h+0r6zcEmdiFICA2vvT55kLFBYOJhnYt9or06TOmCJ7HTbGxgADpndmaJMU29QxAQKvTo
-        vhnHkN1nX12/OlgCNoT3CZsIvgRWc9ao2IT/bTD3+BID7N1/zisBWCKOBB/CagKf8PboJP8CoUmu3yhA
-        ga8AAAAASUVORK5CYII=
-</value>
-  </data>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="MapIconsList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAArjSURBVFhHrVcJUFRXFmVpkE0Wg0ZEMoIBl8RodGSMmVES
+        R0NiChVxCyIIAmFfhe6maeh9AZodZHFpUFQWcQmKisiuLKLEKFFEcIuljtZMYmI5Uc/c14EZYyapmpq8
+        qlP/9/+/373v3HPu+19P7/cf+jSlEWHCOEuzZfNn2Yvo3Pj3D/PTjCwYAwtgyeFwFk163Tos2tvtWJZw
+        zeUjmYFP6vL9fhw31vRPI8/9LnmMrtCWZhtPcJ7hbC/W8DwfnS0LR0t5NKoFazHcqsaprE3YGbMQLrYW
+        W/7fBAxogjGEd5wcXuPK4jxa60qD75VrfIbKMrYMD7VlPX/Ul49rp8RoyPbFIaEnhpuU6NRGoVa2HKuX
+        zEj/X8vAVmlIsDY2Nna2sjBd+ee5b7Yq4tfgfm8a7pxNw60OFa6e4uFmhxr/uFSIexfz0VsZh7PaIJzb
+        F42u8hAcV2/ANz3KF8Hub52kucb+Fv+jAccbm5quWOfxYX5y6Mcnq/IDh1oreX/vOcx9drdbjTudUgye
+        Tsb1piT0H4/DACUw0JiEh33ZePhlFi7UxOCLtI1o2x6IW2cUqM/egLtdediV9MnjSTYm60bE+Ys8rMzN
+        zd1c3/vLgVRV3lN1XjkqyzNoNaEUjIvrLXwMtQsw1JqEy/UxuHg0DJcp+KXj8bh0IobOucSGDA8vpqE6
+        +VNINixBU0kQbp5JJ8jxDSXdeyAE5arlAxTZ/BfRra2tS8Tqwh9L9tQhq6gSabm7odLkoP8oF90V/rjR
+        LsRgExc32oS40ZFCiQgw2Mgj+gW42pBI4OPSsUh6Jgn1mX4ojXJH865IXDzCx50uDe6fV+P8oQQ4Tx6r
+        pOATmVteKgdjXu/Mhk1h328rO4TMwn3gp2YhmquEX7gAfYfjcb4qGH0HQ3D5WAiunU7ApfpofH0ymhIS
+        UwkSqQRb6VoYvm6IZvXG7W4VBVbjwQU1/tanIQZkGDqtwOmSjzHXxXaLsZnZpy85QpdAnfunax/mllRD
+        ma2FQJyHxORMJAqzwBVpUJgtRLF8E7bxlqKjzA991QEYaIijgFwMt6VggJK60hCFr46F4sqprbjbLaf6
+        S0icIh1rwy1i3OvNQff+GEgj3r87/c1JLIGfjX1LP/F6KJDlIy1vN4SyQohVRdAU7IVIXQxuSiZ8/OOw
+        JYyP8EiqfV04Lh2JoHIwMSbiwoFgtO1ah97aTSTMKGIjDl/WhONWl5jKlYrbZ9OJGRWVIg/+axf8SK5a
+        8WoC5fPm//l2qqIIOaVVECm3QZG5C7L0HZCklYJLTCQKNUiWFYAnykJYRDRaywNxrTGRyhKNKyciiIEY
+        dFd743z1ZioT6eJkHK41kXDbRFSKbHzTpcJwsxoHc71fTLGzyBix+L/zUFlaWX+VTcFZ4NzSamQXV1Lw
+        EggkeeBRAsnSfKgyy6DKKcNnxEahIgRfHg5B/7EoDDYn4ma7FD0VAThfG4Cemi3EDI90IKWVq3GbHHKz
+        nUpCbrh6QokEr5mPTEw4773MQij9aPZY5fNYrC6hEhRAnrkTjJEkcS5ieWokS/IhUZdCrtlJbGQiIjQQ
+        /YeD0VMVhoTVbmgs8iVBctG11xtdlUHkDGpQpIN7velUAhmG2+W43spclI6K9JWY6TyxlGKOGxWjG53s
+        5HBMBpZ7+iI6UY44vhoiVTH4ohxCLoTyArqu1OlBll6CZHE20mI9EOjuis3L5uFCbTh6D4Wgu8offYeC
+        qSRccgcPD/qyMEiBb55VYahFgSuNckhjlr2YaGMqH2ntOiKmEAQGBgbnNviGPg2LFSM4UoiAUD78ghLo
+        yEVojBhRiQqEx0nAI5sKiBH/z+OgVfuic7c/Lh+NwZndfughDfQdCtL1hKFmEW51ymn1EjpSAh1ytFCL
+        Pl+nhKebY8XLTYn16DWEgzY2ttdzyI6yjB06+uP4acRANokvhzRRjBR5oe4aN4WupeYgNCIWZ2vj0b17
+        I/UKf3Tt34jOis9otTyyILmkORUDTRKyqxj9DSI07Y0k26Yhes38Roo3YVQH7OVhGiGR0K7O0epEqCRB
+        shKwRIQkQrZqMelAIM6ncihII9uQSCXZEi2HSMjDXvVqXKSGdTLbg6z6OVkwGcfLQvHB4jkYbJMS/UL0
+        1aeSM6So1Hg/oljTR93AupEVYSXhGE+soZa8X+cIlgALzFhg5/HJ6YhIzACXVs9EKiHRMmckSfMQGx0G
+        rXIldU4/dJSvJx3EoSDZC7OszHByTxTOfZGEq00y9B3lo70iElamhp4Ujy1eN8wIrEOd0BRW6DpiWEwq
+        giKSdYiIl5IOUskRKh39AmKECZNP7Mg0O6Ci59Pzd4O/NQK7FBvQULyGOmMUpBsX4KqjGTL5qzHQIqJy
+        iNG6Px5dtYlY7jqhmeKxvUE32C7FGKiP58uf5W6v0ekgPkmNrYIMor4YqcoinQBFdGQrl2ZsB4/cwBJR
+        Zml/+k0sxcQnQZzgDWHIIni9NQHSHU5IS15EPSEN11ok6G9UQs1dh/lvv/GdkZHR3NEETOhkIUE7zvb1
+        wRRFwYv0vD3UBTORJCEdSHMhydgFCXVHVnuWEGvZrDewjqmzKbHDNjHmFl5KBlasWokiFwtop5nhyL6p
+        2JO/CN2HBdSgMpHJ88GH82c8s7b4T1vmUPA3CFxCp19QzBPdtpxdRqon2kkDKRSYXeOJcyBUFMI7IJ70
+        kYsEgRLTXGbgrzNnwmWqC2Y4OsLZZjx43El4ggXI1zohy24MAFd4u9tj8YLpmD71DTiMtwGHY1A7ygB7
+        52N29CLULV7qeT+HnFCoPairu87/RC9rTjE8JYJoY/p4lR8lVQAp7Rc+/pHY7OKE61NN8a21MbQpfwC+
+        m4fbQ7MQNdcCfWMMsTPWDi2yyRgyNkDhOGPYGhpeo97jP5oAcwJjYQ4hk3DOyzvwn9v3HtUJjHXAzSFc
+        RHHlCAznIyAsCZa2k56u3xT2gtHPmGHCdXtnHh47mKBqjS1K5Q7ITrCjlf8RqXPM0bDUCr3bp2C9nj70
+        DDinKMYSwmujCbAjY4G9ZrN3tyMLP/D4IT1vP/J21CBeoKaa55MTUhAeK8J7i91v0DMdxqZmgw7Oc74N
+        iFQ8T5YX6ZzisWI9Uiebo8rKCOcsjLAv1Z72BydUxE5ElcTuKf2P9RunEeGzmD8bTIzsI0I7wc7xdgyf
+        NiayWVoueZ1qz7zPT8l5McnBqZieYZsYO/a4zF7yaKWP4HlASMKLj9xX4WrXWzhdMxUFlkaI1tPDAZE9
+        Htc4wWuhOas5Y/oXgUezYDdZdmK2N6zzCfuB1V1GFkulNswT5cFllms73f+QMIWwjCDjGJnUW1rbfu2z
+        wvXJk85pUH5gieNJdugvd8QV7RSc0TjgiMwevkvH3np1xa/+ZplZE9jecNh14UcPmO8VmnLyfzGr/feU
+        mB/dY7VjybItdSZhrb6+fvEYY6PuMWOMn7ZbGeILfQNYmnN+mO1o/OBdCw74HAMsMjR8NjL/r+Yx+p3H
+        XhjKZs93uxMZr4Z/uOb54qWf3bGf4pw3EpC1UPYsS3g0EU9K4uBsI86zYHPOY3MOp4zuRRLyDfT1O941
+        Mrzvb86Bob4h+0r6zcEmdiFICA2vvT55kLFBYOJhnYt9or06TOmCJ7HTbGxgADpndmaJMU29QxAQKvTo
+        vhnHkN1nX12/OlgCNoT3CZsIvgRWc9ao2IT/bTD3+BID7N1/zisBWCKOBB/CagKf8PboJP8CoUmu3yhA
+        ga8AAAAASUVORK5CYII=
+</value>
+  </data>
 </root>

OpenRA.Editor/NewMapDialog.Designer.cs

@@ -1,296 +1,286 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class NewMapDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.button2 = new System.Windows.Forms.Button();
-			this.button1 = new System.Windows.Forms.Button();
-			this.label3 = new System.Windows.Forms.Label();
-			this.label2 = new System.Windows.Forms.Label();
-			this.label1 = new System.Windows.Forms.Label();
-			this.cordonBottom = new System.Windows.Forms.NumericUpDown();
-			this.cordonTop = new System.Windows.Forms.NumericUpDown();
-			this.cordonRight = new System.Windows.Forms.NumericUpDown();
-			this.cordonLeft = new System.Windows.Forms.NumericUpDown();
-			this.height = new System.Windows.Forms.NumericUpDown();
-			this.width = new System.Windows.Forms.NumericUpDown();
-			this.label4 = new System.Windows.Forms.Label();
-			this.theater = new System.Windows.Forms.ComboBox();
-			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.height)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.width)).BeginInit();
-			this.SuspendLayout();
-			//
-			// button2
-			//
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button2.Location = new System.Drawing.Point(229, 160);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 7;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			//
-			// button1
-			//
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(310, 160);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 8;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			//
-			// label3
-			//
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(31, 77);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(107, 13);
-			this.label3.TabIndex = 9;
-			this.label3.Text = "Cordon Right/Bottom";
-			//
-			// label2
-			//
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(31, 51);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(86, 13);
-			this.label2.TabIndex = 11;
-			this.label2.Text = "Cordon Left/Top";
-			//
-			// label1
-			//
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(31, 25);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(27, 13);
-			this.label1.TabIndex = 10;
-			this.label1.Text = "Size";
-			//
-			// cordonBottom
-			//
-			this.cordonBottom.Location = new System.Drawing.Point(280, 75);
-			this.cordonBottom.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.cordonBottom.Name = "cordonBottom";
-			this.cordonBottom.Size = new System.Drawing.Size(105, 20);
-			this.cordonBottom.TabIndex = 5;
-			this.cordonBottom.Value = new decimal(new int[] {
-			112,
-			0,
-			0,
-			0});
-			this.cordonBottom.Enter += new System.EventHandler(this.SelectText);
-			//
-			// cordonTop
-			//
-			this.cordonTop.Location = new System.Drawing.Point(280, 49);
-			this.cordonTop.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.cordonTop.Name = "cordonTop";
-			this.cordonTop.Size = new System.Drawing.Size(105, 20);
-			this.cordonTop.TabIndex = 3;
-			this.cordonTop.Value = new decimal(new int[] {
-			16,
-			0,
-			0,
-			0});
-			this.cordonTop.Enter += new System.EventHandler(this.SelectText);
-			//
-			// cordonRight
-			//
-			this.cordonRight.Location = new System.Drawing.Point(169, 75);
-			this.cordonRight.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.cordonRight.Name = "cordonRight";
-			this.cordonRight.Size = new System.Drawing.Size(105, 20);
-			this.cordonRight.TabIndex = 4;
-			this.cordonRight.Value = new decimal(new int[] {
-			112,
-			0,
-			0,
-			0});
-			this.cordonRight.Enter += new System.EventHandler(this.SelectText);
-			//
-			// cordonLeft
-			//
-			this.cordonLeft.Location = new System.Drawing.Point(169, 49);
-			this.cordonLeft.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.cordonLeft.Name = "cordonLeft";
-			this.cordonLeft.Size = new System.Drawing.Size(105, 20);
-			this.cordonLeft.TabIndex = 2;
-			this.cordonLeft.Value = new decimal(new int[] {
-			16,
-			0,
-			0,
-			0});
-			this.cordonLeft.Enter += new System.EventHandler(this.SelectText);
-			//
-			// height
-			//
-			this.height.Increment = new decimal(new int[] {
-			8,
-			0,
-			0,
-			0});
-			this.height.Location = new System.Drawing.Point(280, 23);
-			this.height.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.height.Name = "height";
-			this.height.Size = new System.Drawing.Size(105, 20);
-			this.height.TabIndex = 1;
-			this.height.Value = new decimal(new int[] {
-			128,
-			0,
-			0,
-			0});
-			this.height.Enter += new System.EventHandler(this.SelectText);
-			//
-			// width
-			//
-			this.width.Increment = new decimal(new int[] {
-			8,
-			0,
-			0,
-			0});
-			this.width.Location = new System.Drawing.Point(169, 23);
-			this.width.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.width.Name = "width";
-			this.width.Size = new System.Drawing.Size(105, 20);
-			this.width.TabIndex = 0;
-			this.width.Value = new decimal(new int[] {
-			128,
-			0,
-			0,
-			0});
-			this.width.Enter += new System.EventHandler(this.SelectText);
-			//
-			// label4
-			//
-			this.label4.AutoSize = true;
-			this.label4.Location = new System.Drawing.Point(31, 124);
-			this.label4.Name = "label4";
-			this.label4.Size = new System.Drawing.Size(44, 13);
-			this.label4.TabIndex = 14;
-			this.label4.Text = "Tileset";
-			//
-			// theater
-			//
-			this.theater.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.theater.FormattingEnabled = true;
-			this.theater.Location = new System.Drawing.Point(169, 121);
-			this.theater.Name = "theater";
-			this.theater.Size = new System.Drawing.Size(216, 21);
-			this.theater.TabIndex = 6;
-			//
-			// NewMapDialog
-			//
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(418, 210);
-			this.Controls.Add(this.theater);
-			this.Controls.Add(this.label4);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.cordonBottom);
-			this.Controls.Add(this.cordonTop);
-			this.Controls.Add(this.cordonRight);
-			this.Controls.Add(this.cordonLeft);
-			this.Controls.Add(this.height);
-			this.Controls.Add(this.width);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "NewMapDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "New Map";
-			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.height)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.width)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button button2;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Label label3;
-		private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.Label label1;
-		public System.Windows.Forms.NumericUpDown cordonBottom;
-		public System.Windows.Forms.NumericUpDown cordonTop;
-		public System.Windows.Forms.NumericUpDown cordonRight;
-		public System.Windows.Forms.NumericUpDown cordonLeft;
-		public System.Windows.Forms.NumericUpDown height;
-		public System.Windows.Forms.NumericUpDown width;
-		private System.Windows.Forms.Label label4;
-		public System.Windows.Forms.ComboBox theater;
-	}
+namespace OpenRA.Editor
+{
+	partial class NewMapDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.button2 = new System.Windows.Forms.Button();
+			this.button1 = new System.Windows.Forms.Button();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
+			this.cordonBottom = new System.Windows.Forms.NumericUpDown();
+			this.cordonTop = new System.Windows.Forms.NumericUpDown();
+			this.cordonRight = new System.Windows.Forms.NumericUpDown();
+			this.cordonLeft = new System.Windows.Forms.NumericUpDown();
+			this.height = new System.Windows.Forms.NumericUpDown();
+			this.width = new System.Windows.Forms.NumericUpDown();
+			this.label4 = new System.Windows.Forms.Label();
+			this.theater = new System.Windows.Forms.ComboBox();
+			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.height)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.width)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// button2
+			// 
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(229, 160);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 7;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			// 
+			// button1
+			// 
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(310, 160);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 8;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(31, 77);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(107, 13);
+			this.label3.TabIndex = 9;
+			this.label3.Text = "Cordon Right/Bottom";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(31, 51);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(86, 13);
+			this.label2.TabIndex = 11;
+			this.label2.Text = "Cordon Left/Top";
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(31, 25);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 10;
+			this.label1.Text = "Size";
+			// 
+			// cordonBottom
+			// 
+			this.cordonBottom.Location = new System.Drawing.Point(280, 75);
+			this.cordonBottom.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonBottom.Name = "cordonBottom";
+			this.cordonBottom.Size = new System.Drawing.Size(105, 20);
+			this.cordonBottom.TabIndex = 5;
+			this.cordonBottom.Value = new decimal(new int[] {
+            112,
+            0,
+            0,
+            0});
+			this.cordonBottom.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// cordonTop
+			// 
+			this.cordonTop.Location = new System.Drawing.Point(280, 49);
+			this.cordonTop.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonTop.Name = "cordonTop";
+			this.cordonTop.Size = new System.Drawing.Size(105, 20);
+			this.cordonTop.TabIndex = 3;
+			this.cordonTop.Value = new decimal(new int[] {
+            16,
+            0,
+            0,
+            0});
+			this.cordonTop.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// cordonRight
+			// 
+			this.cordonRight.Location = new System.Drawing.Point(169, 75);
+			this.cordonRight.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonRight.Name = "cordonRight";
+			this.cordonRight.Size = new System.Drawing.Size(105, 20);
+			this.cordonRight.TabIndex = 4;
+			this.cordonRight.Value = new decimal(new int[] {
+            112,
+            0,
+            0,
+            0});
+			this.cordonRight.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// cordonLeft
+			// 
+			this.cordonLeft.Location = new System.Drawing.Point(169, 49);
+			this.cordonLeft.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonLeft.Name = "cordonLeft";
+			this.cordonLeft.Size = new System.Drawing.Size(105, 20);
+			this.cordonLeft.TabIndex = 2;
+			this.cordonLeft.Value = new decimal(new int[] {
+            16,
+            0,
+            0,
+            0});
+			this.cordonLeft.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// height
+			// 
+			this.height.Increment = new decimal(new int[] {
+            8,
+            0,
+            0,
+            0});
+			this.height.Location = new System.Drawing.Point(280, 23);
+			this.height.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.height.Name = "height";
+			this.height.Size = new System.Drawing.Size(105, 20);
+			this.height.TabIndex = 1;
+			this.height.Value = new decimal(new int[] {
+            128,
+            0,
+            0,
+            0});
+			this.height.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// width
+			// 
+			this.width.Increment = new decimal(new int[] {
+            8,
+            0,
+            0,
+            0});
+			this.width.Location = new System.Drawing.Point(169, 23);
+			this.width.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.width.Name = "width";
+			this.width.Size = new System.Drawing.Size(105, 20);
+			this.width.TabIndex = 0;
+			this.width.Value = new decimal(new int[] {
+            128,
+            0,
+            0,
+            0});
+			this.width.Enter += new System.EventHandler(this.SelectText);
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(31, 124);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(44, 13);
+			this.label4.TabIndex = 14;
+			this.label4.Text = "Theater";
+			// 
+			// theater
+			// 
+			this.theater.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.theater.FormattingEnabled = true;
+			this.theater.Location = new System.Drawing.Point(169, 121);
+			this.theater.Name = "theater";
+			this.theater.Size = new System.Drawing.Size(216, 21);
+			this.theater.TabIndex = 6;
+			// 
+			// NewMapDialog
+			// 
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(418, 210);
+			this.Controls.Add(this.theater);
+			this.Controls.Add(this.label4);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.cordonBottom);
+			this.Controls.Add(this.cordonTop);
+			this.Controls.Add(this.cordonRight);
+			this.Controls.Add(this.cordonLeft);
+			this.Controls.Add(this.height);
+			this.Controls.Add(this.width);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "NewMapDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "New Map";
+			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.height)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.width)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label1;
+		public System.Windows.Forms.NumericUpDown cordonBottom;
+		public System.Windows.Forms.NumericUpDown cordonTop;
+		public System.Windows.Forms.NumericUpDown cordonRight;
+		public System.Windows.Forms.NumericUpDown cordonLeft;
+		public System.Windows.Forms.NumericUpDown height;
+		public System.Windows.Forms.NumericUpDown width;
+		private System.Windows.Forms.Label label4;
+		public System.Windows.Forms.ComboBox theater;
+	}
 }

OpenRA.Editor/NewMapDialog.cs

@@ -1,28 +1,27 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	public partial class NewMapDialog : Form
-	{
-		public NewMapDialog()
-		{
-			InitializeComponent();
-		}
-
-		void SelectText(object sender, System.EventArgs e)
-		{
-			var ud = sender as NumericUpDown;
-			ud.Select(0, ud.ToString().Length);
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	public partial class NewMapDialog : Form
+	{
+		public NewMapDialog()
+		{
+			InitializeComponent();
+		}
+
+		private void SelectText(object sender, System.EventArgs e)
+		{
+			(sender as NumericUpDown).Select(0, (sender as NumericUpDown).ToString().Length);
+		}
+	}
+}

OpenRA.Editor/NewMapDialog.resx

@@ -1,120 +1,120 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
 </root>

OpenRA.Editor/OpenRA.Editor.csproj

@@ -1,207 +1,160 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{00038B75-405B-44F5-8691-BD2546DBE224}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRA.Editor</RootNamespace>
-    <AssemblyName>OpenRA.Editor</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ActorPropertiesDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ActorPropertiesDialog.Designer.cs">
-      <DependentUpon>ActorPropertiesDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ActorTemplate.cs" />
-    <Compile Include="ActorTool.cs" />
-    <Compile Include="BrushTool.cs" />
-    <Compile Include="ErrorListDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ErrorListDialog.Designer.cs">
-      <DependentUpon>ErrorListDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Form1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ITool.cs" />
-    <Compile Include="LegacyMapImporter.cs" />
-    <Compile Include="MapSelect.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MapSelect.Designer.cs">
-      <DependentUpon>MapSelect.cs</DependentUpon>
-    </Compile>
-    <Compile Include="NewMapDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="NewMapDialog.Designer.cs">
-      <DependentUpon>NewMapDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="PropertiesDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PropertiesDialog.Designer.cs">
-      <DependentUpon>PropertiesDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="ActorPropertiesDialog.resx">
-      <DependentUpon>ActorPropertiesDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MapSelect.resx">
-      <DependentUpon>MapSelect.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NewMapDialog.resx">
-      <DependentUpon>NewMapDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="PropertiesDialog.resx">
-      <DependentUpon>PropertiesDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ResizeDialog.resx">
-      <DependentUpon>ResizeDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="RenderUtils.cs" />
-    <Compile Include="ResizeDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ResizeDialog.Designer.cs">
-      <DependentUpon>ResizeDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ResourceTool.cs" />
-    <Compile Include="Surface.cs">
-      <SubType>Component</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
-      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRA.FileFormats</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
-      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRA.Game</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="OpenRA.Editor.Icon.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{00038B75-405B-44F5-8691-BD2546DBE224}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenRA.Editor</RootNamespace>
+    <AssemblyName>OpenRA.Editor</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ApplicationIcon>OpenRA.Editor.Icon.ico</ApplicationIcon>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ActorTemplate.cs" />
+    <Compile Include="Form1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form1.Designer.cs">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LegacyMapImporter.cs" />
+    <Compile Include="MapSelect.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MapSelect.Designer.cs">
+      <DependentUpon>MapSelect.cs</DependentUpon>
+    </Compile>
+    <Compile Include="NewMapDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="NewMapDialog.Designer.cs">
+      <DependentUpon>NewMapDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="PaletteBox.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PaletteBox.Designer.cs">
+      <DependentUpon>PaletteBox.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="PropertiesDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PropertiesDialog.Designer.cs">
+      <DependentUpon>PropertiesDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MapSelect.resx">
+      <DependentUpon>MapSelect.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="NewMapDialog.resx">
+      <DependentUpon>NewMapDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PaletteBox.resx">
+      <DependentUpon>PaletteBox.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PropertiesDialog.resx">
+      <DependentUpon>PropertiesDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ResizeDialog.resx">
+      <DependentUpon>ResizeDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="RenderUtils.cs" />
+    <Compile Include="ResizeDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ResizeDialog.Designer.cs">
+      <DependentUpon>ResizeDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Surface.cs">
+      <SubType>Component</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
+      <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
+      <Name>OpenRA.FileFormats</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
+      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
+      <Name>OpenRA.Game</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="OpenRA.Editor.Icon.ico" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>

OpenRA.Editor/PaletteBox.Designer.cs

@@ -0,0 +1,165 @@
+namespace OpenRA.Editor
+{
+    partial class PaletteBox
+    {
+        /// <summary>
+        /// Требуется переменная конструктора.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Освободить все используемые ресурсы.
+        /// </summary>
+        /// <param name="disposing">истинно, если управляемый ресурс должен быть удален; иначе ложно.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Код, автоматически созданный конструктором форм Windows
+
+        /// <summary>
+        /// Обязательный метод для поддержки конструктора - не изменяйте
+        /// содержимое данного метода при помощи редактора кода.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.LayerBox = new System.Windows.Forms.ComboBox();
+            this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.pbtilePalette = new System.Windows.Forms.FlowLayoutPanel();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.pbactorPalette = new System.Windows.Forms.FlowLayoutPanel();
+            this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.pbresourcePalette = new System.Windows.Forms.FlowLayoutPanel();
+            this.tabControl1.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            this.tabPage2.SuspendLayout();
+            this.tabPage3.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // LayerBox
+            // 
+            this.LayerBox.Dock = System.Windows.Forms.DockStyle.Top;
+            this.LayerBox.FormattingEnabled = true;
+            this.LayerBox.Location = new System.Drawing.Point(0, 0);
+            this.LayerBox.Name = "LayerBox";
+            this.LayerBox.Size = new System.Drawing.Size(194, 21);
+            this.LayerBox.TabIndex = 0;
+            // 
+            // tabControl1
+            // 
+            this.tabControl1.Controls.Add(this.tabPage1);
+            this.tabControl1.Controls.Add(this.tabPage2);
+            this.tabControl1.Controls.Add(this.tabPage3);
+            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControl1.Location = new System.Drawing.Point(0, 21);
+            this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
+            this.tabControl1.Multiline = true;
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(194, 357);
+            this.tabControl1.TabIndex = 1;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.pbtilePalette);
+            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(186, 331);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "Templates";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // pbtilePalette
+            // 
+            this.pbtilePalette.AutoScroll = true;
+            this.pbtilePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.pbtilePalette.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pbtilePalette.Location = new System.Drawing.Point(3, 3);
+            this.pbtilePalette.Name = "pbtilePalette";
+            this.pbtilePalette.Size = new System.Drawing.Size(180, 325);
+            this.pbtilePalette.TabIndex = 1;
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Controls.Add(this.pbactorPalette);
+            this.tabPage2.Location = new System.Drawing.Point(4, 22);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(186, 331);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "Actors";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // pbactorPalette
+            // 
+            this.pbactorPalette.AutoScroll = true;
+            this.pbactorPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.pbactorPalette.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pbactorPalette.Location = new System.Drawing.Point(3, 3);
+            this.pbactorPalette.Name = "pbactorPalette";
+            this.pbactorPalette.Size = new System.Drawing.Size(180, 325);
+            this.pbactorPalette.TabIndex = 2;
+            // 
+            // tabPage3
+            // 
+            this.tabPage3.Controls.Add(this.pbresourcePalette);
+            this.tabPage3.Location = new System.Drawing.Point(4, 22);
+            this.tabPage3.Name = "tabPage3";
+            this.tabPage3.Size = new System.Drawing.Size(186, 331);
+            this.tabPage3.TabIndex = 2;
+            this.tabPage3.Text = "Resources";
+            this.tabPage3.UseVisualStyleBackColor = true;
+            // 
+            // pbresourcePalette
+            // 
+            this.pbresourcePalette.AutoScroll = true;
+            this.pbresourcePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.pbresourcePalette.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pbresourcePalette.Location = new System.Drawing.Point(0, 0);
+            this.pbresourcePalette.Name = "pbresourcePalette";
+            this.pbresourcePalette.Size = new System.Drawing.Size(186, 331);
+            this.pbresourcePalette.TabIndex = 3;
+            // 
+            // PaletteBox
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(194, 378);
+            this.Controls.Add(this.tabControl1);
+            this.Controls.Add(this.LayerBox);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "PaletteBox";
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Palette Box";
+            this.TopMost = true;
+            this.tabControl1.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.tabPage2.ResumeLayout(false);
+            this.tabPage3.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        public System.Windows.Forms.ComboBox LayerBox;
+        public System.Windows.Forms.TabControl tabControl1;
+        public System.Windows.Forms.TabPage tabPage1;
+        public System.Windows.Forms.FlowLayoutPanel pbtilePalette;
+        public System.Windows.Forms.TabPage tabPage2;
+        public System.Windows.Forms.FlowLayoutPanel pbactorPalette;
+        public System.Windows.Forms.TabPage tabPage3;
+        public System.Windows.Forms.FlowLayoutPanel pbresourcePalette;
+
+    }
+}

OpenRA.Editor/PaletteBox.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+    public partial class PaletteBox : Form
+    {
+        public PaletteBox()
+        {
+            InitializeComponent();
+        }
+    }
+}

OpenRA.Editor/Program.cs

@@ -1,59 +1,29 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using OpenRA.FileFormats;
-
-namespace OpenRA.Editor
-{
-	static class Program
-	{
-		[STAThread]
-		static void Main( string[] args )
-		{
-			if (args.Length >= 2 && args[0] == "--convert")
-			{
-				Game.modData = new ModData(args[1]);
-				FileSystem.LoadFromManifest(Game.modData.Manifest);
-				Rules.LoadRules(Game.modData.Manifest, new Map());
-				UpgradeMaps(args[1]);
-				return;
-			}
-
-			Application.CurrentCulture = CultureInfo.InvariantCulture;
-			Application.EnableVisualStyles();
-			Application.SetCompatibleTextRenderingDefault(false);
-
-			Application.Run(new Form1(args));
-		}
-
-		static void UpgradeMaps(string mod)
-		{
-			var MapFolderPath = new string[] { Environment.CurrentDirectory, "mods", mod, "maps" }
-				.Aggregate(Path.Combine);
-
-			foreach (var path in ModData.FindMapsIn(MapFolderPath))
-			{
-				var map = new Map(path);
-				// Touch the lazy bits to initialize them
-				map.Actors.Force();
-				map.Smudges.Force();
-				map.MapTiles.Force();
-				map.MapResources.Force();
-				map.Save(path);
-			}
-		}
-
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	static class Program
+	{
+		[STAThread]
+		static void Main( string[] args )
+		{
+			Application.CurrentCulture = CultureInfo.InvariantCulture;
+			Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
+
+			Application.Run(new Form1(args));
+		}
+	}
+}

OpenRA.Editor/Properties/AssemblyInfo.cs

@@ -1,46 +1,36 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenRA.Editor")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("OpenRA.Editor")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("e18ea68f-f344-46c9-b026-8bda76fa91f8")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenRA.Editor")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("OpenRA.Editor")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("e18ea68f-f344-46c9-b026-8bda76fa91f8")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

OpenRA.Editor/Properties/Resources.Designer.cs

@@ -1,63 +1,71 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace OpenRA.Editor.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenRA.Editor.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenRA.Editor.Properties
+{
+
+
+	/// <summary>
+	///   A strongly-typed resource class, for looking up localized strings, etc.
+	/// </summary>
+	// This class was auto-generated by the StronglyTypedResourceBuilder
+	// class via a tool like ResGen or Visual Studio.
+	// To add or remove a member, edit your .ResX file then rerun ResGen
+	// with the /str option, or rebuild your VS project.
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+	[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+	internal class Resources
+	{
+
+		private static global::System.Resources.ResourceManager resourceMan;
+
+		private static global::System.Globalization.CultureInfo resourceCulture;
+
+		[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+		internal Resources()
+		{
+		}
+
+		/// <summary>
+		///   Returns the cached ResourceManager instance used by this class.
+		/// </summary>
+		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+		internal static global::System.Resources.ResourceManager ResourceManager
+		{
+			get
+			{
+				if ((resourceMan == null))
+				{
+					global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenRA.Editor.Properties.Resources", typeof(Resources).Assembly);
+					resourceMan = temp;
+				}
+				return resourceMan;
+			}
+		}
+
+		/// <summary>
+		///   Overrides the current thread's CurrentUICulture property for all
+		///   resource lookups using this strongly typed resource class.
+		/// </summary>
+		[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+		internal static global::System.Globalization.CultureInfo Culture
+		{
+			get
+			{
+				return resourceCulture;
+			}
+			set
+			{
+				resourceCulture = value;
+			}
+		}
+	}
+}

OpenRA.Editor/Properties/Settings.Designer.cs

@@ -1,26 +1,30 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace OpenRA.Editor.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4927
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenRA.Editor.Properties
+{
+
+
+	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+	internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+	{
+
+		private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+		public static Settings Default
+		{
+			get
+			{
+				return defaultInstance;
+			}
+		}
+	}
+}

OpenRA.Editor/Properties/Settings.settings

@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

OpenRA.Editor/PropertiesDialog.Designer.cs

@@ -1,182 +1,159 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class PropertiesDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.button2 = new System.Windows.Forms.Button();
-			this.button1 = new System.Windows.Forms.Button();
-			this.label1 = new System.Windows.Forms.Label();
-			this.title = new System.Windows.Forms.TextBox();
-			this.label2 = new System.Windows.Forms.Label();
-			this.desc = new System.Windows.Forms.TextBox();
-			this.selectable = new System.Windows.Forms.CheckBox();
-			this.label3 = new System.Windows.Forms.Label();
-			this.author = new System.Windows.Forms.TextBox();
-			this.useAsShellmap = new System.Windows.Forms.CheckBox();
-			this.SuspendLayout();
-			//
-			// button2
-			//
-			this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button2.Location = new System.Drawing.Point(196, 193);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 14;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			//
-			// button1
-			//
-			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(277, 193);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 15;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			//
-			// label1
-			//
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(12, 50);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(27, 13);
-			this.label1.TabIndex = 16;
-			this.label1.Text = "Title";
-			//
-			// title
-			//
-			this.title.Location = new System.Drawing.Point(66, 47);
-			this.title.Name = "title";
-			this.title.Size = new System.Drawing.Size(286, 20);
-			this.title.TabIndex = 17;
-			//
-			// label2
-			//
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(12, 76);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(32, 13);
-			this.label2.TabIndex = 16;
-			this.label2.Text = "Desc";
-			//
-			// desc
-			//
-			this.desc.Location = new System.Drawing.Point(66, 73);
-			this.desc.Name = "desc";
-			this.desc.Size = new System.Drawing.Size(286, 20);
-			this.desc.TabIndex = 17;
-			//
-			// selectable
-			//
-			this.selectable.AutoSize = true;
-			this.selectable.Location = new System.Drawing.Point(118, 138);
-			this.selectable.Name = "selectable";
-			this.selectable.Size = new System.Drawing.Size(130, 17);
-			this.selectable.TabIndex = 18;
-			this.selectable.Text = "Show in Map Chooser";
-			this.selectable.UseVisualStyleBackColor = true;
-			//
-			// label3
-			//
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(12, 102);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(38, 13);
-			this.label3.TabIndex = 16;
-			this.label3.Text = "Author";
-			//
-			// author
-			//
-			this.author.Location = new System.Drawing.Point(66, 99);
-			this.author.Name = "author";
-			this.author.Size = new System.Drawing.Size(286, 20);
-			this.author.TabIndex = 17;
-			//
-			// checkBox1
-			//
-			this.useAsShellmap.AutoSize = true;
-			this.useAsShellmap.Location = new System.Drawing.Point(118, 161);
-			this.useAsShellmap.Name = "checkBox1";
-			this.useAsShellmap.Size = new System.Drawing.Size(105, 17);
-			this.useAsShellmap.TabIndex = 18;
-			this.useAsShellmap.Text = "Use as Shellmap";
-			this.useAsShellmap.UseVisualStyleBackColor = true;
-			//
-			// PropertiesDialog
-			//
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(370, 228);
-			this.Controls.Add(this.useAsShellmap);
-			this.Controls.Add(this.selectable);
-			this.Controls.Add(this.author);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.desc);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.title);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "PropertiesDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Map Properties";
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Button button2;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Label label1;
-		public System.Windows.Forms.TextBox title;
-		private System.Windows.Forms.Label label2;
-		public System.Windows.Forms.TextBox desc;
-		public System.Windows.Forms.CheckBox selectable;
-		private System.Windows.Forms.Label label3;
-		public System.Windows.Forms.TextBox author;
-		public System.Windows.Forms.CheckBox useAsShellmap;
-	}
-}
+namespace OpenRA.Editor
+{
+	partial class PropertiesDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.button2 = new System.Windows.Forms.Button();
+			this.button1 = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.title = new System.Windows.Forms.TextBox();
+			this.label2 = new System.Windows.Forms.Label();
+			this.desc = new System.Windows.Forms.TextBox();
+			this.selectable = new System.Windows.Forms.CheckBox();
+			this.label3 = new System.Windows.Forms.Label();
+			this.author = new System.Windows.Forms.TextBox();
+			this.SuspendLayout();
+			// 
+			// button2
+			// 
+			this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(196, 193);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 14;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			// 
+			// button1
+			// 
+			this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(277, 193);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 15;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(12, 50);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 16;
+			this.label1.Text = "Title";
+			// 
+			// title
+			// 
+			this.title.Location = new System.Drawing.Point(66, 47);
+			this.title.Name = "title";
+			this.title.Size = new System.Drawing.Size(286, 20);
+			this.title.TabIndex = 17;
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(12, 76);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(32, 13);
+			this.label2.TabIndex = 16;
+			this.label2.Text = "Desc";
+			// 
+			// desc
+			// 
+			this.desc.Location = new System.Drawing.Point(66, 73);
+			this.desc.Name = "desc";
+			this.desc.Size = new System.Drawing.Size(286, 20);
+			this.desc.TabIndex = 17;
+			// 
+			// selectable
+			// 
+			this.selectable.AutoSize = true;
+			this.selectable.Location = new System.Drawing.Point(118, 138);
+			this.selectable.Name = "selectable";
+			this.selectable.Size = new System.Drawing.Size(130, 17);
+			this.selectable.TabIndex = 18;
+			this.selectable.Text = "Show in Map Chooser";
+			this.selectable.UseVisualStyleBackColor = true;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(12, 102);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(38, 13);
+			this.label3.TabIndex = 16;
+			this.label3.Text = "Author";
+			// 
+			// author
+			// 
+			this.author.Location = new System.Drawing.Point(66, 99);
+			this.author.Name = "author";
+			this.author.Size = new System.Drawing.Size(286, 20);
+			this.author.TabIndex = 17;
+			// 
+			// PropertiesDialog
+			// 
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(370, 228);
+			this.Controls.Add(this.selectable);
+			this.Controls.Add(this.author);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.desc);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.title);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "PropertiesDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "PropertiesDialog";
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Label label1;
+		public System.Windows.Forms.TextBox title;
+		private System.Windows.Forms.Label label2;
+		public System.Windows.Forms.TextBox desc;
+		public System.Windows.Forms.CheckBox selectable;
+		private System.Windows.Forms.Label label3;
+		public System.Windows.Forms.TextBox author;
+	}
+}

OpenRA.Editor/PropertiesDialog.cs

@@ -1,22 +1,22 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	public partial class PropertiesDialog : Form
-	{
-		public PropertiesDialog()
-		{
-			InitializeComponent();
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	public partial class PropertiesDialog : Form
+	{
+		public PropertiesDialog()
+		{
+			InitializeComponent();
+		}
+	}
+}

OpenRA.Editor/PropertiesDialog.resx

@@ -1,120 +1,120 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
 </root>

OpenRA.Editor/RenderUtils.cs

@@ -1,105 +1,136 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using OpenRA.FileFormats;
-using OpenRA.Traits;
-
-namespace OpenRA.Editor
-{
-	static class RenderUtils
-	{
-		static Bitmap RenderShp(ShpReader shp, Palette p)
-		{
-			var frame = shp[0];
-
-			var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
-
-			bitmap.Palette = p.AsSystemPalette();
-
-			var data = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-			unsafe
-			{
-				byte* q = (byte*)data.Scan0.ToPointer();
-				var stride2 = data.Stride;
-
-				for (var i = 0; i < shp.Width; i++)
-					for (var j = 0; j < shp.Height; j++)
-						q[j * stride2 + i] = frame.Image[i + shp.Width * j];
-			}
-
-			bitmap.UnlockBits(data);
-			return bitmap;
-		}
-
-		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
-		{
-			var image = RenderSimple.GetImage(info);
-
-			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
-			{
-				var shp = new ShpReader(s);
-				var bitmap = RenderShp(shp, p);
-
-				try
-				{
-					using (var s2 = FileSystem.OpenWithExts(image + "2", tileset.Extensions))
-					{
-						var shp2 = new ShpReader(s2);
-						var roofBitmap = RenderShp(shp2, p);
-
-						using (var g = System.Drawing.Graphics.FromImage(bitmap))
-							g.DrawImage(roofBitmap, 0, 0);
-					}
-				}
-				catch { }
-
-				return new ActorTemplate
-				{
-					Bitmap = bitmap,
-					Info = info,
-					Appearance = info.Traits.GetOrDefault<EditorAppearanceInfo>()
-				};
-			}
-		}
-
-		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, Palette p)
-		{
-			var image = info.SpriteNames[0];
-			using (var s = FileSystem.OpenWithExts(image, exts))
-			{
-				var shp = new ShpReader(s);
-				var frame = shp[shp.ImageCount - 1];
-
-				var bitmap = new Bitmap(shp.Width, shp.Height, PixelFormat.Format8bppIndexed);
-				bitmap.Palette = p.AsSystemPalette();
-				var data = bitmap.LockBits(bitmap.Bounds(),
-					ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-				unsafe
-				{
-					byte* q = (byte*)data.Scan0.ToPointer();
-					var stride = data.Stride;
-
-					for (var i = 0; i < shp.Width; i++)
-						for (var j = 0; j < shp.Height; j++)
-							q[j * stride + i] = frame.Image[i + shp.Width * j];
-				}
-
-				bitmap.UnlockBits(data);
-				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.ImageCount - 1 };
-			}
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Drawing;
+using System.Drawing.Imaging;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
+
+namespace OpenRA.Editor
+{
+	static class RenderUtils
+	{
+		public static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p)
+		{
+			var template = ts.Templates[n];
+			var tile = ts.Tiles[n];
+
+			var bitmap = new Bitmap(ts.TileSize * template.Size.X, ts.TileSize * template.Size.Y);
+			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+			unsafe
+			{
+				int* q = (int*)data.Scan0.ToPointer();
+				var stride = data.Stride >> 2;
+
+				for (var u = 0; u < template.Size.X; u++)
+					for (var v = 0; v < template.Size.Y; v++)
+						if (tile.TileBitmapBytes[u + v * template.Size.X] != null)
+						{
+							var rawImage = tile.TileBitmapBytes[u + v * template.Size.X];
+							for (var i = 0; i < ts.TileSize; i++)
+								for (var j = 0; j < ts.TileSize; j++)
+									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = p.GetColor(rawImage[i + ts.TileSize * j]).ToArgb();
+						}
+						else
+						{
+							for (var i = 0; i < ts.TileSize; i++)
+								for (var j = 0; j < ts.TileSize; j++)
+									q[(v * ts.TileSize + j) * stride + u * ts.TileSize + i] = Color.Transparent.ToArgb();
+						}
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		static Bitmap RenderShp(ShpReader shp, Palette p)
+		{
+			var frame = shp[0];
+
+			var bitmap = new Bitmap(shp.Width, shp.Height);
+			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+			unsafe
+			{
+				int* q = (int*)data.Scan0.ToPointer();
+				var stride2 = data.Stride >> 2;
+
+				for (var i = 0; i < shp.Width; i++)
+					for (var j = 0; j < shp.Height; j++)
+						q[j * stride2 + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
+			}
+
+			bitmap.UnlockBits(data);
+			return bitmap;
+		}
+
+		public static ActorTemplate RenderActor(ActorInfo info, TileSet tileset, Palette p)
+		{
+			var ri = info.Traits.Get<RenderSimpleInfo>();
+			string image = null;
+			if (ri.OverrideTheater != null)
+				for (int i = 0; i < ri.OverrideTheater.Length; i++)
+					if (ri.OverrideTheater[i] == tileset.Id)
+						image = ri.OverrideImage[i];
+
+			image = image ?? ri.Image ?? info.Name;
+			using (var s = FileSystem.OpenWithExts(image, tileset.Extensions))
+			{
+				var shp = new ShpReader(s);
+				var bitmap = RenderShp(shp, p);
+
+				try
+				{
+					using (var s2 = FileSystem.OpenWithExts(image + "2", tileset.Extensions))
+					{
+						var shp2 = new ShpReader(s2);
+						var roofBitmap = RenderShp(shp2, p);
+
+						using (var g = System.Drawing.Graphics.FromImage(bitmap))
+							g.DrawImage(roofBitmap, 0, 0);
+					}
+				}
+				catch { }
+
+				return new ActorTemplate { Bitmap = bitmap, Info = info, Centered = !info.Traits.Contains<BuildingInfo>() };
+			}
+		}
+
+		public static ResourceTemplate RenderResourceType(ResourceTypeInfo info, string[] exts, Palette p)
+		{
+			var image = info.SpriteNames[0];
+			using (var s = FileSystem.OpenWithExts(image, exts))
+			{
+				var shp = new ShpReader(s);
+				var frame = shp[shp.ImageCount - 1];
+
+				var bitmap = new Bitmap(shp.Width, shp.Height);
+				var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+					ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
+
+				unsafe
+				{
+					int* q = (int*)data.Scan0.ToPointer();
+					var stride = data.Stride >> 2;
+
+					for (var i = 0; i < shp.Width; i++)
+						for (var j = 0; j < shp.Height; j++)
+							q[j * stride + i] = p.GetColor(frame.Image[i + shp.Width * j]).ToArgb();
+				}
+
+				bitmap.UnlockBits(data);
+				return new ResourceTemplate { Bitmap = bitmap, Info = info, Value = shp.ImageCount - 1 };
+			}
+		}
+	}
+}

OpenRA.Editor/ResizeDialog.Designer.cs

@@ -1,236 +1,226 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.Editor
-{
-	partial class ResizeDialog
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.width = new System.Windows.Forms.NumericUpDown();
-			this.label1 = new System.Windows.Forms.Label();
-			this.label2 = new System.Windows.Forms.Label();
-			this.cordonLeft = new System.Windows.Forms.NumericUpDown();
-			this.cordonTop = new System.Windows.Forms.NumericUpDown();
-			this.cordonRight = new System.Windows.Forms.NumericUpDown();
-			this.cordonBottom = new System.Windows.Forms.NumericUpDown();
-			this.label3 = new System.Windows.Forms.Label();
-			this.button1 = new System.Windows.Forms.Button();
-			this.button2 = new System.Windows.Forms.Button();
-			this.height = new System.Windows.Forms.NumericUpDown();
-			((System.ComponentModel.ISupportInitialize)(this.width)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)(this.height)).BeginInit();
-			this.SuspendLayout();
-			//
-			// width
-			//
-			this.width.Increment = new decimal(new int[] {
-			8,
-			0,
-			0,
-			0});
-			this.width.Location = new System.Drawing.Point(161, 18);
-			this.width.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.width.Name = "width";
-			this.width.Size = new System.Drawing.Size(105, 20);
-			this.width.TabIndex = 0;
-			//
-			// label1
-			//
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(23, 20);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(27, 13);
-			this.label1.TabIndex = 1;
-			this.label1.Text = "Size";
-			//
-			// label2
-			//
-			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(23, 46);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(86, 13);
-			this.label2.TabIndex = 1;
-			this.label2.Text = "Cordon Left/Top";
-			//
-			// cordonLeft
-			//
-			this.cordonLeft.Location = new System.Drawing.Point(161, 44);
-			this.cordonLeft.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.cordonLeft.Name = "cordonLeft";
-			this.cordonLeft.Size = new System.Drawing.Size(105, 20);
-			this.cordonLeft.TabIndex = 0;
-			//
-			// cordonTop
-			//
-			this.cordonTop.Location = new System.Drawing.Point(272, 44);
-			this.cordonTop.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.cordonTop.Name = "cordonTop";
-			this.cordonTop.Size = new System.Drawing.Size(105, 20);
-			this.cordonTop.TabIndex = 0;
-			//
-			// cordonRight
-			//
-			this.cordonRight.Location = new System.Drawing.Point(161, 70);
-			this.cordonRight.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.cordonRight.Name = "cordonRight";
-			this.cordonRight.Size = new System.Drawing.Size(105, 20);
-			this.cordonRight.TabIndex = 0;
-			//
-			// cordonBottom
-			//
-			this.cordonBottom.Location = new System.Drawing.Point(272, 70);
-			this.cordonBottom.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.cordonBottom.Name = "cordonBottom";
-			this.cordonBottom.Size = new System.Drawing.Size(105, 20);
-			this.cordonBottom.TabIndex = 0;
-			//
-			// label3
-			//
-			this.label3.AutoSize = true;
-			this.label3.Location = new System.Drawing.Point(23, 72);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(107, 13);
-			this.label3.TabIndex = 1;
-			this.label3.Text = "Cordon Right/Bottom";
-			//
-			// button1
-			//
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(302, 111);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(75, 23);
-			this.button1.TabIndex = 2;
-			this.button1.Text = "Cancel";
-			this.button1.UseVisualStyleBackColor = true;
-			//
-			// button2
-			//
-			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button2.Location = new System.Drawing.Point(221, 111);
-			this.button2.Name = "button2";
-			this.button2.Size = new System.Drawing.Size(75, 23);
-			this.button2.TabIndex = 2;
-			this.button2.Text = "OK";
-			this.button2.UseVisualStyleBackColor = true;
-			//
-			// height
-			//
-			this.height.Increment = new decimal(new int[] {
-			8,
-			0,
-			0,
-			0});
-			this.height.Location = new System.Drawing.Point(272, 18);
-			this.height.Maximum = new decimal(new int[] {
-			2048,
-			0,
-			0,
-			0});
-			this.height.Name = "height";
-			this.height.Size = new System.Drawing.Size(105, 20);
-			this.height.TabIndex = 0;
-			//
-			// ResizeDialog
-			//
-			this.AcceptButton = this.button2;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(409, 146);
-			this.Controls.Add(this.button2);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.cordonBottom);
-			this.Controls.Add(this.cordonTop);
-			this.Controls.Add(this.cordonRight);
-			this.Controls.Add(this.cordonLeft);
-			this.Controls.Add(this.height);
-			this.Controls.Add(this.width);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.Name = "ResizeDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Resize Map";
-			((System.ComponentModel.ISupportInitialize)(this.width)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).EndInit();
-			((System.ComponentModel.ISupportInitialize)(this.height)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.Label label3;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.Button button2;
-		public System.Windows.Forms.NumericUpDown width;
-		public System.Windows.Forms.NumericUpDown cordonLeft;
-		public System.Windows.Forms.NumericUpDown cordonTop;
-		public System.Windows.Forms.NumericUpDown cordonRight;
-		public System.Windows.Forms.NumericUpDown cordonBottom;
-		public System.Windows.Forms.NumericUpDown height;
-	}
+namespace OpenRA.Editor
+{
+	partial class ResizeDialog
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			this.width = new System.Windows.Forms.NumericUpDown();
+			this.label1 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.cordonLeft = new System.Windows.Forms.NumericUpDown();
+			this.cordonTop = new System.Windows.Forms.NumericUpDown();
+			this.cordonRight = new System.Windows.Forms.NumericUpDown();
+			this.cordonBottom = new System.Windows.Forms.NumericUpDown();
+			this.label3 = new System.Windows.Forms.Label();
+			this.button1 = new System.Windows.Forms.Button();
+			this.button2 = new System.Windows.Forms.Button();
+			this.height = new System.Windows.Forms.NumericUpDown();
+			((System.ComponentModel.ISupportInitialize)(this.width)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.height)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// width
+			// 
+			this.width.Increment = new decimal(new int[] {
+            8,
+            0,
+            0,
+            0});
+			this.width.Location = new System.Drawing.Point(161, 18);
+			this.width.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.width.Name = "width";
+			this.width.Size = new System.Drawing.Size(105, 20);
+			this.width.TabIndex = 0;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(23, 20);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(27, 13);
+			this.label1.TabIndex = 1;
+			this.label1.Text = "Size";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(23, 46);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(86, 13);
+			this.label2.TabIndex = 1;
+			this.label2.Text = "Cordon Left/Top";
+			// 
+			// cordonLeft
+			// 
+			this.cordonLeft.Location = new System.Drawing.Point(161, 44);
+			this.cordonLeft.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonLeft.Name = "cordonLeft";
+			this.cordonLeft.Size = new System.Drawing.Size(105, 20);
+			this.cordonLeft.TabIndex = 0;
+			// 
+			// cordonTop
+			// 
+			this.cordonTop.Location = new System.Drawing.Point(272, 44);
+			this.cordonTop.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonTop.Name = "cordonTop";
+			this.cordonTop.Size = new System.Drawing.Size(105, 20);
+			this.cordonTop.TabIndex = 0;
+			// 
+			// cordonRight
+			// 
+			this.cordonRight.Location = new System.Drawing.Point(161, 70);
+			this.cordonRight.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonRight.Name = "cordonRight";
+			this.cordonRight.Size = new System.Drawing.Size(105, 20);
+			this.cordonRight.TabIndex = 0;
+			// 
+			// cordonBottom
+			// 
+			this.cordonBottom.Location = new System.Drawing.Point(272, 70);
+			this.cordonBottom.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.cordonBottom.Name = "cordonBottom";
+			this.cordonBottom.Size = new System.Drawing.Size(105, 20);
+			this.cordonBottom.TabIndex = 0;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(23, 72);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(107, 13);
+			this.label3.TabIndex = 1;
+			this.label3.Text = "Cordon Right/Bottom";
+			// 
+			// button1
+			// 
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button1.Location = new System.Drawing.Point(302, 111);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(75, 23);
+			this.button1.TabIndex = 2;
+			this.button1.Text = "Cancel";
+			this.button1.UseVisualStyleBackColor = true;
+			// 
+			// button2
+			// 
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button2.Location = new System.Drawing.Point(221, 111);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(75, 23);
+			this.button2.TabIndex = 2;
+			this.button2.Text = "OK";
+			this.button2.UseVisualStyleBackColor = true;
+			// 
+			// height
+			// 
+			this.height.Increment = new decimal(new int[] {
+            8,
+            0,
+            0,
+            0});
+			this.height.Location = new System.Drawing.Point(272, 18);
+			this.height.Maximum = new decimal(new int[] {
+            2048,
+            0,
+            0,
+            0});
+			this.height.Name = "height";
+			this.height.Size = new System.Drawing.Size(105, 20);
+			this.height.TabIndex = 0;
+			// 
+			// ResizeDialog
+			// 
+			this.AcceptButton = this.button2;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.button1;
+			this.ClientSize = new System.Drawing.Size(409, 146);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.cordonBottom);
+			this.Controls.Add(this.cordonTop);
+			this.Controls.Add(this.cordonRight);
+			this.Controls.Add(this.cordonLeft);
+			this.Controls.Add(this.height);
+			this.Controls.Add(this.width);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.Name = "ResizeDialog";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "Resize Map";
+			((System.ComponentModel.ISupportInitialize)(this.width)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonLeft)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonTop)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonRight)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.cordonBottom)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.height)).EndInit();
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Button button2;
+		public System.Windows.Forms.NumericUpDown width;
+		public System.Windows.Forms.NumericUpDown cordonLeft;
+		public System.Windows.Forms.NumericUpDown cordonTop;
+		public System.Windows.Forms.NumericUpDown cordonRight;
+		public System.Windows.Forms.NumericUpDown cordonBottom;
+		public System.Windows.Forms.NumericUpDown height;
+	}
 }

OpenRA.Editor/ResizeDialog.cs

@@ -1,22 +1,22 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Windows.Forms;
-
-namespace OpenRA.Editor
-{
-	public partial class ResizeDialog : Form
-	{
-		public ResizeDialog()
-		{
-			InitializeComponent();
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Windows.Forms;
+
+namespace OpenRA.Editor
+{
+	public partial class ResizeDialog : Form
+	{
+		public ResizeDialog()
+		{
+			InitializeComponent();
+		}
+	}
+}

OpenRA.Editor/ResizeDialog.resx

@@ -1,120 +1,120 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
 </root>

OpenRA.Editor/ResourceTool.cs

@@ -1,50 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using OpenRA.FileFormats;
-
-using SGraphics = System.Drawing.Graphics;
-
-namespace OpenRA.Editor
-{
-	class ResourceTool : ITool
-	{
-		ResourceTemplate Resource;
-
-		public ResourceTool(ResourceTemplate resource) { Resource = resource; }
-
-		public void Apply(Surface surface)
-		{
-			surface.Map.MapResources.Value[surface.GetBrushLocation().X, surface.GetBrushLocation().Y]
-				= new TileReference<byte, byte>
-				{
-					type = (byte)Resource.Info.ResourceType,
-					index = (byte)random.Next(Resource.Info.SpriteNames.Length)
-				};
-
-			var ch = new int2((surface.GetBrushLocation().X) / Surface.ChunkSize,
-				(surface.GetBrushLocation().Y) / Surface.ChunkSize);
-
-			if (surface.Chunks.ContainsKey(ch))
-			{
-				surface.Chunks[ch].Dispose();
-				surface.Chunks.Remove(ch);
-			}
-		}
-
-		public void Preview(Surface surface, SGraphics g)
-		{
-			surface.DrawImage(g, Resource.Bitmap, surface.GetBrushLocation(), false, null);
-		}
-
-		Random random = new Random();
-	}
-}

OpenRA.FileFormats/ColorRamp.cs

@@ -1,80 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Drawing;
-
-namespace OpenRA.FileFormats
-{
-	public struct ColorRamp
-	{
-		public byte H,S,L,R;
-
-		public ColorRamp(byte h, byte s, byte l, byte r)
-		{
-			H = h; S = s; L = l; R = r;
-		}
-
-		/* returns a color along the Lum ramp */
-		public Color GetColor( float t )
-		{
-			return ColorFromHSL( H / 255f, S / 255f, float2.Lerp( L / 255f, L*R / (255f * 255f), t ) );
-		}
-
-		public override string ToString()
-		{
-			return "{0},{1},{2},{3}".F(H, S, L, R);
-		}
-
-		// hk is hue in the range [0,1] instead of [0,360]
-		static Color ColorFromHSL(float hk, float s, float l)
-		{
-			// Convert from HSL to RGB
-			var q = (l < 0.5f) ? l * (1 + s) : l + s - (l * s);
-			var p = 2 * l - q;
-
-			float[] trgb = { hk + 1 / 3.0f, hk, hk - 1/3.0f };
-			float[] rgb = { 0, 0, 0 };
-
-			for (int k = 0; k < 3; k++)
-			{
-				while (trgb[k] < 0) trgb[k] += 1.0f;
-				while (trgb[k] > 1) trgb[k] -= 1.0f;
-			}
-
-			for (int k = 0; k < 3; k++)
-			{
-				if (trgb[k] < 1 / 6.0f) { rgb[k] = (p + ((q - p) * 6 * trgb[k])); }
-				else if (trgb[k] >= 1 / 6.0f && trgb[k] < 0.5) { rgb[k] = q; }
-				else if (trgb[k] >= 0.5f && trgb[k] < 2.0f / 3) { rgb[k] = (p + ((q - p) * 6 * (2.0f / 3 - trgb[k]))); }
-				else { rgb[k] = p; }
-			}
-
-			return Color.FromArgb((int)(rgb[0] * 255), (int)(rgb[1] * 255), (int)(rgb[2] * 255));
-		}
-
-		public static bool operator ==(ColorRamp me, ColorRamp other)
-		{
-			return (me.H == other.H && me.S == other.S && me.L == other.L && me.R == other.R );
-		}
-
-		public static bool operator !=(ColorRamp me, ColorRamp other) { return !(me == other); }
-
-		public override int GetHashCode() { return H.GetHashCode() ^ S.GetHashCode() ^ L.GetHashCode() ^ R.GetHashCode(); }
-
-		public override bool Equals(object obj)
-		{
-			if (obj == null)
-				return false;
-
-			ColorRamp o = (ColorRamp)obj;
-			return o == this;
-		}
-	}
-}

OpenRA.FileFormats/CompressedPackage.cs

@@ -0,0 +1,45 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Packaging;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class CompressedPackage : IFolder
+	{
+		readonly uint[] hashes;
+		readonly Stream s;
+		readonly ZipPackage pkg;
+
+		public CompressedPackage(string filename)
+		{
+			s = FileSystem.Open(filename);
+			pkg = (ZipPackage)ZipPackage.Open(s, FileMode.Open);
+			hashes = pkg.GetParts()
+				.Select(p => PackageEntry.HashFilename(p.Uri.LocalPath)).ToArray();
+		}
+
+		public Stream GetContent(string filename)
+		{
+			return pkg.GetPart(new Uri(filename)).GetStream(FileMode.Open);
+		}
+
+		public IEnumerable<uint> AllFileHashes() { return hashes; }
+		
+		public bool Exists(string filename)
+		{
+			return hashes.Contains(PackageEntry.HashFilename(filename));
+		}
+	}
+}

OpenRA.FileFormats/Evaluator.cs

@@ -1,107 +1,107 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	public static class Evaluator
-	{
-		public static int Evaluate(string expr)
-		{
-			return Evaluate(expr, new Dictionary<string, int>());
-		}
-
-		public static int Evaluate(string expr, Dictionary<string, int> syms)
-		{
-			var toks = Tokens(expr, "+-*/()");
-			var postfix = ToPostfix(toks, syms);
-
-			var s = new Stack<int>();
-
-			foreach (var t in postfix)
-			{
-				switch (t[0])
-				{
-					case '+': ApplyBinop(s, (x, y) => y + x); break;
-					case '-': ApplyBinop(s, (x, y) => y - x); break;
-					case '*': ApplyBinop(s, (x, y) => y * x); break;
-					case '/': ApplyBinop(s, (x, y) => y / x); break;
-					default: s.Push(int.Parse(t)); break;
-				}
-			}
-			return s.Pop();
-		}
-
-		static void ApplyBinop( Stack<int> s, Func<int,int,int> f )
-		{
-			var x = s.Pop();
-			var y = s.Pop();
-			s.Push( f(x,y) );
-		}
-
-		static IEnumerable<string> ToPostfix(IEnumerable<string> toks, Dictionary<string, int> syms)
-		{
-			var s = new Stack<string>();
-			foreach (var t in toks)
-			{
-				if (t[0] == '(') s.Push(t);
-				else if (t[0] == ')')
-				{
-					var temp = "";
-					while ((temp = s.Pop()) != "(") yield return temp;
-				}
-				else if (char.IsNumber(t[0])) yield return t;
-				else if (char.IsLetter(t[0]))
-				{
-					if (!syms.ContainsKey(t))
-						throw new InvalidOperationException("Substitution `{0}` undefined".F(t));
-
-					yield return syms[t].ToString();
-				}
-				else
-				{
-					while (s.Count > 0 && Prec[t] <= Prec[s.Peek()]) yield return s.Pop();
-					s.Push(t);
-				}
-			}
-
-			while (s.Count > 0) yield return s.Pop();
-		}
-
-		static readonly Dictionary<string, int> Prec
-			= new Dictionary<string, int> { { "+", 0 }, { "-", 0 }, { "*", 1 }, { "/", 1 }, { "(", -1 } };
-
-		static IEnumerable<string> Tokens(string expr, string ops)
-		{
-			var s = "";
-			foreach (var c in expr)
-			{
-				if (char.IsWhiteSpace(c))
-				{
-					if (s != "") yield return s;
-					s = "";
-				}
-				else if (ops.Contains(c))
-				{
-					if (s != "") yield return s;
-					s = "";
-					yield return "" + c;
-				}
-				else
-					s += c;
-			}
-
-			if (s != "") yield return s;
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public static class Evaluator
+	{
+		public static int Evaluate(string expr)
+		{
+			return Evaluate(expr, new Dictionary<string, int>());
+		}
+
+		public static int Evaluate(string expr, Dictionary<string, int> syms)
+		{
+			var toks = Tokens(expr, "+-*/()");
+			var postfix = ToPostfix(toks, syms);
+
+			var s = new Stack<int>();
+
+			foreach (var t in postfix)
+			{
+				switch (t[0])
+				{
+					case '+': ApplyBinop(s, (x, y) => y + x); break;
+					case '-': ApplyBinop(s, (x, y) => y - x); break;
+					case '*': ApplyBinop(s, (x, y) => y * x); break;
+					case '/': ApplyBinop(s, (x, y) => y / x); break;
+					default: s.Push(int.Parse(t)); break;
+				}
+			}
+			return s.Pop();
+		}
+
+		static void ApplyBinop( Stack<int> s, Func<int,int,int> f )
+		{
+			var x = s.Pop();
+			var y = s.Pop();
+			s.Push( f(x,y) );
+		}
+
+		static IEnumerable<string> ToPostfix(IEnumerable<string> toks, Dictionary<string, int> syms)
+		{
+			var s = new Stack<string>();
+			foreach (var t in toks)
+			{
+				if (t[0] == '(') s.Push(t);
+				else if (t[0] == ')')
+				{
+					var temp = "";
+					while ((temp = s.Pop()) != "(") yield return temp;
+				}
+				else if (char.IsNumber(t[0])) yield return t;
+				else if (char.IsLetter(t[0])) 
+				{
+					if (!syms.ContainsKey(t))
+						throw new InvalidOperationException("Substitution `{0}` undefined".F(t));
+					    
+					yield return syms[t].ToString();;
+				}
+				else
+				{
+					while (s.Count > 0 && Prec[t] <= Prec[s.Peek()]) yield return s.Pop();
+					s.Push(t);
+				}
+			}
+			
+			while (s.Count > 0) yield return s.Pop();
+		}
+
+		static readonly Dictionary<string, int> Prec
+			= new Dictionary<string, int> { { "+", 0 }, { "-", 0 }, { "*", 1 }, { "/", 1 }, { "(", -1 } };
+
+		static IEnumerable<string> Tokens(string expr, string ops)
+		{
+			var s = "";
+			foreach (var c in expr)
+			{
+				if (char.IsWhiteSpace(c))
+				{
+					if (s != "") yield return s;
+					s = "";
+				}
+				else if (ops.Contains(c))
+				{
+					if (s != "") yield return s;
+					s = "";
+					yield return "" + c;
+				}
+				else
+					s += c;
+			}
+
+			if (s != "") yield return s;
+		}
+	}
+}

OpenRA.FileFormats/Exts.cs

@@ -1,265 +1,99 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace OpenRA
-{
-	public static class Exts
-	{
-		public static string F(this string fmt, params object[] args)
-		{
-			return string.Format(fmt, args);
-		}
-
-		public static T WithDefault<T>(T def, Func<T> f)
-		{
-			try { return f(); }
-			catch { return def; }
-		}
-
-		public static void Do<T>(this IEnumerable<T> e, Action<T> fn)
-		{
-			foreach (var ee in e)
-				fn(ee);
-		}
-
-		public static IEnumerable<string> GetNamespaces(this Assembly a)
-		{
-			return a.GetTypes().Select(t => t.Namespace).Distinct().Where(n => n != null);
-		}
-
-		public static string ReadAllText(this Stream s)
-		{
-			using (s)
-			using (var sr = new StreamReader(s))
-				return sr.ReadToEnd();
-		}
-
-		public static byte[] ReadAllBytes(this Stream s)
-		{
-			using (s)
-			{
-				var data = new byte[s.Length - s.Position];
-				s.Read(data, 0, data.Length);
-				return data;
-			}
-		}
-
-		public static void Write(this Stream s, byte[] data)
-		{
-			s.Write(data, 0, data.Length);
-		}
-
-		public static IEnumerable<string> ReadAllLines(this Stream s)
-		{
-			using (var sr = new StreamReader(s))
-				for (; ; )
-				{
-					var line = sr.ReadLine();
-					if (line == null)
-						yield break;
-					else
-						yield return line;
-				}
-		}
-
-		public static bool HasAttribute<T>(this MemberInfo mi)
-		{
-			return mi.GetCustomAttributes(typeof(T), true).Length != 0;
-		}
-
-		public static T[] GetCustomAttributes<T>(this MemberInfo mi, bool inherit)
-			where T : class
-		{
-			return (T[])mi.GetCustomAttributes(typeof(T), inherit);
-		}
-
-		public static T[] GetCustomAttributes<T>(this ParameterInfo mi)
-			where T : class
-		{
-			return (T[])mi.GetCustomAttributes(typeof(T), true);
-		}
-
-		public static T Clamp<T>(this T val, T min, T max) where T : IComparable<T>
-		{
-			if (val.CompareTo(min) < 0)
-				return min;
-			else if (val.CompareTo(max) > 0)
-				return max;
-			else
-				return val;
-		}
-
-		public static bool Contains(this Rectangle r, int2 p)
-		{
-			return r.Contains(p.ToPoint());
-		}
-
-		public static bool Contains(this RectangleF r, int2 p)
-		{
-			return r.Contains(p.ToPointF());
-		}
-
-		public static bool HasModifier(this Modifiers k, Modifiers mod)
-		{
-			return (k & mod) == mod;
-		}
-
-		public static bool IsValidInput(this KeyInput key)
-		{
-			return char.IsLetter(key.UnicodeChar) || char.IsDigit(key.UnicodeChar) ||
-					char.IsSymbol(key.UnicodeChar) || char.IsSeparator(key.UnicodeChar) ||
-					char.IsPunctuation(key.UnicodeChar);
-		}
-
-		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k)
-			where V : new()
-		{
-			return d.GetOrAdd(k, _ => new V());
-		}
-
-		public static V GetOrAdd<K, V>(this Dictionary<K, V> d, K k, Func<K, V> createFn)
-		{
-			V ret;
-			if (!d.TryGetValue(k, out ret))
-				d.Add(k, ret = createFn(k));
-			return ret;
-		}
-
-		public static T Random<T>(this IEnumerable<T> ts, Thirdparty.Random r)
-		{
-			var xs = ts.ToArray();
-			return xs[r.Next(xs.Length)];
-		}
-
-		public static float Product(this IEnumerable<float> xs)
-		{
-			return xs.Aggregate(1f, (a, x) => a * x);
-		}
-
-		public static IEnumerable<T> SymmetricDifference<T>(this IEnumerable<T> xs, IEnumerable<T> ys)
-		{
-			// this is probably a shockingly-slow way to do this, but it's concise.
-			return xs.Except(ys).Concat(ys.Except(xs));
-		}
-
-		public static IEnumerable<T> Iterate<T>( this T t, Func<T,T> f )
-		{
-			for(;;) { yield return t; t = f(t); }
-		}
-
-		public static int NextPowerOf2(int v)
-		{
-			--v;
-			v |= v >> 1;
-			v |= v >> 2;
-			v |= v >> 4;
-			v |= v >> 8;
-			++v;
-			return v;
-		}
-
-		public static Size NextPowerOf2(this Size s) { return new Size(NextPowerOf2(s.Width), NextPowerOf2(s.Height)); }
-
-		public static string JoinWith<T>(this IEnumerable<T> ts, string j)
-		{
-			return string.Join(j, ts.Select(t => t.ToString()).ToArray());
-		}
-
-		public static IEnumerable<T> Append<T>( this IEnumerable<T> ts, params T[] moreTs)
-		{
-			return ts.Concat(moreTs);
-		}
-
-		public static Dictionary<TKey, TSource> ToDictionaryWithConflictLog<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, string debugName, Func<TKey, string> logKey, Func<TSource, string> logValue)
-		{
-			return ToDictionaryWithConflictLog(source, keySelector, x => x, debugName, logKey, logValue);
-		}
-
-		public static Dictionary<TKey, TElement> ToDictionaryWithConflictLog<TSource, TKey, TElement>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector, string debugName, Func<TKey, string> logKey, Func<TElement, string> logValue)
-		{
-			// Fall back on ToString() if null functions are provided:
-			logKey = logKey ?? (s => s.ToString());
-			logValue = logValue ?? (s => s.ToString());
-
-			// Try to build a dictionary and log all duplicates found (if any):
-			var dupKeys = new Dictionary<TKey, List<string>>();
-			var d = new Dictionary<TKey, TElement>();
-			foreach (var item in source)
-			{
-				TKey key = keySelector(item);
-				TElement element = elementSelector(item);
-
-				// Check for a key conflict:
-				if (d.ContainsKey(key))
-				{
-					List<string> dupKeyMessages;
-					if (!dupKeys.TryGetValue(key, out dupKeyMessages))
-					{
-						// Log the initial conflicting value already inserted:
-						dupKeyMessages = new List<string>();
-						dupKeyMessages.Add(logValue(d[key]));
-						dupKeys.Add(key, dupKeyMessages);
-					}
-
-					// Log this conflicting value:
-					dupKeyMessages.Add(logValue(element));
-					continue;
-				}
-
-				d.Add(key, element);
-			}
-
-			// If any duplicates were found, log it and throw a descriptive error
-			if (dupKeys.Count > 0)
-			{
-				string badKeysFormatted = String.Join(", ", dupKeys.Select(p => "{0}: [{1}]".F(logKey(p.Key), String.Join(",", p.Value.ToArray()))).ToArray());
-				string msg = "{0}, duplicate values found for the following keys: {1}".F(debugName, badKeysFormatted);
-				Log.Write("debug", msg);
-				throw new ArgumentException(msg);
-			}
-
-			// Return the dictionary we built:
-			return d;
-		}
-
-		public static Color ColorLerp(float t, Color c1, Color c2)
-		{
-			return Color.FromArgb(
-				(int)(t * c2.A + (1 - t) * c1.A),
-				(int)(t * c2.R + (1 - t) * c1.R),
-				(int)(t * c2.G + (1 - t) * c1.G),
-				(int)(t * c2.B + (1 - t) * c1.B));
-		}
-
-		public static T[] MakeArray<T>(int count, Func<int, T> f)
-		{
-			T[] result = new T[count];
-			for (int i = 0; i < count; i++)
-				result[i] = f(i);
-
-			return result;
-		}
-
-		public static Rectangle Bounds(this Bitmap b) { return new Rectangle(0, 0, b.Width, b.Height); }
-	}
-
-	public static class Enum<T>
-	{
-		public static T Parse(string s) { return (T)Enum.Parse(typeof(T), s); }
-		public static T[] GetValues() { return (T[])Enum.GetValues(typeof(T)); }
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+namespace OpenRA
+{
+	public static class Exts
+	{
+		public static string F(this string fmt, params object[] args)
+		{
+			return string.Format(fmt, args);
+		}
+
+		public static void Do<T>( this IEnumerable<T> e, Action<T> fn )
+		{
+			foreach( var ee in e )
+				fn( ee );
+		}
+
+		public static IEnumerable<string> GetNamespaces(this Assembly a)
+		{
+			return a.GetTypes().Select(t => t.Namespace).Distinct().Where(n => n != null);
+		}
+
+		public static string ReadAllText(this Stream s)
+		{
+			using (s)
+			using (var sr = new StreamReader(s))
+				return sr.ReadToEnd();
+		}
+
+		public static byte[] ReadAllBytes(this Stream s)
+		{
+			using (s)
+			{
+				var data = new byte[s.Length - s.Position];
+				s.Read(data, 0, data.Length);
+				return data;
+			}
+		}
+
+		public static void Write(this Stream s, byte[] data)
+		{
+			s.Write(data, 0, data.Length);
+		}
+
+		public static IEnumerable<string> ReadAllLines(this Stream s)
+		{
+			using (var sr = new StreamReader(s))
+				for (; ; )
+				{
+					var line = sr.ReadLine();
+					if (line == null)
+						yield break;
+					else
+						yield return line;
+				}
+		}
+
+		public static bool HasAttribute<T>(this MemberInfo mi)
+		{
+			return mi.GetCustomAttributes(typeof(T), true).Length != 0;
+		}
+
+		public static T[] GetCustomAttributes<T>( this MemberInfo mi, bool inherit )
+			where T : class
+		{
+			return (T[])mi.GetCustomAttributes( typeof( T ), inherit );
+		}
+
+		public static T[] GetCustomAttributes<T>( this ParameterInfo mi )
+			where T : class
+		{
+			return (T[])mi.GetCustomAttributes( typeof( T ), true );
+		}
+
+		public static T Clamp<T>(this T val, T min, T max) where T : IComparable<T>
+		{
+			if (val.CompareTo(min) < 0)
+				return min;
+			else if (val.CompareTo(max) > 0)
+				return max;
+			else
+				return val;
+		}
+	}
+}

OpenRA.FileFormats/FieldLoader.cs

@@ -1,354 +1,280 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Reflection;
-using System.Globalization;
-
-namespace OpenRA.FileFormats
-{
-	public static class FieldLoader
-	{
-		public static Func<string,Type,string,object> InvalidValueAction = (s,t,f) =>
-		{
-			throw new InvalidOperationException("FieldLoader: Cannot parse `{0}` into `{1}.{2}` ".F(s,f,t) );
-		};
-
-		public static Action<string,Type> UnknownFieldAction = (s,f) =>
-		{
-			throw new NotImplementedException( "FieldLoader: Missing field `{0}` on `{1}`".F( s, f.Name ) );
-		};
-
-		public static void Load( object self, MiniYaml my )
-		{
-			var loadDict = typeLoadInfo[ self.GetType() ];
-
-			foreach( var kv in loadDict )
-			{
-				object val;
-				if( kv.Value != null )
-					val = kv.Value( kv.Key.Name, kv.Key.FieldType, my );
-				else if( !TryGetValueFromYaml( kv.Key.Name, kv.Key.FieldType, my, out val ) )
-					continue;
-
-				kv.Key.SetValue( self, val );
-			}
-		}
-
-		static bool TryGetValueFromYaml( string fieldName, Type fieldType, MiniYaml yaml, out object ret )
-		{
-			ret = null;
-			var n = yaml.Nodes.Where( x=>x.Key == fieldName ).ToList();
-			if( n.Count == 0 )
-				return false;
-			if( n.Count == 1 && n[ 0 ].Value.Nodes.Count == 0 )
-			{
-				ret = GetValue( fieldName, fieldType, n[ 0 ].Value.Value );
-				return true;
-			}
-			else if ( n.Count > 1 )
-			{
-				throw new InvalidOperationException("The field {0} has multiple definitions:\n{1}"
-					.F(fieldName, n.Select(m => "\t- " + m.Location).JoinWith("\n")));
-			}
-			throw new InvalidOperationException( "TryGetValueFromYaml: unable to load field {0} (of type {1})".F( fieldName, fieldType ) );
-		}
-
-		public static T Load<T>(MiniYaml y) where T : new()
-		{
-			var t = new T();
-			Load(t, y);
-			return t;
-		}
-
-		static readonly object[] NoIndexes = {};
-		public static void LoadField( object self, string key, string value )
-		{
-			var field = self.GetType().GetField( key.Trim() );
-
-			if( field != null )
-			{
-				if (!field.HasAttribute<FieldFromYamlKeyAttribute>())
-					field.SetValue( self, GetValue( field.Name, field.FieldType, value ) );
-				return;
-			}
-
-			var prop = self.GetType().GetProperty( key.Trim() );
-
-			if (prop != null)
-			{
-				if (!prop.HasAttribute<FieldFromYamlKeyAttribute>())
-					prop.SetValue(self, GetValue(prop.Name, prop.PropertyType, value), NoIndexes);
-				return;
-			}
-
-			UnknownFieldAction( key.Trim(), self.GetType() );
-		}
-
-		public static T GetValue<T>( string field, string value )
-		{
-			return (T) GetValue( field, typeof(T), value );
-		}
-
-		public static object GetValue( string field, Type fieldType, string x )
-		{
-			if (x != null) x = x.Trim();
-			if( fieldType == typeof( int ) )
-			{
-				int res;
-				if (int.TryParse(x,out res))
-					return res;
-				return InvalidValueAction(x,fieldType, field);
-			}
-
-			else if( fieldType == typeof( ushort ) )
-			{
-				ushort res;
-				if (ushort.TryParse(x,out res))
-					return res;
-				return InvalidValueAction(x,fieldType, field);
-			}
-
-			else if (fieldType == typeof(float))
-			{
-				float res;
-				if (float.TryParse(x.Replace("%",""),  NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
-					return res * (x.Contains( '%' ) ? 0.01f : 1f);
-				return InvalidValueAction(x,fieldType, field);
-			}
-
-			else if (fieldType == typeof(decimal))
-			{
-				decimal res;
-				if (decimal.TryParse(x.Replace("%",""),  NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
-					return res * (x.Contains( '%' ) ? 0.01m : 1m);
-				return InvalidValueAction(x,fieldType, field);
-			}
-
-			else if (fieldType == typeof(string))
-				return x;
-
-			else if (fieldType == typeof(Color))
-			{
-				var parts = x.Split(',');
-				if (parts.Length == 3)
-					return Color.FromArgb(int.Parse(parts[0]).Clamp(0, 255), int.Parse(parts[1]).Clamp(0, 255), int.Parse(parts[2]).Clamp(0, 255));
-				if (parts.Length == 4)
-					return Color.FromArgb(int.Parse(parts[0]).Clamp(0, 255), int.Parse(parts[1]).Clamp(0, 255), int.Parse(parts[2]).Clamp(0, 255), int.Parse(parts[3]).Clamp(0, 255));
-				return InvalidValueAction(x,fieldType, field);
-			}
-
-			else if (fieldType == typeof(ColorRamp))
-			{
-				var parts = x.Split(',');
-				if (parts.Length == 4)
-					return new ColorRamp(
-						(byte)int.Parse(parts[0]).Clamp(0, 255),
-						(byte)int.Parse(parts[1]).Clamp(0, 255),
-						(byte)int.Parse(parts[2]).Clamp(0, 255),
-						(byte)int.Parse(parts[3]).Clamp(0, 255));
-
-				return InvalidValueAction(x, fieldType, field);
-			}
-
-			else if (fieldType.IsEnum)
-			{
-				if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(x.ToLower()))
-					return InvalidValueAction(x, fieldType, field);
-				return Enum.Parse(fieldType, x, true);
-			}
-
-			else if (fieldType == typeof(bool))
-				return ParseYesNo(x, fieldType, field);
-
-			else if (fieldType.IsArray)
-			{
-				if (x == null)
-					return Array.CreateInstance(fieldType.GetElementType(), 0);
-
-				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-
-				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
-				for (int i = 0; i < parts.Length; i++)
-					ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i);
-				return ret;
-			}
-			else if (fieldType == typeof(int2))
-			{
-				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
-			}
-			else if (fieldType == typeof(float2))
-			{
-				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				float xx = 0;
-				float yy = 0;
-				float res;
-				if (float.TryParse(parts[0].Replace("%", ""), out res))
-					xx = res * (parts[0].Contains('%') ? 0.01f : 1f);
-				if (float.TryParse(parts[1].Replace("%", ""), out res))
-					yy = res * (parts[1].Contains('%') ? 0.01f : 1f);
-				return new float2(xx, yy);
-			}
-			else if (fieldType == typeof(Rectangle))
-			{
-				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				return new Rectangle(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]));
-			}
-			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Bits<>))
-			{
-				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-				var argTypes = new Type[] { typeof(string[]) };
-				var argValues = new object[] { parts };
-				return fieldType.GetConstructor(argTypes).Invoke(argValues);
-			}
-
-			UnknownFieldAction("[Type] {0}".F(x),fieldType);
-			return null;
-		}
-
-		static object ParseYesNo( string p, System.Type fieldType, string field )
-		{
-			p = p.ToLowerInvariant();
-			if( p == "yes" ) return true;
-			if( p == "true" ) return true;
-			if( p == "no" ) return false;
-			if( p == "false" ) return false;
-			return InvalidValueAction(p,fieldType, field);
-		}
-
-		static Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>> typeLoadInfo = new Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>>( GetTypeLoadInfo );
-
-		static Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>> GetTypeLoadInfo( Type type )
-		{
-			var ret = new Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>();
-
-			foreach( var ff in type.GetFields() )
-			{
-				var field = ff;
-				var ignore = field.GetCustomAttributes<IgnoreAttribute>( false );
-				var loadUsing = field.GetCustomAttributes<LoadUsingAttribute>( false );
-				var fromYamlKey = field.GetCustomAttributes<FieldFromYamlKeyAttribute>( false );
-				if( loadUsing.Length != 0 )
-					ret[ field ] = ( _1, fieldType, yaml ) => loadUsing[ 0 ].LoaderFunc( field )( yaml );
-				else if( fromYamlKey.Length != 0 )
-					ret[ field ] = ( f, ft, yaml ) => GetValue( f, ft, yaml.Value );
-				else if( ignore.Length == 0 )
-					ret[ field ] = null;
-			}
-
-			return ret;
-		}
-
-		[AttributeUsage( AttributeTargets.Field )]
-		public class IgnoreAttribute : Attribute { }
-
-		[AttributeUsage( AttributeTargets.Field )]
-		public class LoadUsingAttribute : Attribute
-		{
-			Func<MiniYaml, object> loaderFuncCache;
-			public readonly string Loader;
-
-			public LoadUsingAttribute( string loader )
-			{
-				Loader = loader;
-			}
-
-			internal Func<MiniYaml, object> LoaderFunc( FieldInfo field )
-			{
-				const BindingFlags bf = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
-				if( loaderFuncCache == null )
-					loaderFuncCache = (Func<MiniYaml, object>)Delegate.CreateDelegate( typeof( Func<MiniYaml, object> ), field.DeclaringType.GetMethod( Loader, bf ) );
-				return loaderFuncCache;
-			}
-		}
-	}
-
-	public static class FieldSaver
-	{
-		public static MiniYaml Save(object o)
-		{
-			var nodes = new List<MiniYamlNode>();
-			string root = null;
-
-			foreach( var f in o.GetType().GetFields( BindingFlags.Public | BindingFlags.Instance ) )
-			{
-				if( f.HasAttribute<FieldFromYamlKeyAttribute>() )
-					root = FormatValue( o, f );
-				else
-					nodes.Add( new MiniYamlNode( f.Name, FormatValue( o, f ) ) );
-			}
-
-			return new MiniYaml( root, nodes );
-		}
-
-		public static MiniYaml SaveDifferences(object o, object from)
-		{
-			if (o.GetType() != from.GetType())
-				throw new InvalidOperationException("FieldLoader: can't diff objects of different types");
-
-			var fields = o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance)
-				.Where(f => FormatValue(o,f) != FormatValue(from,f));
-
-			return new MiniYaml( null, fields.Select( f => new MiniYamlNode(
-					f.Name,
-					FormatValue( o, f ) ) ).ToList() );
-		}
-
-		public static MiniYamlNode SaveField(object o, string field)
-		{
-			return new MiniYamlNode(field, FieldSaver.FormatValue( o, o.GetType().GetField(field) ));
-		}
-
-		public static string FormatValue(object v, Type t)
-		{
-			if (v == null)
-				return "";
-
-			// Color.ToString() does the wrong thing; force it to format as an array
-			if (t == typeof(Color))
-			{
-				var c = (Color)v;
-				return "{0},{1},{2},{3}".F(((int)c.A).Clamp(0, 255),
-					((int)c.R).Clamp(0, 255),
-					((int)c.G).Clamp(0, 255),
-					((int)c.B).Clamp(0, 255));
-			}
-
-			// Don't save floats in settings.yaml using country-specific decimal separators which can be misunderstood as group seperators.
-			if (t == typeof(float))
-				return ((float)v).ToString(CultureInfo.InvariantCulture);
-
-			if (t == typeof(Rectangle))
-			{
-				var r = (Rectangle)v;
-				return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height);
-			}
-
-			if (t.IsArray)
-			{
-				var elems = ((Array)v).OfType<object>();
-				return elems.JoinWith(",");
-			}
-
-			return v.ToString();
-		}
-
-		public static string FormatValue(object o, FieldInfo f)
-		{
-			return FormatValue(f.GetValue(o), f.FieldType);
-		}
-	}
-
-	public class FieldFromYamlKeyAttribute : Attribute { }
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Reflection;
+using System.Globalization;
+
+namespace OpenRA.FileFormats
+{
+	public static class FieldLoader
+	{
+		public static Func<string,Type,string,object> InvalidValueAction = (s,t,f) =>
+		{
+			throw new InvalidOperationException("FieldLoader: Cannot parse `{0}` into `{1}.{2}` ".F(s,f,t) );
+		};
+
+		public static Action<string,Type> UnknownFieldAction = (s,f) =>
+		{
+			throw new NotImplementedException( "FieldLoader: Missing field `{0}` on `{1}`".F( s, f.Name ) );
+		};
+
+		public static void Load( object self, MiniYaml my )
+		{
+			var loadDict = typeLoadInfo[ self.GetType() ];
+
+			foreach( var kv in loadDict )
+			{
+				object val;
+				if( kv.Value != null )
+					val = kv.Value( kv.Key.Name, kv.Key.FieldType, my );
+				else if( !TryGetValueFromYaml( kv.Key.Name, kv.Key.FieldType, my, out val ) )
+					continue;
+
+				kv.Key.SetValue( self, val );
+			}
+		}
+
+		static bool TryGetValueFromYaml( string fieldName, Type fieldType, MiniYaml yaml, out object ret )
+		{
+			ret = null;
+			var n = yaml.Nodes.Where( x=>x.Key == fieldName ).ToList();
+			if( n.Count == 0 )
+				return false;
+			if( n.Count == 1 && n[ 0 ].Value.Nodes.Count == 0 )
+			{
+				ret = GetValue( fieldName, fieldType, n[ 0 ].Value.Value );
+				return true;
+			}
+			throw new InvalidOperationException( "TryGetValueFromYaml: unable to load field {0} (of type {1})".F( fieldName, fieldType ) );
+		}
+
+		public static T Load<T>(MiniYaml y) where T : new()
+		{
+			var t = new T();
+			Load(t, y);
+			return t;
+		}
+
+		public static void LoadField( object self, string key, string value )
+		{
+			var field = self.GetType().GetField( key.Trim() );
+
+			if( field == null )
+				UnknownFieldAction( key.Trim(), self.GetType() );
+			else if( field.HasAttribute<FieldFromYamlKeyAttribute>() )
+				return;
+			else
+				field.SetValue( self, GetValue( field.Name, field.FieldType, value ) );
+		}
+
+		public static object GetValue( string field, Type fieldType, string x )
+		{
+			if (x != null) x = x.Trim();
+			if( fieldType == typeof( int ) )
+			{
+				int res;
+				if (int.TryParse(x,out res))
+					return res;
+				return InvalidValueAction(x,fieldType, field);
+			}
+
+			else if( fieldType == typeof( ushort ) )
+			{
+				ushort res;
+				if (ushort.TryParse(x,out res))
+					return res;
+				return InvalidValueAction(x,fieldType, field);
+			}
+
+			else if (fieldType == typeof(float))
+			{
+				float res;
+				if (float.TryParse(x.Replace("%",""),  System.Globalization.NumberStyles.Any, NumberFormatInfo.InvariantInfo, out res))
+					return res * (x.Contains( '%' ) ? 0.01f : 1f);
+				return InvalidValueAction(x,fieldType, field);
+			}
+
+			else if (fieldType == typeof(string))
+				return x;
+
+			else if (fieldType == typeof(Color))
+			{
+				var parts = x.Split(',');
+				if (parts.Length == 3)
+					return Color.FromArgb(int.Parse(parts[0]).Clamp(0, 255), int.Parse(parts[1]).Clamp(0, 255), int.Parse(parts[2]).Clamp(0, 255));
+				if (parts.Length == 4)
+					return Color.FromArgb(int.Parse(parts[0]).Clamp(0, 255), int.Parse(parts[1]).Clamp(0, 255), int.Parse(parts[2]).Clamp(0, 255), int.Parse(parts[3]).Clamp(0, 255));
+				return InvalidValueAction(x,fieldType, field);
+			}
+
+			else if (fieldType.IsEnum)
+			{
+				if (!Enum.GetNames(fieldType).Select(a => a.ToLower()).Contains(x.ToLower()))
+					return InvalidValueAction(x,fieldType, field);
+				return Enum.Parse(fieldType, x, true);
+			}
+
+			else if (fieldType == typeof(bool))
+				return ParseYesNo(x, fieldType, field);
+
+			else if (fieldType.IsArray)
+			{
+				if (x == null)
+					return Array.CreateInstance(fieldType.GetElementType(), 0);
+
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+				var ret = Array.CreateInstance(fieldType.GetElementType(), parts.Length);
+				for (int i = 0; i < parts.Length; i++)
+					ret.SetValue(GetValue(field, fieldType.GetElementType(), parts[i].Trim()), i);
+				return ret;
+			}
+			else if (fieldType == typeof(int2))
+			{
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				return new int2(int.Parse(parts[0]), int.Parse(parts[1]));
+			}
+			else if (fieldType == typeof(float2))
+			{
+				var parts = x.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				float xx = 0;
+				float yy = 0;
+				float res;
+				if (float.TryParse(parts[0].Replace("%",""), out res))
+					xx = res * (parts[0].Contains( '%' ) ? 0.01f : 1f);
+				if (float.TryParse(parts[1].Replace("%",""), out res))
+					yy = res * (parts[1].Contains( '%' ) ? 0.01f : 1f);
+				return new float2(xx,yy);
+			}
+
+			UnknownFieldAction("[Type] {0}".F(x),fieldType);
+			return null;
+		}
+
+		static object ParseYesNo( string p, System.Type fieldType, string field )
+		{
+			p = p.ToLowerInvariant();
+			if( p == "yes" ) return true;
+			if( p == "true" ) return true;
+			if( p == "no" ) return false;
+			if( p == "false" ) return false;
+			return InvalidValueAction(p,fieldType, field);
+		}
+
+		static Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>> typeLoadInfo = new Cache<Type, Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>>( GetTypeLoadInfo );
+
+		static Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>> GetTypeLoadInfo( Type type )
+		{
+			var ret = new Dictionary<FieldInfo, Func<string, Type, MiniYaml, object>>();
+
+			foreach( var ff in type.GetFields() )
+			{
+				var field = ff;
+				var load = field.GetCustomAttributes<LoadAttribute>( false );
+				var loadUsing = field.GetCustomAttributes<LoadUsingAttribute>( false );
+				var fromYamlKey = field.GetCustomAttributes<FieldFromYamlKeyAttribute>( false );
+				if( loadUsing.Length != 0 )
+					ret[ field ] = ( _1, fieldType, yaml ) => loadUsing[ 0 ].LoaderFunc( field )( yaml );
+				else if( fromYamlKey.Length != 0 )
+					ret[ field ] = ( f, ft, yaml ) => GetValue( f, ft, yaml.Value );
+				else if( load.Length != 0 )
+					ret[ field ] = null;
+			}
+
+			if( ret.Count == 0 )
+				foreach( var f in type.GetFields() )
+					ret.Add( f, null );
+
+			return ret;
+		}
+
+		[AttributeUsage( AttributeTargets.Field )]
+		public class LoadAttribute : Attribute { }
+
+		[AttributeUsage( AttributeTargets.Field )]
+		public class LoadUsingAttribute : Attribute
+		{
+			Func<MiniYaml, object> loaderFuncCache;
+			public readonly string Loader;
+
+			public LoadUsingAttribute( string loader )
+			{
+				Loader = loader;
+			}
+
+			internal Func<MiniYaml, object> LoaderFunc( FieldInfo field )
+			{
+				const BindingFlags bf = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
+				if( loaderFuncCache == null )
+					loaderFuncCache = (Func<MiniYaml, object>)Delegate.CreateDelegate( typeof( Func<MiniYaml, object> ), field.DeclaringType.GetMethod( Loader, bf ) );
+				return loaderFuncCache;
+			}
+		}
+	}
+
+	public static class FieldSaver
+	{
+		public static MiniYaml Save(object o)
+		{
+			var nodes = new List<MiniYamlNode>();
+			string root = null;
+
+			foreach( var f in o.GetType().GetFields( BindingFlags.Public | BindingFlags.Instance ) )
+			{
+				if( f.HasAttribute<FieldFromYamlKeyAttribute>() )
+					root = FormatValue( o, f );
+				else
+					nodes.Add( new MiniYamlNode( f.Name, FormatValue( o, f ) ) );
+			}
+
+			return new MiniYaml( root, nodes );
+		}
+
+		public static MiniYaml SaveDifferences(object o, object from)
+		{
+			if (o.GetType() != from.GetType())
+				throw new InvalidOperationException("FieldLoader: can't diff objects of different types");
+
+			var fields = o.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance)
+				.Where(f => FormatValue(o,f) != FormatValue(from,f));
+
+			return new MiniYaml( null, fields.Select( f => new MiniYamlNode(
+					f.Name,
+					FormatValue( o, f ) ) ).ToList() );
+		}
+
+		public static string FormatValue(object o, FieldInfo f)
+		{
+			var v = f.GetValue(o);
+			if (v == null)
+				return "";
+
+			// Color.ToString() does the wrong thing; force it to format as an array
+			if (f.FieldType == typeof(Color))
+			{
+				var c = (Color)v;
+				return "{0},{1},{2},{3}".F(((int)c.A).Clamp(0, 255),
+					((int)c.R).Clamp(0, 255),
+					((int)c.G).Clamp(0, 255),
+					((int)c.B).Clamp(0, 255));
+			}
+
+			return f.FieldType.IsArray
+				? string.Join(",", ((Array)v).OfType<object>().Select(a => a.ToString()).ToArray())
+				: v.ToString();
+		}
+	}
+
+	public class FieldFromYamlKeyAttribute : Attribute { }
+}

OpenRA.FileFormats/FileFormats/AudLoader.cs

@@ -1,159 +1,155 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.IO;
-
-namespace OpenRA.FileFormats
-{
-	[Flags]
-	enum SoundFlags
-	{
-		Stereo = 0x1,
-		_16Bit = 0x2,
-	}
-
-	enum SoundFormat
-	{
-		WestwoodCompressed = 1,
-		ImaAdpcm = 99,
-	}
-
-	struct Chunk
-	{
-		public int CompressedSize;
-		public int OutputSize;
-
-		public static Chunk Read(BinaryReader r)
-		{
-			Chunk c;
-			c.CompressedSize = r.ReadUInt16();
-			c.OutputSize = r.ReadUInt16();
-			if (0xdeaf != r.ReadUInt32())
-				throw new InvalidDataException("Chunk header is bogus");
-			return c;
-		}
-	}
-
-	public static class AudLoader
-	{
-		static int[] IndexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
-		static int[] StepTable = {
-									7,     8,     9,     10,    11,    12,     13,    14,    16,
-									17,    19,    21,    23,    25,    28,     31,    34,    37,
-									41,    45,    50,    55,    60,    66,     73,    80,    88,
-									97,    107,   118,   130,   143,   157,    173,   190,   209,
-									230,   253,   279,   307,   337,   371,    408,   449,   494,
-									544,   598,   658,   724,   796,   876,    963,   1060,  1166,
-									1282,  1411,  1552,  1707,  1878,  2066,   2272,  2499,  2749,
-									3024,  3327,  3660,  4026,  4428,  4871,   5358,  5894,  6484,
-									7132,  7845,  8630,  9493,  10442, 11487,  12635, 13899, 15289,
-									16818, 18500, 20350, 22385, 24623, 27086,  29794, 32767 };
-
-		static short DecodeSample(byte b, ref int index, ref int current)
-		{
-			var sb = (b & 8) != 0;
-			b &= 7;
-
-			var delta = (StepTable[index] * b) / 4 + StepTable[index] / 8;
-			if (sb) delta = -delta;
-
-			current += delta;
-			if (current > short.MaxValue) current = short.MaxValue;
-			if (current < short.MinValue) current = short.MinValue;
-
-			index += IndexAdjust[b];
-			if (index < 0) index = 0;
-			if (index > 88) index = 88;
-
-			return (short)current;
-		}
-
-		public static byte[] LoadSound(byte[] raw, ref int index)
-		{
-			var br = new BinaryReader(new MemoryStream(raw));
-			var dataSize = raw.Length;
-			var outputSize = raw.Length * 4;
-
-			var output = new byte[outputSize];
-			var offset = 0;
-			var currentSample = 0;
-
-			while (dataSize-- > 0)
-			{
-				var b = br.ReadByte();
-
-				var t = DecodeSample(b, ref index, ref currentSample);
-				output[offset++] = (byte)t;
-				output[offset++] = (byte)(t >> 8);
-
-				t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
-				output[offset++] = (byte)t;
-				output[offset++] = (byte)(t >> 8);
-			}
-
-			return output;
-		}
-
-		public static float SoundLength(Stream s)
-		{
-			var br = new BinaryReader(s);
-			var sampleRate = br.ReadUInt16();
-			/*var dataSize = */ br.ReadInt32();
-			var outputSize = br.ReadInt32();
-			var flags = (SoundFlags) br.ReadByte();
-
-			var samples = outputSize;
-			if (0 != (flags & SoundFlags.Stereo)) samples /= 2;
-			if (0 != (flags & SoundFlags._16Bit)) samples /= 2;
-			return samples / sampleRate;
-		}
-
-		public static byte[] LoadSound(Stream s)
-		{
-			var br = new BinaryReader(s);
-			/*var sampleRate =*/ br.ReadUInt16();
-			var dataSize = br.ReadInt32();
-			var outputSize = br.ReadInt32();
-			/*var flags = (SoundFlags)*/ br.ReadByte();
-			/*var format = (SoundFormat)*/ br.ReadByte();
-
-			var output = new byte[outputSize];
-			var offset = 0;
-			var index = 0;
-			var currentSample = 0;
-
-			while (dataSize > 0)
-			{
-				var chunk = Chunk.Read(br);
-				for (int n = 0; n < chunk.CompressedSize; n++)
-				{
-					var b = br.ReadByte();
-
-					var t = DecodeSample(b, ref index, ref currentSample);
-					output[offset++] = (byte)t;
-					output[offset++] = (byte)(t >> 8);
-
-					if (offset < outputSize)
-					{
-						/* possible that only half of the final byte is used! */
-						t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
-						output[offset++] = (byte)t;
-						output[offset++] = (byte)(t >> 8);
-					}
-				}
-
-				dataSize -= 8 + chunk.CompressedSize;
-			}
-
-			return output;
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	[Flags]
+	enum SoundFlags
+	{
+		Stereo = 0x1,
+		_16Bit = 0x2,
+	}
+
+	enum SoundFormat
+	{
+		WestwoodCompressed = 1,
+		ImaAdpcm = 99,
+	}
+
+	struct Chunk
+	{
+		public int CompressedSize;
+		public int OutputSize;
+
+		public static Chunk Read(BinaryReader r)
+		{
+			Chunk c;
+			c.CompressedSize = r.ReadUInt16();
+			c.OutputSize = r.ReadUInt16();
+			if (0xdeaf != r.ReadUInt32())
+				throw new InvalidDataException("Chunk header is bogus");
+			return c;
+		}
+	}
+
+	public static class AudLoader
+	{
+		static int[] IndexAdjust = { -1, -1, -1, -1, 2, 4, 6, 8 };
+		static int[] StepTable = {
+									7,     8,     9,     10,    11,    12,     13,    14,    16,
+									17,    19,    21,    23,    25,    28,     31,    34,    37,
+									41,    45,    50,    55,    60,    66,     73,    80,    88,
+									97,    107,   118,   130,   143,   157,    173,   190,   209,
+									230,   253,   279,   307,   337,   371,    408,   449,   494,
+									544,   598,   658,   724,   796,   876,    963,   1060,  1166,
+									1282,  1411,  1552,  1707,  1878,  2066,   2272,  2499,  2749,
+									3024,  3327,  3660,  4026,  4428,  4871,   5358,  5894,  6484,
+									7132,  7845,  8630,  9493,  10442, 11487,  12635, 13899, 15289,
+									16818, 18500, 20350, 22385, 24623, 27086,  29794, 32767 };
+
+		static short DecodeSample(byte b, ref int index, ref int current)
+		{
+			var sb = (b & 8) != 0;
+			b &= 7;
+
+			var delta = (StepTable[index] * b) / 4 + StepTable[index] / 8;
+			if (sb) delta = -delta;
+
+			current += delta;
+			if (current > short.MaxValue) current = short.MaxValue;
+			if (current < short.MinValue) current = short.MinValue;
+
+			index += IndexAdjust[b];
+			if (index < 0) index = 0;
+			if (index > 88) index = 88;
+
+			return (short)current;
+		}
+
+		public static byte[] LoadSound(byte[] raw, ref int index)
+		{
+			var br = new BinaryReader(new MemoryStream(raw));
+			var dataSize = raw.Length;
+			var outputSize = raw.Length * 4;
+
+			var output = new byte[outputSize];
+			var offset = 0;
+			var currentSample = 0;
+
+			while (dataSize-- > 0)
+			{
+				var b = br.ReadByte();
+
+				var t = DecodeSample(b, ref index, ref currentSample);
+				output[offset++] = (byte)t;
+				output[offset++] = (byte)(t >> 8);
+
+				t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
+				output[offset++] = (byte)t;
+				output[offset++] = (byte)(t >> 8);
+			}
+
+			return output;
+		}
+
+		public static float SoundLength(Stream s)
+		{
+			var br = new BinaryReader(s);
+			var sampleRate = br.ReadUInt16();
+			/*var dataSize = */ br.ReadInt32();
+			var outputSize = br.ReadInt32();
+			var flags = (SoundFlags) br.ReadByte();
+			
+			var samples = outputSize;
+			if (0 != (flags & SoundFlags.Stereo)) samples /= 2;
+			if (0 != (flags & SoundFlags._16Bit)) samples /= 2;
+			return samples / sampleRate;
+		}
+		
+		public static byte[] LoadSound(Stream s)
+		{
+			var br = new BinaryReader(s);
+			/*var sampleRate =*/ br.ReadUInt16();
+			var dataSize = br.ReadInt32();
+			var outputSize = br.ReadInt32();
+			/*var flags = (SoundFlags)*/ br.ReadByte();
+			/*var format = (SoundFormat)*/ br.ReadByte();
+
+			var output = new byte[outputSize];
+			var offset = 0;
+			var index = 0;
+			var currentSample = 0;
+
+			while (dataSize > 0)
+			{
+				var chunk = Chunk.Read(br);
+				for (int n = 0; n < chunk.CompressedSize; n++)
+				{
+					var b = br.ReadByte();
+
+					var t = DecodeSample(b, ref index, ref currentSample);
+					output[offset++] = (byte)t;
+					output[offset++] = (byte)(t >> 8);
+		
+					t = DecodeSample((byte)(b >> 4), ref index, ref currentSample);
+					output[offset++] = (byte)t;
+					output[offset++] = (byte)(t >> 8);
+				}
+
+				dataSize -= 8 + chunk.CompressedSize;
+			}
+
+			return output;
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/Blast.cs

@@ -1,279 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- *
- * This file is based on the blast routines (version 1.1 by Mark Adler)
- * included in zlib/contrib
- */
-#endregion
-
-using System;
-using System.IO;
-
-namespace OpenRA.FileFormats
-{
-	public static class Blast
-	{
-		public static readonly int MAXBITS = 13; // maximum code length
-		public static readonly int MAXWIN = 4096; // maximum window size
-
-		static byte[] litlen = new byte[] {
-			11, 124, 8, 7, 28, 7, 188, 13, 76, 4,
-			10, 8, 12, 10, 12, 10, 8, 23, 8, 9,
-			7, 6, 7, 8, 7, 6, 55, 8, 23, 24,
-			12, 11, 7, 9, 11, 12, 6, 7, 22, 5,
-			7, 24, 6, 11, 9, 6, 7, 22, 7, 11,
-			38, 7, 9, 8, 25, 11, 8, 11, 9, 12,
-			8, 12, 5, 38, 5, 38, 5, 11, 7, 5,
-			6, 21, 6, 10, 53, 8, 7, 24, 10, 27,
-			44, 253, 253, 253, 252, 252, 252, 13, 12, 45,
-			12, 45, 12, 61, 12, 45, 44, 173
-		};
-
-		// bit lengths of length codes 0..15
-		static byte[] lenlen = new byte[] { 2, 35, 36, 53, 38, 23 };
-
-		// bit lengths of distance codes 0..63
-		static byte[] distlen = new byte[] { 2, 20, 53, 230, 247, 151, 248 };
-
-		// base for length codes
-		static short[] lengthbase = new short[] {
-			3, 2, 4, 5, 6, 7, 8, 9, 10, 12,
-			16, 24, 40, 72, 136, 264
-		};
-
-		// extra bits for length codes
-		static byte[] extra = new byte[] {
-			0, 0, 0, 0, 0, 0, 0, 0, 1, 2,
-			3, 4, 5, 6, 7, 8
-		};
-
-		static Huffman litcode = new Huffman(litlen, litlen.Length, 256);
-		static Huffman lencode = new Huffman(lenlen, lenlen.Length, 16);
-		static Huffman distcode = new Huffman(distlen, distlen.Length, 64);
-
-		// Decode PKWare Compression Library stream.
-		public static byte[] Decompress(byte[] src)
-		{
-			BitReader br = new BitReader(src);
-
-			// Are literals coded?
-			int coded = br.ReadBits(8);
-
-			if (coded < 0 || coded > 1)
-				throw new NotImplementedException("Invalid datastream");
-			bool EncodedLiterals = (coded == 1);
-
-			// log2(dictionary size) - 6
-			int dict = br.ReadBits(8);
-			if (dict < 4 || dict > 6)
-				throw new InvalidDataException("Invalid dictionary size");
-
-			// output state
-			ushort next = 0; // index of next write location in out[]
-			bool first = true; // true to check distances (for first 4K)
-			byte[] outBuffer = new byte[MAXWIN]; // output buffer and sliding window
-			var ms = new MemoryStream();
-
-			// decode literals and length/distance pairs
-			do
-			{
-				// length/distance pair
-				if (br.ReadBits(1) == 1)
-				{
-					// Length
-					int symbol = Decode(lencode, br);
-					int len = lengthbase[symbol] + br.ReadBits(extra[symbol]);
-					if (len == 519) // Magic number for "done"
-					{
-						for (int i = 0; i < next; i++)
-							ms.WriteByte(outBuffer[i]);
-						break;
-					}
-
-					// Distance
-					symbol = len == 2 ? 2 : dict;
-					int dist = Decode(distcode, br) << symbol;
-					dist += br.ReadBits(symbol);
-					dist++;
-
-					if (first && dist > next)
-						throw new InvalidDataException("Attempt to jump before data");
-
-					// copy length bytes from distance bytes back
-					do
-					{
-						int dest = next;
-						int source = dest - dist;
-
-						int copy = MAXWIN;
-						if (next < dist)
-						{
-							source += copy;
-							copy = dist;
-						}
-
-						copy -= next;
-						if (copy > len)
-							copy = len;
-
-						len -= copy;
-						next += (ushort)copy;
-
-						// copy with old-fashioned memcpy semantics
-						// in case of overlapping ranges. this is NOT
-						// the same as Array.Copy()
-						while( copy-- > 0 )
-							outBuffer[dest++] = outBuffer[source++];
-
-						// Flush window to outstream
-						if (next == MAXWIN)
-						{
-							for (int i = 0; i < next; i++)
-								ms.WriteByte(outBuffer[i]);
-							next = 0;
-							first = false;
-						}
-					} while (len != 0);
-				}
-				else // literal value
-				{
-					int symbol = EncodedLiterals ? Decode(litcode, br) : br.ReadBits(8);
-					outBuffer[next++] = (byte)symbol;
-					if (next == MAXWIN)
-					{
-						for (int i = 0; i < next; i++)
-							ms.WriteByte(outBuffer[i]);
-						next = 0;
-						first = false;
-					}
-				}
-			} while (true);
-
-			return ms.ToArray();
-		}
-
-		// Decode a code using huffman table h.
-		static int Decode(Huffman h, BitReader br)
-		{
-			int code = 0; // len bits being decoded
-			int first = 0; // first code of length len
-			int index = 0; // index of first code of length len in symbol table
-			short next = 1;
-			while (true)
-			{
-				code |= br.ReadBits(1) ^ 1; // invert code
-				int count = h.Count[next++];
-				if (code < first + count)
-					return h.Symbol[index + (code - first)];
-
-				index += count;
-				first += count;
-				first <<= 1;
-				code <<= 1;
-			}
-		}
-	}
-
-	class BitReader
-	{
-		readonly byte[] src;
-		int offset = 0;
-		int bitBuffer = 0;
-		int bitCount = 0;
-
-		public BitReader(byte[] src)
-		{
-			this.src = src;
-		}
-
-		public int ReadBits(int count)
-		{
-			int ret = 0;
-			int filled = 0;
-			while (filled < count)
-			{
-				if (bitCount == 0)
-				{
-					bitBuffer = src[offset++];
-					bitCount = 8;
-				}
-
-				ret |= (bitBuffer & 1) << filled;
-				bitBuffer >>= 1;
-				bitCount--;
-				filled++;
-			}
-			return ret;
-		}
-	}
-
-	/*
-	 * Given a list of repeated code lengths rep[0..n-1], where each byte is a
-	 * count (high four bits + 1) and a code length (low four bits), generate the
-	 * list of code lengths.  This compaction reduces the size of the object code.
-	 * Then given the list of code lengths length[0..n-1] representing a canonical
-	 * Huffman code for n symbols, construct the tables required to decode those
-	 * codes.  Those tables are the number of codes of each length, and the symbols
-	 * sorted by length, retaining their original order within each length.
-	 */
-	class Huffman
-	{
-		public short[] Count; // number of symbols of each length
-		public short[] Symbol; // canonically ordered symbols
-
-		public Huffman(byte[] rep, int n, short SymbolCount)
-		{
-			short[] length = new short[256]; // code lengths
-			int s = 0; // current symbol
-
-			// convert compact repeat counts into symbol bit length list
-			foreach (byte code in rep)
-			{
-				int num = (code >> 4) + 1; // Number of codes (top four bits plus 1)
-				byte len = (byte)(code & 15); // Code length (low four bits)
-				do
-				{
-					length[s++] = len;
-				} while (--num > 0);
-			}
-			n = s;
-
-			// count number of codes of each length
-			Count = new short[Blast.MAXBITS + 1];
-			for (int i = 0; i < n; i++)
-				Count[length[i]]++;
-
-			// no codes!
-			if (Count[0] == n)
-				return;
-
-			// check for an over-subscribed or incomplete set of lengths
-			int left = 1; // one possible code of zero length
-			for (int len = 1; len <= Blast.MAXBITS; len++)
-			{
-				left <<= 1;
-				// one more bit, double codes left
-				left -= Count[len];
-				// deduct count from possible codes
-				if (left < 0)
-					throw new InvalidDataException ("over subscribed code set");
-			}
-
-			// generate offsets into symbol table for each length for sorting
-			short[] offs = new short[Blast.MAXBITS + 1];
-			for (int len = 1; len < Blast.MAXBITS; len++)
-				offs[len + 1] = (short)(offs[len] + Count[len]);
-
-			// put symbols in table sorted by length, by symbol order within each length
-			Symbol = new short[SymbolCount];
-			for (short i = 0; i < n; i++)
-				if (length[i] != 0)
-					Symbol[offs[length[i]]++] = i;
-		}
-	}
-}

OpenRA.FileFormats/FileFormats/Blowfish.cs

@@ -1,406 +1,406 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.FileFormats
-{
-	class Blowfish
-	{
-		public Blowfish(byte[] key)
-		{
-			for (int i = 0, j = 0; i < 18; ++i)
-			{
-				uint a = key[j++ % key.Length];
-				uint b = key[j++ % key.Length];
-				uint c = key[j++ % key.Length];
-				uint d = key[j++ % key.Length];
-
-				m_p[i] ^= a << 24 | b << 16 | c << 8 | d;
-			}
-
-			uint l = 0, r = 0;
-
-			for (int i = 0; i < 18; )
-			{
-				Encrypt(ref l, ref r);
-				m_p[i++] = l;
-				m_p[i++] = r;
-			}
-
-			for (int i = 0; i < 4; ++i)
-				for (int j = 0; j < 256; )
-				{
-					Encrypt(ref l, ref r);
-					m_s[i, j++] = l;
-					m_s[i, j++] = r;
-				}
-		}
-
-		public uint[] Encrypt(uint[] data) { return RunCipher(data, Encrypt); }
-		public uint[] Decrypt(uint[] data) { return RunCipher(data, Decrypt); }
-
-		delegate void CipherFunc( ref uint a, ref uint b );
-
-		uint[] RunCipher(uint[] data, CipherFunc f)
-		{
-			uint[] result = new uint[data.Length];
-
-			int size = data.Length / 2;
-			int i = 0;
-			while (size-- > 0)
-			{
-				uint a = SwapBytes(data[i]);
-				uint b = SwapBytes(data[i+1]);
-
-				f(ref a, ref b);
-
-				result[i++] = SwapBytes(a);
-				result[i++] = SwapBytes(b);
-			}
-
-			return result;
-		}
-
-		void Encrypt(ref uint a, ref uint b)
-		{
-			uint _a = a, _b = b;
-			_a ^= m_p[0];
-
-			bool x = false;
-			for( int i = 1; i <= 16; i++, x ^= true)
-			{
-				if (x)
-					Round(ref _a, _b, i);
-				else
-					Round(ref _b, _a, i);
-			}
-			_b ^= m_p[17];
-
-			a = _b;
-			b = _a;
-		}
-
-		void Decrypt(ref uint a, ref uint b)
-		{
-			uint _a = a, _b = b;
-			_a ^= m_p[17];
-
-			bool x = false;
-			for (int i = 16; i >= 1; i--, x ^= true)
-			{
-				if (x)
-					Round(ref _a, _b, i);
-				else
-					Round(ref _b, _a, i);
-			}
-			_b ^= m_p[0];
-
-			a = _b;
-			b = _a;
-		}
-
-		uint S(uint x, int i)
-		{
-			return m_s[i, (x >> ((3 - i) << 3)) & 0xff];
-		}
-
-		uint bf_f(uint x)
-		{
-			return ((S(x, 0) + S(x, 1)) ^ S(x, 2)) + S(x, 3);
-		}
-
-		void Round(ref uint a, uint b, int n)
-		{
-			a ^= bf_f(b) ^ m_p[n];
-		}
-
-		uint SwapBytes(uint i)
-		{
-			i = (i << 16) | (i >> 16);
-			i = ((i << 8) & 0xff00ff00) | ((i >> 8) & 0x00ff00ff);
-			return i;
-		}
-
-		uint[] m_p = new uint[] {
-			0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-			0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-			0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-			0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-			0x9216d5d9, 0x8979fb1b
-		};
-
-		uint[,] m_s = new uint[,] {
-			{
-				0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
-				0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-				0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-				0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-				0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-				0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-				0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
-				0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-				0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-				0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-				0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-				0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-				0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
-				0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-				0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-				0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-				0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
-				0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-				0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
-				0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-				0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-				0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-				0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
-				0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-				0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-				0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-				0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-				0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-				0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
-				0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-				0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
-				0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-				0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-				0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-				0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-				0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-				0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
-				0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-				0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-				0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-				0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
-				0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-				0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
-				0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-				0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-				0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-				0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
-				0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-				0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
-				0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-				0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-				0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-				0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
-				0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-				0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-				0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-				0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-				0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-				0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
-				0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-				0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
-				0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-				0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-				0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
-			},
-			{
-				0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-				0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-				0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-				0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-				0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
-				0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-				0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
-				0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-				0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-				0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-				0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-				0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-				0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
-				0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-				0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-				0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-				0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
-				0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-				0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
-				0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-				0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-				0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-				0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
-				0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-				0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
-				0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-				0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-				0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-				0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
-				0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-				0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-				0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-				0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-				0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-				0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
-				0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-				0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
-				0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-				0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-				0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-				0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-				0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-				0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
-				0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-				0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-				0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-				0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
-				0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-				0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
-				0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-				0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-				0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-				0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
-				0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-				0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-				0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-				0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-				0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-				0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
-				0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-				0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-				0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-				0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-				0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
-			},
-			{
-				0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
-				0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-				0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-				0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-				0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
-				0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-				0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-				0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-				0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-				0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-				0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-				0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-				0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
-				0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-				0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-				0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-				0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-				0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-				0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
-				0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-				0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-				0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-				0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
-				0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-				0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
-				0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-				0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-				0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-				0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
-				0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-				0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
-				0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-				0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-				0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-				0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
-				0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-				0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-				0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-				0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-				0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-				0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
-				0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-				0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
-				0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-				0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-				0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-				0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-				0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-				0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
-				0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-				0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-				0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-				0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
-				0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-				0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-				0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-				0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-				0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-				0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
-				0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-				0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
-				0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-				0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-				0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
-			},
-			{
-				0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
-				0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-				0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-				0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-				0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
-				0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-				0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
-				0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-				0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-				0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-				0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-				0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-				0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-				0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-				0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-				0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-				0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
-				0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-				0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
-				0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-				0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-				0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-				0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-				0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-				0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
-				0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-				0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-				0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-				0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
-				0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-				0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
-				0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-				0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-				0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-				0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
-				0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-				0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
-				0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-				0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-				0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-				0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
-				0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-				0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-				0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-				0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-				0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-				0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
-				0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-				0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
-				0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-				0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-				0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-				0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-				0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-				0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-				0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-				0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-				0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-				0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
-				0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-				0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
-				0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-				0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-				0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
-			}
-
-		};
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	class Blowfish
+	{
+		public Blowfish(byte[] key)
+		{
+			for (int i = 0, j = 0; i < 18; ++i)
+			{
+				uint a = key[j++ % key.Length];
+				uint b = key[j++ % key.Length];
+				uint c = key[j++ % key.Length];
+				uint d = key[j++ % key.Length];
+
+				m_p[i] ^= a << 24 | b << 16 | c << 8 | d;
+			}
+
+			uint l = 0, r = 0;
+
+			for (int i = 0; i < 18; )
+			{
+				Encrypt(ref l, ref r);
+				m_p[i++] = l;
+				m_p[i++] = r;
+			}
+
+			for (int i = 0; i < 4; ++i)
+				for (int j = 0; j < 256; )
+				{
+					Encrypt(ref l, ref r);
+					m_s[i, j++] = l;
+					m_s[i, j++] = r;
+				}
+		}
+
+		public uint[] Encrypt(uint[] data) { return RunCipher(data, Encrypt); }
+		public uint[] Decrypt(uint[] data) { return RunCipher(data, Decrypt); }
+
+		delegate void CipherFunc( ref uint a, ref uint b );
+
+		uint[] RunCipher(uint[] data, CipherFunc f)
+		{
+			uint[] result = new uint[data.Length];
+
+			int size = data.Length / 2;
+			int i = 0;
+			while (size-- > 0)
+			{
+				uint a = SwapBytes(data[i]);
+				uint b = SwapBytes(data[i+1]);
+
+				f(ref a, ref b);
+
+				result[i++] = SwapBytes(a);
+				result[i++] = SwapBytes(b);
+			}
+
+			return result;
+		}
+
+		void Encrypt(ref uint a, ref uint b)
+		{
+			uint _a = a, _b = b;
+			_a ^= m_p[0];
+
+			bool x = false;
+			for( int i = 1; i <= 16; i++, x ^= true)
+			{
+				if (x)
+					Round(ref _a, _b, i);
+				else
+					Round(ref _b, _a, i);
+			}
+			_b ^= m_p[17];
+
+			a = _b;
+			b = _a;
+		}
+
+		void Decrypt(ref uint a, ref uint b)
+		{
+			uint _a = a, _b = b;
+			_a ^= m_p[17];
+
+			bool x = false;
+			for (int i = 16; i >= 1; i--, x ^= true)
+			{
+				if (x)
+					Round(ref _a, _b, i);
+				else
+					Round(ref _b, _a, i);
+			}
+			_b ^= m_p[0];
+
+			a = _b;
+			b = _a;
+		}
+
+		uint S(uint x, int i)
+		{
+			return m_s[i, (x >> ((3 - i) << 3)) & 0xff];
+		}
+
+		uint bf_f(uint x)
+		{
+			return ((S(x, 0) + S(x, 1)) ^ S(x, 2)) + S(x, 3);
+		}
+
+		void Round(ref uint a, uint b, int n)
+		{
+			a ^= bf_f(b) ^ m_p[n];
+		}
+
+		uint SwapBytes(uint i)
+		{
+			i = (i << 16) | (i >> 16);
+			i = ((i << 8) & 0xff00ff00) | ((i >> 8) & 0x00ff00ff);
+			return i;
+		}
+
+		uint[] m_p = new uint[] {
+			0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+			0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+			0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+			0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+			0x9216d5d9, 0x8979fb1b
+		};
+
+		uint[,] m_s = new uint[,] {
+			{
+				0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+				0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+				0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+				0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+				0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+				0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+				0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+				0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+				0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+				0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+				0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+				0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+				0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+				0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+				0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+				0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+				0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+				0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+				0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+				0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+				0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+				0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+				0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+				0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+				0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+				0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+				0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+				0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+				0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+				0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+				0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+				0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+				0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+				0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+				0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+				0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+				0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+				0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+				0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+				0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+				0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+				0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+				0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+				0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+				0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+				0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+				0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+				0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+				0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+				0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+				0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+				0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+				0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+				0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+				0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+				0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+				0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+				0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+				0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+				0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+				0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+				0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+				0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+				0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
+			},
+			{
+				0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+				0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+				0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+				0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+				0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+				0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+				0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+				0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+				0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+				0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+				0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+				0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+				0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+				0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+				0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+				0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+				0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+				0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+				0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+				0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+				0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+				0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+				0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+				0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+				0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+				0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+				0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+				0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+				0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+				0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+				0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+				0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+				0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+				0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+				0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+				0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+				0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+				0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+				0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+				0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+				0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+				0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+				0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+				0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+				0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+				0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+				0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+				0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+				0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+				0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+				0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+				0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+				0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+				0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+				0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+				0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+				0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+				0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+				0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+				0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+				0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+				0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+				0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+				0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
+			},
+			{
+				0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+				0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+				0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+				0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+				0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+				0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+				0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+				0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+				0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+				0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+				0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+				0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+				0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+				0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+				0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+				0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+				0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+				0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+				0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+				0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+				0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+				0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+				0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+				0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+				0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+				0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+				0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+				0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+				0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+				0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+				0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+				0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+				0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+				0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+				0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+				0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+				0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+				0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+				0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+				0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+				0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+				0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+				0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+				0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+				0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+				0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+				0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+				0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+				0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+				0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+				0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+				0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+				0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+				0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+				0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+				0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+				0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+				0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+				0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+				0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+				0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+				0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+				0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+				0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
+			},
+			{
+				0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+				0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+				0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+				0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+				0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+				0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+				0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+				0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+				0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+				0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+				0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+				0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+				0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+				0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+				0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+				0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+				0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+				0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+				0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+				0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+				0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+				0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+				0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+				0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+				0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+				0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+				0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+				0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+				0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+				0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+				0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+				0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+				0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+				0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+				0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+				0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+				0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+				0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+				0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+				0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+				0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+				0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+				0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+				0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+				0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+				0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+				0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+				0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+				0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+				0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+				0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+				0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+				0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+				0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+				0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+				0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+				0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+				0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+				0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+				0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+				0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+				0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+				0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+				0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+			}
+
+		};
+	}
+}

OpenRA.FileFormats/FileFormats/Format2.cs

@@ -1,36 +1,36 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.FileFormats
-{
-	public static class Format2
-	{
-		public static int DecodeInto(byte[] src, byte[] dest)
-		{
-			FastByteReader r = new FastByteReader(src);
-
-			int i = 0;
-			while (!r.Done())
-			{
-				byte cmd = r.ReadByte();
-				if (cmd == 0)
-				{
-					byte count = r.ReadByte();
-					while (count-- > 0)
-						dest[i++] = 0;
-				}
-				else
-					dest[i++] = cmd;
-			}
-
-			return i;
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	public static class Format2
+	{
+		public static int DecodeInto(byte[] src, byte[] dest)
+		{
+			FastByteReader r = new FastByteReader(src);
+
+			int i = 0;
+			while (!r.Done())
+			{
+				byte cmd = r.ReadByte();
+				if (cmd == 0)
+				{
+					byte count = r.ReadByte();
+					while (count-- > 0)
+						dest[i++] = 0;
+				}
+				else
+					dest[i++] = cmd;
+			}
+
+			return i;
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/Format40.cs

@@ -1,78 +1,78 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-namespace OpenRA.FileFormats
-{
-	public static class Format40
-	{
-		public static int DecodeInto( byte[] src, byte[] dest )
-		{
-			var ctx = new FastByteReader(src);
-			int destIndex = 0;
-
-			while( true )
-			{
-				byte i = ctx.ReadByte();
-				if( ( i & 0x80 ) == 0 )
-				{
-					int count = i & 0x7F;
-					if( count == 0 )
-					{
-						// case 6
-						count = ctx.ReadByte();
-						byte value = ctx.ReadByte();
-						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-							dest[ destIndex ] ^= value;
-					}
-					else
-					{
-						// case 5
-						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-							dest[destIndex] ^= ctx.ReadByte();
-					}
-				}
-				else
-				{
-					int count = i & 0x7F;
-					if( count == 0 )
-					{
-						count = ctx.ReadWord();
-						if( count == 0 )
-							return destIndex;
-
-						if( ( count & 0x8000 ) == 0 )
-						{
-							// case 2
-							destIndex += ( count & 0x7FFF );
-						}
-						else if( ( count & 0x4000 ) == 0 )
-						{
-							// case 3
-							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
-								dest[destIndex] ^= ctx.ReadByte();
-						}
-						else
-						{
-							// case 4
-							byte value = ctx.ReadByte();
-							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
-								dest[ destIndex ] ^= value;
-						}
-					}
-					else
-					{
-						// case 1
-						destIndex += count;
-					}
-				}
-			}
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+namespace OpenRA.FileFormats
+{
+	public static class Format40
+	{
+		public static int DecodeInto( byte[] src, byte[] dest )
+		{
+            var ctx = new FastByteReader(src);
+			int destIndex = 0;
+
+			while( true )
+			{
+                byte i = ctx.ReadByte();
+				if( ( i & 0x80 ) == 0 )
+				{
+					int count = i & 0x7F;
+					if( count == 0 )
+					{
+						// case 6
+                        count = ctx.ReadByte();
+                        byte value = ctx.ReadByte();
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] ^= value;
+					}
+					else
+					{
+						// case 5
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+                            dest[destIndex] ^= ctx.ReadByte();
+					}
+				}
+				else
+				{
+					int count = i & 0x7F;
+					if( count == 0 )
+					{
+                        count = ctx.ReadWord();
+						if( count == 0 )
+							return destIndex;
+
+						if( ( count & 0x8000 ) == 0 )
+						{
+							// case 2
+							destIndex += ( count & 0x7FFF );
+						}
+						else if( ( count & 0x4000 ) == 0 )
+						{
+							// case 3
+							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
+                                dest[destIndex] ^= ctx.ReadByte();
+						}
+						else
+						{
+							// case 4
+                            byte value = ctx.ReadByte();
+							for( int end = destIndex + ( count & 0x3FFF ) ; destIndex < end ; destIndex++ )
+								dest[ destIndex ] ^= value;
+						}
+					}
+					else
+					{
+						// case 1
+						destIndex += count;
+					}
+				}
+			}
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/Format80.cs

@@ -1,150 +1,125 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.IO;
-
-namespace OpenRA.FileFormats
-{
-	class FastByteReader
-	{
-		readonly byte[] src;
-		int offset = 0;
-
-		public FastByteReader(byte[] src)
-		{
-			this.src = src;
-		}
-
-		public bool Done() { return offset >= src.Length; }
-		public byte ReadByte() { return src[offset++]; }
-		public int ReadWord()
-		{
-			int x = ReadByte();
-			return x | (ReadByte() << 8);
-		}
-
-		public void CopyTo(byte[] dest, int offset, int count)
-		{
-			Array.Copy(src, this.offset, dest, offset, count);
-			this.offset += count;
-		}
-
-		public int Remaining() { return src.Length - offset; }
-	}
-
-	public static class Format80
-	{
-		static void ReplicatePrevious( byte[] dest, int destIndex, int srcIndex, int count )
-		{
-			if( srcIndex > destIndex )
-				throw new NotImplementedException("srcIndex > destIndex {0} {1}".F(srcIndex, destIndex));
-
-			if( destIndex - srcIndex == 1 )
-			{
-				for( int i = 0 ; i < count ; i++ )
-					dest[ destIndex + i ] = dest[ destIndex - 1 ];
-			}
-			else
-			{
-				for( int i = 0 ; i < count ; i++ )
-					dest[ destIndex + i ] = dest[ srcIndex + i ];
-			}
-		}
-
-		public static int DecodeInto( byte[] src, byte[] dest )
-		{
-			var ctx = new FastByteReader(src);
-			int destIndex = 0;
-
-			while( true )
-			{
-				byte i = ctx.ReadByte();
-				if( ( i & 0x80 ) == 0 )
-				{
-					// case 2
-					byte secondByte = ctx.ReadByte();
-					int count = ( ( i & 0x70 ) >> 4 ) + 3;
-					int rpos = ( ( i & 0xf ) << 8 ) + secondByte;
-
-					ReplicatePrevious( dest, destIndex, destIndex - rpos, count );
-					destIndex += count;
-				}
-				else if( ( i & 0x40 ) == 0 )
-				{
-					// case 1
-					int count = i & 0x3F;
-					if( count == 0 )
-						return destIndex;
-
-					ctx.CopyTo( dest, destIndex, count );
-					destIndex += count;
-				}
-				else
-				{
-					int count3 = i & 0x3F;
-					if( count3 == 0x3E )
-					{
-						// case 4
-						int count = ctx.ReadWord();
-						byte color = ctx.ReadByte();
-
-						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-							dest[ destIndex ] = color;
-					}
-					else if( count3 == 0x3F )
-					{
-						// case 5
-						int count = ctx.ReadWord();
-						int srcIndex = ctx.ReadWord();
-						if( srcIndex >= destIndex )
-							throw new NotImplementedException("srcIndex >= destIndex {0} {1}".F(srcIndex, destIndex));
-
-						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-							dest[ destIndex ] = dest[ srcIndex++ ];
-					}
-					else
-					{
-						// case 3
-						int count = count3 + 3;
-						int srcIndex = ctx.ReadWord();
-						if( srcIndex >= destIndex )
-							throw new NotImplementedException("srcIndex >= destIndex {0} {1}".F(srcIndex, destIndex));
-
-						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
-							dest[ destIndex ] = dest[ srcIndex++ ];
-					}
-				}
-			}
-		}
-
-		public static byte[] Encode(byte[] src)
-		{
-			/* quick & dirty format80 encoder -- only uses raw copy operator, terminated with a zero-run. */
-			/* this does not produce good compression, but it's valid format80 */
-
-			var ctx = new FastByteReader(src);
-			var ms = new MemoryStream();
-
-			do
-			{
-				var len = Math.Min(ctx.Remaining(), 0x3F);
-				ms.WriteByte((byte)(0x80 | len));
-				while (len-- > 0)
-					ms.WriteByte(ctx.ReadByte());
-			}
-			while (!ctx.Done());
-
-			ms.WriteByte(0x80);	// terminator -- 0-length run.
-
-			return ms.ToArray();
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+
+namespace OpenRA.FileFormats
+{
+    class FastByteReader
+    {
+        readonly byte[] src;
+        int offset = 0;
+
+        public FastByteReader(byte[] src)
+        {
+            this.src = src;
+        }
+
+        public bool Done() { return offset >= src.Length; }
+        public byte ReadByte() { return src[offset++]; }
+        public int ReadWord()
+        {
+            int x = ReadByte();
+            return x | (ReadByte() << 8);
+        }
+
+        public void CopyTo(byte[] dest, int offset, int count)
+        {
+            Array.Copy(src, this.offset, dest, offset, count);
+            this.offset += count;
+        }
+    }
+
+	public static class Format80
+	{
+		static void ReplicatePrevious( byte[] dest, int destIndex, int srcIndex, int count )
+		{
+			if( srcIndex > destIndex )
+				throw new NotImplementedException( string.Format( "srcIndex > destIndex  {0}  {1}", srcIndex, destIndex ) );
+
+			if( destIndex - srcIndex == 1 )
+			{
+				for( int i = 0 ; i < count ; i++ )
+					dest[ destIndex + i ] = dest[ destIndex - 1 ];
+			}
+			else
+			{
+				for( int i = 0 ; i < count ; i++ )
+					dest[ destIndex + i ] = dest[ srcIndex + i ];
+			}
+		}
+
+		public static int DecodeInto( byte[] src, byte[] dest )
+		{
+            var ctx = new FastByteReader(src);
+			int destIndex = 0;
+
+			while( true )
+			{
+                byte i = ctx.ReadByte();
+				if( ( i & 0x80 ) == 0 )
+				{
+					// case 2
+                    byte secondByte = ctx.ReadByte();
+					int count = ( ( i & 0x70 ) >> 4 ) + 3;
+					int rpos = ( ( i & 0xf ) << 8 ) + secondByte;
+
+					ReplicatePrevious( dest, destIndex, destIndex - rpos, count );
+					destIndex += count;
+				}
+				else if( ( i & 0x40 ) == 0 )
+				{
+					// case 1
+					int count = i & 0x3F;
+					if( count == 0 )
+						return destIndex;
+
+					ctx.CopyTo( dest, destIndex, count );
+					destIndex += count;
+				}
+				else
+				{
+					int count3 = i & 0x3F;
+					if( count3 == 0x3E )
+					{
+						// case 4
+                        int count = ctx.ReadWord();
+                        byte color = ctx.ReadByte();
+
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] = color;
+					}
+					else if( count3 == 0x3F )
+					{
+						// case 5
+                        int count = ctx.ReadWord();
+                        int srcIndex = ctx.ReadWord();
+						if( srcIndex >= destIndex )
+							throw new NotImplementedException( string.Format( "srcIndex >= destIndex  {0}  {1}", srcIndex, destIndex ) );
+
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] = dest[ srcIndex++ ];
+					}
+					else
+					{
+						// case 3
+						int count = count3 + 3;
+                        int srcIndex = ctx.ReadWord();
+						if( srcIndex >= destIndex )
+							throw new NotImplementedException( string.Format( "srcIndex >= destIndex  {0}  {1}", srcIndex, destIndex ) );
+
+						for( int end = destIndex + count ; destIndex < end ; destIndex++ )
+							dest[ destIndex ] = dest[ srcIndex++ ];
+					}
+				}
+			}
+		}
+	}
+}

OpenRA.FileFormats/FileFormats/IniFile.cs

@@ -1,151 +1,151 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Text.RegularExpressions;
-
-namespace OpenRA.FileFormats
-{
-	public class IniFile
-	{
-		Dictionary<string, IniSection> sections = new Dictionary<string, IniSection>();
-
-		public IniFile( Stream s )
-		{
-			Load( s );
-		}
-
-		public IniFile( params Stream[] streams )
-		{
-			foreach( var s in streams )
-				Load( s );
-		}
-
-		public void Load( Stream s )
-		{
-			StreamReader reader = new StreamReader( s );
-			IniSection currentSection = null;
-
-			while( !reader.EndOfStream )
-			{
-				string line = reader.ReadLine();
-
-				if( line.Length == 0 ) continue;
-
-				switch( line[ 0 ] )
-				{
-				case ';': break;
-				case '[': currentSection = ProcessSection( line ); break;
-				default: ProcessEntry( line, currentSection ); break;
-				}
-			}
-		}
-
-		Regex sectionPattern = new Regex( @"^\[([^]]*)\]" );
-
-		IniSection ProcessSection( string line )
-		{
-			Match m = sectionPattern.Match( line );
-			if( m == null || !m.Success )
-				return null;
-			string sectionName = m.Groups[ 1 ].Value.ToLowerInvariant();
-
-			IniSection ret;
-			if( !sections.TryGetValue( sectionName, out ret ) )
-				sections.Add( sectionName, ret = new IniSection( sectionName ) );
-			return ret;
-		}
-
-		bool ProcessEntry( string line, IniSection currentSection )
-		{
-			int comment = line.IndexOf( ';' );
-			if( comment >= 0 )
-				line = line.Substring( 0, comment );
-
-			line = line.Trim();
-			if( line.Length == 0 )
-				return false;
-
-			var key = line;
-			var value = "";
-			int eq = line.IndexOf( '=' );
-			if( eq >= 0 )
-			{
-				key = line.Substring( 0, eq );
-				value = line.Substring( eq + 1, line.Length - eq - 1 );
-			}
-
-			if( currentSection == null )
-				throw new InvalidOperationException( "No current INI section" );
-
-			if( !currentSection.Contains( key ) )
-				currentSection.Add( key, value );
-			return true;
-		}
-
-		public IniSection GetSection( string s )
-		{
-			return GetSection( s, false );
-		}
-
-		public IniSection GetSection( string s, bool allowFail )
-		{
-			IniSection section;
-			if( sections.TryGetValue( s.ToLowerInvariant(), out section ) )
-				return section;
-
-			if( allowFail )
-				return new IniSection( s );
-			throw new InvalidOperationException( "Section does not exist in map or rules: " + s );
-		}
-
-		public IEnumerable<IniSection> Sections { get { return sections.Values; } }
-	}
-
-	public class IniSection : IEnumerable<KeyValuePair<string, string>>
-	{
-		public string Name { get; private set; }
-		Dictionary<string, string> values = new Dictionary<string, string>();
-
-		public IniSection( string name )
-		{
-			Name = name;
-		}
-
-		public void Add( string key, string value )
-		{
-			values[key] = value;
-		}
-
-		public bool Contains( string key )
-		{
-			return values.ContainsKey( key );
-		}
-
-		public string GetValue( string key, string defaultValue )
-		{
-			string s;
-			return values.TryGetValue( key, out s ) ? s : defaultValue;
-		}
-
-		public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
-		{
-			return values.GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.RegularExpressions;
+
+namespace OpenRA.FileFormats
+{
+	public class IniFile
+	{
+		Dictionary<string, IniSection> sections = new Dictionary<string, IniSection>();
+
+		public IniFile( Stream s )
+		{
+			Load( s );
+		}
+
+		public IniFile( params Stream[] streams )
+		{
+			foreach( var s in streams )
+				Load( s );
+		}
+
+		public void Load( Stream s )
+		{
+			StreamReader reader = new StreamReader( s );
+			IniSection currentSection = null;
+
+			while( !reader.EndOfStream )
+			{
+				string line = reader.ReadLine();
+
+				if( line.Length == 0 ) continue;
+
+				switch( line[ 0 ] )
+				{
+				case ';': break;
+				case '[': currentSection = ProcessSection( line ); break;
+				default: ProcessEntry( line, currentSection ); break;
+				}
+			}
+		}
+
+		Regex sectionPattern = new Regex( @"^\[([^]]*)\]" );
+
+		IniSection ProcessSection( string line )
+		{
+			Match m = sectionPattern.Match( line );
+			if( m == null || !m.Success )
+				return null;
+			string sectionName = m.Groups[ 1 ].Value.ToLowerInvariant();
+
+			IniSection ret;
+			if( !sections.TryGetValue( sectionName, out ret ) )
+				sections.Add( sectionName, ret = new IniSection( sectionName ) );
+			return ret;
+		}
+
+		bool ProcessEntry( string line, IniSection currentSection )
+		{
+			int comment = line.IndexOf( ';' );
+			if( comment >= 0 )
+				line = line.Substring( 0, comment );
+
+			line = line.Trim();
+			if( line.Length == 0 )
+				return false;
+
+			var key = line;
+			var value = "";
+			int eq = line.IndexOf( '=' );
+			if( eq >= 0 )
+			{
+				key = line.Substring( 0, eq );
+				value = line.Substring( eq + 1, line.Length - eq - 1 );
+			}
+
+			if( currentSection == null )
+				throw new InvalidOperationException( "No current INI section" );
+
+			if( !currentSection.Contains( key ) )
+				currentSection.Add( key, value );
+			return true;
+		}
+
+		public IniSection GetSection( string s )
+		{
+			return GetSection( s, false );
+		}
+
+		public IniSection GetSection( string s, bool allowFail )
+		{
+			IniSection section;
+			if( sections.TryGetValue( s.ToLowerInvariant(), out section ) )
+				return section;
+
+			if( allowFail )
+				return new IniSection( s );
+			throw new InvalidOperationException( "Section does not exist in map or rules: " + s );
+		}
+
+		public IEnumerable<IniSection> Sections { get { return sections.Values; } }
+	}
+
+	public class IniSection : IEnumerable<KeyValuePair<string, string>>
+	{
+		public string Name { get; private set; }
+		Dictionary<string, string> values = new Dictionary<string, string>();
+
+		public IniSection( string name )
+		{
+			Name = name;
+		}
+
+		public void Add( string key, string value )
+		{
+			values[key] = value;
+		}
+
+		public bool Contains( string key )
+		{
+			return values.ContainsKey( key );
+		}
+
+		public string GetValue( string key, string defaultValue )
+		{
+			string s;
+			return values.TryGetValue( key, out s ) ? s : defaultValue;
+		}
+
+		public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
+		{
+			return values.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+}

OpenRA.FileFormats/FileSystem.cs

@@ -0,0 +1,159 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+
+namespace OpenRA.FileFormats
+{
+	public static class FileSystem
+	{
+		static List<IFolder> mountedFolders = new List<IFolder>();
+
+		static Cache<uint, List<IFolder>> allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
+
+		static void MountInner(IFolder folder)
+		{
+			mountedFolders.Add(folder);
+
+			foreach( var hash in folder.AllFileHashes() )
+			{
+				var l = allFiles[hash];
+				if( !l.Contains( folder ) )
+					l.Add( folder );
+			}
+		}
+
+		static IFolder OpenPackage(string filename)
+		{
+			if (filename.EndsWith(".mix"))
+				return new Package(filename);
+			else if (filename.EndsWith(".zip"))
+				return new CompressedPackage(filename);
+			else
+				return new Folder(filename);
+		}
+
+		public static void Mount(string name)
+		{
+			name = name.ToLowerInvariant();
+			var optional = name.StartsWith("~");
+			if (optional) name = name.Substring(1);
+
+			var a = (Action)(() => FileSystem.MountInner(OpenPackage(name)));
+
+			if (optional)
+				try { a(); }
+				catch { }
+			else
+				a();
+		}
+
+		public static void UnmountAll()
+		{
+			mountedFolders.Clear();
+			allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
+		}
+
+		public static void LoadFromManifest( Manifest manifest )
+		{
+			UnmountAll();
+			foreach (var dir in manifest.Folders) Mount(dir);
+			foreach (var pkg in manifest.Packages) Mount(pkg);
+		}
+
+		static Stream GetFromCache( Cache<uint, List<IFolder>> index, string filename )
+		{
+			foreach( var folder in index[ PackageEntry.HashFilename( filename ) ] )
+				if (folder.Exists(filename))
+					return folder.GetContent(filename);
+			return null;
+		}
+
+		public static Stream Open(string filename)
+		{
+			if( filename.IndexOfAny( new char[] { '/', '\\' } ) == -1 )
+			{
+				var ret = GetFromCache( allFiles, filename );
+				if( ret != null )
+					return ret;
+			}
+
+			foreach( IFolder folder in mountedFolders )
+			{
+				if (folder.Exists(filename))
+					return folder.GetContent(filename);
+			}
+
+			throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );
+		}
+
+		public static Stream OpenWithExts( string filename, params string[] exts )
+		{
+			if( filename.IndexOfAny( new char[] { '/', '\\' } ) == -1 )
+			{
+				foreach( var ext in exts )
+				{
+					var s = GetFromCache( allFiles, filename + ext );
+					if( s != null )
+						return s;
+				}
+			}
+
+			foreach( var ext in exts )
+			{
+				foreach( IFolder folder in mountedFolders )
+					if (folder.Exists(filename + ext))
+						return folder.GetContent( filename + ext );
+			}
+
+			throw new FileNotFoundException( string.Format( "File not found: {0}", filename ), filename );
+		}
+
+		public static bool Exists(string filename)
+		{
+			foreach (var folder in mountedFolders)
+				if (folder.Exists(filename))
+				    return true;
+			return false;
+		}
+
+		static Dictionary<string, Assembly> assemblyCache = new Dictionary<string, Assembly>();
+
+		public static Assembly ResolveAssembly(object sender, ResolveEventArgs e)
+		{
+			foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+			{
+				if (assembly.FullName == e.Name)
+					return assembly;
+			}
+
+			string[] frags = e.Name.Split(',');
+			var filename = frags[0] + ".dll";
+			Assembly a;
+			if (assemblyCache.TryGetValue(filename, out a))
+				return a;
+
+			if (FileSystem.Exists(filename))
+				using (Stream s = FileSystem.Open(filename))
+				{
+					byte[] buf = new byte[s.Length];
+					s.Read(buf, 0, buf.Length);
+					a = Assembly.Load(buf);
+					assemblyCache.Add(filename, a);
+					return a;
+				}
+			
+			return null;
+		}
+	}
+}

OpenRA.FileFormats/Filesystem/FileSystem.cs

@@ -1,184 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace OpenRA.FileFormats
-{
-	public static class FileSystem
-	{
-		static List<IFolder> mountedFolders = new List<IFolder>();
-
-		static Cache<uint, List<IFolder>> allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
-
-		static void MountInner(IFolder folder)
-		{
-			mountedFolders.Add(folder);
-
-			foreach( var hash in folder.AllFileHashes() )
-			{
-				var l = allFiles[hash];
-				if( !l.Contains( folder ) )
-					l.Add( folder );
-			}
-		}
-
-		static int order = 0;
-
-		static IFolder OpenPackage(string filename)
-		{
-			return OpenPackage(filename, order++);
-		}
-
-		public static IFolder CreatePackage(string filename, int order, Dictionary<string, byte[]> content)
-		{
-			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
-				return new MixFile(filename, order, content);
-			else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(filename, order, content);
-			else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(filename, order, content);
-			else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
-				throw new NotImplementedException("Creating .Z archives is unsupported");
-			else
-				return new Folder(filename, order, content);
-		}
-
-		public static IFolder OpenPackage(string filename, int order)
-		{
-			if (filename.EndsWith(".mix", StringComparison.InvariantCultureIgnoreCase))
-				return new MixFile(filename, order);
-			else if (filename.EndsWith(".zip", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(filename, order);
-			else if (filename.EndsWith(".oramap", StringComparison.InvariantCultureIgnoreCase))
-				return new ZipFile(filename, order);
-			else if (filename.EndsWith(".Z", StringComparison.InvariantCultureIgnoreCase))
-				return new InstallShieldPackage(filename, order);
-			else
-				return new Folder(filename, order);
-		}
-
-		public static void Mount(string name)
-		{
-			var optional = name.StartsWith("~");
-			if (optional) name = name.Substring(1);
-
-			// paths starting with ^ are relative to the support dir
-			if (name.StartsWith("^"))
-				name = Platform.SupportDir+name.Substring(1);
-
-			var a = (Action)(() => FileSystem.MountInner(OpenPackage(name)));
-
-			if (optional)
-				try { a(); }
-				catch { }
-			else
-				a();
-		}
-
-		public static void UnmountAll()
-		{
-			mountedFolders.Clear();
-			allFiles = new Cache<uint, List<IFolder>>( _ => new List<IFolder>() );
-		}
-
-		public static bool Unmount(IFolder mount)
-		{
-			return (mountedFolders.RemoveAll(f => f == mount) > 0);
-		}
-
-		public static void Mount(IFolder mount)
-		{
-			if (!mountedFolders.Contains(mount)) mountedFolders.Add(mount);
-		}
-
-		public static void LoadFromManifest( Manifest manifest )
-		{
-			UnmountAll();
-			foreach (var dir in manifest.Folders) Mount(dir);
-			foreach (var pkg in manifest.Packages) Mount(pkg);
-		}
-
-		static Stream GetFromCache( Cache<uint, List<IFolder>> index, string filename )
-		{
-			var folder = index[PackageEntry.HashFilename(filename)]
-				.Where(x => x.Exists(filename))
-				.OrderBy(x => x.Priority)
-				.FirstOrDefault();
-
-			if (folder != null)
-				return folder.GetContent(filename);
-
-			return null;
-		}
-
-		public static Stream Open(string filename) { return OpenWithExts(filename, ""); }
-
-		public static Stream OpenWithExts( string filename, params string[] exts )
-		{
-			if( filename.IndexOfAny( new char[] { '/', '\\' } ) == -1 )
-			{
-				foreach( var ext in exts )
-				{
-					var s = GetFromCache( allFiles, filename + ext );
-					if( s != null )
-						return s;
-				}
-			}
-
-			foreach( var ext in exts )
-			{
-				var folder = mountedFolders
-					.Where(x => x.Exists(filename + ext))
-					.OrderByDescending(x => x.Priority)
-					.FirstOrDefault();
-
-				if (folder != null)
-					return folder.GetContent(filename + ext);
-			}
-
-			throw new FileNotFoundException("File not found: {0}".F(filename), filename);
-		}
-
-		public static bool Exists(string filename) { return mountedFolders.Any(f => f.Exists(filename)); }
-
-		static Dictionary<string, Assembly> assemblyCache = new Dictionary<string, Assembly>();
-
-		public static Assembly ResolveAssembly(object sender, ResolveEventArgs e)
-		{
-			foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
-				if (assembly.FullName == e.Name)
-					return assembly;
-
-			var frags = e.Name.Split(',');
-			var filename = frags[0] + ".dll";
-
-			Assembly a;
-			if (assemblyCache.TryGetValue(filename, out a))
-				return a;
-
-			if (FileSystem.Exists(filename))
-				using (var s = FileSystem.Open(filename))
-				{
-					var buf = new byte[s.Length];
-					s.Read(buf, 0, buf.Length);
-					a = Assembly.Load(buf);
-					assemblyCache.Add(filename, a);
-					return a;
-				}
-
-			return null;
-		}
-	}
-}

OpenRA.FileFormats/Filesystem/Folder.cs

@@ -1,76 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-using System;
-
-namespace OpenRA.FileFormats
-{
-	public class Folder : IFolder
-	{
-		readonly string path;
-
-		int priority;
-
-		// Create a new folder package
-		public Folder(string path, int priority, Dictionary<string, byte[]> contents)
-		{
-			this.path = path;
-			this.priority = priority;
-			if (Directory.Exists(path))
-				Directory.Delete(path, true);
-
-			Write(contents);
-		}
-
-		public Folder(string path, int priority)
-		{
-			this.path = path;
-			this.priority = priority;
-			if (!Directory.Exists(path))
-				Directory.CreateDirectory(path);
-		}
-
-		public Stream GetContent(string filename)
-		{
-			try { return File.OpenRead( Path.Combine( path, filename ) ); }
-			catch { return null; }
-		}
-
-		public IEnumerable<uint> AllFileHashes()
-		{
-			foreach( var filename in Directory.GetFiles( path, "*", SearchOption.TopDirectoryOnly ) )
-				yield return PackageEntry.HashFilename( Path.GetFileName(filename) );
-		}
-
-		public bool Exists(string filename)
-		{
-			return File.Exists(Path.Combine(path,filename));
-		}
-
-
-		public int Priority
-		{
-			get { return priority; }
-		}
-
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			if (!Directory.Exists(path))
-				Directory.CreateDirectory(path);
-
-			foreach (var file in contents)
-				using (var dataStream = File.Create(Path.Combine(path, file.Key)))
-					using (var writer = new BinaryWriter(dataStream))
-					   writer.Write(file.Value);
-		}
-	}
-}

OpenRA.FileFormats/Filesystem/InstallShieldPackage.cs

@@ -1,126 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	public class InstallShieldPackage : IFolder
-	{
-		readonly Dictionary<uint, PackageEntry> index = new Dictionary<uint, PackageEntry>();
-		readonly Stream s;
-		readonly long dataStart = 255;
-		int priority;
-
-		public InstallShieldPackage(string filename, int priority)
-		{
-			this.priority = priority;
-			s = FileSystem.Open(filename);
-
-			// Parse package header
-			BinaryReader reader = new BinaryReader(s);
-			uint signature = reader.ReadUInt32();
-			if (signature != 0x8C655D13)
-				throw new InvalidDataException("Not an Installshield package");
-
-			reader.ReadBytes(8);
-			/*var FileCount = */reader.ReadUInt16();
-			reader.ReadBytes(4);
-			/*var ArchiveSize = */reader.ReadUInt32();
-			reader.ReadBytes(19);
-			var TOCAddress = reader.ReadInt32();
-			reader.ReadBytes(4);
-			var DirCount = reader.ReadUInt16();
-
-			// Parse the directory list
-			s.Seek(TOCAddress, SeekOrigin.Begin);
-			BinaryReader TOCreader = new BinaryReader(s);
-			for (var i = 0; i < DirCount; i++)
-				ParseDirectory(TOCreader);
-		}
-
-		void ParseDirectory(BinaryReader reader)
-		{
-			// Parse directory header
-			var FileCount = reader.ReadUInt16();
-			var ChunkSize = reader.ReadUInt16();
-			var NameLength = reader.ReadUInt16();
-			reader.ReadChars(NameLength); //var DirName = new String(reader.ReadChars(NameLength));
-
-			// Skip to the end of the chunk
-			reader.ReadBytes(ChunkSize - NameLength - 6);
-
-			// Parse files
-			for (var i = 0; i < FileCount; i++)
-				ParseFile(reader);
-		}
-
-		uint AccumulatedData = 0;
-		void ParseFile(BinaryReader reader)
-		{
-			reader.ReadBytes(7);
-			var CompressedSize = reader.ReadUInt32();
-			reader.ReadBytes(12);
-			var ChunkSize = reader.ReadUInt16();
-			reader.ReadBytes(4);
-			var NameLength = reader.ReadByte();
-			var FileName = new String(reader.ReadChars(NameLength));
-
-			var hash = PackageEntry.HashFilename(FileName);
-			index.Add(hash, new PackageEntry(hash,AccumulatedData, CompressedSize));
-			AccumulatedData += CompressedSize;
-
-			// Skip to the end of the chunk
-			reader.ReadBytes(ChunkSize - NameLength - 30);
-		}
-
-		public Stream GetContent(uint hash)
-		{
-			PackageEntry e;
-			if (!index.TryGetValue(hash, out e))
-				return null;
-
-			s.Seek( dataStart + e.Offset, SeekOrigin.Begin );
-			byte[] data = new byte[ e.Length ];
-			s.Read( data, 0, (int)e.Length );
-
-			return new MemoryStream(Blast.Decompress(data));
-		}
-
-		public Stream GetContent(string filename)
-		{
-			return GetContent(PackageEntry.HashFilename(filename));
-		}
-
-		public IEnumerable<uint> AllFileHashes()
-		{
-			return index.Keys;
-		}
-
-		public bool Exists(string filename)
-		{
-			return index.ContainsKey(PackageEntry.HashFilename(filename));
-		}
-
-
-		public int Priority
-		{
-			get { return 2000 + priority; }
-		}
-
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			throw new NotImplementedException("Cannot save InstallShieldPackages.");
-		}
-	}
-}

OpenRA.FileFormats/Filesystem/ZipFile.cs

@@ -1,117 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-using ICSharpCode.SharpZipLib.Zip;
-using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
-
-namespace OpenRA.FileFormats
-{
-	public class ZipFile : IFolder
-	{
-		string filename;
-		SZipFile pkg;
-		int priority;
-
-		public ZipFile(string filename, int priority)
-		{
-			this.filename = filename;
-			this.priority = priority;
-			try
-			{
-				// pull the file into memory, dont keep it open.
-				pkg = new SZipFile(new MemoryStream(File.ReadAllBytes(filename)));
-			}
-			catch (ZipException e)
-			{
-				Log.Write("debug", "Couldn't load zip file: {0}", e.Message);
-			}
-		}
-
-		// Create a new zip with the specified contents
-		public ZipFile(string filename, int priority, Dictionary<string, byte[]> contents)
-		{
-			this.priority = priority;
-			this.filename = filename;
-
-			if (File.Exists(filename))
-				File.Delete(filename);
-
-			pkg = SZipFile.Create(filename);
-			Write(contents);
-		}
-
-		public Stream GetContent(string filename)
-		{
-
-			using (var z = pkg.GetInputStream(pkg.GetEntry(filename)))
-			{
-				var ms = new MemoryStream();
-				int bufSize = 2048;
-				byte[] buf = new byte[bufSize];
-				while ((bufSize = z.Read(buf, 0, buf.Length)) > 0)
-					ms.Write(buf, 0, bufSize);
-
-				ms.Seek(0, SeekOrigin.Begin);
-				return ms;
-			}
-		}
-
-		public IEnumerable<uint> AllFileHashes()
-		{
-			foreach(ZipEntry entry in pkg)
-				yield return PackageEntry.HashFilename(entry.Name);
-		}
-
-		public bool Exists(string filename)
-		{
-			return pkg.GetEntry(filename) != null;
-		}
-
-		public int Priority
-		{
-			get { return 500 + priority; }
-		}
-
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			pkg.Close();
-
-			pkg = SZipFile.Create(filename);
-
-			pkg.BeginUpdate();
-			// TODO: Clear existing content?
-
-			foreach (var kvp in contents)
-				pkg.Add(new StaticMemoryDataSource(kvp.Value), kvp.Key);
-
-			pkg.CommitUpdate();
-
-			pkg.Close();
-
-			pkg = new SZipFile(new MemoryStream(File.ReadAllBytes(filename)));
-		}
-	}
-
-	class StaticMemoryDataSource : IStaticDataSource
-	{
-		byte[] data;
-		public StaticMemoryDataSource (byte[] data)
-		{
-			this.data = data;
-		}
-
-		public Stream GetSource()
-		{
-			return new MemoryStream(data);
-		}
-	}
-}

OpenRA.FileFormats/Folder.cs

@@ -0,0 +1,39 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class Folder : IFolder
+	{
+		readonly string path;
+
+		public Folder(string path) { this.path = path; }
+
+		public Stream GetContent(string filename)
+		{
+			try { return File.OpenRead( Path.Combine( path, filename ) ); }
+			catch { return null; }
+		}
+
+		public IEnumerable<uint> AllFileHashes()
+		{
+			foreach( var filename in Directory.GetFiles( path, "*", SearchOption.TopDirectoryOnly ) )
+				yield return PackageEntry.HashFilename( filename );
+		}
+		
+		public bool Exists(string filename)
+		{
+			return File.Exists(Path.Combine(path,filename));
+		}
+	}
+}

OpenRA.FileFormats/Graphics/Dune2ShpReader.cs

@@ -1,146 +1,146 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-
-namespace OpenRA.FileFormats
-{
-	public enum Dune2ImageFlags : int
-	{
-		F80_F2 = 0,
-		F2 = 2,
-		L16_F80_F2_1 = 1,
-		L16_F80_F2_2 = 3,
-		Ln_F80_F2 = 5
-	}
-
-	public class Dune2ImageHeader
-	{
-		public readonly Dune2ImageFlags Flags;
-		public readonly int Width;
-		public readonly int Height;
-		public readonly int Slices;
-		public readonly int FileSize;
-		public readonly int DataSize;
-
-		public readonly byte[] LookupTable;
-		public byte[] Image;
-
-		public Dune2ImageHeader(BinaryReader reader)
-		{
-			Flags = (Dune2ImageFlags)reader.ReadUInt16();
-			Slices = reader.ReadByte();
-			Width = reader.ReadUInt16();
-			Height = reader.ReadByte();
-			FileSize = reader.ReadUInt16();
-			DataSize = reader.ReadUInt16();
-
-			if (Flags == Dune2ImageFlags.L16_F80_F2_1 ||
-				Flags == Dune2ImageFlags.L16_F80_F2_2 ||
-				Flags == Dune2ImageFlags.Ln_F80_F2)
-			{
-				int n = Flags == Dune2ImageFlags.Ln_F80_F2 ? reader.ReadByte() : (byte)16;
-				LookupTable = new byte[n];
-				for (int i = 0; i < n; i++)
-					LookupTable[i] = reader.ReadByte();
-			}
-			else
-			{
-				LookupTable = new byte[256];
-				for (int i = 0; i < 256; i++)
-					LookupTable[i] = (byte)i;
-				LookupTable[1] = 0x7f;
-				LookupTable[2] = 0x7e;
-				LookupTable[3] = 0x7d;
-				LookupTable[4] = 0x7c;
-			}
-		}
-
-		public Size Size
-		{
-			get { return new Size(Width, Height); }
-		}
-	}
-
-	public class Dune2ShpReader : IEnumerable<Dune2ImageHeader>
-	{
-		public readonly int ImageCount;
-
-		List<Dune2ImageHeader> headers = new List<Dune2ImageHeader>();
-
-		public Dune2ShpReader(Stream stream)
-		{
-			BinaryReader reader = new BinaryReader(stream);
-
-			ImageCount = reader.ReadUInt16();
-
-			//Last offset is pointer to end of file.
-			uint[] offsets = new uint[ImageCount + 1];
-
-			uint temp = reader.ReadUInt32();
-
-			//If fourth byte in file is non-zero, the offsets are two bytes each.
-			bool twoByteOffsets = (temp & 0xFF0000) > 0;
-			if (twoByteOffsets)
-			{
-				offsets[0] = ((temp & 0xFFFF0000) >> 16) + 2; //Offset does not account for image count bytes
-				offsets[1] = (temp & 0xFFFF) + 2;
-			}
-			else
-				offsets[0] = temp + 2;
-
-			for (int i = twoByteOffsets ? 2 : 1; i < ImageCount + 1; i++)
-				offsets[i] = (twoByteOffsets ? reader.ReadUInt16() : reader.ReadUInt32()) + 2;
-
-			for (int i = 0; i < ImageCount; i++)
-			{
-				reader.BaseStream.Seek(offsets[i], SeekOrigin.Begin);
-				Dune2ImageHeader header = new Dune2ImageHeader(reader);
-				byte[] imgData = reader.ReadBytes(header.FileSize);
-				header.Image = new byte[header.Height * header.Width];
-
-				//Decode image data
-				if (header.Flags != Dune2ImageFlags.F2)
-				{
-					byte[] tempData = new byte[header.DataSize];
-					Format80.DecodeInto(imgData, tempData);
-					Format2.DecodeInto(tempData, header.Image);
-				}
-				else
-					Format2.DecodeInto(imgData, header.Image);
-
-				//Lookup values in lookup table
-				if (header.LookupTable != null)
-					for (int j = 0; j < header.Image.Length; j++)
-						header.Image[j] = header.LookupTable[header.Image[j]];
-
-				headers.Add(header);
-			}
-		}
-
-		public Dune2ImageHeader this[int index]
-		{
-			get { return headers[index]; }
-		}
-
-		public IEnumerator<Dune2ImageHeader> GetEnumerator()
-		{
-			return headers.GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public enum Dune2ImageFlags : int
+	{
+		F80_F2 = 0,
+		F2 = 2,
+		L16_F80_F2_1 = 1,
+		L16_F80_F2_2 = 3,
+		Ln_F80_F2 = 5
+	}
+
+	public class Dune2ImageHeader
+	{
+		public readonly Dune2ImageFlags Flags;
+		public readonly int Width;
+		public readonly int Height;
+		public readonly int Slices;
+		public readonly int FileSize;
+		public readonly int DataSize;
+
+		public readonly byte[] LookupTable;
+		public byte[] Image;
+
+		public Dune2ImageHeader(BinaryReader reader)
+		{
+			Flags = (Dune2ImageFlags)reader.ReadUInt16();
+			Slices = reader.ReadByte();
+			Width = reader.ReadUInt16();
+			Height = reader.ReadByte();
+			FileSize = reader.ReadUInt16();
+			DataSize = reader.ReadUInt16();
+
+			if (Flags == Dune2ImageFlags.L16_F80_F2_1 ||
+				Flags == Dune2ImageFlags.L16_F80_F2_2 ||
+				Flags == Dune2ImageFlags.Ln_F80_F2)
+			{
+				int n = Flags == Dune2ImageFlags.Ln_F80_F2 ? reader.ReadByte() : (byte)16;
+				LookupTable = new byte[n];
+				for (int i = 0; i < n; i++)
+					LookupTable[i] = reader.ReadByte();
+			}
+			else
+			{
+				LookupTable = new byte[256];
+				for (int i = 0; i < 256; i++)
+					LookupTable[i] = (byte)i;
+				LookupTable[1] = 0x7f;
+				LookupTable[2] = 0x7e;
+				LookupTable[3] = 0x7d;
+				LookupTable[4] = 0x7c;
+			}
+		}
+
+		public Size Size
+		{
+			get { return new Size(Width, Height); }
+		}
+	}
+
+	public class Dune2ShpReader : IEnumerable<Dune2ImageHeader>
+	{
+		public readonly int ImageCount;
+
+		List<Dune2ImageHeader> headers = new List<Dune2ImageHeader>();
+
+		public Dune2ShpReader(Stream stream)
+		{
+			BinaryReader reader = new BinaryReader(stream);
+
+			ImageCount = reader.ReadUInt16();
+			
+			//Last offset is pointer to end of file.
+			uint[] offsets = new uint[ImageCount + 1];
+
+			uint temp = reader.ReadUInt32();
+
+			//If fourth byte in file is non-zero, the offsets are two bytes each.
+			bool twoByteOffsets = (temp & 0xFF0000) > 0; 
+			if (twoByteOffsets)
+			{
+				offsets[0] = ((temp & 0xFFFF0000) >> 16) + 2; //Offset does not account for image count bytes
+				offsets[1] = (temp & 0xFFFF) + 2;
+			}
+			else
+				offsets[0] = temp + 2;
+
+			for (int i = twoByteOffsets ? 2 : 1; i < ImageCount + 1; i++)
+				offsets[i] = (twoByteOffsets ? reader.ReadUInt16() : reader.ReadUInt32()) + 2;
+
+			for (int i = 0; i < ImageCount; i++)
+			{
+				reader.BaseStream.Seek(offsets[i], SeekOrigin.Begin);
+				Dune2ImageHeader header = new Dune2ImageHeader(reader);
+				byte[] imgData = reader.ReadBytes(header.FileSize);
+				header.Image = new byte[header.Height * header.Width];
+
+				//Decode image data
+				if (header.Flags != Dune2ImageFlags.F2)
+				{
+					byte[] tempData = new byte[header.DataSize];
+					Format80.DecodeInto(imgData, tempData);
+					Format2.DecodeInto(tempData, header.Image);
+				}
+				else
+					Format2.DecodeInto(imgData, header.Image);
+
+				//Lookup values in lookup table
+				if (header.LookupTable != null)
+					for (int j = 0; j < header.Image.Length; j++)
+						header.Image[j] = header.LookupTable[header.Image[j]];
+
+				headers.Add(header);
+			}
+		}
+
+		public Dune2ImageHeader this[int index]
+		{
+			get { return headers[index]; }
+		}
+	
+		public IEnumerator<Dune2ImageHeader> GetEnumerator()
+		{
+			return headers.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+}

OpenRA.FileFormats/Graphics/IGraphicsDevice.cs

@@ -1,96 +1,98 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Drawing;
-using System.IO;
-
-namespace OpenRA.FileFormats.Graphics
-{
-	[AttributeUsage( AttributeTargets.Assembly )]
-	public class RendererAttribute : Attribute
-	{
-		public readonly Type Type;
-
-		public RendererAttribute( Type graphicsDeviceType )
-		{
-			if( !typeof( IDeviceFactory ).IsAssignableFrom( graphicsDeviceType ) )
-				throw new InvalidOperationException( "Incorrect type in RendererAttribute" );
-			Type = graphicsDeviceType;
-		}
-	}
-
-	public interface IDeviceFactory
-	{
-		IGraphicsDevice Create( Size size, WindowMode windowMode );
-	}
-
-	public interface IGraphicsDevice
-	{
-		IVertexBuffer<Vertex> CreateVertexBuffer( int length );
-		ITexture CreateTexture( Bitmap bitmap );
-		ITexture CreateTexture();
-		IShader CreateShader( string name );
-
-		Size WindowSize { get; }
-		int GpuMemoryUsed { get; }
-
-		void Clear();
-		void Present();
-		void PumpInput(IInputHandler inputHandler);
-
-		void DrawPrimitives( PrimitiveType type, int firstVertex, int numVertices );
-
-		void SetLineWidth( float width );
-		void EnableScissor( int left, int top, int width, int height );
-		void DisableScissor();
-	}
-
-	public interface IVertexBuffer<T>
-	{
-		void Bind();
-		void SetData( T[] vertices, int length );
-	}
-
-	public interface IShader
-	{
-		void SetValue( string name, float x, float y );
-		void SetValue( string param, ITexture texture );
-		void Render( Action a );
-	}
-
-	public interface ITexture
-	{
-		void SetData(Bitmap bitmap);
-		void SetData(uint[,] colors);
-		void SetData(byte[] colors, int width, int height);
-	}
-
-	public enum PrimitiveType
-	{
-		PointList,
-		LineList,
-		TriangleList,
-		QuadList,
-	}
-
-	public struct Range<T>
-	{
-		public readonly T Start, End;
-		public Range( T start, T end ) { Start = start; End = end; }
-	}
-
-	public enum WindowMode
-	{
-		Windowed,
-		Fullscreen,
-		PseudoFullscreen,
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+using System.IO;
+
+namespace OpenRA.FileFormats.Graphics
+{
+	[AttributeUsage( AttributeTargets.Assembly )]
+	public class RendererAttribute : Attribute
+	{
+		public readonly Type Type;
+
+		public RendererAttribute( Type graphicsDeviceType )
+		{
+			if( !typeof( IGraphicsDevice ).IsAssignableFrom( graphicsDeviceType ) )
+				throw new InvalidOperationException( "Incorrect type in RendererAttribute" );
+			Type = graphicsDeviceType;
+		}
+	}
+
+	public interface IGraphicsDevice
+	{
+		IVertexBuffer<Vertex> CreateVertexBuffer( int length );
+		IIndexBuffer CreateIndexBuffer( int length );
+		ITexture CreateTexture( Bitmap bitmap );
+		ITexture CreateTexture();
+		IShader CreateShader( Stream stream );
+
+		Size WindowSize { get; }
+
+		void Begin();
+		void End();
+		void Clear( Color color );
+		void Present();
+
+		void DrawIndexedPrimitives( PrimitiveType type, Range<int> vertexRange, Range<int> indexRange );
+		void DrawIndexedPrimitives( PrimitiveType type, int vertexPool, int numPrimitives );
+
+		void EnableScissor( int left, int top, int width, int height );
+		void DisableScissor();
+	}
+
+	public interface IVertexBuffer<T>
+	{
+		void Bind();
+		void SetData( T[] vertices, int length );
+	}
+
+	public interface IIndexBuffer
+	{
+		void Bind();
+		void SetData( ushort[] indices, int length );
+	}
+
+	public interface IShader
+	{
+		void SetValue( string name, float x, float y );
+		void SetValue( string param, ITexture texture );
+		void Commit();
+		void Render( Action a );
+	}
+
+	public interface ITexture
+	{
+		void SetData(Bitmap bitmap);
+		void SetData(uint[,] colors);
+		void SetData(byte[] colors, int width, int height);
+	}
+
+    public enum PrimitiveType
+    {
+        PointList, 
+        LineList, 
+        TriangleList,
+    }
+
+	public struct Range<T>
+	{
+		public readonly T Start, End;
+		public Range( T start, T end ) { Start = start; End = end; }
+	}
+	
+	public enum WindowMode
+	{
+		Windowed,
+		Fullscreen,
+		PseudoFullscreen,
+	}
+}

OpenRA.FileFormats/Graphics/IInputHandler.cs

@@ -1,75 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenRA
-{
-	public interface IInputHandler
-	{
-		void ModifierKeys( Modifiers mods );
-		void OnKeyInput( KeyInput input );
-		void OnMouseInput( MouseInput input );
-	}
-
-	public struct MouseInput
-	{
-		public MouseInputEvent Event;
-		public MouseButton Button;
-		public int2 Location;
-		public Modifiers Modifiers;
-		public int MultiTapCount;
-
-		public MouseInput( MouseInputEvent ev, MouseButton button, int2 location, Modifiers mods, int multiTapCount )
-		{
-			this.Event = ev;
-			this.Button = button;
-			this.Location = location;
-			this.Modifiers = mods;
-			this.MultiTapCount = multiTapCount;
-		}
-	}
-
-	public enum MouseInputEvent { Down, Move, Up };
-
-	[Flags]
-	public enum MouseButton
-	{
-		None = 0,
-		Left = 1,
-		Right = 2,
-		Middle = 4,
-		WheelDown = 8,
-		WheelUp = 16
-	}
-
-	[Flags]
-	public enum Modifiers
-	{
-		None = 0,
-		Shift = 1,
-		Alt = 2,
-		Ctrl = 4,
-		Meta = 8,
-	}
-
-	public enum KeyInputEvent { Down, Up };
-	public struct KeyInput
-	{
-		public KeyInputEvent Event;
-		public char UnicodeChar;
-		public string KeyName;
-		public Modifiers Modifiers;
-		public int VirtKey;
-		public int MultiTapCount;
-	}
-}

OpenRA.FileFormats/Graphics/PngLoader.cs

@@ -1,182 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.IO.Compression;
-using System.Net;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace OpenRA.FileFormats.Graphics
-{
-	public static class PngLoader
-	{
-		public static Bitmap Load(string filename)
-		{
-			using (var s = File.OpenRead(filename))
-				return Load(s);
-		}
-
-		public static Bitmap Load(Stream s)
-		{
-			using (var br = new BinaryReader(s))
-			{
-				var signature = new byte[] { 137, 80, 78, 71, 13, 10, 26, 10 };
-				foreach (var b in signature)
-					if (br.ReadByte() != b)
-						throw new InvalidDataException("PNG Signature is bogus");
-
-				Bitmap bitmap = null;
-				Color[] palette = null;
-				List<byte> data = new List<byte>();
-
-				for (; ; )
-				{
-					var length = IPAddress.NetworkToHostOrder(br.ReadInt32());
-					var type = Encoding.UTF8.GetString(br.ReadBytes(4));
-					var content = br.ReadBytes(length);
-					/*var crc = */br.ReadInt32();
-
-					using (var ms = new MemoryStream(content))
-					using (var cr = new BinaryReader(ms))
-						switch (type)
-						{
-							case "IHDR":
-								{
-
-									var width = IPAddress.NetworkToHostOrder(cr.ReadInt32());
-									var height = IPAddress.NetworkToHostOrder(cr.ReadInt32());
-									var bitDepth = cr.ReadByte();
-									var colorType = (PngColorType)cr.ReadByte();
-									var compression = cr.ReadByte();
-									/*var filter = */cr.ReadByte();
-									var interlace = cr.ReadByte();
-
-									if (compression != 0) throw new InvalidDataException("Compression method not supported");
-									if (interlace != 0) throw new InvalidDataException("Interlacing not supported");
-
-									bitmap = new Bitmap(width, height, MakePixelFormat(bitDepth, colorType));
-
-								}
-								break;
-
-							case "PLTE":
-								{
-									palette = new Color[256];
-									for (var i = 0; i < 256; i++)
-									{
-										var r = cr.ReadByte(); var g = cr.ReadByte(); var b = cr.ReadByte();
-										palette[i] = Color.FromArgb(r, g, b);
-									}
-								}
-								break;
-
-							case "tRNS":
-								{
-									for (var i = 0; i < length; i++)
-										palette[i] = Color.FromArgb(cr.ReadByte(), palette[i]);
-								}
-								break;
-
-							case "IDAT":
-								{
-									data.AddRange(content);
-								}
-								break;
-
-							case "IEND":
-								{
-									var bits = bitmap.LockBits(bitmap.Bounds(),
-										ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-									using (var ns = new MemoryStream(data.ToArray()))
-									{
-										// 'zlib' flags bytes; confuses the DeflateStream.
-										/*var flags = (byte)*/ns.ReadByte();
-										/*var moreFlags = (byte)*/ns.ReadByte();
-
-										using (var ds = new DeflateStream(ns, CompressionMode.Decompress))
-										using (var dr = new BinaryReader(ds))
-										{
-											var prevLine = new byte[bitmap.Width];	// all zero
-											for (var y = 0; y < bitmap.Height; y++)
-											{
-												var filter = (PngFilter)dr.ReadByte();
-												var line = dr.ReadBytes(bitmap.Width);
-
-												for (var i = 0; i < bitmap.Width; i++)
-													line[i] = i > 0
-														? UnapplyFilter(filter, line[i], line[i - 1], prevLine[i], prevLine[i - 1])
-														: UnapplyFilter(filter, line[i], 0, prevLine[i], 0);
-
-												Marshal.Copy(line, 0, new IntPtr(bits.Scan0.ToInt64() + y * bits.Stride), line.Length);
-												prevLine = line;
-											}
-										}
-									}
-
-									bitmap.UnlockBits(bits);
-
-									using (var temp = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
-									{
-										var cp = temp.Palette;
-										for (var i = 0; i < 256; i++)
-											cp.Entries[i] = palette[i];		// finalize the palette.
-										bitmap.Palette = cp;
-										return bitmap;
-									}
-								}
-						}
-				}
-			}
-		}
-
-		static byte UnapplyFilter(PngFilter f, byte x, byte a, byte b, byte c)
-		{
-			switch (f)
-			{
-				case PngFilter.None: return x;
-				case PngFilter.Sub: return (byte)(x + a);
-				case PngFilter.Up: return (byte)(x + b);
-				case PngFilter.Average: return (byte)(x + (a + b) / 2);
-				case PngFilter.Paeth: return (byte)(x + Paeth(a, b, c));
-				default:
-					throw new InvalidOperationException("Unsupported Filter");
-			}
-		}
-
-		static byte Paeth(byte a, byte b, byte c)
-		{
-			var p = a + b - c;
-			var pa = Math.Abs(p - a);
-			var pb = Math.Abs(p - b);
-			var pc = Math.Abs(p - c);
-
-			return (pa <= pb && pa <= pc) ? a :
-				(pb <= pc) ? b : c;
-		}
-
-		[Flags]
-		enum PngColorType { Indexed = 1, Color = 2, Alpha = 4 };
-		enum PngFilter { None, Sub, Up, Average, Paeth };
-
-		static PixelFormat MakePixelFormat(byte bitDepth, PngColorType colorType)
-		{
-			if (bitDepth == 8 && colorType == (PngColorType.Indexed | PngColorType.Color))
-				return PixelFormat.Format8bppIndexed;
-
-			throw new InvalidDataException("Unknown pixelformat");
-		}
-	}
-}

OpenRA.FileFormats/Graphics/ShpReader.cs

@@ -1,167 +1,167 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	public class ImageHeader
-	{
-		public uint Offset;
-		public Format Format;
-
-		public uint RefOffset;
-		public Format RefFormat;
-		public ImageHeader RefImage;
-
-		public byte[] Image;
-
-		public ImageHeader() { }
-
-		public ImageHeader( BinaryReader reader )
-		{
-			var data = reader.ReadUInt32();
-			Offset = data & 0xffffff;
-			Format = (Format)(data >> 24);
-
-			RefOffset = reader.ReadUInt16();
-			RefFormat = (Format)reader.ReadUInt16();
-		}
-
-		public static readonly int SizeOnDisk = 8;
-
-		public void WriteTo(BinaryWriter writer)
-		{
-			writer.Write(Offset | ((uint)Format << 24));
-			writer.Write((ushort)RefOffset);
-			writer.Write((ushort)RefFormat);
-		}
-	}
-
-	public enum Format { Format20 = 0x20, Format40 = 0x40, Format80 = 0x80 }
-
-	public class ShpReader
-	{
-		public readonly int ImageCount;
-		public readonly ushort Width;
-		public readonly ushort Height;
-
-		public Size Size { get { return new Size(Width, Height); } }
-
-		readonly List<ImageHeader> headers = new List<ImageHeader>();
-
-		int recurseDepth = 0;
-
-		public ShpReader( Stream stream )
-		{
-			using( var reader = new BinaryReader( stream ) )
-			{
-				ImageCount = reader.ReadUInt16();
-				reader.ReadUInt16();
-				reader.ReadUInt16();
-				Width = reader.ReadUInt16();
-				Height = reader.ReadUInt16();
-				reader.ReadUInt32();
-
-				for( int i = 0 ; i < ImageCount ; i++ )
-					headers.Add( new ImageHeader( reader ) );
-
-				new ImageHeader( reader ); // end-of-file header
-				new ImageHeader( reader ); // all-zeroes header
-
-				var offsets = headers.ToDictionary(h => h.Offset, h =>h);
-
-				for( int i = 0 ; i < ImageCount ; i++ )
-				{
-					var h = headers[ i ];
-					if( h.Format == Format.Format20 )
-						h.RefImage = headers[ i - 1 ];
-
-					else if( h.Format == Format.Format40 )
-						if( !offsets.TryGetValue( h.RefOffset, out h.RefImage ) )
-							throw new InvalidDataException( "Reference doesnt point to image data {0}->{1}".F(h.Offset, h.RefOffset) );
-				}
-
-				foreach( ImageHeader h in headers )
-					Decompress( stream, h );
-			}
-		}
-
-		public ImageHeader this[ int index ]
-		{
-			get { return headers[ index ]; }
-		}
-
-		void Decompress( Stream stream, ImageHeader h )
-		{
-			if( recurseDepth > ImageCount )
-				throw new InvalidDataException( "Format20/40 headers contain infinite loop" );
-
-			switch( h.Format )
-			{
-				case Format.Format20:
-				case Format.Format40:
-					{
-						if( h.RefImage.Image == null )
-						{
-							++recurseDepth;
-							Decompress( stream, h.RefImage );
-							--recurseDepth;
-						}
-
-						h.Image = CopyImageData( h.RefImage.Image );
-						Format40.DecodeInto(ReadCompressedData(stream, h), h.Image);
-						break;
-					}
-				case Format.Format80:
-					{
-						var imageBytes = new byte[ Width * Height ];
-						Format80.DecodeInto( ReadCompressedData( stream, h ), imageBytes );
-						h.Image = imageBytes;
-						break;
-					}
-				default:
-					throw new InvalidDataException();
-			}
-		}
-
-		static byte[] ReadCompressedData( Stream stream, ImageHeader h )
-		{
-			stream.Position = h.Offset;
-			// Actually, far too big. There's no length field with the correct length though :(
-			var compressedLength = (int)( stream.Length - stream.Position );
-
-			var compressedBytes = new byte[ compressedLength ];
-			stream.Read( compressedBytes, 0, compressedLength );
-
-			return compressedBytes;
-		}
-
-		byte[] CopyImageData( byte[] baseImage )
-		{
-			var imageData = new byte[ Width * Height ];
-			for( int i = 0 ; i < Width * Height ; i++ )
-				imageData[ i ] = baseImage[ i ];
-
-			return imageData;
-		}
-
-		public IEnumerable<ImageHeader> Frames { get { return headers; } }
-
-		public static ShpReader Load(string filename)
-		{
-			using (var s = File.OpenRead(filename))
-				return new ShpReader(s);
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class ImageHeader
+	{
+		public uint Offset;
+		public Format Format;
+
+		public uint RefOffset;
+		public Format RefFormat;
+		public ImageHeader RefImage;
+
+		public byte[] Image;
+
+		public ImageHeader( BinaryReader reader )
+		{
+			Offset = reader.ReadUInt32();
+			Format = (Format)( Offset >> 24 );
+			Offset &= 0xFFFFFF;
+
+			RefOffset = reader.ReadUInt16();
+			RefFormat = (Format)reader.ReadUInt16();
+		}
+	}
+
+	public enum Format
+	{
+		Format20 = 0x20,
+		Format40 = 0x40,
+		Format80 = 0x80,
+	}
+
+	public class ShpReader : IEnumerable<ImageHeader>
+	{
+		public readonly int ImageCount;
+		public readonly ushort Width;
+		public readonly ushort Height;
+
+		public Size Size { get { return new Size(Width, Height); } }
+
+		private readonly List<ImageHeader> headers = new List<ImageHeader>();
+
+		int recurseDepth = 0;
+
+		public ShpReader( Stream stream )
+		{
+			BinaryReader reader = new BinaryReader( stream );
+
+			ImageCount = reader.ReadUInt16();
+			reader.ReadUInt16();
+			reader.ReadUInt16();
+			Width = reader.ReadUInt16();
+			Height = reader.ReadUInt16();
+			reader.ReadUInt32();
+
+			for( int i = 0 ; i < ImageCount ; i++ )
+				headers.Add( new ImageHeader( reader ) );
+
+			new ImageHeader( reader ); // end-of-file header
+			new ImageHeader( reader ); // all-zeroes header
+
+			Dictionary<uint, ImageHeader> offsets = new Dictionary<uint, ImageHeader>();
+			foreach( ImageHeader h in headers )
+				offsets.Add( h.Offset, h );
+
+			for( int i = 0 ; i < ImageCount ; i++ )
+			{
+				ImageHeader h = headers[ i ];
+				if( h.Format == Format.Format20 )
+					h.RefImage = headers[ i - 1 ];
+
+				else if( h.Format == Format.Format40 )
+				{
+					if( !offsets.TryGetValue( h.RefOffset, out h.RefImage ) )
+						throw new InvalidDataException( string.Format( "Reference doesnt point to image data {0}->{1}", h.Offset, h.RefOffset ) );
+				}
+			}
+
+			foreach( ImageHeader h in headers )
+				Decompress( stream, h );
+		}
+
+		public ImageHeader this[ int index ]
+		{
+			get { return headers[ index ]; }
+		}
+
+		void Decompress( Stream stream, ImageHeader h )
+		{
+			if( recurseDepth > ImageCount )
+				throw new InvalidDataException( "Format20/40 headers contain infinite loop" );
+
+			switch( h.Format )
+			{
+				case Format.Format20:
+				case Format.Format40:
+					{
+						if( h.RefImage.Image == null )
+						{
+							++recurseDepth;
+							Decompress( stream, h.RefImage );
+							--recurseDepth;
+						}
+
+						h.Image = CopyImageData( h.RefImage.Image );
+						Format40.DecodeInto(ReadCompressedData(stream, h), h.Image);
+						break;
+					}
+				case Format.Format80:
+					{
+						byte[] imageBytes = new byte[ Width * Height ];
+						Format80.DecodeInto( ReadCompressedData( stream, h ), imageBytes );
+						h.Image = imageBytes;
+						break;
+					}
+				default:
+					throw new InvalidDataException();
+			}
+		}
+
+		static byte[] ReadCompressedData( Stream stream, ImageHeader h )
+		{
+			stream.Position = h.Offset;
+			// Actually, far too big. There's no length field with the correct length though :(
+			int compressedLength = (int)( stream.Length - stream.Position );
+
+			byte[] compressedBytes = new byte[ compressedLength ];
+			stream.Read( compressedBytes, 0, compressedLength );
+
+			//MemoryStream ms = new MemoryStream( compressedBytes );
+			return compressedBytes;
+		}
+
+		private byte[] CopyImageData( byte[] baseImage )
+		{
+			byte[] imageData = new byte[ Width * Height ];
+			for( int i = 0 ; i < Width * Height ; i++ )
+				imageData[ i ] = baseImage[ i ];
+
+			return imageData;
+		}
+
+		public IEnumerator<ImageHeader> GetEnumerator()
+		{
+			return headers.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+}

OpenRA.FileFormats/Graphics/ShpWriter.cs

@@ -1,56 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats.Graphics
-{
-	// format80-only SHP writer
-
-	public static class ShpWriter
-	{
-		public static void Write(Stream s, int width, int height, IEnumerable<byte[]> frames)
-		{
-			var compressedFrames = frames.Select(f => Format80.Encode(f)).ToArray();
-
-			// note: end-of-file and all-zeroes headers
-			var dataOffset = 14 + (compressedFrames.Length + 2) * ImageHeader.SizeOnDisk;
-
-			using (var bw = new BinaryWriter(s))
-			{
-				bw.Write((ushort)compressedFrames.Length);
-				bw.Write((ushort)0);	// unused
-				bw.Write((ushort)0);	// unused
-				bw.Write((ushort)width);
-				bw.Write((ushort)height);
-				bw.Write((uint)0);		// unused
-
-				foreach (var f in compressedFrames)
-				{
-					var ih = new ImageHeader { Format = Format.Format80, Offset = (uint)dataOffset };
-					dataOffset += f.Length;
-
-					ih.WriteTo(bw);
-				}
-
-				var eof = new ImageHeader { Offset = (uint)dataOffset };
-				eof.WriteTo(bw);
-
-				var allZeroes = new ImageHeader { };
-				allZeroes.WriteTo(bw);
-
-				foreach (var f in compressedFrames)
-					bw.Write(f);
-			}
-		}
-	}
-}

OpenRA.FileFormats/Graphics/Vertex.cs

@@ -1,28 +1,28 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Runtime.InteropServices;
-
-namespace OpenRA.FileFormats.Graphics
-{
-	[StructLayout(LayoutKind.Sequential)]
-	public struct Vertex
-	{
-		public float x, y, z, u, v;
-		public float p, c;
-
-		public Vertex(float2 xy, float2 uv, float2 pc)
-		{
-			this.x = xy.X; this.y = xy.Y; this.z = 0;
-			this.u = uv.X; this.v = uv.Y;
-			this.p = pc.X; this.c = pc.Y;
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Runtime.InteropServices;
+
+namespace OpenRA.FileFormats.Graphics
+{
+	[StructLayout(LayoutKind.Sequential)]
+	public struct Vertex
+	{
+		public float x, y, z, u, v;
+		public float p, c;
+
+		public Vertex(float2 xy, float2 uv, float2 pc)
+		{
+			this.x = xy.X; this.y = xy.Y; this.z = 0;
+			this.u = uv.X; this.v = uv.Y;
+			this.p = pc.X; this.c = pc.Y;
+		}
+	}
+}

OpenRA.FileFormats/Graphics/VqaReader.cs

@@ -1,16 +1,16 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation. For more information,
- * see COPYING.
+ * see LICENSE.
  */
-#endregion
-
-using System;
-using System.IO;
-
+#endregion
+
+using System;
+using System.IO;
+
 namespace OpenRA.FileFormats
 {
 	public class VqaReader
@@ -19,7 +19,7 @@ namespace OpenRA.FileFormats
 		public readonly byte Framerate;
 		public readonly ushort Width;
 		public readonly ushort Height;
-
+		
 		Stream stream;
 		int currentFrame;
 		ushort numColors;
@@ -32,75 +32,75 @@ namespace OpenRA.FileFormats
 
 		// Stores a list of subpixels, referenced by the VPTZ chunk
 		byte[] cbf;
-		byte[] cbp;
+		byte[] cbp;			
 		int cbChunk = 0;
 		int cbOffset = 0;
-
+		
 		// Top half contains block info, bottom half contains references to cbf array
 		byte[] origData;
-
+		
 		// Final frame output
-		uint[,] frameData;
-		byte[] audioData;		// audio for this frame: 22050Hz 16bit mono pcm, uncompressed.
-
-		public byte[] AudioData { get { return audioData; } }
+		uint[,] frameData;
+		byte[] audioData;		// audio for this frame: 22050Hz 16bit mono pcm, uncompressed.
+
+		public byte[] AudioData { get { return audioData; } }
 		public int CurrentFrame { get { return currentFrame; } }
-
+		
 		public VqaReader( Stream stream )
 		{
 			this.stream = stream;
 			BinaryReader reader = new BinaryReader( stream );
-
+			
 			// Decode FORM chunk
 			if (new String(reader.ReadChars(4)) != "FORM")
 				throw new InvalidDataException("Invalid vqa (invalid FORM section)");
 			/*var length = */ reader.ReadUInt32();
-
+			
 			if (new String(reader.ReadChars(8)) != "WVQAVQHD")
 				throw new InvalidDataException("Invalid vqa (not WVQAVQHD)");
 			/* var length = */reader.ReadUInt32();
-
+			
 			/*var version = */reader.ReadUInt16();
 			/*var flags = */reader.ReadUInt16();
 			Frames = reader.ReadUInt16();
 			Width = reader.ReadUInt16();
 			Height = reader.ReadUInt16();
-
+			
 			blockWidth = reader.ReadByte();
 			blockHeight = reader.ReadByte();
 			Framerate = reader.ReadByte();
 			cbParts = reader.ReadByte();
 			blocks = new int2(Width / blockWidth, Height / blockHeight);
-
+			
 			numColors = reader.ReadUInt16();
 			/*var maxBlocks = */reader.ReadUInt16();
 			/*var unknown1 = */reader.ReadUInt16();
 			/*var unknown2 = */reader.ReadUInt32();
-
+			
 			// Audio
 			/*var freq = */reader.ReadUInt16();
 			/*var channels = */reader.ReadByte();
 			/*var bits = */reader.ReadByte();
 			/*var unknown3 = */reader.ReadChars(14);
-
-
-			var frameSize = Exts.NextPowerOf2(Math.Max(Width,Height));
+			
+			
+			var frameSize = NextPowerOf2(Math.Max(Width,Height));
 			cbf = new byte[Width*Height];
 			cbp = new byte[Width*Height];
 			palette = new uint[numColors];
 			origData = new byte[2*blocks.X*blocks.Y];
 			frameData = new uint[frameSize,frameSize];
-
+			
 			var type = new String(reader.ReadChars(4));
 			if (type != "FINF")
 			{
 				reader.ReadBytes(27);
 				type = new String(reader.ReadChars(4));
 			}
-
+			
 			/*var length = */reader.ReadUInt16();
 			/*var unknown4 = */reader.ReadUInt16();
-
+			
 			// Frame offsets
 			offsets = new UInt32[Frames];
 			for (int i = 0; i < Frames; i++)
@@ -108,79 +108,79 @@ namespace OpenRA.FileFormats
 				offsets[i] = reader.ReadUInt32();
 				if (offsets[i] > 0x40000000) offsets[i] -= 0x40000000;
 				offsets[i] <<= 1;
-			}
-
+			}
+
 			CollectAudioData();
-
+			
 			Reset();
-		}
+		}
 
 		public void Reset()
 		{
 			currentFrame = cbOffset = cbChunk = 0;
 			LoadFrame();
 		}
+		
+		void CollectAudioData()
+		{
+			var ms = new MemoryStream();
+			var adpcmIndex = 0;
 
-		void CollectAudioData()
-		{
-			var ms = new MemoryStream();
-			var adpcmIndex = 0;
-
-			bool compressed = false;
-			for (var i = 0; i < Frames; i++)
-			{
-				stream.Seek(offsets[i], SeekOrigin.Begin);
-				BinaryReader reader = new BinaryReader(stream);
-				var end = (i < Frames - 1) ? offsets[i + 1] : stream.Length;
-
-				while (reader.BaseStream.Position < end)
-				{
-					var type = new String(reader.ReadChars(4));
-					var length = int2.Swap(reader.ReadUInt32());
-
-					switch (type)
-					{
+			bool compressed = false;
+			for (var i = 0; i < Frames; i++)
+			{
+				stream.Seek(offsets[i], SeekOrigin.Begin);
+				BinaryReader reader = new BinaryReader(stream);
+				var end = (i < Frames - 1) ? offsets[i + 1] : stream.Length;
+
+				while (reader.BaseStream.Position < end)
+				{
+					var type = new String(reader.ReadChars(4));
+					var length = int2.Swap(reader.ReadUInt32());
+
+					switch (type)
+					{
 						case "SND0":
 						case "SND2":
 							var rawAudio = reader.ReadBytes((int)length);
 							ms.Write(rawAudio);
 							compressed = (type == "SND2");
-							break;
-						default:
-							reader.ReadBytes((int)length);
-							break;
-					}
-
-					if (reader.PeekChar() == 0) reader.ReadByte();
-				}
-			}
-
-			audioData = (compressed) ? AudLoader.LoadSound(ms.ToArray(), ref adpcmIndex) : ms.ToArray();
-		}
+							break;
+						default:
+							reader.ReadBytes((int)length);
+							break;
+					}
+
+					if (reader.PeekChar() == 0) reader.ReadByte();
+				}
+			}
+
+			audioData = (compressed) ? AudLoader.LoadSound(ms.ToArray(), ref adpcmIndex) : ms.ToArray();
+		}
 
 		public void AdvanceFrame()
 		{
 			currentFrame++;
 			LoadFrame();
 		}
-
+		
 		void LoadFrame()
-		{
+		{			
 			if (currentFrame >= Frames)
 				return;
-
+			
 			// Seek to the start of the frame
 			stream.Seek(offsets[currentFrame], SeekOrigin.Begin);
 			BinaryReader reader = new BinaryReader(stream);
 			var end = (currentFrame < Frames - 1) ? offsets[currentFrame+1] : stream.Length;
-
+	
 			while(reader.BaseStream.Position < end)
 			{
 				var type = new String(reader.ReadChars(4));
 				var length = int2.Swap(reader.ReadUInt32());
 
 				switch(type)
-				{
+				{
 					case "VQFR":
 						DecodeVQFR(reader);
 					break;
@@ -189,17 +189,17 @@ namespace OpenRA.FileFormats
 						reader.ReadBytes((int)length);
 						break;
 				}
-
+				
 				// Chunks are aligned on even bytes; advance by a byte if the next one is null
 				if (reader.PeekChar() == 0) reader.ReadByte();
 			}
 		}
-
+		
 		// VQA Frame
 		public void DecodeVQFR(BinaryReader reader)
-		{
+		{			
 			while(true)
-			{
+			{				
 				// Chunks are aligned on even bytes; may be padded with a single null
 				if (reader.PeekChar() == 0) reader.ReadByte();
 				var type = new String(reader.ReadChars(4));
@@ -214,9 +214,9 @@ namespace OpenRA.FileFormats
 					case "CBF0":
 						cbf = reader.ReadBytes(subchunkLength);
 					break;
-
+					
 					// frame-modifier chunk
-					case "CBP0":
+					case "CBP0":	
 					case "CBPZ":
 						// Partial buffer is full; dump and recreate
 						if (cbChunk == cbParts)
@@ -225,16 +225,16 @@ namespace OpenRA.FileFormats
 								cbf = (byte[])cbp.Clone();
 							else
 								Format80.DecodeInto( cbp, cbf );
-
+							
 							cbOffset = cbChunk = 0;
 						}
-
+						
 						var bytes = reader.ReadBytes(subchunkLength);
 						bytes.CopyTo(cbp,cbOffset);
 						cbOffset += subchunkLength;
 						cbChunk++;
 					break;
-
+					
 					// Palette
 					case "CPL0":
 						for (int i = 0; i < numColors; i++)
@@ -245,7 +245,7 @@ namespace OpenRA.FileFormats
 							palette[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
 						}
 					break;
-
+					
 					// Frame data
 					case "VPTZ":
 						Format80.DecodeInto( reader.ReadBytes(subchunkLength), origData );
@@ -256,36 +256,39 @@ namespace OpenRA.FileFormats
 				}
 			}
 		}
-
+		
 		int cachedFrame = -1;
-
-		void DecodeFrameData( int frame )
+		public uint[,] FrameData	{ get
 		{
-			cachedFrame = currentFrame;
-			for (var y = 0; y < blocks.Y; y++)
-				for (var x = 0; x < blocks.X; x++)
-				{
-					var px = origData[x + y*blocks.X];
-					var mod = origData[x + (y + blocks.Y)*blocks.X];
-					for (var j = 0; j < blockHeight; j++)
-						for (var i = 0; i < blockWidth; i++)
-						{
-							var cbfi = (mod*256 + px)*8 + j*blockWidth + i;
-							byte color = (mod == 0x0f) ? px : cbf[cbfi];
-							frameData[y*blockHeight + j, x*blockWidth + i] = palette[color];
-						}
-				}
-		}
-
-		public uint[,] FrameData
-		{
-			get
+			if (cachedFrame != currentFrame)
 			{
-				if (cachedFrame != currentFrame)
-					DecodeFrameData(currentFrame);
-
-				return frameData;
+				cachedFrame = currentFrame;
+				for (var y = 0; y < blocks.Y; y++)
+					for (var x = 0; x < blocks.X; x++)
+					{
+						var px = origData[x + y*blocks.X];
+						var mod = origData[x + (y + blocks.Y)*blocks.X];
+						for (var j = 0; j < blockHeight; j++)
+							for (var i = 0; i < blockWidth; i++)
+							{
+								var cbfi = (mod*256 + px)*8 + j*blockWidth + i;
+								byte color = (mod == 0x0f) ? px : cbf[cbfi];
+								frameData[y*blockHeight + j, x*blockWidth + i] = palette[color];
+							}
+					}
 			}
+			return frameData;
+		}}
+		
+		int NextPowerOf2(int v)
+		{
+			--v;
+			v |= v >> 1;
+			v |= v >> 2;
+			v |= v >> 4;
+			v |= v >> 8;
+			++v;
+			return v;
 		}
 	}
 }

OpenRA.FileFormats/InstallUtils.cs

@@ -1,131 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using ICSharpCode.SharpZipLib;
-using ICSharpCode.SharpZipLib.Zip;
-
-namespace OpenRA.FileFormats
-{
-	public static class InstallUtils
-	{
-		static IEnumerable<ZipEntry> GetEntries(this ZipInputStream z)
-		{
-			for (; ; )
-			{
-				var e = z.GetNextEntry();
-				if (e != null) yield return e; else break;
-			}
-		}
-
-		public static string GetMountedDisk(Func<string, bool> isValidDisk)
-		{
-			var volumes = DriveInfo.GetDrives()
-				.Where(v => v.DriveType == DriveType.CDRom && v.IsReady)
-				.Select(v => v.RootDirectory.FullName);
-
-			return volumes.FirstOrDefault(v => isValidDisk(v));
-		}
-
-		// TODO: The package should be mounted into its own context to avoid name collisions with installed files
-		public static bool ExtractFromPackage(string srcPath, string package, string[] files, string destPath, Action<string> onProgress, Action<string> onError)
-		{
-			if (!Directory.Exists(destPath))
-				Directory.CreateDirectory(destPath);
-
-			if (!Directory.Exists(srcPath)) { onError("Cannot find "+package); return false; }
-			FileSystem.Mount(srcPath);
-			if (!FileSystem.Exists(package)) { onError("Cannot find "+package); return false; }
-			FileSystem.Mount(package);
-
-			foreach (string s in files)
-			{
-				var destFile = Path.Combine(destPath, s);
-				using (var sourceStream = FileSystem.Open(s))
-				using (var destStream = File.Create(destFile))
-				{
-					onProgress("Extracting "+s);
-					destStream.Write(sourceStream.ReadAllBytes());
-				}
-			}
-			return true;
-		}
-
-		public static bool CopyFiles(string srcPath, string[] files, string destPath, Action<string> onProgress, Action<string> onError)
-		{
-			foreach (var file in files)
-			{
-				var fromPath = Path.Combine(srcPath, file);
-				if (!File.Exists(fromPath))
-				{
-					onError("Cannot find "+file);
-					return false;
-				}
-				var destFile = Path.GetFileName(file).ToLowerInvariant();
-				onProgress("Extracting "+destFile);
-				File.Copy(fromPath,	Path.Combine(destPath, destFile), true);
-			}
-			return true;
-		}
-
-		public static bool ExtractZip(string zipFile, string dest, Action<string> onProgress, Action<string> onError)
-		{
-			if (!File.Exists(zipFile))
-			{
-				onError("Invalid path: "+zipFile);
-				return false;
-			}
-
-			List<string> extracted = new List<string>();
-			try
-			{
-				var z = new ZipInputStream(File.OpenRead(zipFile));
-				z.ExtractZip(dest, extracted, s => onProgress("Extracting "+s));
-			}
-			catch (SharpZipBaseException)
-			{
-				foreach(var f in extracted)
-					File.Delete(f);
-
-				onError("Invalid archive");
-				return false;
-			}
-			return true;
-		}
-
-		// TODO: this belongs in FileSystem/ZipFile
-		static void ExtractZip(this ZipInputStream z, string destPath, List<string> extracted, Action<string> onProgress)
-		{
-			foreach (var entry in z.GetEntries())
-			{
-				if (!entry.IsFile) continue;
-
-				onProgress(entry.Name);
-
-				Directory.CreateDirectory(Path.Combine(destPath, Path.GetDirectoryName(entry.Name)));
-				var path = Path.Combine(destPath, entry.Name);
-				extracted.Add(path);
-
-				using (var f = File.Create(path))
-				{
-					int bufSize = 2048;
-					byte[] buf = new byte[bufSize];
-					while ((bufSize = z.Read(buf, 0, buf.Length)) > 0)
-					f.Write(buf, 0, bufSize);
-				}
-			}
-
-			z.Close();
-		}
-	}
-}

OpenRA.FileFormats/Manifest.cs

@@ -1,70 +1,65 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	/* describes what is to be loaded in order to run a set of mods */
-
-	public class Manifest
-	{
-		public readonly string[]
-			Mods, Folders, Packages, Rules, ServerTraits,
-			Sequences, Cursors, Chrome, Assemblies, ChromeLayout,
-			Weapons, Voices, Notifications, Music, Movies, TileSets, ChromeMetrics;
-		public readonly MiniYaml LoadScreen;
-		public readonly Dictionary<string, Pair<string,int>> Fonts;
-		public readonly int TileSize = 24;
-
-		public Manifest(string[] mods)
-		{
-			Mods = mods;
-			var yaml = new MiniYaml(null, mods
-				.Select(m => MiniYaml.FromFile("mods/" + m + "/mod.yaml"))
-				.Aggregate(MiniYaml.MergeLiberal)).NodesDict;
-
-			// Todo: Use fieldloader
-			Folders = YamlList(yaml, "Folders");
-			Packages = YamlList(yaml, "Packages");
-			Rules = YamlList(yaml, "Rules");
-			ServerTraits = YamlList(yaml, "ServerTraits");
-			Sequences = YamlList(yaml, "Sequences");
-			Cursors = YamlList(yaml, "Cursors");
-			Chrome = YamlList(yaml, "Chrome");
-			Assemblies = YamlList(yaml, "Assemblies");
-			ChromeLayout = YamlList(yaml, "ChromeLayout");
-			Weapons = YamlList(yaml, "Weapons");
-			Voices = YamlList(yaml, "Voices");
-			Notifications = YamlList(yaml, "Notifications");
-			Music = YamlList(yaml, "Music");
-			Movies = YamlList(yaml, "Movies");
-			TileSets = YamlList(yaml, "TileSets");
-			ChromeMetrics = YamlList(yaml, "ChromeMetrics");
-
-			LoadScreen = yaml["LoadScreen"];
-			Fonts = yaml["Fonts"].NodesDict.ToDictionary(x => x.Key,
-				x => Pair.New(x.Value.NodesDict["Font"].Value,
-					int.Parse(x.Value.NodesDict["Size"].Value)));
-
-			if (yaml.ContainsKey("TileSize"))
-				TileSize = int.Parse(yaml["TileSize"].Value);
-		}
-
-		static string[] YamlList(Dictionary<string, MiniYaml> yaml, string key)
-		{
-			if (!yaml.ContainsKey(key))
-				return new string[] {};
-
-			return yaml[key].NodesDict.Keys.ToArray();
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	/* describes what is to be loaded in order to run a set of mods */
+
+	public class Manifest
+	{
+		public readonly string[]
+			Folders, Packages, Rules,
+			Sequences, Cursors, Chrome, Assemblies, ChromeLayout,
+			Weapons, Voices, Music, Movies, TileSets;
+
+		public readonly string ShellmapUid, LoadScreen;
+		public readonly int TileSize = 24;
+
+		public Manifest(string[] mods)
+		{
+			var yaml = mods
+				.Select(m => MiniYaml.FromFile("mods/" + m + "/mod.yaml"))
+				.Aggregate(MiniYaml.Merge);
+			
+			// Todo: Use fieldloader
+			Folders = YamlList(yaml, "Folders");
+			Packages = YamlList(yaml, "Packages");
+			Rules = YamlList(yaml, "Rules");
+			Sequences = YamlList(yaml, "Sequences");
+			Cursors = YamlList(yaml, "Cursors");
+			Chrome = YamlList(yaml, "Chrome");
+			Assemblies = YamlList(yaml, "Assemblies");
+			ChromeLayout = YamlList(yaml, "ChromeLayout");
+			Weapons = YamlList(yaml, "Weapons");
+			Voices = YamlList(yaml, "Voices");
+			Music = YamlList(yaml, "Music");
+			Movies = YamlList(yaml, "Movies");
+			TileSets = YamlList(yaml, "TileSets");
+
+			ShellmapUid = yaml.First( x => x.Key == "ShellmapUid" ).Value.Value;
+			LoadScreen = yaml.First( x => x.Key == "LoadScreen" ).Value.Value;
+			
+			if (yaml.FirstOrDefault( x => x.Key == "TileSize" ) != null)
+				TileSize = int.Parse(yaml.First( x => x.Key == "TileSize" ).Value.Value);
+		}
+
+		static string[] YamlList(List<MiniYamlNode> ys, string key)
+		{
+			var y = ys.FirstOrDefault( x => x.Key == key );
+			if( y == null )
+				return new string[ 0 ];
+
+			return y.Value.NodesDict.Keys.ToArray();
+		}
+	}
+}

OpenRA.FileFormats/Map/MapStub.cs

@@ -0,0 +1,61 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class MapStub
+	{
+		public readonly IFolder Package;
+		
+		// Yaml map data
+		public readonly string Uid;
+		[FieldLoader.Load] public bool Selectable;
+
+		[FieldLoader.Load] public string Title;
+		[FieldLoader.Load] public string Description;
+		[FieldLoader.Load] public string Author;
+		[FieldLoader.Load] public int PlayerCount;
+		[FieldLoader.Load] public string Tileset;
+
+		[FieldLoader.LoadUsing( "LoadWaypoints" )]
+		public Dictionary<string, int2> Waypoints = new Dictionary<string, int2>();
+		public IEnumerable<int2> SpawnPoints { get { return Waypoints.Select(kv => kv.Value); } }
+		
+		[FieldLoader.Load] public int2 TopLeft;
+		[FieldLoader.Load] public int2 BottomRight;
+		public int Width { get { return BottomRight.X - TopLeft.X; } }
+		public int Height { get { return BottomRight.Y - TopLeft.Y; } }
+	
+		public MapStub(IFolder package)
+		{
+			Package = package;
+			var yaml = MiniYaml.FromStream(Package.GetContent("map.yaml"));
+			FieldLoader.Load( this, new MiniYaml( null, yaml ) );
+			
+			Uid = Package.GetContent("map.uid").ReadAllText();
+		}
+
+		static object LoadWaypoints( MiniYaml y )
+		{
+			var ret = new Dictionary<string, int2>();
+			foreach( var wp in y.NodesDict[ "Waypoints" ].NodesDict )
+			{
+				string[] loc = wp.Value.Value.Split( ',' );
+				ret.Add( wp.Key, new int2( int.Parse( loc[ 0 ] ), int.Parse( loc[ 1 ] ) ) );
+			}
+			return ret;
+		}
+	}
+}

OpenRA.FileFormats/Map/PlayerReference.cs

@@ -1,15 +1,14 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
 #endregion
 
 using System.Drawing;
-using System;
 
 namespace OpenRA.FileFormats
 {
@@ -17,32 +16,30 @@ namespace OpenRA.FileFormats
 	{
 		public string Name;
 		public string Palette;
-		public bool OwnsWorld = false;
-		public bool NonCombatant = false;
-		public bool Playable = false;
-		public string Bot = null;
-		public bool DefaultStartingUnits = false;
-		public bool AllowBots = true;
-
-		public bool LockRace = false;
 		public string Race;
-
-		public bool LockColor = false;
-		public ColorRamp ColorRamp = new ColorRamp(0,0,238,34);
-
-		public bool LockSpawn = false;
-		public int Spawn = 0;
-
-		public bool LockTeam = false;
-		public int Team = 0;
-
-		public int InitialCash = 0;
-		public string[] Allies = {};
+		public bool OwnsWorld = false;
+		public bool NonCombatant = false;
+		public bool Playable = false;
+		public bool DefaultStartingUnits = false;
+		public Color Color = Color.FromArgb(238,238,238);
+		public Color Color2 = Color.FromArgb(44,28,24);
+		
+		public int InitialCash = 0;
+		public string[] Allies = {};
 		public string[] Enemies = {};
-
+		
 		public PlayerReference() {}
-		public PlayerReference(MiniYaml my) { FieldLoader.Load(this, my); }
-
-		public override string ToString() { return Name; }
+		public PlayerReference(MiniYaml my)
+		{
+			FieldLoader.Load(this, my);
+		}
+		
+		public PlayerReference(string name, string race, bool ownsworld, bool noncombatant)
+		{
+			Name = name;
+			Race = race;
+			OwnsWorld = ownsworld;
+			NonCombatant = noncombatant;
+		}
 	}
 }

OpenRA.FileFormats/Map/SmudgeReference.cs

@@ -1,11 +1,11 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
 #endregion
 
 namespace OpenRA.FileFormats
@@ -15,17 +15,17 @@ namespace OpenRA.FileFormats
 		public readonly string Type;
 		public readonly int2 Location;
 		public readonly int Depth;
-
 		public SmudgeReference( string type, int2 location, int depth )
 		{
 			Type = type;
 			Location = location;
 			Depth = depth;
 		}
-
-		public override string ToString()
+		
+		public override string ToString ()
 		{
-			return "{0} {1},{2} {3}".F(Type, Location.X, Location.Y, Depth);
+			return string.Format("{0} {1},{2} {3}", Type, Location.X,Location.Y, Depth);
 		}
+
 	}
 }

OpenRA.FileFormats/Map/Terrain.cs

@@ -1,76 +1,76 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-
-namespace OpenRA.FileFormats
-{
-	public class Terrain
-	{
-		public readonly List<byte[]> TileBitmapBytes = new List<byte[]>();
-
-		public Terrain( Stream stream, int size )
-		{
-			// Try loading as a cnc .tem
-			BinaryReader reader = new BinaryReader( stream );
-			int Width = reader.ReadUInt16();
-			int Height = reader.ReadUInt16();
-
-			if( Width != size || Height != size )
-				throw new InvalidDataException( "{0}x{1} != {2}x{2}".F(Width, Height, size ) );
-
-			/*NumTiles = */reader.ReadUInt16();
-			/*Zero1 = */reader.ReadUInt16();
-			/*uint Size = */reader.ReadUInt32();
-			uint ImgStart = reader.ReadUInt32();
-			/*Zero2 = */reader.ReadUInt32();
-
-			int IndexEnd, IndexStart;
-			if (reader.ReadUInt16() == 65535) // ID1 = FFFFh for cnc
-			{
-				/*ID2 = */reader.ReadUInt16();
-				IndexEnd = reader.ReadInt32();
-				IndexStart = reader.ReadInt32();
-			}
-			else // Load as a ra .tem
-			{
-				stream.Position = 0;
-				reader = new BinaryReader( stream );
-				Width = reader.ReadUInt16();
-				Height = reader.ReadUInt16();
-
-				/*NumTiles = */reader.ReadUInt16();
-				reader.ReadUInt16();
-				/*XDim = */reader.ReadUInt16();
-				/*YDim = */reader.ReadUInt16();
-				/*uint FileSize = */reader.ReadUInt32();
-				ImgStart = reader.ReadUInt32();
-				reader.ReadUInt32();
-				reader.ReadUInt32();
-				IndexEnd = reader.ReadInt32();
-				reader.ReadUInt32();
-				IndexStart = reader.ReadInt32();
-			}
-			stream.Position = IndexStart;
-
-			foreach( byte b in new BinaryReader(stream).ReadBytes(IndexEnd - IndexStart) )
-			{
-				if (b != 255)
-				{
-					stream.Position = ImgStart + b * size * size;
-					TileBitmapBytes.Add(new BinaryReader(stream).ReadBytes(size * size));
-				}
-				else
-					TileBitmapBytes.Add(null);
-			}
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class Terrain
+	{
+		public readonly List<byte[]> TileBitmapBytes = new List<byte[]>();
+
+		public Terrain( Stream stream, int size )
+		{		
+			// Try loading as a cnc .tem
+			BinaryReader reader = new BinaryReader( stream );
+			int Width = reader.ReadUInt16();
+			int Height = reader.ReadUInt16();
+			
+			if( Width != size || Height != size )
+				throw new InvalidDataException( "{0}x{1} != {2}x{2}".F(Width, Height, size ) );
+			
+			/*NumTiles = */reader.ReadUInt16();
+			/*Zero1 = */reader.ReadUInt16();			
+			/*uint Size = */reader.ReadUInt32();
+			uint ImgStart = reader.ReadUInt32();
+			/*Zero2 = */reader.ReadUInt32();
+			
+			int IndexEnd, IndexStart;
+			if (reader.ReadUInt16() == 65535) // ID1 = FFFFh for cnc
+			{
+				/*ID2 = */reader.ReadUInt16();	
+				IndexEnd = reader.ReadInt32();
+				IndexStart = reader.ReadInt32();
+			}
+			else // Load as a ra .tem
+			{
+				stream.Position = 0;	
+				reader = new BinaryReader( stream );
+				Width = reader.ReadUInt16();
+				Height = reader.ReadUInt16();
+				
+				/*NumTiles = */reader.ReadUInt16();
+				reader.ReadUInt16();
+				/*XDim = */reader.ReadUInt16();
+				/*YDim = */reader.ReadUInt16();
+				/*uint FileSize = */reader.ReadUInt32();
+				ImgStart = reader.ReadUInt32();
+				reader.ReadUInt32();
+				reader.ReadUInt32();
+				IndexEnd = reader.ReadInt32();
+				reader.ReadUInt32();
+				IndexStart = reader.ReadInt32();		
+			}
+			stream.Position = IndexStart;
+
+			foreach( byte b in new BinaryReader(stream).ReadBytes(IndexEnd - IndexStart) )
+			{
+				if (b != 255)
+				{
+					stream.Position = ImgStart + b * size * size;
+					TileBitmapBytes.Add(new BinaryReader(stream).ReadBytes(size * size));
+				}
+				else
+					TileBitmapBytes.Add(null);
+			}
+		}
+	}
+}

OpenRA.FileFormats/Map/TileReference.cs

@@ -1,11 +1,11 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
 #endregion
 
 namespace OpenRA.FileFormats
@@ -14,11 +14,20 @@ namespace OpenRA.FileFormats
 	{
 		public T type;
 		public U index;
-
+		public U image;
+		
 		public TileReference(T t, U i)
 		{
 			type = t;
 			index = i;
+			image = i;
+		}
+		
+		public TileReference(T t, U i, U im)
+		{
+			type = t;
+			index = i;
+			image = im;
 		}
 
 		public override int GetHashCode() { return type.GetHashCode() ^ index.GetHashCode(); }

OpenRA.FileFormats/Map/TileSet.cs

@@ -1,200 +1,157 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace OpenRA.FileFormats
-{
-	public class TerrainTypeInfo
-	{
-		public string Type;
-		public string[] AcceptsSmudgeType = { };
-		public bool IsWater = false;
-		public Color Color;
-		public string CustomCursor;
-
-		public TerrainTypeInfo() {}
-		public TerrainTypeInfo(MiniYaml my) { FieldLoader.Load(this, my); }
-
-		public MiniYaml Save() { return FieldSaver.Save(this); }
-	}
-
-	public class TileTemplate
-	{
-		public ushort Id;
-		public string Image;
-		public int2 Size;
-		public bool PickAny;
-		public string Category;
-
-		[FieldLoader.LoadUsing( "LoadTiles" )]
-		public Dictionary<byte, string> Tiles = new Dictionary<byte, string>();
-
-		public TileTemplate() {}
-		public TileTemplate(MiniYaml my) { FieldLoader.Load( this, my ); }
-
-		static object LoadTiles( MiniYaml y )
-		{
-			return y.NodesDict["Tiles"].NodesDict.ToDictionary(
-				t => byte.Parse(t.Key),
-				t => t.Value.Value );
-		}
-
-		static readonly string[] Fields = { "Id", "Image", "Size", "PickAny" };
-
-		public MiniYaml Save()
-		{
-			var root = new List<MiniYamlNode>();
-			foreach (var field in Fields)
-			{
-				FieldInfo f = this.GetType().GetField(field);
-				if (f.GetValue(this) == null) continue;
-				root.Add( new MiniYamlNode( field, FieldSaver.FormatValue( this, f ) ) );
-			}
-
-			root.Add( new MiniYamlNode( "Tiles", null,
-				Tiles.Select( x => new MiniYamlNode( x.Key.ToString(), x.Value ) ).ToList() ) );
-
-			return new MiniYaml(null, root);
-		}
-
-		public Terrain Data;
-	}
-
-	public class TileSet
-	{
-		public string Name;
-		public string Id;
-		public string Palette;
-		public int TileSize = 24;
-		public string[] Extensions;
-		public Dictionary<string, TerrainTypeInfo> Terrain = new Dictionary<string, TerrainTypeInfo>();
-		public Dictionary<ushort, TileTemplate> Templates = new Dictionary<ushort, TileTemplate>();
-
-		static readonly string[] fields = {"Name", "TileSize", "Id", "Palette", "Extensions"};
-
-		public TileSet() {}
-
-		public TileSet( string filepath )
-		{
-			var yaml = MiniYaml.DictFromFile( filepath );
-
-			// General info
-			FieldLoader.Load(this, yaml["General"]);
-
-			// TerrainTypes
-			Terrain = yaml["Terrain"].NodesDict.Values
-				.Select(y => new TerrainTypeInfo(y)).ToDictionary(t => t.Type);
-
-			// Templates
-			Templates = yaml["Templates"].NodesDict.Values
-				.Select(y => new TileTemplate(y)).ToDictionary(t => t.Id);
-		}
-
-		public void LoadTiles()
-		{
-			foreach (var t in Templates)
-				if (t.Value.Data == null)
-					using( var s = FileSystem.OpenWithExts(t.Value.Image, Extensions) )
-						t.Value.Data = new Terrain(s, TileSize);
-		}
-
-		public void Save(string filepath)
-		{
-			var root = new List<MiniYamlNode>();
-			var gen = new List<MiniYamlNode>();
-
-			foreach (var field in fields)
-			{
-				FieldInfo f = this.GetType().GetField(field);
-				if (f.GetValue(this) == null) continue;
-				gen.Add( new MiniYamlNode( field, FieldSaver.FormatValue( this, f ) ) );
-			}
-
-			root.Add( new MiniYamlNode( "General", null, gen ) );
-
-			root.Add( new MiniYamlNode( "Terrain", null,
-				Terrain.Select( t => new MiniYamlNode(
-					"TerrainType@{0}".F( t.Value.Type ),
-					t.Value.Save() ) ).ToList() ) );
-
-			root.Add( new MiniYamlNode( "Templates", null,
-				Templates.Select( t => new MiniYamlNode(
-					"Template@{0}".F( t.Value.Id ),
-					t.Value.Save() ) ).ToList() ) );
-			root.WriteToFile(filepath);
-		}
-
-		public byte[] GetBytes(TileReference<ushort,byte> r)
-		{
-			TileTemplate tile;
-			if( Templates.TryGetValue( r.type, out tile ) )
-				return tile.Data.TileBitmapBytes[ r.index ];
-
-			byte[] missingTile = new byte[ TileSize * TileSize ];
-			for( int i = 0 ; i < missingTile.Length ; i++ )
-				missingTile[ i ] = 0x36;
-
-			return missingTile;
-		}
-
-		public string GetTerrainType(TileReference<ushort, byte> r)
-		{
-			var tt = Templates[r.type].Tiles;
-			string ret;
-			if (!tt.TryGetValue(r.index, out ret))
-				return "Clear"; // Default walkable
-			return ret;
-		}
-
-		public Bitmap RenderTemplate(ushort n, Palette p)
-		{
-			var template = Templates[n];
-
-			var bitmap = new Bitmap(TileSize * template.Size.X, TileSize * template.Size.Y,
-				PixelFormat.Format8bppIndexed);
-
-			bitmap.Palette = p.AsSystemPalette();
-
-			var data = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-			unsafe
-			{
-				byte* q = (byte*)data.Scan0.ToPointer();
-				var stride = data.Stride;
-
-				for (var u = 0; u < template.Size.X; u++)
-					for (var v = 0; v < template.Size.Y; v++)
-						if (template.Data.TileBitmapBytes[u + v * template.Size.X] != null)
-						{
-							var rawImage = template.Data.TileBitmapBytes[u + v * template.Size.X];
-							for (var i = 0; i < TileSize; i++)
-								for (var j = 0; j < TileSize; j++)
-									q[(v * TileSize + j) * stride + u * TileSize + i] = rawImage[i + TileSize * j];
-						}
-						else
-						{
-							for (var i = 0; i < TileSize; i++)
-								for (var j = 0; j < TileSize; j++)
-									q[(v * TileSize + j) * stride + u * TileSize + i] = 0;
-						}
-			}
-
-			bitmap.UnlockBits(data);
-			return bitmap;
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+namespace OpenRA.FileFormats
+{
+	public class TerrainTypeInfo
+	{
+		public string Type;
+		public bool Buildable = true;
+		public bool AcceptSmudge = true;
+		public bool IsWater = false;
+		public Color Color;
+
+		public TerrainTypeInfo() {}
+		public TerrainTypeInfo(MiniYaml my) { FieldLoader.Load(this, my); }
+		public MiniYaml Save() { return FieldSaver.Save(this); }
+	}
+	
+	public class TileTemplate
+	{
+		[FieldLoader.Load] public ushort Id;
+		[FieldLoader.Load] public string Image;
+		[FieldLoader.Load] public int2 Size;
+		[FieldLoader.Load] public bool PickAny;
+
+		[FieldLoader.LoadUsing( "LoadTiles" )]
+		public Dictionary<byte, string> Tiles = new Dictionary<byte, string>();
+		
+		public TileTemplate() {}
+		public TileTemplate(MiniYaml my)
+		{
+			FieldLoader.Load( this, my );
+		}
+
+		static object LoadTiles( MiniYaml y )
+		{
+			return y.NodesDict["Tiles"].NodesDict.ToDictionary(
+				t => byte.Parse(t.Key),
+				t => t.Value.Value );
+		}
+		
+		public MiniYaml Save()
+		{
+			var root = new List<MiniYamlNode>();
+			foreach (var field in new string[] {"Id", "Image", "Size", "PickAny"})
+			{
+				FieldInfo f = this.GetType().GetField(field);
+				if (f.GetValue(this) == null) continue;
+				root.Add( new MiniYamlNode( field, FieldSaver.FormatValue( this, f ) ) );
+			}
+
+			root.Add( new MiniYamlNode( "Tiles", null,
+				Tiles.Select( x => new MiniYamlNode( x.Key.ToString(), x.Value ) ).ToList() ) );
+			
+			return new MiniYaml(null, root);
+		}
+	}
+	
+	public class TileSet
+	{
+		public string Name;
+		public string Id;
+		public string Palette;
+		public int TileSize = 24;
+		public string[] Extensions;
+		public Dictionary<string, TerrainTypeInfo> Terrain = new Dictionary<string, TerrainTypeInfo>();
+		public Dictionary<ushort, Terrain> Tiles = new Dictionary<ushort, Terrain>();
+		public Dictionary<ushort, TileTemplate> Templates = new Dictionary<ushort, TileTemplate>();
+		static List<string> fields = new List<string>() {"Name", "TileSize", "Id", "Palette", "Extensions"};
+
+		public TileSet() {}
+		public TileSet( string filepath )
+		{
+			var yaml = MiniYaml.DictFromFile( filepath );
+			
+			// General info
+			FieldLoader.Load(this, yaml["General"]);
+
+			// TerrainTypes
+			Terrain = yaml["Terrain"].NodesDict.Values
+				.Select(y => new TerrainTypeInfo(y)).ToDictionary(t => t.Type);
+
+			// Templates
+			Templates = yaml["Templates"].NodesDict.Values
+				.Select(y => new TileTemplate(y)).ToDictionary(t => t.Id);
+		}
+		
+		public void LoadTiles()
+		{
+			foreach (var t in Templates)
+				using( Stream s = FileSystem.OpenWithExts(t.Value.Image, Extensions) )
+				{
+					if( !Tiles.ContainsKey( t.Key ) )
+						Tiles.Add( t.Key, new Terrain( s, TileSize ) );
+				}
+		}
+		
+		public void Save(string filepath)
+		{			
+			var root = new List<MiniYamlNode>();
+			var gen = new List<MiniYamlNode>();
+			foreach (var field in fields)
+			{
+				FieldInfo f = this.GetType().GetField(field);
+				if (f.GetValue(this) == null) continue;
+				gen.Add( new MiniYamlNode( field, FieldSaver.FormatValue( this, f ) ) );
+			}
+			root.Add( new MiniYamlNode( "General", null, gen ) );
+
+			root.Add( new MiniYamlNode( "Terrain", null, 
+				Terrain.Select( t => new MiniYamlNode(
+					"TerrainType@{0}".F( t.Value.Type ),
+					t.Value.Save() ) ).ToList() ) );
+
+			root.Add( new MiniYamlNode( "Templates", null,
+				Templates.Select( t => new MiniYamlNode(
+					"Template@{0}".F( t.Value.Id ),
+					t.Value.Save() ) ).ToList() ) );
+			root.WriteToFile(filepath);
+		} 
+				
+		public byte[] GetBytes(TileReference<ushort,byte> r)
+		{
+			Terrain tile;
+			if( Tiles.TryGetValue( r.type, out tile ) )
+				return tile.TileBitmapBytes[ r.image ];
+			
+			byte[] missingTile = new byte[ TileSize * TileSize ];
+			for( int i = 0 ; i < missingTile.Length ; i++ )
+				missingTile[ i ] = 0x36;
+
+			return missingTile;
+		}
+
+		public string GetTerrainType(TileReference<ushort, byte> r)
+		{
+			var tt = Templates[r.type].Tiles;
+			string ret;
+			if (!tt.TryGetValue(r.image, out ret))
+				return "Clear"; // Default walkable
+			return ret;
+		}
+	}
+}

OpenRA.FileFormats/MiniYaml.cs

@@ -1,297 +1,240 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	using MiniYamlNodes = List<MiniYamlNode>;
-
-	public class MiniYamlNode
-	{
-		public struct SourceLocation
-		{
-			public string Filename; public int Line;
-			public override string ToString() { return "{0}:{1}".F(Filename, Line); }
-		}
-
-		public SourceLocation Location;
-		public string Key;
-		public MiniYaml Value;
-
-		public MiniYamlNode( string k, MiniYaml v )
-		{
-			Key = k;
-			Value = v;
-		}
-
-		public MiniYamlNode( string k, MiniYaml v, SourceLocation loc )
-			: this( k, v )
-		{
-			Location = loc;
-		}
-
-		public MiniYamlNode( string k, string v )
-			: this( k, v, null )
-		{
-		}
-		public MiniYamlNode( string k, string v, List<MiniYamlNode> n )
-			: this( k, new MiniYaml( v, n ) )
-		{
-		}
-
-		public MiniYamlNode( string k, string v, List<MiniYamlNode> n, SourceLocation loc )
-			: this( k, new MiniYaml( v, n ), loc )
-		{
-		}
-
-		public override string ToString()
-		{
-			return "{{YamlNode: {0} @ {1}}}".F(Key, Location);
-		}
-	}
-
-	public class MiniYaml
-	{
-		public string Value;
-		public List<MiniYamlNode> Nodes;
-
-		public Dictionary<string, MiniYaml> NodesDict
-		{
-			get
-			{
-				var ret = new Dictionary<string, MiniYaml>();
-				foreach (var y in Nodes)
-				{
-					if (ret.ContainsKey(y.Key))
-						throw new InvalidDataException("Duplicate key `{0}' in MiniYaml".F(y.Key));
-					ret.Add(y.Key, y.Value);
-				}
-				return ret;
-			}
-		}
-
-		public MiniYaml( string value ) : this( value, null ) { }
-
-		public MiniYaml( string value, List<MiniYamlNode> nodes )
-		{
-			Value = value;
-			Nodes = nodes ?? new List<MiniYamlNode>();
-		}
-
-		public static MiniYaml FromDictionary<K, V>( Dictionary<K, V> dict )
-		{
-			return new MiniYaml( null, dict.Select( x => new MiniYamlNode( x.Key.ToString(), new MiniYaml( x.Value.ToString() ) ) ).ToList() );
-		}
-
-		public static MiniYaml FromList<T>( List<T> list )
-		{
-			return new MiniYaml( null, list.Select( x => new MiniYamlNode( x.ToString(), new MiniYaml( null ) ) ).ToList() );
-		}
-
-		static List<MiniYamlNode> FromLines(string[] lines, string filename)
-		{
-			var levels = new List<List<MiniYamlNode>>();
-			levels.Add(new List<MiniYamlNode>());
-
-			var lineNo = 0;
-			foreach (var ll in lines)
-			{
-				var line = ll;
-				++lineNo;
-				if (line.Contains('#'))
-					line = line.Substring(0, line.IndexOf('#')).TrimEnd(' ', '\t');
-				var t = line.TrimStart(' ', '\t');
-				if (t.Length == 0)
-					continue;
-				var level = line.Length - t.Length;
-				var location = new MiniYamlNode.SourceLocation { Filename = filename, Line = lineNo };
-
-				if (levels.Count <= level)
-					throw new YamlException("Bad indent in miniyaml at {0}".F (location));
-				while (levels.Count > level + 1)
-					levels.RemoveAt(levels.Count - 1);
-
-				var d = new List<MiniYamlNode>();
-				var rhs = SplitAtColon( ref t );
-				levels[ level ].Add( new MiniYamlNode( t, rhs, d, location ) );
-
-				levels.Add(d);
-			}
-			return levels[ 0 ];
-		}
-
-		static string SplitAtColon( ref string t )
-		{
-			var colon = t.IndexOf(':');
-			if( colon == -1 )
-				return null;
-			var ret = t.Substring( colon + 1 ).Trim();
-			if( ret.Length == 0 )
-				ret = null;
-			t = t.Substring( 0, colon ).Trim();
-			return ret;
-		}
-
-		public static List<MiniYamlNode> FromFileInPackage( string path )
-		{
-			StreamReader reader = new StreamReader( FileSystem.Open(path) );
-			List<string> lines = new List<string>();
-
-			while( !reader.EndOfStream )
-				lines.Add(reader.ReadLine());
-			reader.Close();
-
-			return FromLines(lines.ToArray(), path);
-		}
-
-		public static Dictionary<string, MiniYaml> DictFromFile( string path )
-		{
-			return FromFile( path ).ToDictionary( x => x.Key, x => x.Value );
-		}
-
-		public static Dictionary<string, MiniYaml> DictFromStream( Stream stream )
-		{
-			return FromStream( stream ).ToDictionary( x => x.Key, x => x.Value );
-		}
-
-		public static List<MiniYamlNode> FromFile( string path )
-		{
-			return FromLines(File.ReadAllLines( path ), path);
-		}
-
-		public static List<MiniYamlNode> FromStream(Stream s)
-		{
-			using (var reader = new StreamReader(s))
-				return FromString(reader.ReadToEnd());
-		}
-
-		public static List<MiniYamlNode> FromString(string text)
-		{
-			return FromLines(text.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries), "<no filename available>");
-		}
-
-		public static List<MiniYamlNode> MergeLiberal(List<MiniYamlNode> a, List<MiniYamlNode> b)
-		{
-			return Merge(a, b, false);
-		}
-
-		public static List<MiniYamlNode> MergeStrict(List<MiniYamlNode> a, List<MiniYamlNode> b)
-		{
-			return Merge(a, b, true);
-		}
-
-		static List<MiniYamlNode> Merge( List<MiniYamlNode> a, List<MiniYamlNode> b, bool throwErrors )
-		{
-			if( a.Count == 0 )
-				return b;
-			if( b.Count == 0 )
-				return a;
-
-			var ret = new List<MiniYamlNode>();
-
-			var aDict = a.ToDictionary( x => x.Key );
-			var bDict = b.ToDictionary( x => x.Key );
-			var keys = aDict.Keys.Union( bDict.Keys ).ToList();
-
-			var noInherit = keys.Where(x => x.Length > 0 && x[0] == '-')
-				.ToDictionary(x => x.Substring(1), x => false);
-
-			foreach( var key in keys )
-			{
-				MiniYamlNode aa, bb;
-				aDict.TryGetValue( key, out aa );
-				bDict.TryGetValue( key, out bb );
-
-				if( noInherit.ContainsKey( key ) )
-				{
-					if (!throwErrors)
-						if (aa != null)
-							ret.Add(aa);
-
-					noInherit[key] = true;
-				}
-				else
-				{
-					var loc = aa == null ? default( MiniYamlNode.SourceLocation ) : aa.Location;
-					var merged = ( aa == null || bb == null ) ? aa ?? bb : new MiniYamlNode( key, Merge( aa.Value, bb.Value, throwErrors ), loc );
-					ret.Add( merged );
-				}
-			}
-
-			if (throwErrors)
-			if (noInherit.ContainsValue(false))
-				throw new YamlException("Bogus yaml removals: {0}".F(
-					noInherit.Where(x => !x.Value).JoinWith(", ")));
-
-			return ret;
-		}
-
-		public static MiniYaml MergeLiberal(MiniYaml a, MiniYaml b)
-		{
-			return Merge(a, b, false);
-		}
-
-		public static MiniYaml MergeStrict(MiniYaml a, MiniYaml b)
-		{
-			return Merge(a, b, true);
-		}
-
-		static MiniYaml Merge( MiniYaml a, MiniYaml b, bool throwErrors )
-		{
-			if( a == null )
-				return b;
-			if( b == null )
-				return a;
-
-			return new MiniYaml( a.Value ?? b.Value, Merge( a.Nodes, b.Nodes, throwErrors ) );
-		}
-
-		public IEnumerable<string> ToLines(string name)
-		{
-			yield return name + ": " + Value;
-			if (Nodes != null)
-				foreach (var line in Nodes.ToLines(false))
-					yield return "\t" + line;
-		}
-	}
-
-	public static class MiniYamlExts
-	{
-		public static void WriteToFile(this MiniYamlNodes y, string filename)
-		{
-			File.WriteAllLines(filename, y.ToLines(true).Select(x => x.TrimEnd()).ToArray());
-		}
-
-		public static string WriteToString(this MiniYamlNodes y)
-		{
-			return y.ToLines(true).Select(x => x.TrimEnd()).JoinWith("\n");
-		}
-
-		public static IEnumerable<string> ToLines(this MiniYamlNodes y, bool lowest)
-		{
-			foreach (var kv in y)
-			{
-				foreach (var line in kv.Value.ToLines(kv.Key))
-					yield return line;
-				if (lowest)
-					yield return "";
-			}
-		}
-	}
-
-	public class YamlException : Exception
-	{
-		public YamlException(string s) : base(s) { }
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	using MiniYamlNodes = List<MiniYamlNode>;
+
+	public class MiniYamlNode
+	{
+		public struct SourceLocation
+		{
+			public string Filename; public int Line;
+		}
+
+		public SourceLocation Location;
+		public string Key;
+		public MiniYaml Value;
+
+		public MiniYamlNode( string k, MiniYaml v )
+		{
+			Key = k;
+			Value = v;
+		}
+
+		public MiniYamlNode( string k, MiniYaml v, SourceLocation loc )
+			: this( k, v )
+		{
+			Location = loc;
+		}
+
+		public MiniYamlNode( string k, string v )
+			: this( k, v, null )
+		{
+		}
+		public MiniYamlNode( string k, string v, List<MiniYamlNode> n )
+			: this( k, new MiniYaml( v, n ) )
+		{
+		}
+
+		public MiniYamlNode( string k, string v, List<MiniYamlNode> n, SourceLocation loc )
+			: this( k, new MiniYaml( v, n ), loc )
+		{
+		}
+	}
+
+	public class MiniYaml
+	{
+		public string Value;
+		public List<MiniYamlNode> Nodes;
+
+		public Dictionary<string, MiniYaml> NodesDict { get { return Nodes.ToDictionary( x => x.Key, x => x.Value ); } }
+
+		public MiniYaml( string value ) : this( value, null ) { }
+
+		public MiniYaml( string value, List<MiniYamlNode> nodes )
+		{
+			Value = value;
+			Nodes = nodes ?? new List<MiniYamlNode>();
+		}
+
+		public static MiniYaml FromDictionary<K, V>( Dictionary<K, V> dict )
+		{
+			return new MiniYaml( null, dict.Select( x => new MiniYamlNode( x.Key.ToString(), new MiniYaml( x.Value.ToString() ) ) ).ToList() );
+		}
+
+		public static MiniYaml FromList<T>( List<T> list )
+		{
+			return new MiniYaml( null, list.Select( x => new MiniYamlNode( x.ToString(), new MiniYaml( null ) ) ).ToList() );
+		}
+		
+		static List<MiniYamlNode> FromLines(string[] lines, string filename)
+		{
+			var levels = new List<List<MiniYamlNode>>();
+			levels.Add(new List<MiniYamlNode>());
+
+			var lineNo = 0;
+			foreach (var line in lines)
+			{
+				++lineNo;
+				var t = line.TrimStart(' ', '\t');
+				if (t.Length == 0 || t[0] == '#')
+					continue;
+				var level = line.Length - t.Length;
+
+				if (levels.Count <= level)
+					throw new InvalidOperationException("Bad indent in miniyaml");
+				while (levels.Count > level + 1)
+					levels.RemoveAt(levels.Count - 1);
+
+				var d = new List<MiniYamlNode>();
+				var rhs = SplitAtColon( ref t );
+				levels[ level ].Add( new MiniYamlNode( t, rhs, d, new MiniYamlNode.SourceLocation { Filename = filename, Line = lineNo } ) );
+				
+				levels.Add(d);
+			}
+			return levels[ 0 ];
+		}
+
+		static string SplitAtColon( ref string t )
+		{
+			var colon = t.IndexOf(':');
+			if( colon == -1 )
+				return null;
+			var ret = t.Substring( colon + 1 ).Trim();
+			if( ret.Length == 0 )
+				ret = null;
+			t = t.Substring( 0, colon ).Trim();
+			return ret;
+		}
+
+		public static List<MiniYamlNode> FromFileInPackage( string path )
+		{
+			StreamReader reader = new StreamReader( FileSystem.Open(path) );
+			List<string> lines = new List<string>();
+			
+			while( !reader.EndOfStream )
+				lines.Add(reader.ReadLine());
+			reader.Close();
+			
+			return FromLines(lines.ToArray(), path);
+		}
+
+		public static Dictionary<string, MiniYaml> DictFromFile( string path )
+		{
+			return FromFile( path ).ToDictionary( x => x.Key, x => x.Value );
+		}
+
+		public static Dictionary<string, MiniYaml> DictFromStream( Stream stream )
+		{
+			return FromStream( stream ).ToDictionary( x => x.Key, x => x.Value );
+		}
+
+		public static List<MiniYamlNode> FromFile( string path )
+		{			
+			return FromLines(File.ReadAllLines( path ), path);
+		}
+
+		public static List<MiniYamlNode> FromStream(Stream s)
+		{
+			using (var reader = new StreamReader(s))
+				return FromString(reader.ReadToEnd());
+		}
+
+		public static List<MiniYamlNode> FromString(string text)
+		{
+			return FromLines(text.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries), "<no filename available>");
+		}
+
+		public static List<MiniYamlNode> Merge( List<MiniYamlNode> a, List<MiniYamlNode> b )
+		{
+			if( a.Count == 0 )
+				return b;
+			if( b.Count == 0 )
+				return a;
+
+			var ret = new List<MiniYamlNode>();
+
+			var aDict = a.ToDictionary( x => x.Key );
+			var bDict = b.ToDictionary( x => x.Key );
+			var keys = aDict.Keys.Union( bDict.Keys ).ToList();
+
+			var noInherit = keys.Where( x => x.Length > 0 && x[ 0 ] == '-' ).Select( x => x.Substring( 1 ) ).ToList();
+
+			foreach( var key in keys )
+			{
+				MiniYamlNode aa, bb;
+				aDict.TryGetValue( key, out aa );
+				bDict.TryGetValue( key, out bb );
+
+				if( noInherit.Contains( key ) )
+				{
+					if( aa != null )
+						ret.Add( aa );
+				}
+				else
+				{
+					var loc = aa == null ? default( MiniYamlNode.SourceLocation ) : aa.Location;
+					var merged = ( aa == null || bb == null ) ? aa ?? bb : new MiniYamlNode( key, Merge( aa.Value, bb.Value ), loc );
+					ret.Add( merged );
+				}
+			}
+
+			return ret;
+		}
+
+		public static MiniYaml Merge( MiniYaml a, MiniYaml b )
+		{
+			if( a == null )
+				return b;
+			if( b == null )
+				return a;
+
+			return new MiniYaml( a.Value ?? b.Value, Merge( a.Nodes, b.Nodes ) );
+		}
+
+		public IEnumerable<string> ToLines(string name)
+		{
+			yield return name + ": " + Value;
+			if (Nodes != null)
+				foreach (var line in Nodes.ToLines(false))
+					yield return "\t" + line;
+		}
+	}
+
+	public static class MiniYamlExts
+	{
+		public static void WriteToFile(this MiniYamlNodes y, string filename)
+		{
+			File.WriteAllLines(filename, y.ToLines(true).Select(x => x.TrimEnd()).ToArray());
+		}
+
+		public static string WriteToString(this MiniYamlNodes y)
+		{
+			return string.Join("\n", y.ToLines(true).Select(x => x.TrimEnd()).ToArray());
+		}
+
+		public static IEnumerable<string> ToLines(this MiniYamlNodes y, bool lowest)
+		{
+			foreach (var kv in y)
+			{
+				foreach (var line in kv.Value.ToLines(kv.Key))
+					yield return line;
+				if (lowest)
+					yield return "";
+			}
+		}
+	}
+}

OpenRA.FileFormats/Mod.cs

@@ -1,56 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	public class Mod
-	{
-		public string Id;
-		public string Title;
-		public string Description;
-		public string Version;
-		public string Author;
-		public string Requires;
-
-		public static readonly Dictionary<string, Mod> AllMods = ValidateMods(Directory.GetDirectories("mods").Select(x => x.Substring(5)).ToArray());
-
-		public static Dictionary<string, Mod> ValidateMods(string[] mods)
-		{
-			var ret = new Dictionary<string, Mod>();
-			foreach (var m in mods)
-			{
-				var yamlPath = new[] { "mods", m, "mod.yaml" }.Aggregate( Path.Combine );
-				if (!File.Exists(yamlPath))
-					continue;
-
-				var yaml = new MiniYaml(null, MiniYaml.FromFile(yamlPath));
-				if (!yaml.NodesDict.ContainsKey("Metadata"))
-					continue;
-
-				var mod = FieldLoader.Load<Mod>(yaml.NodesDict["Metadata"]);
-				mod.Id = m;
-
-				ret.Add(m, mod);
-			}
-			return ret;
-		}
-
-		public string[] WithPrerequisites()
-		{
-			return Id.Iterate(m => AllMods[m].Requires)
-				.TakeWhile(m => m != null)
-				.ToArray();
-		}
-	}
-}

OpenRA.FileFormats/OpenRA.FileFormats.csproj

@@ -1,161 +1,112 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRA.FileFormats</RootNamespace>
-    <AssemblyName>OpenRA.FileFormats</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\thirdparty\Tao\Tao.Sdl.dll</HintPath>
-    </Reference>
-    <Reference Include="WindowsBase">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\thirdparty\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ColorRamp.cs" />
-    <Compile Include="Evaluator.cs" />
-    <Compile Include="Exts.cs" />
-    <Compile Include="FieldLoader.cs" />
-    <Compile Include="FileFormats\AudLoader.cs" />
-    <Compile Include="FileFormats\Blast.cs" />
-    <Compile Include="FileFormats\Blowfish.cs" />
-    <Compile Include="FileFormats\BlowfishKeyProvider.cs" />
-    <Compile Include="FileFormats\Format2.cs" />
-    <Compile Include="FileFormats\Format40.cs" />
-    <Compile Include="FileFormats\Format80.cs" />
-    <Compile Include="FileFormats\IniFile.cs" />
-    <Compile Include="Filesystem\FileSystem.cs" />
-    <Compile Include="Filesystem\Folder.cs" />
-    <Compile Include="Filesystem\InstallShieldPackage.cs" />
-    <Compile Include="Filesystem\MixFile.cs" />
-    <Compile Include="Filesystem\ZipFile.cs" />
-    <Compile Include="Graphics\Dune2ShpReader.cs" />
-    <Compile Include="Graphics\IGraphicsDevice.cs" />
-    <Compile Include="Graphics\IInputHandler.cs" />
-    <Compile Include="Graphics\PngLoader.cs" />
-    <Compile Include="Graphics\ShpReader.cs" />
-    <Compile Include="Graphics\ShpWriter.cs" />
-    <Compile Include="Graphics\Vertex.cs" />
-    <Compile Include="Graphics\VqaReader.cs" />
-    <Compile Include="InstallUtils.cs" />
-    <Compile Include="Manifest.cs" />
-    <Compile Include="Map\PlayerReference.cs" />
-    <Compile Include="Map\SmudgeReference.cs" />
-    <Compile Include="Map\Terrain.cs" />
-    <Compile Include="Map\TileReference.cs" />
-    <Compile Include="Map\TileSet.cs" />
-    <Compile Include="MiniYaml.cs" />
-    <Compile Include="Mod.cs" />
-    <Compile Include="PackageEntry.cs" />
-    <Compile Include="Palette.cs" />
-    <Compile Include="Platform.cs" />
-    <Compile Include="PlayerColorRemap.cs" />
-    <Compile Include="Primitives\ActionQueue.cs" />
-    <Compile Include="Primitives\Bits.cs" />
-    <Compile Include="Primitives\Cache.cs" />
-    <Compile Include="Primitives\Cached.cs" />
-    <Compile Include="Primitives\DisposableAction.cs" />
-    <Compile Include="Primitives\Lazy.cs" />
-    <Compile Include="Primitives\Pair.cs" />
-    <Compile Include="Primitives\PriorityQueue.cs" />
-    <Compile Include="Primitives\Set.cs" />
-    <Compile Include="Primitives\float2.cs" />
-    <Compile Include="Primitives\int2.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Support\Log.cs" />
-    <Compile Include="Support\Stopwatch.cs" />
-    <Compile Include="Support\Timer.cs" />
-    <Compile Include="Thirdparty\Random.cs" />
-    <Compile Include="TypeDictionary.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OpenRA.FileFormats</RootNamespace>
+    <AssemblyName>OpenRA.FileFormats</AssemblyName>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\thirdparty\Tao\Tao.Sdl.dll</HintPath>
+    </Reference>
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Evaluator.cs" />
+    <Compile Include="Exts.cs" />
+    <Compile Include="FieldLoader.cs" />
+    <Compile Include="FileSystem.cs" />
+    <Compile Include="Folder.cs" />
+    <Compile Include="Graphics\IGraphicsDevice.cs" />
+    <Compile Include="Graphics\Vertex.cs" />
+    <Compile Include="Manifest.cs" />
+    <Compile Include="MiniYaml.cs" />
+    <Compile Include="PackageEntry.cs" />
+    <Compile Include="Package.cs" />
+    <Compile Include="PackageWriter.cs" />
+    <Compile Include="Palette.cs" />
+    <Compile Include="PlayerColorRemap.cs" />
+    <Compile Include="Primitives\DisposableAction.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Thirdparty\Random.cs" />
+    <Compile Include="Support\Log.cs" />
+    <Compile Include="Support\Stopwatch.cs" />
+    <Compile Include="Support\Timer.cs" />
+    <Compile Include="TypeDictionary.cs" />
+    <Compile Include="Map\TileReference.cs" />
+    <Compile Include="Map\Terrain.cs" />
+    <Compile Include="Primitives\Cache.cs" />
+    <Compile Include="Primitives\float2.cs" />
+    <Compile Include="Primitives\Pair.cs" />
+    <Compile Include="Map\TileSet.cs" />
+    <Compile Include="Primitives\PriorityQueue.cs" />
+    <Compile Include="Primitives\Lazy.cs" />
+    <Compile Include="FileFormats\AudLoader.cs" />
+    <Compile Include="FileFormats\Blowfish.cs" />
+    <Compile Include="FileFormats\BlowfishKeyProvider.cs" />
+    <Compile Include="Primitives\Set.cs" />
+    <Compile Include="Graphics\Dune2ShpReader.cs" />
+    <Compile Include="FileFormats\Format2.cs" />
+    <Compile Include="FileFormats\Format40.cs" />
+    <Compile Include="FileFormats\Format80.cs" />
+    <Compile Include="FileFormats\IniFile.cs" />
+    <Compile Include="Graphics\ShpReader.cs" />
+    <Compile Include="Primitives\int2.cs" />
+    <Compile Include="Map\MapStub.cs" />
+    <Compile Include="Map\SmudgeReference.cs" />
+    <Compile Include="Map\PlayerReference.cs" />
+    <Compile Include="CompressedPackage.cs" />
+    <Compile Include="Graphics\VqaReader.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>

OpenRA.FileFormats/Package.cs

@@ -1,224 +1,160 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	public interface IFolder
-	{
-		Stream GetContent(string filename);
-		bool Exists(string filename);
-		IEnumerable<uint> AllFileHashes();
-		void Write(Dictionary<string, byte[]> contents);
-		int Priority { get; }
-	}
-
-	public class MixFile : IFolder
-	{
-		readonly Dictionary<uint, PackageEntry> index;
-		readonly bool isRmix, isEncrypted;
-		readonly long dataStart;
-		readonly Stream s;
-		int priority;
-
-		// Create a new MixFile
-		public MixFile(string filename, int priority, Dictionary<string, byte[]> contents)
-		{
-			this.priority = priority;
-			if (File.Exists(filename))
-				File.Delete(filename);
-
-			s = File.Create(filename);
-			Write(contents);
-		}
-
-		public MixFile(string filename, int priority)
-		{
-			this.priority = priority;
-			s = FileSystem.Open(filename);
-
-			BinaryReader reader = new BinaryReader(s);
-			uint signature = reader.ReadUInt32();
-
-			isRmix = 0 == (signature & ~(uint)(MixFileFlags.Checksum | MixFileFlags.Encrypted));
-
-			if (isRmix)
-			{
-				isEncrypted = 0 != (signature & (uint)MixFileFlags.Encrypted);
-				if( isEncrypted )
-				{
-					index = ParseRaHeader(s, out dataStart).ToDictionaryWithConflictLog(x => x.Hash,
-						"MixFile.RaHeader", null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
-					);
-					return;
-				}
-			}
-			else
-				s.Seek( 0, SeekOrigin.Begin );
-
-			isEncrypted = false;
-			index = ParseTdHeader(s, out dataStart).ToDictionaryWithConflictLog(x => x.Hash,
-				"MixFile.TdHeader", null, x => "(offs={0}, len={1})".F(x.Offset, x.Length)
-			);
-		}
-
-		const long headerStart = 84;
-
-		List<PackageEntry> ParseRaHeader(Stream s, out long dataStart)
-		{
-			BinaryReader reader = new BinaryReader(s);
-			byte[] keyblock = reader.ReadBytes(80);
-			byte[] blowfishKey = new BlowfishKeyProvider().DecryptKey(keyblock);
-
-			uint[] h = ReadUints(reader, 2);
-
-			Blowfish fish = new Blowfish(blowfishKey);
-			MemoryStream ms = Decrypt( h, fish );
-			BinaryReader reader2 = new BinaryReader(ms);
-
-			ushort numFiles = reader2.ReadUInt16();
-			reader2.ReadUInt32(); /*datasize*/
-
-			s.Position = headerStart;
-			reader = new BinaryReader(s);
-
-			int byteCount = 6 + numFiles * PackageEntry.Size;
-			h = ReadUints( reader, ( byteCount + 3 ) / 4 );
-
-			ms = Decrypt( h, fish );
-
-			dataStart = headerStart + byteCount + ( ( ~byteCount + 1 ) & 7 );
-
-			long ds;
-			return ParseTdHeader( ms, out ds );
-		}
-
-		static MemoryStream Decrypt( uint[] h, Blowfish fish )
-		{
-			uint[] decrypted = fish.Decrypt( h );
-
-			MemoryStream ms = new MemoryStream();
-			BinaryWriter writer = new BinaryWriter( ms );
-			foreach( uint t in decrypted )
-				writer.Write( t );
-			writer.Flush();
-
-			ms.Position = 0;
-			return ms;
-		}
-
-		uint[] ReadUints(BinaryReader r, int count)
-		{
-			uint[] ret = new uint[count];
-			for (int i = 0; i < ret.Length; i++)
-				ret[i] = r.ReadUInt32();
-
-			return ret;
-		}
-
-		List<PackageEntry> ParseTdHeader(Stream s, out long dataStart)
-		{
-			List<PackageEntry> items = new List<PackageEntry>();
-
-			BinaryReader reader = new BinaryReader(s);
-			ushort numFiles = reader.ReadUInt16();
-			/*uint dataSize = */reader.ReadUInt32();
-
-			for (int i = 0; i < numFiles; i++)
-				items.Add(new PackageEntry(reader));
-
-			dataStart = s.Position;
-			return items;
-		}
-
-		public Stream GetContent(uint hash)
-		{
-			PackageEntry e;
-			if (!index.TryGetValue(hash, out e))
-				return null;
-
-			s.Seek( dataStart + e.Offset, SeekOrigin.Begin );
-			byte[] data = new byte[ e.Length ];
-			s.Read( data, 0, (int)e.Length );
-			return new MemoryStream(data);
-		}
-
-		public Stream GetContent(string filename)
-		{
-			return GetContent(PackageEntry.HashFilename(filename));
-		}
-
-		public IEnumerable<uint> AllFileHashes()
-		{
-			return index.Keys;
-		}
-
-		public bool Exists(string filename)
-		{
-			return index.ContainsKey(PackageEntry.HashFilename(filename));
-		}
-
-
-		public int Priority
-		{
-			get { return 1000 + priority; }
-		}
-
-		public void Write(Dictionary<string, byte[]> contents)
-		{
-			// Cannot modify existing mixfile - rename existing file and
-			// create a new one with original content plus modifications
-			FileSystem.Unmount(this);
-
-			// TODO: Add existing data to the contents list
-			if (index.Count > 0)
-				throw new NotImplementedException("Updating mix files unfinished");
-
-			// Construct a list of entries for the file header
-			uint dataSize = 0;
-			var items = new List<PackageEntry>();
-			foreach (var kv in contents)
-			{
-				uint length = (uint)kv.Value.Length;
-				uint hash = PackageEntry.HashFilename(Path.GetFileName(kv.Key));
-				items.Add(new PackageEntry(hash, dataSize, length));
-				dataSize += length;
-			}
-
-			// Write the new file
-			s.Seek(0,SeekOrigin.Begin);
-			using (var writer = new BinaryWriter(s))
-			{
-				// Write file header
-				writer.Write((ushort)items.Count);
-				writer.Write(dataSize);
-				foreach (var item in items)
-					item.Write(writer);
-
-				writer.Flush();
-
-				// Copy file data
-				foreach (var file in contents)
-					s.Write(file.Value);
-			}
-		}
-	}
-
-	[Flags]
-	enum MixFileFlags : uint
-	{
-		Checksum = 0x10000,
-		Encrypted = 0x20000,
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public interface IFolder
+	{
+		Stream GetContent(string filename);
+		bool Exists(string filename);
+		IEnumerable<uint> AllFileHashes();
+	}
+
+	public class Package : IFolder
+	{
+		readonly Dictionary<uint, PackageEntry> index;
+		readonly bool isRmix, isEncrypted;
+		readonly long dataStart;
+		readonly Stream s;
+
+		public Package(string filename)
+		{
+			s = FileSystem.Open(filename);
+
+			BinaryReader reader = new BinaryReader(s);
+			uint signature = reader.ReadUInt32();
+
+			isRmix = 0 == (signature & ~(uint)(MixFileFlags.Checksum | MixFileFlags.Encrypted));
+
+			if (isRmix)
+			{
+				isEncrypted = 0 != (signature & (uint)MixFileFlags.Encrypted);
+				if( isEncrypted )
+				{
+					index = ParseRaHeader( s, out dataStart ).ToDictionary(x => x.Hash);
+					return;
+				}
+			}
+			else
+				s.Seek( 0, SeekOrigin.Begin );
+
+			isEncrypted = false;
+			index = ParseTdHeader(s, out dataStart).ToDictionary(x => x.Hash);
+		}
+
+		const long headerStart = 84;
+
+		List<PackageEntry> ParseRaHeader(Stream s, out long dataStart)
+		{
+			BinaryReader reader = new BinaryReader(s);
+			byte[] keyblock = reader.ReadBytes(80);
+			byte[] blowfishKey = new BlowfishKeyProvider().DecryptKey(keyblock);
+
+			uint[] h = ReadUints(reader, 2);
+
+			Blowfish fish = new Blowfish(blowfishKey);
+			MemoryStream ms = Decrypt( h, fish );
+			BinaryReader reader2 = new BinaryReader(ms);
+
+			ushort numFiles = reader2.ReadUInt16();
+			reader2.ReadUInt32(); /*datasize*/
+
+			s.Position = headerStart;
+			reader = new BinaryReader(s);
+
+			int byteCount = 6 + numFiles * PackageEntry.Size;
+			h = ReadUints( reader, ( byteCount + 3 ) / 4 );
+
+			ms = Decrypt( h, fish );
+
+			dataStart = headerStart + byteCount + ( ( ~byteCount + 1 ) & 7 );
+
+			long ds;
+			return ParseTdHeader( ms, out ds );
+		}
+
+		static MemoryStream Decrypt( uint[] h, Blowfish fish )
+		{
+			uint[] decrypted = fish.Decrypt( h );
+
+			MemoryStream ms = new MemoryStream();
+			BinaryWriter writer = new BinaryWriter( ms );
+			foreach( uint t in decrypted )
+				writer.Write( t );
+			writer.Flush();
+
+			ms.Position = 0;
+			return ms;
+		}
+
+		uint[] ReadUints(BinaryReader r, int count)
+		{
+			uint[] ret = new uint[count];
+			for (int i = 0; i < ret.Length; i++)
+				ret[i] = r.ReadUInt32();
+
+			return ret;
+		}
+
+		List<PackageEntry> ParseTdHeader(Stream s, out long dataStart)
+		{
+			List<PackageEntry> items = new List<PackageEntry>();
+
+			BinaryReader reader = new BinaryReader(s);
+			ushort numFiles = reader.ReadUInt16();
+			/*uint dataSize = */reader.ReadUInt32();
+
+			for (int i = 0; i < numFiles; i++)
+				items.Add(new PackageEntry(reader));
+
+			dataStart = s.Position;
+			return items;
+		}
+		
+		public Stream GetContent(uint hash)
+		{
+			PackageEntry e;
+			if (!index.TryGetValue(hash, out e))
+				return null;
+
+			s.Seek( dataStart + e.Offset, SeekOrigin.Begin );
+			byte[] data = new byte[ e.Length ];
+			s.Read( data, 0, (int)e.Length );
+			return new MemoryStream(data);
+		}
+
+		public Stream GetContent(string filename)
+		{
+			return GetContent(PackageEntry.HashFilename(filename));
+		}
+
+		public IEnumerable<uint> AllFileHashes()
+		{
+			return index.Keys;
+		}
+		
+		public bool Exists(string filename)
+		{
+			return index.ContainsKey(PackageEntry.HashFilename(filename));
+		}
+	}
+
+	[Flags]
+	enum MixFileFlags : uint
+	{
+		Checksum = 0x10000,
+		Encrypted = 0x20000,
+	}
+}

OpenRA.FileFormats/PackageEntry.cs

@@ -1,85 +1,85 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-namespace OpenRA.FileFormats
-{
-	public class PackageEntry
-	{
-		public readonly uint Hash;
-		public readonly uint Offset;
-		public readonly uint Length;
-
-
-		public PackageEntry(uint hash, uint offset, uint length)
-		{
-			Hash = hash;
-			Offset = offset;
-			Length = length;
-		}
-
-		public PackageEntry(BinaryReader r)
-		{
-			Hash = r.ReadUInt32();
-			Offset = r.ReadUInt32();
-			Length = r.ReadUInt32();
-		}
-
-		public void Write(BinaryWriter w)
-		{
-			w.Write(Hash);
-			w.Write(Offset);
-			w.Write(Length);
-		}
-
-		public override string ToString()
-		{
-			string filename;
-			if (Names.TryGetValue(Hash, out filename))
-				return "{0} - offset 0x{1:x8} - length 0x{2:x8}".F(filename, Offset, Length);
-			else
-				return "0x{0:x8} - offset 0x{1:x8} - length 0x{2:x8}".F(Hash, Offset, Length);
-		}
-
-		public static uint HashFilename(string name)
-		{
-			if (name.Length > 12)
-				name = name.Substring(0, 12);
-
-			name = name.ToUpperInvariant();
-			if (name.Length % 4 != 0)
-				name = name.PadRight(name.Length + (4 - name.Length % 4), '\0');
-
-			MemoryStream ms = new MemoryStream(Encoding.ASCII.GetBytes(name));
-			BinaryReader reader = new BinaryReader(ms);
-
-			int len = name.Length >> 2;
-			uint result = 0;
-
-			while (len-- != 0)
-				result = ((result << 1) | (result >> 31)) + reader.ReadUInt32();
-
-			return result;
-		}
-
-		static Dictionary<uint, string> Names = new Dictionary<uint,string>();
-
-		public static void AddStandardName(string s)
-		{
-			uint hash = HashFilename(s);
-			Names.Add(hash, s);
-		}
-
-		public const int Size = 12;
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace OpenRA.FileFormats
+{
+	public class PackageEntry
+	{
+		public readonly uint Hash;
+		public readonly uint Offset;
+		public readonly uint Length;
+
+		
+		public PackageEntry(uint hash, uint offset, uint length)
+		{
+			Hash = hash;
+			Offset = offset;
+			Length = length;
+		}
+		
+		public PackageEntry(BinaryReader r)
+		{
+			Hash = r.ReadUInt32();
+			Offset = r.ReadUInt32();
+			Length = r.ReadUInt32();
+		}
+		
+		public void Write(BinaryWriter w)
+		{
+			w.Write(Hash);
+			w.Write(Offset);
+			w.Write(Length);
+		}
+
+		public override string ToString()
+		{
+			string filename;
+			if (Names.TryGetValue(Hash, out filename))
+				return string.Format("{0} - offset 0x{1:x8} - length 0x{2:x8}", filename, Offset, Length);
+			else
+				return string.Format("0x{0:x8} - offset 0x{1:x8} - length 0x{2:x8}", Hash, Offset, Length);
+		}
+
+		public static uint HashFilename(string name)
+		{
+			if (name.Length > 12)
+				name = name.Substring(0, 12);
+
+			name = name.ToUpperInvariant();
+			if (name.Length % 4 != 0)
+				name = name.PadRight(name.Length + (4 - name.Length % 4), '\0');
+
+			MemoryStream ms = new MemoryStream(Encoding.ASCII.GetBytes(name));
+			BinaryReader reader = new BinaryReader(ms);
+
+			int len = name.Length >> 2; 
+			uint result = 0;
+
+			while (len-- != 0)
+				result = ((result << 1) | (result >> 31)) + reader.ReadUInt32();
+
+			return result;
+		}
+
+		static Dictionary<uint, string> Names = new Dictionary<uint,string>();
+		
+		public static void AddStandardName(string s)
+		{
+			uint hash = HashFilename(s);
+			Names.Add(hash, s);
+		}
+
+		public const int Size = 12;
+	}
+}

OpenRA.FileFormats/PackageWriter.cs

@@ -0,0 +1,48 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public static class PackageWriter
+	{
+		public static void CreateMix(string filename, List<string> contents)
+		{
+			// Construct a list of entries for the file header
+			uint dataSize = 0;
+			var items = new List<PackageEntry>();
+			foreach (var file in contents)
+			{
+				uint length = (uint)new FileInfo(file).Length;
+				uint hash = PackageEntry.HashFilename(Path.GetFileName(file));
+				items.Add(new PackageEntry(hash, dataSize, length));
+				dataSize += length;
+			}
+
+			using (var s = File.Create(filename))
+			using (var writer = new BinaryWriter(s))
+			{
+				// Write file header
+				writer.Write((ushort)items.Count);
+				writer.Write(dataSize);
+				foreach (var item in items)
+					item.Write(writer);
+
+				writer.Flush();
+
+				// Copy file data
+				foreach (var file in contents)
+					s.Write(File.ReadAllBytes(file));
+			}
+		}
+	}
+}

OpenRA.FileFormats/Palette.cs

@@ -1,99 +1,80 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2012 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System;
-using System.Reflection;
-
-namespace OpenRA.FileFormats
-{
-	public class Palette
-	{
-		uint[] colors;
-		public Color GetColor(int index)
-		{
-			return Color.FromArgb((int)colors[index]);
-		}
-
-		public void SetColor(int index, Color color)
-		{
-			colors[index] = (uint)color.ToArgb();
-		}
-
-		public void SetColor(int index, uint color)
-		{
-			colors[index] = (uint)color;
-		}
-
-		public uint[] Values
-		{
-			get { return colors; }
-		}
-
-		public Palette(Stream s, int[] remapShadow)
-		{
-			colors = new uint[256];
-
-			using (BinaryReader reader = new BinaryReader(s))
-			{
-				for (int i = 0; i < 256; i++)
-				{
-					byte r = (byte)(reader.ReadByte() << 2);
-					byte g = (byte)(reader.ReadByte() << 2);
-					byte b = (byte)(reader.ReadByte() << 2);
-					colors[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
-				}
-			}
-
-			colors[0] = 0; //convert black background to transparency
-			foreach (int i in remapShadow)
-				colors[i] = 140u << 24;
-		}
-
-		public Palette(Palette p, IPaletteRemap r)
-		{
-			colors = new uint[256];
-			for(int i = 0; i < 256; i++)
-				colors[i] = (uint)r.GetRemappedColor(Color.FromArgb((int)p.colors[i]),i).ToArgb();
-		}
-
-		public Palette(Palette p)
-		{
-			colors = (uint[])p.colors.Clone();
-		}
-
-		public ColorPalette AsSystemPalette()
-		{
-			ColorPalette pal;
-			using (var b = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
-				pal = b.Palette;
-
-			for (var i = 0; i < 256; i++)
-				pal.Entries[i] = GetColor(i);
-
-			// hack around a mono bug -- the palette flags get set wrong.
-			if (Platform.CurrentPlatform != PlatformType.Windows)
-				typeof(ColorPalette).GetField("flags",
-					BindingFlags.Instance | BindingFlags.NonPublic).SetValue(pal, 1);
-
-			return pal;
-		}
-
-		public static Palette Load(string filename, int[] remap)
-		{
-			using(var s = File.OpenRead(filename))
-				return new Palette(s, remap);
-		}
-	}
-
-	public interface IPaletteRemap { Color GetRemappedColor(Color original, int index); }
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System;
+
+namespace OpenRA.FileFormats
+{
+	public class Palette
+	{
+		uint[] colors;
+		public Color GetColor(int index)
+		{
+			return Color.FromArgb((int)colors[index]);
+		}
+		
+		public void SetColor(int index, Color color)
+		{
+			colors[index] = (uint)color.ToArgb();
+		}
+		
+		public void SetColor(int index, uint color)
+		{
+			colors[index] = (uint)color;
+		}
+				
+		public uint[] Values
+		{			
+			get { return colors; }
+		}
+
+		public Palette(Stream s, bool remapTransparent)
+		{
+			colors = new uint[256];
+			
+			using (BinaryReader reader = new BinaryReader(s))
+			{
+				for (int i = 0; i < 256; i++)
+				{
+					byte r = (byte)(reader.ReadByte() << 2);
+					byte g = (byte)(reader.ReadByte() << 2);
+					byte b = (byte)(reader.ReadByte() << 2);
+					colors[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
+				}
+			}
+
+			colors[0] = 0;
+			if (remapTransparent)
+			{
+				colors[1] = 178u << 24; // Hack for d2k; may have side effects
+				colors[3] = 178u << 24;
+				colors[4] = 140u << 24;
+			}
+		}
+
+		public Palette(Palette p, IPaletteRemap r)
+		{
+			colors = new uint[256];
+			for(int i = 0; i < 256; i++)
+				colors[i] = (uint)r.GetRemappedColor(Color.FromArgb((int)p.colors[i]),i).ToArgb();
+		}
+		
+		public Palette(Palette p)
+		{
+			colors = (uint[])p.colors.Clone();
+		}
+	}
+
+	public interface IPaletteRemap { Color GetRemappedColor(Color original, int index);	}
+}

OpenRA.FileFormats/Platform.cs

@@ -1,75 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Diagnostics;
-using System.IO;
-using OpenRA.FileFormats;
-
-namespace OpenRA
-{
-	public enum PlatformType { Unknown, Windows, OSX, Linux }
-
-	public static class Platform
-	{
-		public static PlatformType CurrentPlatform { get { return currentPlatform.Value; } }
-
-		static Lazy<PlatformType> currentPlatform = Lazy.New((Func<PlatformType>)GetCurrentPlatform);
-
-		static PlatformType GetCurrentPlatform()
-		{
-				if (Environment.OSVersion.Platform == PlatformID.Win32NT)
-					return PlatformType.Windows;
-
-				try
-				{
-					var psi = new ProcessStartInfo("uname", "-s");
-					psi.UseShellExecute = false;
-					psi.RedirectStandardOutput = true;
-					var p = Process.Start(psi);
-					var kernelName = p.StandardOutput.ReadToEnd();
-					if (kernelName.Contains("Linux") || kernelName.Contains("BSD"))
-						return PlatformType.Linux;
-					if (kernelName.Contains("Darwin"))
-						return PlatformType.OSX;
-				}
-				catch {	}
-
-				return PlatformType.Unknown;
-		}
-
-		public static string SupportDir
-		{
-			get
-			{
-				var dir = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
-
-				switch (CurrentPlatform)
-				{
-				case PlatformType.Windows:
-					dir += Path.DirectorySeparatorChar + "OpenRA";
-					break;
-				case PlatformType.OSX:
-					dir += "/Library/Application Support/OpenRA";
-					break;
-				case PlatformType.Linux:
-				default:
-					dir += "/.openra";
-					break;
-				}
-
-				if (!Directory.Exists(dir))
-					Directory.CreateDirectory(dir);
-
-				return dir + Path.DirectorySeparatorChar;
-			}
-		}
-	}
-}

OpenRA.FileFormats/PlayerColorRemap.cs

@@ -1,53 +1,50 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-
-	public class PlayerColorRemap : IPaletteRemap
-	{
-		Dictionary<int, Color> remapColors;
-
-		public static int GetRemapIndex(int[] Ramp, int i)
-		{
-			return Ramp[i];
-		}
-
-		public PlayerColorRemap(int[] Ramp, ColorRamp c)
-		{
-			var c1 = c.GetColor(0);
-			var c2 = c.GetColor(1); // temptemp: this can be expressed better
-
-			var baseIndex = Ramp[0];
-			var RemapRamp = Ramp.Select(r => r - Ramp[0]).ToArray();
-
-			if (Ramp[0] > Ramp[15]) // reversed remapping
-                        {
-				baseIndex = Ramp[15];
-				for (int i=15; i>0; i--)
-					RemapRamp = Ramp.Select(r => r - Ramp[15]).ToArray();
-			}
-			
-			remapColors = RemapRamp.Select((x, i) => Pair.New(baseIndex + i, Exts.ColorLerp(x / 16f, c1, c2)))
-				.ToDictionary(u => u.First, u => u.Second);
-		}
-
-		public Color GetRemappedColor(Color original, int index)
-		{
-			Color c;
-			return remapColors.TryGetValue(index, out c)
-				? c : original;
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	// TODO: ship this out of here.
+	public enum PaletteFormat { ra, cnc, d2k }
+
+	public class PlayerColorRemap : IPaletteRemap
+	{
+		Dictionary<int, Color> remapColors;
+
+		public PlayerColorRemap(Color c1, Color c2, PaletteFormat fmt)
+		{
+			var baseIndex = (fmt == PaletteFormat.cnc) ? 0xb0 : (fmt == PaletteFormat.d2k) ? 240 : 80;
+			var ramp = (fmt == PaletteFormat.cnc)
+				? new[] { 0, 2, 4, 6, 8, 10, 13, 15, 1, 3, 5, 7, 9, 11, 12, 14 }
+				: new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+
+			remapColors = ramp.Select((x, i) => Pair.New(baseIndex + i, ColorLerp(x / 16f, c1, c2)))
+				.ToDictionary(u => u.First, u => u.Second);
+		}
+
+		static Color ColorLerp(float t, Color c1, Color c2)
+		{
+			return Color.FromArgb(255,
+				(int)(t * c2.R + (1 - t) * c1.R),
+				(int)(t * c2.G + (1 - t) * c1.G),
+				(int)(t * c2.B + (1 - t) * c1.B));
+		}
+		
+		public Color GetRemappedColor(Color original, int index)
+		{
+			Color c;
+			return remapColors.TryGetValue(index, out c) 
+				? c : original;
+		}
+	}
+}

OpenRA.FileFormats/Primitives/ActionQueue.cs

@@ -1,62 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-
-namespace OpenRA.FileFormats
-{
-	/// <summary>
-	/// A thread-safe action queue, suitable for passing units of work between threads.
-	/// </summary>
-	public class ActionQueue
-	{
-		object syncRoot = new object();
-		PriorityQueue<DelayedAction> actions = new PriorityQueue<DelayedAction>();
-
-		public void Add(Action a) { Add(a, 0); }
-		public void Add(Action a, int delay)
-		{
-			lock (syncRoot)
-				actions.Add(new DelayedAction(a, Environment.TickCount + delay));
-		}
-
-		public void PerformActions()
-		{
-			Action a = () => {};
-			lock (syncRoot)
-			{
-				var t = Environment.TickCount;
-				while (!actions.Empty && actions.Peek().Time <= t)
-				{
-					var da = actions.Pop();
-					a += da.Action;
-				}
-			}
-			a();
-		}
-	}
-
-	struct DelayedAction : IComparable<DelayedAction>
-	{
-		public int Time;
-		public Action Action;
-
-		public DelayedAction(Action action, int time)
-		{
-			Action = action;
-			Time = time;
-		}
-
-		public int CompareTo(DelayedAction other)
-		{
-			return Time.CompareTo(other.Time);
-		}
-	}
-}

OpenRA.FileFormats/Primitives/Bits.cs

@@ -1,65 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenRA.FileFormats
-{
-	static class BitAllocator<T> where T : struct
-	{
-		static int nextVal = 1;
-		static Cache<string,int> bits;
-
-		static BitAllocator() {	bits = new Cache<string, int>( _ => Allocate() ); }
-
-		static int Allocate()
-		{
-			if (nextVal == 0)
-				throw new InvalidOperationException(
-					"Too many values in BitAllocator<{0}>".F(typeof(T).Name));
-
-			var val = nextVal;
-			nextVal <<= 1;
-			return val;
-		}
-
-		public static int GetValue(string[] val)
-		{
-			return val.Select( a => bits[a] ).Aggregate( 0, (a,b) => a | b );
-		}
-
-		public static IEnumerable<string> GetStrings(int val)
-		{
-			for( var i = 0; i < 32; i++ )
-			{
-				var x = 1 << i;
-				if ((val & x) != 0)
-					yield return bits.Single( a => a.Value == x ).Key;
-			}
-		}
-	}
-
-	public struct Bits<T> where T : struct
-	{
-		public int Value;
-
-		public Bits(string[] val) { Value = BitAllocator<T>.GetValue(val); }
-		public Bits(Bits<T> other) { Value = other.Value; }
-
-		public override string ToString()
-		{
-			return BitAllocator<T>.GetStrings(Value).JoinWith(",");
-		}
-
-		public override int GetHashCode() { return Value.GetHashCode(); }
-	}
-}

OpenRA.FileFormats/Primitives/Cache.cs

@@ -1,53 +1,49 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace OpenRA.FileFormats
-{
-	public class Cache<T, U> : IEnumerable<KeyValuePair<T, U>>
-	{
-		Dictionary<T, U> hax;
-		Func<T,U> loader;
-
-		public Cache(Func<T,U> loader, IEqualityComparer<T> c)
-		{
-			hax = new Dictionary<T, U>(c);
-			if (loader == null)
-				throw new ArgumentNullException();
-
-			this.loader = loader;
-		}
-
-		public Cache(Func<T, U> loader)
-			: this(loader, EqualityComparer<T>.Default) { }
-
-		public U this[T key]
-		{
-			get
-			{
-				U result;
-				if (!hax.TryGetValue(key, out result))
-					hax.Add(key, result = loader(key));
-
-				return result;
-			}
-		}
-
-		public IEnumerator<KeyValuePair<T, U>> GetEnumerator() { return hax.GetEnumerator(); }
-
-		IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); }
-
-		public IEnumerable<T> Keys { get { return hax.Keys; } }
-		public IEnumerable<U> Values { get { return hax.Values; } }
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace OpenRA.FileFormats
+{
+	public class Cache<T, U> : IEnumerable<KeyValuePair<T, U>>
+	{
+		Dictionary<T, U> hax = new Dictionary<T, U>();
+		Func<T,U> loader;
+
+		public Cache(Func<T,U> loader)
+		{
+			if (loader == null)
+				throw new ArgumentNullException();
+
+			this.loader = loader;
+		}
+
+		public U this[T key]
+		{
+			get
+			{
+				U result;
+				if (!hax.TryGetValue(key, out result))
+					hax.Add(key, result = loader(key));
+
+				return result;
+			}
+		}
+
+		public IEnumerator<KeyValuePair<T, U>> GetEnumerator() { return hax.GetEnumerator(); }
+
+		IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); }
+
+		public IEnumerable<T> Keys { get { return hax.Keys; } }
+		public IEnumerable<U> Values { get { return hax.Values; } }
+	}
+}

OpenRA.FileFormats/Primitives/Cached.cs

@@ -1,55 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-
-namespace OpenRA.FileFormats
-{
-	public class Cached<T>
-	{
-		Func<T> p;
-		T value;
-		bool hasValue;
-
-		public Cached(Func<T> p)
-		{
-			if (p == null)
-				throw new ArgumentNullException();
-
-			this.p = p;
-		}
-
-		public T Value
-		{
-			get
-			{
-				if (hasValue)
-					return value;
-
-				value = p();
-				hasValue = true;
-				return value;
-			}
-		}
-
-		public T Force() { return Value; }
-
-		public void Invalidate()
-		{
-			hasValue = false;
-		}
-	}
-
-	public static class Cached
-	{
-		public static Cached<T> New<T>(Func<T> p) { return new Cached<T>(p); }
-	}
-}
-

OpenRA.FileFormats/Primitives/DisposableAction.cs

@@ -1,40 +1,35 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-
-namespace OpenRA
-{
-	public class DisposableAction : IDisposable
-	{
-		public DisposableAction(Action onDispose, Action onFinalize)
-		{
-			this.onDispose = onDispose;
-			this.onFinalize = onFinalize;
-		}
-
-		Action onDispose;
-		Action onFinalize;
-		bool disposed;
-
-		public void Dispose()
-		{
-			if (disposed) return;
-			disposed = true;
-			onDispose();
-			GC.SuppressFinalize(this);
-		}
-
-		~DisposableAction()
-		{
-			onFinalize();
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+
+namespace OpenRA
+{
+	public class DisposableAction : IDisposable
+	{
+		public DisposableAction(Action a) { this.a = a; }
+
+		Action a;
+		bool disposed;
+
+		public void Dispose()
+		{
+			if (disposed) return;
+			disposed = true;
+			a();
+			GC.SuppressFinalize(this);
+		}
+
+		~DisposableAction()
+		{
+			Dispose();
+		}
+	}
+}

OpenRA.FileFormats/Primitives/Lazy.cs

@@ -1,48 +1,46 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-
-namespace OpenRA.FileFormats
-{
-	public class Lazy<T>
-	{
-		Func<T> p;
-		T value;
-
-		public Lazy(Func<T> p)
-		{
-			if (p == null)
-				throw new ArgumentNullException();
-
-			this.p = p;
-		}
-
-		public T Value
-		{
-			get
-			{
-				if (p == null)
-					return value;
-
-				value = p();
-				p = null;
-				return value;
-			}
-		}
-
-		public T Force() { return Value; }
-	}
-
-	public static class Lazy
-	{
-		public static Lazy<T> New<T>(Func<T> p) { return new Lazy<T>(p); }
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+
+namespace OpenRA.FileFormats
+{
+	public class Lazy<T>
+	{
+		Func<T> p;
+		T value;
+
+		public Lazy(Func<T> p)
+		{
+			if (p == null)
+				throw new ArgumentNullException();
+
+			this.p = p;
+		}
+
+		public T Value
+		{
+			get
+			{
+				if (p == null)
+					return value;
+
+				value = p();
+				p = null;
+				return value;
+			}
+		}
+	}
+
+	public static class Lazy
+	{
+		public static Lazy<T> New<T>(Func<T> p) { return new Lazy<T>(p); }
+	}
+}

OpenRA.FileFormats/Primitives/Pair.cs

@@ -1,90 +1,70 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Collections.Generic;
-using System;
-using System.Drawing;
-
-namespace OpenRA.FileFormats
-{
-	public struct Pair<T, U>
-	{
-		public T First;
-		public U Second;
-
-		public Pair(T first, U second)
-		{
-			First = first;
-			Second = second;
-		}
-
-		internal static IEqualityComparer<T> tc = EqualityComparer<T>.Default;
-		internal static IEqualityComparer<U> uc = EqualityComparer<U>.Default;
-
-		public static bool operator ==(Pair<T, U> a, Pair<T, U> b)
-		{
-			return tc.Equals(a.First, b.First) && uc.Equals(a.Second, b.Second);
-		}
-
-		public static bool operator !=(Pair<T, U> a, Pair<T, U> b)
-		{
-			return !(a == b);
-		}
-
-		public override bool Equals(object obj)
-		{
-			if (!(obj is Pair<T, U>))
-				return false;
-
-			return (Pair<T, U>)obj == this;
-		}
-
-		public override int GetHashCode()
-		{
-			return First.GetHashCode() ^ Second.GetHashCode();
-		}
-
-		public Pair<T, U> WithFirst(T t) { return new Pair<T, U>(t, Second); }
-		public Pair<T, U> WithSecond(U u) { return new Pair<T, U>(First, u); }
-
-		public static T AsFirst(Pair<T, U> p) { return p.First; }
-		public static U AsSecond(Pair<T, U> p) { return p.Second; }
-
-		public override string ToString()
-		{
-			return "({0},{1})".F(First, Second);
-		}
-
-		class PairEqualityComparer : IEqualityComparer<Pair<T, U>>
-		{
-			public bool Equals(Pair<T, U> x, Pair<T, U> y) { return x == y; }
-			public int GetHashCode(Pair<T, U> obj) { return obj.GetHashCode(); }
-		}
-
-		public static IEqualityComparer<Pair<T, U>> EqualityComparer { get { return new PairEqualityComparer(); } }
-	}
-
-	public static class Pair
-	{
-		public static Pair<T, U> New<T, U>(T t, U u) { return new Pair<T, U>(t, u); }
-
-		static Pair()
-		{
-			Pair<char,Color>.uc = new ColorEqualityComparer();
-		}
-
-		// avoid the default crappy one
-		class ColorEqualityComparer : IEqualityComparer<Color>
-		{
-			public bool Equals(Color x, Color y) { return x.ToArgb() == y.ToArgb(); }
-			public int GetHashCode(Color obj) { return obj.GetHashCode(); }
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Collections.Generic;
+
+namespace OpenRA.FileFormats
+{
+	public struct Pair<T, U>
+	{
+		public T First;
+		public U Second;
+
+		public Pair(T first, U second)
+		{
+			First = first;
+			Second = second;
+		}
+
+		static IEqualityComparer<T> tc = EqualityComparer<T>.Default;
+		static IEqualityComparer<U> uc = EqualityComparer<U>.Default;
+
+		public static bool operator ==(Pair<T, U> a, Pair<T, U> b)
+		{
+			return tc.Equals(a.First, b.First) && uc.Equals(a.Second, b.Second);
+		}
+
+		public static bool operator !=(Pair<T, U> a, Pair<T, U> b)
+		{
+			return !(a == b);
+		}
+
+		public override bool Equals(object obj)
+		{
+			if (!(obj is Pair<T, U>))
+				return false;
+
+			return (Pair<T, U>)obj == this;
+		}
+
+		public override int GetHashCode()
+		{
+			return First.GetHashCode() ^ Second.GetHashCode();
+		}
+
+		public Pair<T, U> WithFirst(T t) { return new Pair<T, U>(t, Second); }
+		public Pair<T, U> WithSecond(U u) { return new Pair<T, U>(First, u); }
+
+		public static T AsFirst(Pair<T, U> p) { return p.First; }
+		public static U AsSecond(Pair<T, U> p) { return p.Second; }
+
+        public Pair<U, T> Swap() { return Pair.New(Second, First); }
+
+		public override string ToString()
+		{
+			return "({0},{1})".F(First, Second);
+		}
+	}
+
+    public static class Pair
+    {
+        public static Pair<T, U> New<T, U>(T t, U u) { return new Pair<T, U>(t, u); }
+    }
+}

OpenRA.FileFormats/Primitives/PriorityQueue.cs

@@ -1,104 +1,103 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-
-namespace OpenRA.FileFormats
-{
-	public class PriorityQueue<T>
-			where T : IComparable<T>
-	{
-		List<T[]> items = new List<T[]>();
-		int level, index;
-
-		public PriorityQueue()
-		{
-			items.Add(new T[1]);
-		}
-
-		public void Add(T item)
-		{
-			int addLevel = level;
-			int addIndex = index;
-
-			while (addLevel >= 1 && Above(addLevel, addIndex).CompareTo(item) > 0)
-			{
-				items[addLevel][addIndex] = Above(addLevel, addIndex);
-				--addLevel;
-				addIndex >>= 1;
-			}
-
-			items[addLevel][addIndex] = item;
-
-			if (++index >= (1 << level))
-			{
-				index = 0;
-				if (items.Count <= ++level)
-					items.Add(new T[1 << level]);
-			}
-		}
-
-		public bool Empty { get { return (level == 0); } }
-
-		T At(int level, int index) { return items[level][index]; }
-		T Above(int level, int index) { return items[level - 1][index >> 1]; }
-
-		T Last()
-		{
-			int lastLevel = level;
-			int lastIndex = index;
-
-			if (--lastIndex < 0)
-				lastIndex = (1 << --lastLevel) - 1;
-
-			return At(lastLevel, lastIndex);
-		}
-
-		public T Peek() { return At(0,0); }
-		public T Pop()
-		{
-			if (level == 0 && index == 0)
-				throw new InvalidOperationException("Attempting to pop empty PriorityQueue");
-
-			T ret = At(0, 0);
-			BubbleInto(0, 0, Last());
-			if (--index < 0)
-				index = (1 << --level) - 1;
-
-			return ret;
-		}
-
-		void BubbleInto(int intoLevel, int intoIndex, T val)
-		{
-			int downLevel = intoLevel + 1;
-			int downIndex = intoIndex << 1;
-
-			if (downLevel > level || (downLevel == level && downIndex >= index))
-			{
-				items[intoLevel][intoIndex] = val;
-				return;
-			}
-
-			if (downLevel <= level && downIndex < index - 1 &&
-				At(downLevel, downIndex).CompareTo(At(downLevel, downIndex + 1)) >= 0)
-				++downIndex;
-
-			if (val.CompareTo(At(downLevel, downIndex)) <= 0)
-			{
-				items[intoLevel][intoIndex] = val;
-				return;
-			}
-
-			items[intoLevel][intoIndex] = At(downLevel, downIndex);
-			BubbleInto(downLevel, downIndex, val);
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+
+namespace OpenRA.FileFormats
+{
+	public class PriorityQueue<T>
+			where T : IComparable<T>
+	{
+		List<T[]> items = new List<T[]>();
+		int level, index;
+
+		public PriorityQueue()
+		{
+			items.Add(new T[1]);
+		}
+
+		public void Add(T item)
+		{
+			int addLevel = level;
+			int addIndex = index;
+
+			while (addLevel >= 1 && Above(addLevel, addIndex).CompareTo(item) > 0)
+			{
+				items[addLevel][addIndex] = Above(addLevel, addIndex);
+				--addLevel;
+				addIndex >>= 1;
+			}
+
+			items[addLevel][addIndex] = item;
+
+			if (++index >= (1 << level))
+			{
+				index = 0;
+				if (items.Count <= ++level)
+					items.Add(new T[1 << level]);
+			}
+		}
+
+		public bool Empty { get { return (level == 0); } }
+
+		T At(int level, int index) { return items[level][index]; }
+		T Above(int level, int index) { return items[level - 1][index >> 1]; }
+
+		T Last()
+		{
+			int lastLevel = level;
+			int lastIndex = index;
+
+			if (--lastIndex < 0)
+				lastIndex = (1 << --lastLevel) - 1;
+
+			return At(lastLevel, lastIndex);
+		}
+
+		public T Pop()
+		{
+			if (level == 0 && index == 0)
+				throw new InvalidOperationException("Attempting to pop empty PriorityQueue");
+
+			T ret = At(0, 0);
+			BubbleInto(0, 0, Last());
+			if (--index < 0)
+				index = (1 << --level) - 1;
+
+			return ret;
+		}
+
+		void BubbleInto(int intoLevel, int intoIndex, T val)
+		{
+			int downLevel = intoLevel + 1;
+			int downIndex = intoIndex << 1;
+
+			if (downLevel > level || (downLevel == level && downIndex >= index))
+			{
+				items[intoLevel][intoIndex] = val;
+				return;
+			}
+
+			if (downLevel <= level && downIndex < index - 1 &&
+				At(downLevel, downIndex).CompareTo(At(downLevel, downIndex + 1)) >= 0)
+				++downIndex;
+
+			if (val.CompareTo(At(downLevel, downIndex)) <= 0)
+			{
+				items[intoLevel][intoIndex] = val;
+				return;
+			}
+
+			items[intoLevel][intoIndex] = At(downLevel, downIndex);
+			BubbleInto(downLevel, downIndex, val);
+		}
+	}
+}

OpenRA.FileFormats/Primitives/Set.cs

@@ -1,56 +1,66 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace OpenRA.FileFormats
-{
-	public class Set<T> : IEnumerable<T>
-	{
-		Dictionary<T, bool> data = new Dictionary<T, bool>();
-
-		public void Add( T obj )
-		{
-			data.Add( obj, false );
-			if( OnAdd != null )
-				OnAdd( obj );
-		}
-
-		public void Remove( T obj )
-		{
-			data.Remove( obj );
-			if( OnRemove != null )
-				OnRemove( obj );
-		}
-
-		public event Action<T> OnAdd;
-		public event Action<T> OnRemove;
-
-		public IEnumerator<T> GetEnumerator()
-		{
-			return data.Keys.GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-
-		public bool Contains( T obj ) { return data.ContainsKey(obj); }
-
-		public Set( params T[] ts )
-		{
-			foreach( var t in ts )
-				Add(t);
-		}
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace OpenRA.Collections
+{
+	public class Set<T> : IEnumerable<T>
+	{
+		Dictionary<T, bool> data = new Dictionary<T, bool>();
+
+		public void Add( T obj )
+		{
+			data.Add( obj, false );
+			if( OnAdd != null )
+				OnAdd( obj );
+		}
+
+		public void Remove( T obj )
+		{
+			data.Remove( obj );
+			if( OnRemove != null )
+				OnRemove( obj );
+		}
+
+		public event Action<T> OnAdd;
+		public event Action<T> OnRemove;
+
+		public IEnumerator<T> GetEnumerator()
+		{
+			return data.Keys.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	}
+
+	public class CachedView<T,U> : Set<U>
+	{
+		public CachedView( Set<T> set, Func<T, bool> include, Func<T, U> store )
+			: this( set, include, x => new[] { store( x ) } )
+		{
+		}
+
+		public CachedView( Set<T> set, Func<T,bool> include, Func<T,IEnumerable<U>> store )
+		{
+			foreach( var t in set )
+				if( include( t ) )
+					store( t ).Do( x => Add( x ) );
+
+			set.OnAdd += obj => { if( include( obj ) ) store( obj ).Do( x => Add( x ) ); };
+			set.OnRemove += obj => { if( include( obj ) ) store( obj ).Do( x => Remove( x ) ); };
+		}
+	}
+}

OpenRA.FileFormats/Primitives/float2.cs

@@ -1,104 +1,103 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Drawing;
-using System.Runtime.InteropServices;
-
-namespace OpenRA
-{
-	[StructLayout(LayoutKind.Sequential)]
-	public struct float2
-	{
-		public float X, Y;
-
-		public float2(float x, float y) { X = x; Y = y; }
-		public float2(PointF p) { X = p.X; Y = p.Y; }
-		public float2(Point p) { X = p.X; Y = p.Y; }
-		public float2(Size p) { X = p.Width; Y = p.Height; }
-		public float2(SizeF p) { X = p.Width; Y = p.Height; }
-
-		public PointF ToPointF() { return new PointF(X, Y); }
-		public SizeF ToSizeF() { return new SizeF(X, Y); }
-
-		public static implicit operator float2(int2 src) { return new float2(src.X, src.Y); }
-
-		public static float2 operator +(float2 a, float2 b) { return new float2(a.X + b.X, a.Y + b.Y); }
-		public static float2 operator -(float2 a, float2 b) { return new float2(a.X - b.X, a.Y - b.Y); }
-
-		public static float2 operator -(float2 a) { return new float2(-a.X, -a.Y); }
-
-		public static float Lerp(float a, float b, float t) { return a + t * (b - a); }
-
-		public static float2 Lerp(float2 a, float2 b, float t)
-		{
-			return new float2(
-				Lerp(a.X, b.X, t),
-				Lerp(a.Y, b.Y, t));
-		}
-
-		public static float2 Lerp(float2 a, float2 b, float2 t)
-		{
-			return new float2(
-				Lerp(a.X, b.X, t.X),
-				Lerp(a.Y, b.Y, t.Y));
-		}
-
-		public static float2 FromAngle(float a) { return new float2((float)Math.Sin(a), (float)Math.Cos(a)); }
-
-		static float Constrain(float x, float a, float b) { return x < a ? a : x > b ? b : x; }
-
-		public float2 Constrain(float2 min, float2 max)
-		{
-			return new float2(
-				Constrain(X, min.X, max.X),
-				Constrain(Y, min.Y, max.Y));
-		}
-
-		public static float2 operator *(float a, float2 b) { return new float2(a * b.X, a * b.Y); }
-		public static float2 operator *(float2 b, float a) { return new float2(a * b.X, a * b.Y); }
-		public static float2 operator *( float2 a, float2 b ) { return new float2( a.X * b.X, a.Y * b.Y ); }
-		public static float2 operator /( float2 a, float2 b ) { return new float2( a.X / b.X, a.Y / b.Y ); }
-
-		public static bool operator ==(float2 me, float2 other) { return (me.X == other.X && me.Y == other.Y); }
-		public static bool operator !=(float2 me, float2 other) { return !(me == other); }
-		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
-
-		public override bool Equals(object obj)
-		{
-			if (obj == null)
-				return false;
-
-			float2 o = (float2)obj;
-			return o == this;
-		}
-
-		public static readonly float2 Zero = new float2(0, 0);
-
-		public static bool WithinEpsilon(float2 a, float2 b, float e)
-		{
-			float2 d = a - b;
-			return Math.Abs(d.X) < e && Math.Abs(d.Y) < e;
-		}
-
-		public float2 Sign() { return new float2(Math.Sign(X), Math.Sign(Y)); }
-		public static float Dot(float2 a, float2 b) { return a.X * b.X + a.Y * b.Y; }
-		public float2 Round() { return new float2((float)Math.Round(X), (float)Math.Round(Y)); }
-
-		public override string ToString() { return "({0},{1})".F(X, Y); }
-		public int2 ToInt2() { return new int2((int)X, (int)Y); }
-
-		public static float2 Max(float2 a, float2 b) { return new float2(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
-		public static float2 Min(float2 a, float2 b) { return new float2(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
-
-		public float LengthSquared { get { return X * X + Y * Y; } }
-		public float Length { get { return (float)Math.Sqrt(LengthSquared); } }
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace OpenRA
+{
+	[StructLayout(LayoutKind.Sequential)]
+	public struct float2
+	{
+		public float X, Y;
+
+		public float2(float x, float y) { X = x; Y = y; }
+		public float2(PointF p) { X = p.X; Y = p.Y; }
+		public float2(Point p) { X = p.X; Y = p.Y; }
+		public float2(Size p) { X = p.Width; Y = p.Height; }
+		public float2(SizeF p) { X = p.Width; Y = p.Height; }
+
+		public PointF ToPointF() { return new PointF(X, Y); }
+		public SizeF ToSizeF() { return new SizeF(X, Y); }
+
+		public static implicit operator float2(int2 src) { return new float2(src.X, src.Y); }
+
+		public static float2 operator +(float2 a, float2 b) { return new float2(a.X + b.X, a.Y + b.Y); }
+		public static float2 operator -(float2 a, float2 b) { return new float2(a.X - b.X, a.Y - b.Y); }
+
+		public static float2 operator -(float2 a) { return new float2(-a.X, -a.Y); }
+
+		public static float Lerp(float a, float b, float t) { return a + t * (b - a); }
+
+		public static float2 Lerp(float2 a, float2 b, float t)
+		{
+			return new float2(
+				Lerp(a.X, b.X, t),
+				Lerp(a.Y, b.Y, t));
+		}
+
+		public static float2 Lerp(float2 a, float2 b, float2 t)
+		{
+			return new float2(
+				Lerp(a.X, b.X, t.X),
+				Lerp(a.Y, b.Y, t.Y));
+		}
+
+		public static float2 FromAngle(float a) { return new float2((float)Math.Sin(a), (float)Math.Cos(a)); }
+
+		static float Constrain(float x, float a, float b) { return x < a ? a : x > b ? b : x; }
+
+		public float2 Constrain(float2 min, float2 max)
+		{
+			return new float2(
+				Constrain(X, min.X, max.X),
+				Constrain(Y, min.Y, max.Y));
+		}
+
+		public static float2 operator *(float a, float2 b) { return new float2(a * b.X, a * b.Y); }
+		public static float2 operator *( float2 a, float2 b ) { return new float2( a.X * b.X, a.Y * b.Y ); }
+		public static float2 operator /( float2 a, float2 b ) { return new float2( a.X / b.X, a.Y / b.Y ); }
+
+        public static bool operator ==(float2 me, float2 other) { return (me.X == other.X && me.Y == other.Y); }
+        public static bool operator !=(float2 me, float2 other) { return !(me == other); }
+        public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+                return false;
+
+            float2 o = (float2)obj;
+            return o == this;
+        }
+
+		public static readonly float2 Zero = new float2(0, 0);
+
+		public static bool WithinEpsilon(float2 a, float2 b, float e)
+		{
+			float2 d = a - b;
+			return Math.Abs(d.X) < e && Math.Abs(d.Y) < e;
+		}
+
+		public float2 Sign() { return new float2(Math.Sign(X), Math.Sign(Y)); }
+		public static float Dot(float2 a, float2 b) { return a.X * b.X + a.Y * b.Y; }
+		public float2 Round() { return new float2((float)Math.Round(X), (float)Math.Round(Y)); }
+
+		public override string ToString() { return string.Format("({0},{1})", X, Y); }
+		public int2 ToInt2() { return new int2((int)X, (int)Y); }
+
+		public static float2 Max(float2 a, float2 b) { return new float2(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
+		public static float2 Min(float2 a, float2 b) { return new float2(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
+
+		public float LengthSquared { get { return X * X + Y * Y; } }
+		public float Length { get { return (float)Math.Sqrt(LengthSquared); } }
+	}
+}

OpenRA.FileFormats/Primitives/int2.cs

@@ -1,85 +1,74 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Drawing;
-
-namespace OpenRA
-{
-	public struct int2
-	{
-		public int X,Y;
-
-		public int2( int x, int y ) { this.X = x; this.Y = y; }
-		public int2( Point p ) { X = p.X; Y = p.Y; }
-		public int2( Size p ) { X = p.Width; Y = p.Height; }
-
-		public static int2 operator +(int2 a, int2 b) { return new int2(a.X + b.X, a.Y + b.Y); }
-		public static int2 operator -(int2 a, int2 b) { return new int2(a.X - b.X, a.Y - b.Y); }
-		public static int2 operator *(int a, int2 b) { return new int2(a * b.X, a * b.Y); }
-		public static int2 operator *(int2 b, int a) { return new int2(a * b.X, a * b.Y); }
-		public static int2 operator /(int2 a, int b) { return new int2(a.X / b, a.Y / b); }
-
-		public static int2 operator -(int2 a) { return new int2(-a.X, -a.Y); }
-
-		public static bool operator ==(int2 me, int2 other) { return (me.X == other.X && me.Y == other.Y); }
-		public static bool operator !=(int2 me, int2 other) { return !(me == other); }
-
-		public int2 Sign() { return new int2(Math.Sign(X), Math.Sign(Y)); }
-		public int2 Abs() { return new int2( Math.Abs( X ), Math.Abs( Y ) ); }
-		public int LengthSquared { get { return X * X + Y * Y; } }
-		public int Length { get { return (int)Math.Sqrt(LengthSquared); } }
-		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
-
-		public static int2 Max(int2 a, int2 b) { return new int2(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
-		public static int2 Min(int2 a, int2 b) { return new int2(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
-
-		public override bool Equals(object obj)
-		{
-			if (obj == null)
-				return false;
-
-			int2 o = (int2)obj;
-			return o == this;
-		}
-
-		public static readonly int2 Zero = new int2(0, 0);
-		public Point ToPoint() { return new Point(X, Y); }
-		public PointF ToPointF() { return new PointF(X, Y); }
-		public float2 ToFloat2() { return new float2(X, Y); }
-
-		public override string ToString() { return "{0},{1}".F(X, Y); }
-
-		// Change endianness of a uint32
-		public static uint Swap(uint orig)
-		{
-			return (uint)((orig & 0xff000000) >> 24) | ((orig & 0x00ff0000) >> 8) | ((orig & 0x0000ff00) << 8) | ((orig & 0x000000ff) << 24);
-		}
-
-		public static int Lerp( int a, int b, int mul, int div )
-		{
-			return a + ( b - a ) * mul / div;
-		}
-
-		public static int2 Lerp( int2 a, int2 b, int mul, int div )
-		{
-			return a + ( b - a ) * mul / div;
-		}
-
-		public int2 Clamp(Rectangle r)
-		{
-			return new int2(Math.Min(r.Right, Math.Max(X, r.Left)),
-							Math.Min(r.Bottom, Math.Max(Y, r.Top)));
-		}
-
-		public static int Dot(int2 a, int2 b) { return a.X * b.X + a.Y * b.Y; }
-
-	}
-}
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System;
+using System.Drawing;
+
+namespace OpenRA
+{
+	public struct int2
+	{
+		public int X,Y;
+
+		public int2( int x, int y ) { this.X = x; this.Y = y; }
+		public int2( Point p ) { X = p.X; Y = p.Y; }
+		public int2( Size p ) { X = p.Width; Y = p.Height; }
+
+		public static int2 operator +(int2 a, int2 b) { return new int2(a.X + b.X, a.Y + b.Y); }
+		public static int2 operator -(int2 a, int2 b) { return new int2(a.X - b.X, a.Y - b.Y); }
+		public static int2 operator *(int a, int2 b) { return new int2(a * b.X, a * b.Y); }
+		public static int2 operator *(int2 b, int a) { return new int2(a * b.X, a * b.Y); }
+		public static int2 operator /(int2 a, int b) { return new int2(a.X / b, a.Y / b); }
+
+		public static bool operator ==(int2 me, int2 other) { return (me.X == other.X && me.Y == other.Y); }
+		public static bool operator !=(int2 me, int2 other) { return !(me == other); }
+
+		public int2 Sign() { return new int2(Math.Sign(X), Math.Sign(Y)); }
+		public int2 Abs() { return new int2( Math.Abs( X ), Math.Abs( Y ) ); }
+		public int LengthSquared { get { return X * X + Y * Y; } }
+		public int Length { get { return (int)Math.Sqrt(LengthSquared); } }
+		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode(); }
+
+		public static int2 Max(int2 a, int2 b) { return new int2(Math.Max(a.X, b.X), Math.Max(a.Y, b.Y)); }
+		public static int2 Min(int2 a, int2 b) { return new int2(Math.Min(a.X, b.X), Math.Min(a.Y, b.Y)); }
+
+		public override bool Equals(object obj)
+		{
+			if (obj == null)
+				return false;
+
+			int2 o = (int2)obj;
+			return o == this;
+		}
+
+		public static readonly int2 Zero = new int2(0, 0);
+		public Point ToPoint() { return new Point(X, Y); }
+        public PointF ToPointF() { return new PointF(X, Y); }
+		public float2 ToFloat2() { return new float2(X, Y); }
+
+		public override string ToString() { return string.Format("{0},{1}", X, Y); }
+		
+		// Change endianness of a uint32
+		public static uint Swap(uint orig)
+		{
+			return (uint)((orig & 0xff000000) >> 24) | ((orig & 0x00ff0000) >> 8) | ((orig & 0x0000ff00) << 8) | ((orig & 0x000000ff) << 24);
+		}
+
+		public static int Lerp( int a, int b, int mul, int div )
+		{
+			return a + ( b - a ) * mul / div;
+		}
+
+		public static int2 Lerp( int2 a, int2 b, int mul, int div )
+		{
+			return a + ( b - a ) * mul / div;
+		}
+	}
+}

OpenRA.FileFormats/Properties/AssemblyInfo.cs

@@ -1,26 +1,36 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("OpenRA.FileFormats")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenRA.FileFormats")]
-[assembly: AssemblyCopyright("Copyright ©  2007,2009,2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: 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.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("OpenRA.FileFormats")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenRA.FileFormats")]
+[assembly: AssemblyCopyright("Copyright ©  2007,2009,2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]