Deploy builds to the local repository.

If the aircraft does not take off on resupply,
we allow it to enter resuppliers without ForceMove modifier.

ResolveOrder already handled this correctly, only the cursor
shown was wrong.

.editorconfig

@@ -4,6 +4,7 @@ root = true
 ; Unix-style newlines
 [*]
 end_of_line = LF
+insert_final_newline = true
 
 ; 4-column tab indentation
 [*.cs]

.gitattributes

@@ -1,12 +1,10 @@
 # Enforce LF normalization on Windows
 *.yaml eol=lf
 *.lua eol=lf
+*.cs eol=lf
+*.csproj eol=lf
+*.sln eol=lf
 * text=lf
 
 # Custom for Visual Studio
 *.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,39 @@
+<!--
+  This is a guideline, which shall help to write enhancement requests or bug reports.
+  Fill in the placeholders below. Delete any headings and placeholders that you do not use.
+
+  Before you start check if a similar request/bug report already exists in this Github issue tracker and comment there.
+
+When submitting a feature or enhancement request:
+
+1. Explain briefly what the enhancement is and why you think it would be useful.
+2. Provide any other necessary or useful information regarding your issue, such as (code) examples or related links.
+
+
+When submitting a bug report, please follow the template below:
+-->
+
+### Issue Summary
+<!-- Explanation of the issue. Expectation vs. actual behavior. -->
+... ... ...
+
+#### System Information
+- **Operating System:** [e.g. Windows 10, Mac OS 10.12, Ubuntu 16.04, ...]
+- **.NET / Mono Version:** [e.g. .NET 4.7.1, Mono 4.6.2, ...]
+- **OpenRA Version:** [e.g. release-20180218, playtest-20180208, ...]
+- **Mod:** [e.g. Red Alert, Tiberian Dawn, Dune2000, ...]
+
+#### Additional Information:
+- Steps to reproduce
+	1. Step
+	2. Step
+	3. ...
+
+- Logs
+<!-- If you have a log (e.g. debug.log, exception.log), zip and attach it. -->
+
+- OpenRA Replays
+<!-- You have to zip it before you can attach it. When does the issue appear [e.g. 10:33]? -->
+
+- Screenshots & Videos
+<!-- You should be able to attach screenshots by drag&drop. Videos need to be uploaded to an external platform (e.g. https://www.youtube.com, https://www.dropbox.com) -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+Thank you for your contribution to OpenRA!
+
+Please be aware that we do not have enough project maintainers to match the rate of contributions, so it may take several days before somebody is able to respond to your Pull Request.
+
+You can help speed up the review process by following a few steps:
+
+* Make sure that you have read and understand the OpenRA Coding Standard (see https://github.com/OpenRA/OpenRA/wiki/Coding-Standard).
+* Write quality commit messages (see https://chris.beams.io/posts/git-commit/).
+* Only commit changes that directly relate to your Pull Request.  Use your Git interface to unstage any unrelated changes to project files, line endings, whitespace, or other files.
+* Review the code diff view below to double check that your changes satisfy the above three points.
+* Use the `make test` and `make check` commands to check for (and fix!) any issues that are reported by our automated tests.
+* If you are changing shared mod or engine code, make sure that you have tested your changes in all four default mods.
+* Respond to review comments as soon as you reasonably can.  Reviewers will usually prioritize Pull Requests that are still fresh in their minds.  Make sure to leave a comment when you push new changes, otherwise GitHub does not automatically notify reviewers!
+* Leave a polite comment asking for reviews if a week or more has passed without feedback.
+
+If you need any help you can ask in the #openra IRC channel on freenode (most active during European evenings).

.gitignore

@@ -1,82 +1,69 @@
-# Visual Studio
-Release
-bin
-obj
-*.ncb
-*.vcproj*
-*.suo
-*.user
-*.sln.cache
-*.manifest
-*.CodeAnalysisLog.xml
-*.lastcodeanalysissucceeded
-_ReSharper.*/
+# Visual Studio
+Release
+bin
+obj
+*.ncb
+*.vcproj*
+*.suo
+*.user
+*.sln.cache
+*.manifest
+*.CodeAnalysisLog.xml
+*.lastcodeanalysissucceeded
+_ReSharper.*/
 /.vs
-
-# movies
-*.vqa
-
-# archives
-*.mix
-
-# binaries
-mods/*/*.dll
-mods/*/*.mdb
-mods/*/*.pdb
-/*.dll
-/*.dll.config
-/*.so
-/*.dylib
-/*.pdb
-/*.mdb
-/*.exe
-thirdparty/download/*
-*.mmdb.gz
-
-# backup files by various editors
-*~
-*.orig
-\#*
-.*.sw?
-
-# Monodevelop
-*.pidb
-*.userprefs
-
-# Mac OS X
-.DS_Store
-
-# XCode
-packaging/osx/launcher/build/
-packaging/osx/launcher/OpenRA.xcodeproj/*.pbxuser
-packaging/osx/launcher/OpenRA.xcodeproj/*.perspectivev3
-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
-*.resources
-
-# auto-generated documentation
-DOCUMENTATION.md
-Lua-API.md
-*.html
-openra.6
-
-# StyleCop
-*.Cache
-StyleCopViolations.xml
-
-# SublimeText
-*.sublime-project
-*.sublime-workspace
-
-# NUnit
-/TestResult.xml
-/lib/
-
-# Support directory
-/Support
+
+# binaries
+mods/*/*.dll
+mods/*/*.mdb
+mods/*/*.pdb
+/*.dll
+/*.dll.config
+/*.so
+/*.dylib
+/*.pdb
+/*.mdb
+/*.exe
+/*.exe.config
+thirdparty/download/*
+*.mmdb.gz
+
+# backup files by various editors
+*~
+*.orig
+\#*
+.*.sw?
+
+# Monodevelop
+*.pidb
+*.userprefs
+
+# Mac OS X
+.DS_Store
+
+# auto-generated documentation
+DOCUMENTATION.md
+WEAPONS.md
+Lua-API.md
+Settings.md
+*.html
+openra.6
+update.log
+
+# StyleCop
+*.Cache
+StyleCopViolations.xml
+
+# SublimeText
+*.sublime-project
+*.sublime-workspace
+
+# NUnit
+/TestResult.xml
+/lib/
+
+# Support directory
+/Support
+
+# IntelliJ files
+.idea

.travis.yml

@@ -1,11 +1,9 @@
 # Travis-CI Build for OpenRA
 # see travis-ci.org for details
 
+dist: xenial
 language: csharp
-mono: 4.6.1
-
-# http://docs.travis-ci.com/user/migrating-from-legacy
-sudo: false
+mono: 5.20.1
 
 cache:
   directories:
@@ -15,8 +13,6 @@ addons:
   apt:
     packages:
     - lua5.1
-    - nsis
-    - nsis-common
     - dpkg
     - markdown
     - zlib1g-dev
@@ -24,6 +20,7 @@ addons:
     - cmake
     - genisoimage
     - fakeroot
+    - zsync
 
 # Environment variables
 env:
@@ -36,15 +33,7 @@ env:
 # Run the NUnit tests
 script:
  - travis_retry make all-dependencies
- - make all SDK="-sdk:4.5"
- - make check
- - make check-scripts
- - make test
- - make nunit
-
-# Automatically update the trait documentation and Lua API
-after_success:
- - test $TRAVIS_PULL_REQUEST == "false" && cd packaging && ./update-wiki.sh $TRAVIS_BRANCH; cd ..
+ - make all
 
 # Only watch the development branch and tagged release.
 branches:
@@ -52,35 +41,30 @@ branches:
    - /^release-.*$/
    - /^playtest-.*$/
    - /^pkgtest-.*$/
+   - /^devtest-.*$/
    - /^prep-.*$/
    - bleed
 
-# Notify developers when build passed/failed.
-notifications:
-  irc:
-    template:
-      - "%{repository}#%{build_number} %{commit} %{author}: %{message} %{build_url}"
-    channels:
-      - "irc.freenode.net#openra"
-    use_notice: true
-    skip_join: true
-
 before_deploy:
+ - wget http://mirrors.kernel.org/ubuntu/pool/universe/n/nsis/nsis-common_3.03-2_all.deb
+ - wget http://mirrors.kernel.org/ubuntu/pool/universe/n/nsis/nsis_3.03-2_amd64.deb
+ - sudo dpkg -i nsis-common_3.03-2_all.deb
+ - sudo dpkg -i nsis_3.03-2_amd64.deb
+ - makensis -VERSION
  - export PATH=$PATH:$HOME/usr/bin
  - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"`
  - cd packaging
  - mkdir build
  - ./package-all.sh ${TRAVIS_TAG} ${PWD}/build/
+
 deploy:
   provider: releases
   api_key:
-    secure: "g/LU11f+mjqv+lj0sR1UliHwogXL4ofJUwoG5Dbqlvdf5UTLWytw/OWSCv8RGyuh10miyWeaoqHh1cn2C1IFhUEqN1sSeKKKOWOTvJ2FR5mzi9uH3d/MOBzG5icQ7Qh0fZ1YPz5RaJJhYu6bmfvA/1gD49GoaX2kxQL4J5cEBgg="
-  file:
-    - build/OpenRA-${TRAVIS_TAG}.exe
-    - build/OpenRA-${TRAVIS_TAG}.dmg
-    - build/openra_${DOTVERSION}_all.deb
+    secure: BzLdjZHvDqd5jyyHS8KK8zrNiXEIQiGRS/RMfqK6LuFPC4mXYDE4C/0oLPe93ULtai6LgUUkwB+zKq4lDV109EBO8Xp0jXKdDLLsepGU5xRLt3Z2tT4Zj+Nx6daVjAJe1MaKO5Zo5ODi8kBploRnPCffA8AMzOyQ+OwwJNlcRSs=
+  file_glob: true
+  file: build/*
   skip_cleanup: true
   on:
     all_branches: true
     tags: true
-    repo: OpenRA/OpenRA
+    repo: pchote/OpenRA

AUTHORS

@@ -38,12 +38,14 @@ Also thanks to:
     * Bellator
     * Biofreak
     * Braxton Williams (Buddytex)
+    * Brendan Gluth (Mechanical_Man)
     * Bryan Wilbur
     * Bugra Cuhadaroglu (BugraC)
     * Christer Ulfsparre (Holloweye)
     * Chris Grant (Unit158)
     * clem
     * Cody Brittain (Generalcamo)
+    * Constantin Helmig (CH4Code)
     * D2k Sardaukar
     * D'Arcy Rush (r34ch)
     * Daniel Derejvanik (Harisson)
@@ -52,6 +54,7 @@ Also thanks to:
     * David Russell (DavidARussell)
     * DeadlySurprise
     * Dmitri Suvorov (suvjunmd)
+    * dtluna
     * Erasmus Schroder (rasco)
     * Eric Bajumpaa (SteelPhase)
     * Evgeniy Sergeev (evgeniysergeev)
@@ -59,24 +62,26 @@ Also thanks to:
     * Florian Wiesbauer (FiveAces)
     * Frank Razenberg (zzattack)
     * Gareth Needham (Ripley`)
-    * Glen Anderson (GlenLife)
+    * Glen Anderson (glen7)
     * Glenn Martin Jensen (Baxxster)
     * Gordon Martin (Happy0)
     * Guido Lipke (LipkeGu)
-    * Gyula Zimmermann (Graion Dilach)
     * Hervé Matysiak (Herve-M)
     * Huw Pascoe
     * Ian T. Jacobsen (Smilex)
     * Imago
     * Iran
+    * Ishan Bhargava (ishantheperson)
     * Jacob Dufault (jacobdufault)
     * James Dunne (jsd)
     * James Gilbert (DSUK)
     * Jan-Willem Buurlage (jwbuurlage)
     * Jason (atlimit8)
     * Jeff Harris (jeff_1amstudios)
+    * Jefri Sevkin (Arular)
     * Jes
     * Joakim Lindberg (booom3)
+    * Joe Alam (joealam)
     * John Turner (whinis)
     * Jonas A. Lind (SoScared)
     * Joppy Furr
@@ -84,10 +89,12 @@ Also thanks to:
     * Kenny Hoxworth (hoxworth)
     * Kevin Azzam (ChaoticMind)
     * Krishnakanth Mallik
+    * Kyle Smith (Smitty)
     * Kyrre Soerensen (zypres)
     * Lawrence Wang
     * Lesueur Benjamin (Valkirie)
     * Maarten Meuris (Nyerguds)
+    * Manuel Geiger (Ectras)
     * Mark Olson (markolson)
     * Markus Hartung (hartmark)
     * Matija Hustic (matija-hustic)
@@ -96,10 +103,15 @@ Also thanks to:
     * Matthijs Benschop (Nerdie)
     * Max621
     * Max Ugrumov (katzsmile)
+    * Mazar Farran (mazarf)
     * Michael Rätzel
+    * Michael Silber (frühstück)
     * Michael Sztolcman (s1w_)
+    * Mike Gagné (AngryBirdz)
+    * Muh
     * Mustafa Alperen Seki (MustaphaTR)
     * Neil Shivkar (havok13888)
+    * Nikolay Fomin (netnazgul)
     * Nooze
     * Nukem
     * Okunev Yu Dmitry (xaionaro)
@@ -108,8 +120,9 @@ Also thanks to:
     * Paul Dovydaitis (pdovy)
     * Pavlos Touboulidis (pav)
     * Pedro Ferreira Ramos (bateramos)
+    * Peter Amrehn (jongleur1983)
     * Pizzaoverhead
-    * Piët Delport (pjdelport)
+    * Pi Delport (pjdelport)
     * Psydev
     * Raphael Vogt (TheRaffy, Yellow)
     * Raymond Bedrossian (Squiggles211)
@@ -126,6 +139,8 @@ Also thanks to:
     * Teemu Nieminen (Temeez)
     * Tim Mylemans (gecko)
     * Tirili
+    * Tomas Einarsson (Mesacer)
+    * Tom van Leth (tovl)
     * Tristan Keating (Kilkakon)
     * Tristan Mühlbacher (MicroBit)
     * UnknownProgrammer
@@ -149,9 +164,6 @@ the Apache 2.0 license.
 Using GeoLite2 data created by MaxMind and
 distributed under the CC BY-SA 3.0 license.
 
-Using SharpFont created by Robert Rouhani and
-distributed under the MIT license.
-
 Using SDL2-CS and OpenAL-CS created by Ethan
 Lee and released under the zlib license.
 
@@ -168,9 +180,6 @@ under the MIT license.
 Using ICSharpCode.SharpZipLib initially by Mike
 Krueger and distributed under the GNU GPL terms.
 
-Using SmartIrc4Net developed by Mirco Bauer
-distributed under the LGPL version 2.1 or later.
-
 Using rix0rrr.BeaconLib developed by Rico Huijbers
 distributed under MIT License.
 

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by private-messaging a project team member (users with a + in front
+of their name) via our IRC channel (#openra on freenode –
+[webchat](http://webchat.freenode.net/?channels=openra)). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -1,5 +1,8 @@
 # OpenRA Contributing Guidelines
 
+## Participating
+Help us keep OpenRA open and inclusive. Please read and follow our [Code of Conduct](https://github.com/OpenRA/OpenRA/blob/bleed/CODE_OF_CONDUCT.md).
+
 ## Bug reports
 
 * Have you read the [FAQ](https://github.com/OpenRA/OpenRA/wiki/FAQ)?

INSTALL.md

@@ -6,78 +6,107 @@ The following lists per-platform dependencies required to build from source.
 Windows
 =======
 
-* [Windows PowerShell >= 4.0](http://microsoft.com/powershell)
-* [.NET Framework >= 4.5 (Client Profile)](http://www.microsoft.com/en-us/download/details.aspx?id=30653)
-* [SDL 2](http://www.libsdl.org/download-2.0.php) (included)
-* [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm) (included)
-* [zlib](http://gnuwin32.sourceforge.net/packages/zlib.htm) (included)
-* [OpenAL](http://kcat.strangesoft.net/openal.html) (included)
-* [liblua 5.1](http://luabinaries.sourceforge.net/download.html) (included)
+Compiling OpenRA requires the following dependencies:
+* [Windows PowerShell >= 4.0](http://microsoft.com/powershell) (included by default in recent Windows 10 versions)
+* [.NET Framework 4.6.1 (Developer Pack)](https://dotnet.microsoft.com/download/dotnet-framework/net461) (or via Visual Studio 2017)
+* [.NET Core 2.2 SDK](https://dotnet.microsoft.com/download/dotnet-core/2.2) (or via Visual Studio 2017)
 
-You need to fetch the thirdparty dependencies using [NuGet](http://www.nuget.org) and place them at the appropriate places by typing `make dependencies` in a command terminal.
+Type `make dependencies` in a command terminal to download pre-compiled native libraries for:
+* [SDL 2](http://www.libsdl.org/download-2.0.php)
+* [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm)
+* [zlib](http://gnuwin32.sourceforge.net/packages/zlib.htm)
+* [OpenAL](http://kcat.strangesoft.net/openal.html)
+* [liblua 5.1](http://luabinaries.sourceforge.net/download.html)
 
 To compile OpenRA, open the `OpenRA.sln` solution in the main folder, build it from the command-line with MSBuild or use the Makefile analogue command `make all` scripted in PowerShell syntax.
 
-Run the game with `OpenRA.Game.exe Game.Mod=ra` for Red Alert or `OpenRA.Game.exe Game.Mod=cnc` for Tiberian Dawn.
+Run the game with `launch-game.cmd`. It can be handed arguments that specify the exact mod one wishes to run, for example, run `launch-game.cmd Game.Mod=ra` to launch Red Alert, `launch-game.cmd Game.Mod=cnc` to start Tiberian dawn or `launch-game.cmd Game.Mod=d2k` to launch Dune 2000.
 
 Linux
 =====
 
-Use `make dependencies` to map the native libraries to your system, fetch the remaining CLI dependencies using [NuGet](http://www.nuget.org) and place them at the appropriate places.
+Mono, version 5.4 or later, is required to compile OpenRA. You can add the [upstream mono repository](https://www.mono-project.com/download/stable/#download-lin) for your distro to obtain the latest version if your system packages are not sufficient.
 
-To compile OpenRA, run `make all` from the command line.
+Use `make dependencies` to map the native libraries to your system and fetch the remaining CLI dependencies to place them at the appropriate places.
 
-Run with either `launch-game.sh` or `mono --debug OpenRA.Game.exe`.
+To compile OpenRA, run `make all` from the command line. After this one can run the game with `./launch-game.sh`. It is also possible to specify the mod you wish to run from the command line, e.g. with `./launch-game.sh Game.Mod=ts` if you wish to try the experimental Tiberian Sun mod. 
 
-Type `sudo make install` for system wide installation. Run `make install-linux-shortcuts` to get startup scripts, icons and desktop files. You can then run from the `openra` shortcut.
+Type `sudo make install` for system-wide installation. Run `sudo make install-linux-shortcuts` to get startup scripts, icons and desktop files. You can then run the Red Alert by executing the `openra-ra` command, the Dune 2000 mod by running the `openra-d2k` command and Tiberian Dawn by the `openra-cnc` command. Alternatively, you can also run these mods by clicking on their desktop shortcuts if you ran `sudo make install-linux-shortcuts`. 
+
+Arch Linux
+----------
+
+It is important to note there is an unofficial [`openra-git`](https://aur.archlinux.org/packages/openra-git) package in the Arch User Repository (AUR) of Arch Linux. If manually compiling is the way you wish to go the build and runtime dependencies can be installed with:
+
+```
+sudo pacman -S mono openal libgl freetype2 sdl2 lua51 xdg-utils zenity
+```
 
 Debian/Ubuntu
 -------------
 
-* nuget
-* mono-devel
-* libfreetype6
-* libopenal1
-* liblua5.1-0
-* libsdl2-2.0-0
-* xdg-utils
-* zenity
-* curl
+:warning: The `mono` packages in the Ubuntu < 19.04 and Debian < 10 repositories are too old to support OpenRA. :warning:
 
-openSUSE
---------
+See the instructions under the *Linux* section above to upgrade `mono` using the upstream releases if needed.
 
-* mono-devel
-* nuget
-* openal
-* freetype2
-* SDL2
-* lua51
-* xdg-utils
-* zenity
-* curl
+```
+sudo apt install mono-devel libfreetype6 libopenal1 liblua5.1-0 libsdl2-2.0-0 xdg-utils zenity wget
+```
+
+Fedora
+------
+
+:warning: The `mono` packages in the Fedora repositories are too old to support OpenRA. :warning:
+
+See the instructions under the *Linux* section above to upgrade `mono` using the upstream releases.
+
+
+```
+sudo dnf install "pkgconfig(mono)" SDL2 freetype "lua = 5.1" openal-soft xdg-utils zenity
+```
 
 Gentoo
 ------
 
-* dev-lang/mono
-* dev-dotnet/libgdiplus
-* dev-dotnet/nuget
-* media-libs/freetype:2
-* media-libs/libsdl2
-* media-libs/openal
-* virtual/jpeg
-* virtual/opengl
-* dev-lang/lua-5.1.5
-* x11-misc/xdg-utils
-* gnome-extra/zenity
-* net-misc/curl
+```
+sudo emerge -av dev-lang/mono dev-dotnet/libgdiplus media-libs/freetype:2 media-libs/libsdl2 media-libs/openal virtual/jpeg virtual/opengl '=dev-lang/lua-5.1.5*' x11-misc/xdg-utils gnome-extra/zenity
+```
+
+Mageia
+------
+
+```
+sudo dnf install "pkgconfig(mono)" SDL2 freetype "lib*lua5.1" "lib*freetype2" "lib*sdl2.0_0" openal-soft xdg-utils zenity
+```
+
+openSUSE
+--------
+
+```
+sudo zypper in mono-devel openal-soft freetype2 SDL2 lua51 xdg-utils zenity
+```
+
+Red Hat Enterprise Linux (and rebuilds, e.g. CentOS)
+----------------------------------------------------
+
+The EPEL repository is required in order for the following command to run properly. 
+
+```
+sudo yum install "pkgconfig(mono)" SDL2 freetype "lua = 5.1" openal-soft xdg-utils zenity
+```
 
 OSX
 =====
 
-Use `make dependencies` to map the native libraries to your system.
+Before compiling OpenRA you must install the following dependencies:
+* [Mono >= 5.4](https://www.mono-project.com/download/stable/#download-mac)
+
+Use `make dependencies` to download pre-compiled native libraries for:
+* [SDL 2](http://www.libsdl.org/download-2.0.php)
+* [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm)
+* [OpenAL](http://kcat.strangesoft.net/openal.html)
+* [liblua 5.1](http://luabinaries.sourceforge.net/download.html)
 
 To compile OpenRA, run `make` from the command line.
 
-Run with `mono --debug OpenRA.Game.exe`.
+Run with `./launch-game.sh`.

Makefile

@@ -1,7 +1,7 @@
 ############################# INSTRUCTIONS #############################
 #
 # to compile, run:
-#   make [DEBUG=false]
+#   make [DEBUG=true]
 #
 # to check unit tests (requires NUnit version >= 2.6), run:
 #  make nunit [NUNIT_CONSOLE=<path-to/nunit[2]-console>] [NUNIT_LIBS_PATH=<path-to-libs-dir>] [NUNIT_LIBS=<nunit-libs>]
@@ -14,9 +14,6 @@
 # to check the official mod dlls for StyleCop violations, run:
 #   make check
 #
-# to generate documentation aimed at modders, run:
-#   make docs
-#
 # to install, run:
 #   make [prefix=/foo] [bindir=/bar/bin] install
 #
@@ -36,28 +33,22 @@
 # to start the game, run:
 #   openra
 
-
-
 ############################## TOOLCHAIN ###############################
 #
-SDK         ?=
-CSC         = mcs $(SDK)
-CSFLAGS     = -nologo -warn:4 -codepage:utf8 -unsafe -warnaserror
-DEFINE      = TRACE
-COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/Eluant.dll thirdparty/download/SmarIrc4net.dll thirdparty/download/rix0rrr.BeaconLib.dll
+# List of .NET assemblies that we can guarantee exist
+# OpenRA.Game.dll is a harmless false positive that we can ignore
+WHITELISTED_OPENRA_ASSEMBLIES = OpenRA.Game.exe OpenRA.Utility.exe OpenRA.Platforms.Default.dll OpenRA.Mods.Common.dll OpenRA.Mods.Cnc.dll OpenRA.Mods.D2k.dll OpenRA.Game.dll
+
+# These are explicitly shipped alongside our core files by the packaging script
+WHITELISTED_THIRDPARTY_ASSEMBLIES = ICSharpCode.SharpZipLib.dll FuzzyLogicLibrary.dll MaxMind.Db.dll Eluant.dll rix0rrr.BeaconLib.dll Open.Nat.dll SDL2-CS.dll OpenAL-CS.dll 
+
+# These are shipped in our custom minimal mono runtime and also available in the full system-installed .NET/mono stack
+# This list *must* be kept in sync with the files packaged by the AppImageSupport and OpenRALauncherOSX repositories
+WHITELISTED_CORE_ASSEMBLIES = mscorlib.dll System.dll System.Configuration.dll System.Core.dll System.Numerics.dll System.Security.dll System.Xml.dll Mono.Security.dll
+
 NUNIT_LIBS_PATH :=
 NUNIT_LIBS  := $(NUNIT_LIBS_PATH)nunit.framework.dll
 
-DEBUG = true
-ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
-CSFLAGS   += -debug:pdbonly -optimize+
-else
-CSFLAGS   += -debug:full -optimize-
-DEFINE    := DEBUG;$(DEFINE)
-endif
-
-
-
 ######################### UTILITIES/SETTINGS ###########################
 #
 # install locations
@@ -84,8 +75,13 @@ INSTALL_DIR = $(INSTALL) -d
 INSTALL_PROGRAM = $(INSTALL) -m755
 INSTALL_DATA = $(INSTALL) -m644
 
+# Toolchain
+MSBUILD = msbuild -verbosity:m -nologo
+
+# Enable 32 bit builds while generating the windows installer
+WIN32 = false
+
 # program targets
-CORE = pdefault game utility server
 VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
 
 # dependencies
@@ -96,108 +92,30 @@ else
 os-dependencies = linux-dependencies
 endif
 
-
-
-######################## PROGRAM TARGET RULES ##########################
-#
-# Core binaries
-
-game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
-game_TARGET = OpenRA.Game.exe
-game_KIND = winexe
-game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/SharpFont.dll thirdparty/download/Open.Nat.dll
-PROGRAMS += game
-game: $(game_TARGET)
-
-# Platform dlls
-pdefault_SRCS := $(shell find OpenRA.Platforms.Default/ -iname '*.cs')
-pdefault_TARGET = OpenRA.Platforms.Default.dll
-pdefault_KIND = library
-pdefault_DEPS = $(game_TARGET)
-pdefault_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll thirdparty/download/OpenAL-CS.dll $(pdefault_DEPS)
-PROGRAMS += pdefault
-platforms: $(pdefault_TARGET)
-
-# Mods Common
-mod_common_SRCS := $(shell find OpenRA.Mods.Common/ -iname '*.cs')
-mod_common_TARGET = mods/common/OpenRA.Mods.Common.dll
-mod_common_KIND = library
-mod_common_DEPS = $(game_TARGET)
-mod_common_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS)
-PROGRAMS += mod_common
-mod_common: $(mod_common_TARGET)
-
-# NUnit testing
-test_dll_SRCS := $(shell find OpenRA.Test/ -iname '*.cs')
-test_dll_TARGET = OpenRA.Test.dll
-test_dll_KIND = library
-test_dll_DEPS = $(game_TARGET) $(mod_common_TARGET)
-test_dll_FLAGS = -warn:1
-test_dll_LIBS = $(COMMON_LIBS) $(game_TARGET) $(mod_common_TARGET) $(NUNIT_LIBS)
-PROGRAMS += test_dll
-test_dll: $(test_dll_TARGET)
-
-##### Official Mods #####
-
-STD_MOD_LIBS	= $(game_TARGET)
-STD_MOD_DEPS	= $(STD_MOD_LIBS)
-
-# Command and Conquer
-mod_cnc_SRCS := $(shell find OpenRA.Mods.Cnc/ -iname '*.cs')
-mod_cnc_TARGET = mods/common/OpenRA.Mods.Cnc.dll
-mod_cnc_KIND = library
-mod_cnc_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
-mod_cnc_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
-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_common_TARGET)
-mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
-PROGRAMS += mod_d2k
-mod_d2k: $(mod_d2k_TARGET)
-
 check-scripts:
 	@echo
 	@echo "Checking for Lua syntax errors..."
 	@luac -p $(shell find mods/*/maps/* -iname '*.lua')
 	@luac -p $(shell find lua/* -iname '*.lua')
 
-check: utility stylecheck mods
+check: dependencies
+	@echo
+	@echo "Compiling in debug mode..."
+	@$(MSBUILD) -t:build -p:Configuration=Debug
+	@echo
+	@echo "Checking runtime assemblies..."
+	@mono --debug OpenRA.Utility.exe all --check-runtime-assemblies $(WHITELISTED_OPENRA_ASSEMBLIES) $(WHITELISTED_THIRDPARTY_ASSEMBLIES) $(WHITELISTED_CORE_ASSEMBLIES)
 	@echo
 	@echo "Checking for explicit interface violations..."
 	@mono --debug OpenRA.Utility.exe all --check-explicit-interfaces
 	@echo
-	@echo "Checking for code style violations in OpenRA.Game..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Game
-	@echo
-	@echo "Checking for code style violations in OpenRA.Platforms.Default..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Platforms.Default
-	@echo
-	@echo "Checking for code style violations in OpenRA.Mods.Common..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Mods.Common
-	@echo
-	@echo "Checking for code style violations in OpenRA.Mods.Cnc..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Mods.Cnc
-	@echo
-	@echo "Checking for code style violations in OpenRA.Mods.D2k..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Mods.D2k
-	@echo
-	@echo "Checking for code style violations in OpenRA.Utility..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Utility
-	@echo
-	@echo "Checking for code style violations in OpenRA.Test..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Test
-	@echo
-	@echo "Checking for code style violations in OpenRA.Server..."
-	@mono --debug OpenRA.StyleCheck.exe OpenRA.Server
+	@echo "Checking for incorrect conditional trait interface overrides..."
+	@mono --debug OpenRA.Utility.exe all --check-conditional-trait-interface-overrides
+
 
 NUNIT_CONSOLE := $(shell test -f thirdparty/download/nunit3-console.exe && echo mono thirdparty/download/nunit3-console.exe || \
 	which nunit3-console 2>/dev/null || which nunit2-console 2>/dev/null || which nunit-console 2>/dev/null)
-nunit: test_dll
+nunit: core
 	@echo
 	@echo "Checking unit tests..."
 	@if [ "$(NUNIT_CONSOLE)" = "" ] ; then \
@@ -214,7 +132,7 @@ nunit: test_dll
 	fi
 	@$(NUNIT_CONSOLE) --noresult OpenRA.Test.nunit
 
-test: utility mods
+test: core
 	@echo
 	@echo "Testing Tiberian Sun mod MiniYAML..."
 	@mono --debug OpenRA.Utility.exe ts --check-yaml
@@ -228,71 +146,22 @@ test: utility mods
 	@echo "Testing Red Alert mod MiniYAML..."
 	@mono --debug OpenRA.Utility.exe ra --check-yaml
 
-
-##### Launchers / Utilities #####
-
-utility_SRCS := $(shell find OpenRA.Utility/ -iname '*.cs')
-utility_TARGET = OpenRA.Utility.exe
-utility_KIND = exe
-utility_DEPS = $(game_TARGET)
-utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/download/ICSharpCode.SharpZipLib.dll
-PROGRAMS += utility
-utility: $(utility_TARGET)
-
-stylecheck_SRCS := $(shell find OpenRA.StyleCheck/ -iname '*.cs')
-stylecheck_TARGET = OpenRA.StyleCheck.exe
-stylecheck_KIND = exe
-stylecheck_LIBS = thirdparty/download/StyleCop.dll thirdparty/download/StyleCop.CSharp.dll thirdparty/download/StyleCop.CSharp.Rules.dll
-PROGRAMS += stylecheck
-stylecheck: $(stylecheck_TARGET)
-
-# Dedicated server
-server_SRCS := $(shell find OpenRA.Server/ -iname '*.cs')
-server_TARGET = OpenRA.Server.exe
-server_KIND = exe
-server_DEPS = $(game_TARGET)
-server_LIBS = $(COMMON_LIBS) $(server_DEPS)
-PROGRAMS += server
-server: $(server_TARGET)
-
-# Patches binary headers to work around a mono bug
-fixheader.exe: packaging/fixheader.cs
-	@command -v $(CSC) >/dev/null || (echo "Mono is not installed. Please install Mono from http://www.mono-project.com/download/ before building OpenRA."; exit 1)
-	@echo CSC fixheader.exe
-	@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)
-
-# Generate build rules for each target defined above in PROGRAMS
-define BUILD_ASSEMBLY
-
-$$($(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
-
-$(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
-
-
-
 ########################## MAKE/INSTALL RULES ##########################
 #
-default: core
+all: dependencies core
 
-core: dependencies game platforms mods utility server
-
-mods: mod_common mod_cnc mod_d2k
-
-all: dependencies core stylecheck
+core:
+	@command -v $(MSBUILD) >/dev/null || (echo "OpenRA requires the '$(MSBUILD)' tool provided by Mono >= 5.4."; exit 1)
+ifeq ($(WIN32), $(filter $(WIN32),true yes y on 1))
+	@$(MSBUILD) -t:build -p:Configuration="Release-x86"
+else
+	@$(MSBUILD) -t:build -p:Configuration=Release
+endif
 
 clean:
-	@-$(RM_F) *.exe *.dll *.dylib *.dll.config ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources
+	@ $(MSBUILD) -t:clean
+	@-$(RM_F) *.config
+	@-$(RM_F) *.exe *.dll *.dylib ./OpenRA*/*.dll *.pdb mods/**/*.dll mods/**/*.pdb *.resources
 	@-$(RM_RF) ./*/bin ./*/obj
 	@-$(RM_RF) ./thirdparty/download
 
@@ -302,6 +171,7 @@ cli-dependencies:
 	@./thirdparty/fetch-thirdparty-deps.sh
 	@ $(CP_R) thirdparty/download/*.dll .
 	@ $(CP_R) thirdparty/download/*.dll.config .
+	@ test -f OpenRA.Game/obj/project.assets.json || $(MSBUILD) -t:restore
 
 linux-dependencies: cli-dependencies geoip-dependencies linux-native-dependencies
 
@@ -309,7 +179,11 @@ linux-native-dependencies:
 	@./thirdparty/configure-native-deps.sh
 
 windows-dependencies: cli-dependencies geoip-dependencies
-	@./thirdparty/fetch-thirdparty-deps-windows.sh
+ifeq ($(WIN32), $(filter $(WIN32),true yes y on 1))
+	@./thirdparty/fetch-thirdparty-deps-windows.sh x86
+else
+	@./thirdparty/fetch-thirdparty-deps-windows.sh x64
+endif
 
 osx-dependencies: cli-dependencies geoip-dependencies
 	@./thirdparty/fetch-thirdparty-deps-osx.sh
@@ -332,18 +206,19 @@ version: VERSION mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mo
 		rm $${i}.tmp; \
 	done
 
-man-page: utility mods
-	@mono --debug OpenRA.Utility.exe all --man-page > openra.6
-
-install: default install-core
+install: dependencies core install-core
 
 install-linux-shortcuts: install-linux-scripts install-linux-icons install-linux-desktop
 
 install-engine:
 	@-echo "Installing OpenRA engine to $(DATA_INSTALL_DIR)"
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) $(foreach prog,$(CORE),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) OpenRA.Game.exe "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) OpenRA.Server.exe "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) OpenRA.Utility.exe "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) OpenRA.Platforms.Default.dll "$(DATA_INSTALL_DIR)"
 
+	@$(INSTALL_DATA) OpenRA.Platforms.Default.dll.config "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"
 	@$(INSTALL_DATA) VERSION "$(DATA_INSTALL_DIR)/VERSION"
 	@$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
@@ -356,19 +231,16 @@ install-engine:
 	@$(CP) Eluant* "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) FuzzyLogicLibrary.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) SharpFont.dll "$(DATA_INSTALL_DIR)"
-	@$(CP) SharpFont.dll.config "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) Open.Nat.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) MaxMind.Db.dll "$(DATA_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) SmarIrc4net.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) rix0rrr.BeaconLib.dll "$(DATA_INSTALL_DIR)"
 
 install-common-mod-files:
 	@-echo "Installing OpenRA common mod files to $(DATA_INSTALL_DIR)"
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)/mods"
 	@$(CP_R) mods/common "$(DATA_INSTALL_DIR)/mods/"
-	@$(INSTALL_PROGRAM) $(mod_common_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
-	@$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/common"
+	@$(INSTALL_PROGRAM) mods/common/OpenRA.Mods.Common.dll "$(DATA_INSTALL_DIR)/mods/common"
+	@$(INSTALL_PROGRAM) mods/common/OpenRA.Mods.Cnc.dll "$(DATA_INSTALL_DIR)/mods/common"
 	@$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
 
 install-default-mods:
@@ -377,48 +249,57 @@ install-default-mods:
 	@$(CP_R) mods/cnc "$(DATA_INSTALL_DIR)/mods/"
 	@$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/"
 	@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
-	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k"
+	@$(INSTALL_PROGRAM) mods/d2k/OpenRA.Mods.D2k.dll "$(DATA_INSTALL_DIR)/mods/d2k"
 	@$(CP_R) mods/modcontent "$(DATA_INSTALL_DIR)/mods/"
 
 install-core: install-engine install-common-mod-files install-default-mods
 	@$(CP) *.sh "$(DATA_INSTALL_DIR)"
 
 install-linux-icons:
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
-	@$(CP_R) packaging/linux/hicolor "$(DESTDIR)$(datadir)/icons/"
+	for SIZE in 16x16 32x32 48x48 64x64 128x128; do \
+		$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps"; \
+		$(INSTALL_DATA) packaging/linux/icons/ra_$$SIZE.png "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-ra.png"; \
+		$(INSTALL_DATA) packaging/linux/icons/cnc_$$SIZE.png "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-cnc.png"; \
+		$(INSTALL_DATA) packaging/linux/icons/d2k_$$SIZE.png "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-d2k.png"; \
+	done
+	$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps"
+	$(INSTALL_DATA) packaging/linux/icons/ra_scalable.svg "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-ra.svg"
+	$(INSTALL_DATA) packaging/linux/icons/cnc_scalable.svg "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-cnc.svg"
 
 install-linux-desktop:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MOD}/ra/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra.desktop
+	@sed 's/{MODID}/ra/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Red Alert/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-ra.desktop
 	@$(INSTALL_DATA) packaging/linux/openra-ra.desktop "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MOD}/cnc/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc.desktop
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Tiberian Dawn/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-cnc.desktop
 	@$(INSTALL_DATA) packaging/linux/openra-cnc.desktop "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MOD}/d2k/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k.desktop
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Dune 2000/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-d2k.desktop
 	@$(INSTALL_DATA) packaging/linux/openra-d2k.desktop "$(DESTDIR)$(datadir)/applications"
 	@-$(RM) packaging/linux/openra-ra.desktop packaging/linux/openra-cnc.desktop packaging/linux/openra-d2k.desktop
 
 install-linux-mime:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mime/packages/"
-
-	@sed 's/{MOD}/ra/g' packaging/linux/openra-mimeinfo.xml.in | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-mimeinfo.xml
-	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
-
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MOD}/ra/g' packaging/linux/openra-join-servers.desktop.in | sed 's/{MODNAME}/Red Alert/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-ra-join-servers.desktop
-	@$(INSTALL_DATA) packaging/linux/openra-ra-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MOD}/cnc/g' packaging/linux/openra-join-servers.desktop.in | sed 's/{MODNAME}/Tiberian Dawn/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-cnc-join-servers.desktop
-	@$(INSTALL_DATA) packaging/linux/openra-cnc-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
-	@sed 's/{MOD}/d2k/g' packaging/linux/openra-join-servers.desktop.in | sed 's/{MODNAME}/Dune 2000/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-d2k-join-servers.desktop
-	@$(INSTALL_DATA) packaging/linux/openra-d2k-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
-	@-$(RM) packaging/linux/openra-mimeinfo.xml packaging/linux/openra-ra-join-servers.desktop packaging/linux/openra-cnc-join-servers.desktop packaging/linux/openra-d2k-join-servers.desktop
+	@sed 's/{MODID}/ra/g' packaging/linux/openra-mimeinfo.xml.in | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-mimeinfo.xml
+	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra-ra.xml"
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra-mimeinfo.xml.in | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-mimeinfo.xml
+	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra-cnc.xml"
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra-mimeinfo.xml.in | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-mimeinfo.xml
+	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra-d2k.xml"
 
 install-linux-appdata:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/appdata/"
-	@$(INSTALL_DATA) packaging/linux/openra.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+	@sed 's/{MODID}/ra/g' packaging/linux/openra.appdata.xml.in | sed 's/{MOD_NAME}/Red Alert/g' | sed 's/{SCREENSHOT_RA}/ type="default"/g' | sed 's/{SCREENSHOT_CNC}//g' | sed 's/{SCREENSHOT_D2K}//g'> packaging/linux/openra-ra.appdata.xml
+	@$(INSTALL_DATA) packaging/linux/openra-ra.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra.appdata.xml.in | sed 's/{MOD_NAME}/Tiberian Dawn/g' | sed 's/{SCREENSHOT_RA}//g' | sed 's/{SCREENSHOT_CNC}/ type="default"/g' | sed 's/{SCREENSHOT_D2K}//g'> packaging/linux/openra-cnc.appdata.xml
+	@$(INSTALL_DATA) packaging/linux/openra-cnc.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra.appdata.xml.in | sed 's/{MOD_NAME}/Dune 2000/g' | sed 's/{SCREENSHOT_RA}//g' | sed 's/{SCREENSHOT_CNC}//g' | sed 's/{SCREENSHOT_D2K}/ type="default"/g'> packaging/linux/openra-d2k.appdata.xml
+	@$(INSTALL_DATA) packaging/linux/openra-d2k.appdata.xml "$(DESTDIR)$(datadir)/appdata/"
+	@-$(RM) packaging/linux/openra-ra.appdata.xml packaging/linux/openra-cnc.appdata.xml packaging/linux/openra-d2k.appdata.xml
 
-install-man-page: man-page
+install-man-page:
 	@$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man6/"
+	@mono --debug OpenRA.Utility.exe all --man-page > openra.6
 	@$(INSTALL_DATA) openra.6 "$(DESTDIR)$(mandir)/man6/"
+	@-$(RM) openra.6
 
 install-linux-scripts:
 ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
@@ -429,9 +310,9 @@ else
 	@sed 's/{DEBUG}/--debug/' packaging/linux/openra-server.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra-server.debug.in
 endif
 
-	@sed 's/{MOD}/ra/g' packaging/linux/openra.debug.in | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra
-	@sed 's/{MOD}/cnc/g' packaging/linux/openra.debug.in | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc
-	@sed 's/{MOD}/d2k/g' packaging/linux/openra.debug.in | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k
+	@sed 's/{MODID}/ra/g' packaging/linux/openra.debug.in  | sed 's/{TAG}/$(VERSION)/g' | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra.debug.in | sed 's/{TAG}/$(VERSION)/g' | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra.debug.in | sed 's/{TAG}/$(VERSION)/g' | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k
 
 	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-ra "$(BIN_INSTALL_DIR)"
@@ -439,9 +320,9 @@ endif
 	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-d2k "$(BIN_INSTALL_DIR)"
 	@-$(RM) packaging/linux/openra-ra packaging/linux/openra-cnc packaging/linux/openra-d2k packaging/linux/openra.debug.in
 
-	@sed 's/{MOD}/ra/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra-server
-	@sed 's/{MOD}/cnc/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc-server
-	@sed 's/{MOD}/d2k/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k-server
+	@sed 's/{MODID}/ra/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra-server
+	@sed 's/{MODID}/cnc/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc-server
+	@sed 's/{MODID}/d2k/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k-server
 
 	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-ra-server "$(BIN_INSTALL_DIR)"
@@ -460,26 +341,19 @@ uninstall:
 	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-ra.desktop"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-cnc.desktop"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-d2k.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-ra-join-servers.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-cnc-join-servers.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-d2k-join-servers.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra-ra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra-cnc.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra-d2k.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra.appdata.xml"
+	@-for SIZE in 16x16 32x32 48x48 64x64 128x128; do \
+		$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-ra.png"; \
+		$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-cnc.png"; \
+		$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps/openra-d2k.png"; \
+	done
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-ra.svg"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/openra-cnc.svg"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra-ra.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra-cnc.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra-d2k.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra-ra.appdata.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra-cnc.appdata.xml"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra-d2k.appdata.xml"
 	@-$(RM_F) "$(DESTDIR)$(mandir)/man6/openra.6"
 
 help:
@@ -495,9 +369,6 @@ help:
 	@echo 'to check the official mods for erroneous yaml files, run:'
 	@echo '  make test'
 	@echo
-	@echo 'to generate documentation aimed at modders, run:'
-	@echo '  make docs'
-	@echo
 	@echo 'to install, run:'
 	@echo '  make [prefix=/foo] [bindir=/bar/bin] install'
 	@echo
@@ -510,13 +381,10 @@ help:
 	@echo 'to start the game, run:'
 	@echo '  openra'
 
-
-
-
 ########################### MAKEFILE SETTINGS ##########################
 #
-.DEFAULT_GOAL := default
+.DEFAULT_GOAL := all
 
 .SUFFIXES:
 
-.PHONY: core package all mods clean distclean dependencies version $(PROGRAMS) nunit
+.PHONY: check-scripts check nunit test all core clean distclean cli-dependencies linux-dependencies linux-native-dependencies windows-dependencies osx-dependencies geoip-dependencies dependencies all-dependencies version install install-linux-shortcuts install-engine install-common-mod-files install-default-mods install-core install-linux-icons install-linux-desktop install-linux-mime install-linux-appdata install-man-page install-linux-scripts uninstall help

OpenRA.Game/Activities/Activity.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -12,159 +12,61 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Graphics;
+using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA.Activities
 {
-	public enum ActivityState { Queued, Active, Done, Canceled }
+	public enum ActivityState { Queued, Active, Canceling, Done }
+
+	public class TargetLineNode
+	{
+		public readonly Target Target;
+		public readonly Color Color;
+		public readonly Sprite Tile;
+
+		public TargetLineNode(Target target, Color color, Sprite tile = null)
+		{
+			// Note: Not all activities are drawable. In that case, pass Target.Invalid as target,
+			// if "yield break" in TargetLineNode(Actor self) is not feasible.
+			Target = target;
+			Color = color;
+			Tile = tile;
+		}
+	}
 
 	/*
-	 * Activities are actions carried out by actors during each tick.
-	 *
-	 * Activities exist in a graph data structure built up amongst themselves. Each activity has a parent activity,
-	 * optionally child activities, and usually a next activity. An actor's CurrentActivity is a pointer into that graph
-	 * and moves through it as activities run.
-	 *
-	 * There are two kinds of activities, the base activity and composite activities. They differ in the way their children
-	 * are run: while a base activity is responsible for running its children itself, a composite activity relies on the actor's
-	 * activity-running code. Therefore, the actor's CurrentActivity stays on the base activity while it runs its children. With
-	 * composite activities however, the CurrentActivity moves through the list of children as they run.
-	 *
-	 *
 	 * Things to be aware of when writing activities:
 	 *
-	 * - Use "return NextActivity" at least once somewhere in the tick method.
-	 * - Do not use "return new SomeActivity()" as that will break the graph. Queue the new activity and use "return NextActivity" instead.
-	 * - Do not "reuse" (with "SequenceActivities", for example) activity objects that have already finished running.
+	 * - Use "return true" at least once somewhere in the tick method.
+	 * - Do not "reuse" (with "SequenceActivities", for example) activity objects that have already started running.
 	 *   Queue a new instance instead.
 	 * - Avoid calling actor.CancelActivity(). It is almost always a bug. Call activity.Cancel() instead.
-	 * - A composite activity will run at least twice. The first time when it returns its children,
-	 *   the second time when its last child returns its Parent.
-	 * - Do not return the Parent explicitly unless you have an extremly good reason. "return NextActivity"
-	 *   will do the right thing in all circumstances.
-	 * - You do not need to care about the ChildActivity pointer advancing through the list of children,
-	 *   the activity code already takes care of that.
-	 * - If you want to check whether there are any follow-up activities queued, check against "NextInQueue"
-	 *   in favour of "NextActivity" to avoid checking against the Parent activity.
-	 *
-	 *
-	 * Guide when to use which kind of activity:
-	 *
-	 * - The activity does not have any children -> base activity
-	 * - The activity needs to run preparatory steps during each tick before its children can be run -> base activity
-	 * - The activity or the actor is left in a bogus state when one of the child activities is canceled -> base activity
-	 * - The activity's children are self-contained and can run independently of the parent -> composite activity
-	 * - The activity does not have any or little logic of its own, but is just composed of sub-steps -> composite activity
-	*/
-	public abstract class Activity
+	 */
+	public abstract class Activity : IActivityInterface
 	{
 		public ActivityState State { get; private set; }
 
-		/// <summary>
-		/// Returns the top-most activity *from the point of view of the calling activity*. Note that the root activity
-		/// can and likely will have next activities of its own, which would in turn be the root for their children.
-		/// </summary>
-		public Activity RootActivity
-		{
-			get
-			{
-				var p = this;
-				while (p.ParentActivity != null)
-					p = p.ParentActivity;
+		protected Activity ChildActivity { get; private set; }
+		public Activity NextActivity { get; private set; }
 
-				return p;
-			}
-		}
-
-		Activity parentActivity;
-		public Activity ParentActivity
-		{
-			get
-			{
-				return parentActivity;
-			}
-
-			protected set
-			{
-				parentActivity = value;
-
-				var next = NextInQueue;
-				if (next != null)
-					next.ParentActivity = parentActivity;
-			}
-		}
-
-		Activity childActivity;
-		protected Activity ChildActivity
-		{
-			get
-			{
-				return childActivity != null && childActivity.State < ActivityState.Done ? childActivity : null;
-			}
-
-			set
-			{
-				if (value == this || value == ParentActivity || value == NextInQueue)
-					childActivity = null;
-				else
-				{
-					childActivity = value;
-
-					if (childActivity != null)
-						childActivity.ParentActivity = this;
-				}
-			}
-		}
-
-		Activity nextActivity;
-
-		/// <summary>
-		/// The getter will return either the next activity or, if there is none, the parent one.
-		/// </summary>
-		public virtual Activity NextActivity
-		{
-			get
-			{
-				return nextActivity != null ? nextActivity : ParentActivity;
-			}
-
-			set
-			{
-				if (value == this || value == ParentActivity || (value != null && value.ParentActivity == this))
-					nextActivity = null;
-				else
-				{
-					nextActivity = value;
-
-					if (nextActivity != null)
-						nextActivity.ParentActivity = ParentActivity;
-				}
-			}
-		}
-
-		/// <summary>
-		/// The getter will return the next activity on the same level _only_, in contrast to NextActivity.
-		/// Use this to check whether there are any follow-up activities queued.
-		/// </summary>
-		public Activity NextInQueue
-		{
-			get { return nextActivity; }
-			set { NextActivity = value; }
-		}
-
-		public bool IsIdle { get; protected set; }
 		public bool IsInterruptible { get; protected set; }
-		public bool IsCanceled { get { return State == ActivityState.Canceled; } }
+		public bool ChildHasPriority { get; protected set; }
+		public bool IsCanceling { get { return State == ActivityState.Canceling; } }
+		bool finishing;
+		bool lastRun;
 
 		public Activity()
 		{
 			IsInterruptible = true;
+			ChildHasPriority = true;
 		}
 
 		public Activity TickOuter(Actor self)
 		{
-			if (State == ActivityState.Done && Game.Settings.Debug.StrictActivityChecking)
-				throw new InvalidOperationException("Actor {0} attempted to tick activity {1} after it had already completed.".F(self, this.GetType()));
+			if (State == ActivityState.Done)
+				throw new InvalidOperationException("Actor {0} attempted to tick activity {1} after it had already completed.".F(self, GetType()));
 
 			if (State == ActivityState.Queued)
 			{
@@ -172,24 +74,61 @@ namespace OpenRA.Activities
 				State = ActivityState.Active;
 			}
 
-			var ret = Tick(self);
-			if (ret == null || (ret != this && ret.ParentActivity != this))
+			// Only run the parent tick when the child is done.
+			// We must always let the child finish on its own before continuing.
+			if (ChildHasPriority)
 			{
-				// Make sure that the Parent's ChildActivity pointer is moved forwards as the child queue advances.
-				// The Child's ParentActivity will be set automatically during assignment.
-				if (ParentActivity != null && ParentActivity != ret)
-					ParentActivity.ChildActivity = ret;
-
-				if (State != ActivityState.Canceled)
-					State = ActivityState.Done;
-
-				OnLastRun(self);
+				lastRun = TickChild(self) && (finishing || Tick(self));
+				finishing |= lastRun;
 			}
 
-			return ret;
+			// The parent determines whether the child gets a chance at ticking.
+			else
+				lastRun = Tick(self);
+
+			// Avoid a single tick delay if the childactivity was just queued.
+			if (ChildActivity != null && ChildActivity.State == ActivityState.Queued)
+			{
+				if (ChildHasPriority)
+					lastRun = TickChild(self) && finishing;
+				else
+					TickChild(self);
+			}
+
+			if (lastRun)
+			{
+				State = ActivityState.Done;
+				OnLastRun(self);
+				return NextActivity;
+			}
+
+			return this;
 		}
 
-		public abstract Activity Tick(Actor self);
+		protected bool TickChild(Actor self)
+		{
+			ChildActivity = ActivityUtils.RunActivity(self, ChildActivity);
+			return ChildActivity == null;
+		}
+
+		/// <summary>
+		/// Called every tick to run activity logic. Returns false if the activity should
+		/// remain active, or true if it is complete. Cancelled activities must ensure they
+		/// return the actor to a consistent state before returning true.
+		///
+		/// Child activities can be queued using QueueChild, and these will be ticked
+		/// instead of the parent while they are active. Activities that need to run logic
+		/// in parallel with child activities should set ChildHasPriority to false and
+		/// manually call TickChildren.
+		///
+		/// Queuing one or more child activities and returning true is valid, and causes
+		/// the activity to be completed immediately (without ticking again) once the
+		/// children have completed.
+		/// </summary>
+		public virtual bool Tick(Actor self)
+		{
+			return true;
+		}
 
 		/// <summary>
 		/// Runs once immediately before the first Tick() execution.
@@ -201,32 +140,47 @@ namespace OpenRA.Activities
 		/// </summary>
 		protected virtual void OnLastRun(Actor self) { }
 
-		public virtual bool Cancel(Actor self, bool keepQueue = false)
+		/// <summary>
+		/// Runs once on Actor.Dispose() (through OnActorDisposeOuter) and can be used to perform activity clean-up on actor death/disposal,
+		/// for example by force-triggering OnLastRun (which would otherwise be skipped).
+		/// </summary>
+		protected virtual void OnActorDispose(Actor self) { }
+
+		/// <summary>
+		/// Runs once on Actor.Dispose().
+		/// Main purpose is to ensure ChildActivity.OnActorDispose runs as well (which isn't otherwise accessible due to protection level).
+		/// </summary>
+		internal void OnActorDisposeOuter(Actor self)
 		{
-			if (!IsInterruptible)
-				return false;
+			if (ChildActivity != null)
+				ChildActivity.OnActorDisposeOuter(self);
 
-			if (ChildActivity != null && !ChildActivity.Cancel(self))
-				return false;
+			OnActorDispose(self);
+		}
 
+		public virtual void Cancel(Actor self, bool keepQueue = false)
+		{
 			if (!keepQueue)
 				NextActivity = null;
 
-			ChildActivity = null;
-			State = ActivityState.Canceled;
+			if (!IsInterruptible)
+				return;
 
-			return true;
+			if (ChildActivity != null)
+				ChildActivity.Cancel(self);
+
+			State = ActivityState.Canceling;
 		}
 
-		public virtual void Queue(Activity activity)
+		public void Queue(Activity activity)
 		{
-			if (NextInQueue != null)
-				NextInQueue.Queue(activity);
+			if (NextActivity != null)
+				NextActivity.Queue(activity);
 			else
-				NextInQueue = activity;
+				NextActivity = activity;
 		}
 
-		public virtual void QueueChild(Activity activity)
+		public void QueueChild(Activity activity)
 		{
 			if (ChildActivity != null)
 				ChildActivity.Queue(activity);
@@ -235,30 +189,31 @@ namespace OpenRA.Activities
 		}
 
 		/// <summary>
-		/// Prints the activity tree, starting from the root or optionally from a given origin.
+		/// Prints the activity tree, starting from the top or optionally from a given origin.
 		///
 		/// Call this method from any place that's called during a tick, such as the Tick() method itself or
 		/// the Before(First|Last)Run() methods. The origin activity will be marked in the output.
 		/// </summary>
-		/// <param name="origin">Activity from which to start traversing, and which to mark. If null, mark the calling activity, and start traversal from the root.</param>
+		/// <param name="self">The actor performing this activity.</param>
+		/// <param name="origin">Activity from which to start traversing, and which to mark. If null, mark the calling activity, and start traversal from the top.</param>
 		/// <param name="level">Initial level of indentation.</param>
-		protected void PrintActivityTree(Activity origin = null, int level = 0)
+		protected void PrintActivityTree(Actor self, Activity origin = null, int level = 0)
 		{
 			if (origin == null)
-				RootActivity.PrintActivityTree(this);
+				self.CurrentActivity.PrintActivityTree(self, this);
 			else
 			{
 				Console.Write(new string(' ', level * 2));
 				if (origin == this)
 					Console.Write("*");
 
-				Console.WriteLine(this.GetType().ToString().Split('.').Last());
+				Console.WriteLine(GetType().ToString().Split('.').Last());
 
 				if (ChildActivity != null)
-					ChildActivity.PrintActivityTree(origin, level + 1);
+					ChildActivity.PrintActivityTree(self, origin, level + 1);
 
-				if (NextInQueue != null)
-					NextInQueue.PrintActivityTree(origin, level);
+				if (NextActivity != null)
+					NextActivity.PrintActivityTree(self, origin, level);
 			}
 		}
 
@@ -266,39 +221,34 @@ namespace OpenRA.Activities
 		{
 			yield break;
 		}
-	}
 
-	/// <summary>
-	/// In contrast to the base activity class, which is responsible for running its children itself,
-	/// composite activities rely on the actor's activity-running logic for their children.
-	/// </summary>
-	public abstract class CompositeActivity : Activity
-	{
-		/// <summary>
-		/// The getter will return the first non-null value of either child, next or parent activity, in that order, or ultimately null.
-		/// </summary>
-		public override Activity NextActivity
+		public virtual IEnumerable<TargetLineNode> TargetLineNodes(Actor self)
 		{
-			get
+			yield break;
+		}
+
+		public IEnumerable<string> DebugLabelComponents()
+		{
+			var act = this;
+			while (act != null)
 			{
-				if (ChildActivity != null)
-					return ChildActivity;
-				else if (NextInQueue != null)
-					return NextInQueue;
-				else
-					return ParentActivity;
+				yield return act.GetType().Name;
+				act = act.ChildActivity;
 			}
 		}
-	}
 
-	public static class ActivityExts
-	{
-		public static IEnumerable<Target> GetTargetQueue(this Actor self)
+		public IEnumerable<T> ActivitiesImplementing<T>(bool includeChildren = true) where T : IActivityInterface
 		{
-			return self.CurrentActivity
-				.Iterate(u => u.NextActivity)
-				.TakeWhile(u => u != null)
-				.SelectMany(u => u.GetTargets(self));
+			if (includeChildren && ChildActivity != null)
+				foreach (var a in ChildActivity.ActivitiesImplementing<T>())
+					yield return a;
+
+			if (this is T)
+				yield return (T)(object)this;
+
+			if (NextActivity != null)
+				foreach (var a in NextActivity.ActivitiesImplementing<T>())
+					yield return a;
 		}
 	}
 }

OpenRA.Game/Activities/CallFunc.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -24,10 +24,10 @@ namespace OpenRA.Activities
 
 		Action a;
 
-		public override Activity Tick(Actor self)
+		public override bool Tick(Actor self)
 		{
 			if (a != null) a();
-			return NextActivity;
+			return true;
 		}
 	}
 }

OpenRA.Game/Actor.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,7 +11,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using Eluant;
 using Eluant.ObjectBinding;
@@ -28,8 +27,9 @@ namespace OpenRA
 		internal struct SyncHash
 		{
 			public readonly ISync Trait;
-			public readonly int Hash;
-			public SyncHash(ISync trait, int hash) { Trait = trait; Hash = hash; }
+			readonly Func<object, int> hashFunction;
+			public SyncHash(ISync trait) { Trait = trait; hashFunction = Sync.GetHashFunction(trait); }
+			public int Hash() { return hashFunction(Trait); }
 		}
 
 		public readonly ActorInfo Info;
@@ -41,19 +41,19 @@ namespace OpenRA
 		public Player Owner { get; internal set; }
 
 		public bool IsInWorld { get; internal set; }
+		public bool WillDispose { get; private set; }
 		public bool Disposed { get; private set; }
 
 		public Activity CurrentActivity { get; private set; }
 
 		public int Generation;
+		public Actor ReplacedByActor;
 
-		public Rectangle Bounds { get; private set; }
-		public Rectangle VisualBounds { get; private set; }
 		public IEffectiveOwner EffectiveOwner { get; private set; }
 		public IOccupySpace OccupiesSpace { get; private set; }
 		public ITargetable[] Targetables { get; private set; }
 
-		public bool IsIdle { get { return CurrentActivity == null || CurrentActivity.IsIdle; } }
+		public bool IsIdle { get { return CurrentActivity == null; } }
 		public bool IsDead { get { return Disposed || (health != null && health.IsDead); } }
 
 		public CPos Location { get { return OccupiesSpace.TopLeft; } }
@@ -69,15 +69,19 @@ namespace OpenRA
 			}
 		}
 
-		internal IEnumerable<SyncHash> SyncHashes { get; private set; }
+		internal SyncHash[] SyncHashes { get; private set; }
 
 		readonly IFacing facing;
 		readonly IHealth health;
 		readonly IRenderModifier[] renderModifiers;
 		readonly IRender[] renders;
-		readonly IDisable[] disables;
+		readonly IMouseBounds[] mouseBounds;
 		readonly IVisibilityModifier[] visibilityModifiers;
 		readonly IDefaultVisibility defaultVisibility;
+		readonly INotifyBecomingIdle[] becomingIdles;
+		readonly INotifyIdle[] tickIdles;
+		readonly ITargetablePositions[] targetablePositions;
+		WPos[] staticTargetablePositions;
 
 		internal Actor(World world, string name, TypeDictionary initDict)
 		{
@@ -110,51 +114,28 @@ namespace OpenRA
 			// PERF: Cache all these traits as soon as the actor is created. This is a fairly cheap one-off cost per
 			// actor that allows us to provide some fast implementations of commonly used methods that are relied on by
 			// performance-sensitive parts of the core game engine, such as pathfinding, visibility and rendering.
-			Bounds = DetermineBounds();
-			VisualBounds = DetermineVisualBounds();
 			EffectiveOwner = TraitOrDefault<IEffectiveOwner>();
 			facing = TraitOrDefault<IFacing>();
 			health = TraitOrDefault<IHealth>();
 			renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
 			renders = TraitsImplementing<IRender>().ToArray();
-			disables = TraitsImplementing<IDisable>().ToArray();
+			mouseBounds = TraitsImplementing<IMouseBounds>().ToArray();
 			visibilityModifiers = TraitsImplementing<IVisibilityModifier>().ToArray();
 			defaultVisibility = Trait<IDefaultVisibility>();
+			becomingIdles = TraitsImplementing<INotifyBecomingIdle>().ToArray();
+			tickIdles = TraitsImplementing<INotifyIdle>().ToArray();
 			Targetables = TraitsImplementing<ITargetable>().ToArray();
+			targetablePositions = TraitsImplementing<ITargetablePositions>().ToArray();
+			world.AddFrameEndTask(w =>
+			{
+				// Caching this in a AddFrameEndTask, because trait construction order might cause problems if done directly at creation time.
+				// All actors that can move or teleport should have IPositionable, if not it's pretty safe to assume the actor is completely immobile and
+				// all targetable positions can be cached if all ITargetablePositions have no conditional requirements.
+				if (!Info.HasTraitInfo<IPositionableInfo>() && targetablePositions.Any() && targetablePositions.All(tp => tp.AlwaysEnabled))
+					staticTargetablePositions = targetablePositions.SelectMany(tp => tp.TargetablePositions(this)).ToArray();
+			});
 
-			SyncHashes =
-				TraitsImplementing<ISync>()
-				.Select(sync => Pair.New(sync, Sync.GetHashFunction(sync)))
-				.ToArray()
-				.Select(pair => new SyncHash(pair.First, pair.Second(pair.First)));
-		}
-
-		Rectangle DetermineBounds()
-		{
-			var si = Info.TraitInfoOrDefault<SelectableInfo>();
-			var size = (si != null && si.Bounds != null) ? new int2(si.Bounds[0], si.Bounds[1]) :
-				TraitsImplementing<IAutoSelectionSize>().Select(x => x.SelectionSize(this)).FirstOrDefault();
-
-			var offset = -size / 2;
-			if (si != null && si.Bounds != null && si.Bounds.Length > 2)
-				offset += new int2(si.Bounds[2], si.Bounds[3]);
-
-			return new Rectangle(offset.X, offset.Y, size.X, size.Y);
-		}
-
-		Rectangle DetermineVisualBounds()
-		{
-			var sd = Info.TraitInfoOrDefault<ISelectionDecorationsInfo>();
-			if (sd == null || sd.SelectionBoxBounds == null)
-				return Bounds;
-
-			var size = new int2(sd.SelectionBoxBounds[0], sd.SelectionBoxBounds[1]);
-
-			var offset = -size / 2;
-			if (sd.SelectionBoxBounds.Length > 2)
-				offset += new int2(sd.SelectionBoxBounds[2], sd.SelectionBoxBounds[3]);
-
-			return new Rectangle(offset.X, offset.Y, size.X, size.Y);
+			SyncHashes = TraitsImplementing<ISync>().Select(sync => new SyncHash(sync)).ToArray();
 		}
 
 		public void Tick()
@@ -163,8 +144,18 @@ namespace OpenRA
 			CurrentActivity = ActivityUtils.RunActivity(this, CurrentActivity);
 
 			if (!wasIdle && IsIdle)
-				foreach (var n in TraitsImplementing<INotifyBecomingIdle>())
+			{
+				foreach (var n in becomingIdles)
 					n.OnBecomingIdle(this);
+
+				// If IsIdle is true, it means the last CurrentActivity.Tick returned null.
+				// If a next activity has been queued via OnBecomingIdle, we need to start running it now,
+				// to avoid an 'empty' null tick where the actor will (visibly, if moving) do nothing.
+				CurrentActivity = ActivityUtils.RunActivity(this, CurrentActivity);
+			}
+			else if (wasIdle)
+				foreach (var tickIdle in tickIdles)
+					tickIdle.TickIdle(this);
 		}
 
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
@@ -190,6 +181,35 @@ namespace OpenRA
 					yield return renderable;
 		}
 
+		public IEnumerable<Rectangle> ScreenBounds(WorldRenderer wr)
+		{
+			var bounds = Bounds(wr);
+			foreach (var modifier in renderModifiers)
+				bounds = modifier.ModifyScreenBounds(this, wr, bounds);
+			return bounds;
+		}
+
+		IEnumerable<Rectangle> Bounds(WorldRenderer wr)
+		{
+			// PERF: Avoid LINQ. See comments for Renderables
+			foreach (var render in renders)
+				foreach (var r in render.ScreenBounds(this, wr))
+					if (!r.IsEmpty)
+						yield return r;
+		}
+
+		public Rectangle MouseBounds(WorldRenderer wr)
+		{
+			foreach (var mb in mouseBounds)
+			{
+				var bounds = mb.MouseoverBounds(this, wr);
+				if (!bounds.IsEmpty)
+					return bounds;
+			}
+
+			return Rectangle.Empty;
+		}
+
 		public void QueueActivity(bool queued, Activity nextActivity)
 		{
 			if (!queued)
@@ -202,15 +222,13 @@ namespace OpenRA
 			if (CurrentActivity == null)
 				CurrentActivity = nextActivity;
 			else
-				CurrentActivity.RootActivity.Queue(nextActivity);
+				CurrentActivity.Queue(nextActivity);
 		}
 
-		public bool CancelActivity()
+		public void CancelActivity()
 		{
 			if (CurrentActivity != null)
-				return CurrentActivity.RootActivity.Cancel(this);
-
-			return true;
+				CurrentActivity.Cancel(this);
 		}
 
 		public override int GetHashCode()
@@ -260,6 +278,14 @@ namespace OpenRA
 
 		public void Dispose()
 		{
+			// If CurrentActivity isn't null, run OnActorDisposeOuter in case some cleanups are needed.
+			// This should be done before the FrameEndTask to avoid dependency issues.
+			if (CurrentActivity != null)
+				CurrentActivity.OnActorDisposeOuter(this);
+
+			// Allow traits/activities to prevent a race condition when they depend on disposing the actor (e.g. Transforms)
+			WillDispose = true;
+
 			World.AddFrameEndTask(w =>
 			{
 				if (Disposed)
@@ -282,27 +308,36 @@ namespace OpenRA
 		// TODO: move elsewhere.
 		public void ChangeOwner(Player newOwner)
 		{
-			World.AddFrameEndTask(w =>
-			{
-				if (Disposed)
-					return;
+			World.AddFrameEndTask(_ => ChangeOwnerSync(newOwner));
+		}
 
-				var oldOwner = Owner;
-				var wasInWorld = IsInWorld;
+		/// <summary>
+		/// Change the actors owner without queuing a FrameEndTask.
+		/// This must only be called from inside an existing FrameEndTask.
+		/// </summary>
+		public void ChangeOwnerSync(Player newOwner)
+		{
+			if (Disposed)
+				return;
 
-				// momentarily remove from world so the ownership queries don't get confused
-				if (wasInWorld)
-					w.Remove(this);
+			var oldOwner = Owner;
+			var wasInWorld = IsInWorld;
 
-				Owner = newOwner;
-				Generation++;
+			// momentarily remove from world so the ownership queries don't get confused
+			if (wasInWorld)
+				World.Remove(this);
 
-				foreach (var t in TraitsImplementing<INotifyOwnerChanged>())
-					t.OnOwnerChanged(this, oldOwner, newOwner);
+			Owner = newOwner;
+			Generation++;
 
-				if (wasInWorld)
-					w.Add(this);
-			});
+			foreach (var t in TraitsImplementing<INotifyOwnerChanged>())
+				t.OnOwnerChanged(this, oldOwner, newOwner);
+
+			foreach (var t in World.WorldActor.TraitsImplementing<INotifyOwnerChanged>())
+				t.OnOwnerChanged(this, oldOwner, newOwner);
+
+			if (wasInWorld)
+				World.Add(this);
 		}
 
 		public DamageState GetDamageState()
@@ -321,21 +356,12 @@ namespace OpenRA
 			health.InflictDamage(this, attacker, damage, false);
 		}
 
-		public void Kill(Actor attacker)
+		public void Kill(Actor attacker, BitSet<DamageType> damageTypes = default(BitSet<DamageType>))
 		{
 			if (Disposed || health == null)
 				return;
 
-			health.Kill(this, attacker);
-		}
-
-		public bool IsDisabled()
-		{
-			// PERF: Avoid LINQ.
-			foreach (var disable in disables)
-				if (disable.Disabled)
-					return true;
-			return false;
+			health.Kill(this, attacker, damageTypes);
 		}
 
 		public bool CanBeViewedByPlayer(Player player)
@@ -348,21 +374,23 @@ namespace OpenRA
 			return defaultVisibility.IsVisible(this, player);
 		}
 
-		public IEnumerable<string> GetAllTargetTypes()
+		public BitSet<TargetableType> GetAllTargetTypes()
 		{
 			// PERF: Avoid LINQ.
+			var targetTypes = default(BitSet<TargetableType>);
 			foreach (var targetable in Targetables)
-				foreach (var targetType in targetable.TargetTypes)
-					yield return targetType;
+				targetTypes = targetTypes.Union(targetable.TargetTypes);
+			return targetTypes;
 		}
 
-		public IEnumerable<string> GetEnabledTargetTypes()
+		public BitSet<TargetableType> GetEnabledTargetTypes()
 		{
 			// PERF: Avoid LINQ.
+			var targetTypes = default(BitSet<TargetableType>);
 			foreach (var targetable in Targetables)
 				if (targetable.IsTraitEnabled())
-					foreach (var targetType in targetable.TargetTypes)
-						yield return targetType;
+					targetTypes = targetTypes.Union(targetable.TargetTypes);
+			return targetTypes;
 		}
 
 		public bool IsTargetableBy(Actor byActor)
@@ -375,6 +403,18 @@ namespace OpenRA
 			return false;
 		}
 
+		public IEnumerable<WPos> GetTargetablePositions()
+		{
+			if (staticTargetablePositions != null)
+				return staticTargetablePositions;
+
+			var enabledTargetablePositionTraits = targetablePositions.Where(Exts.IsTraitEnabled);
+			if (enabledTargetablePositionTraits.Any())
+				return enabledTargetablePositionTraits.SelectMany(tp => tp.TargetablePositions(this));
+
+			return new[] { CenterPosition };
+		}
+
 		#region Scripting interface
 
 		Lazy<ScriptActorInterface> luaInterface;

OpenRA.Game/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <runtime>
-    <loadFromRemoteSources enabled="true" />
-  </runtime>
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <runtime>
+    <loadFromRemoteSources enabled="true" />
+  </runtime>
 </configuration>

OpenRA.Game/CPos.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -18,11 +18,29 @@ namespace OpenRA
 {
 	public struct CPos : IScriptBindable, ILuaAdditionBinding, ILuaSubtractionBinding, ILuaEqualityBinding, ILuaTableBinding, IEquatable<CPos>
 	{
-		public readonly int X, Y;
-		public readonly byte Layer;
+		// Coordinates are packed in a 32 bit signed int
+		// X and Y are 12 bits (signed): -2048...2047
+		// Layer is an unsigned byte
+		// Packing is XXXX XXXX XXXX YYYY YYYY YYYY LLLL LLLL
+		public readonly int Bits;
+
+		// X is padded to MSB, so bit shift does the correct sign extension
+		public int X { get { return Bits >> 20; } }
+
+		// Align Y with a short, cast, then shift the rest of the way
+		// The signed short bit shift does the correct sign extension
+		public int Y { get { return ((short)(Bits >> 4)) >> 4; } }
+
+		public byte Layer { get { return (byte)Bits; } }
+
+		public CPos(int bits) { Bits = bits; }
+		public CPos(int x, int y)
+			: this(x, y, 0) { }
+		public CPos(int x, int y, byte layer)
+		{
+			Bits = (x & 0xFFF) << 20 | (y & 0xFFF) << 8 | layer;
+		}
 
-		public CPos(int x, int y) { X = x; Y = y; Layer = 0; }
-		public CPos(int x, int y, byte layer) { X = x; Y = y; Layer = layer; }
 		public static readonly CPos Zero = new CPos(0, 0, 0);
 
 		public static explicit operator CPos(int2 a) { return new CPos(a.X, a.Y); }
@@ -32,12 +50,12 @@ namespace OpenRA
 		public static CPos operator -(CPos a, CVec b) { return new CPos(a.X - b.X, a.Y - b.Y, a.Layer); }
 		public static CVec operator -(CPos a, CPos b) { return new CVec(a.X - b.X, a.Y - b.Y); }
 
-		public static bool operator ==(CPos me, CPos other) { return me.X == other.X && me.Y == other.Y && me.Layer == other.Layer; }
+		public static bool operator ==(CPos me, CPos other) { return me.Bits == other.Bits; }
 		public static bool operator !=(CPos me, CPos other) { return !(me == other); }
 
-		public override int GetHashCode() { return X.GetHashCode() ^ Y.GetHashCode() ^ Layer.GetHashCode(); }
+		public override int GetHashCode() { return Bits.GetHashCode(); }
 
-		public bool Equals(CPos other) { return X == other.X && Y == other.Y && Layer == other.Layer; }
+		public bool Equals(CPos other) { return Bits == other.Bits; }
 		public override bool Equals(object obj) { return obj is CPos && Equals((CPos)obj); }
 
 		public override string ToString() { return X + "," + Y; }
@@ -132,4 +150,4 @@ namespace OpenRA
 
 		#endregion
 	}
-}
+}

OpenRA.Game/CVec.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,9 +10,9 @@
 #endregion
 
 using System;
-using System.Drawing;
 using Eluant;
 using Eluant.ObjectBinding;
+using OpenRA.Primitives;
 using OpenRA.Scripting;
 
 namespace OpenRA

OpenRA.Game/CacheStorage.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -17,4 +17,4 @@ namespace OpenRA
 		void Store(string key, T data);
 		T Retrieve(string key);
 	}
-}
+}

OpenRA.Game/CryptoUtil.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -9,6 +9,7 @@
  */
 #endregion
 
+using System;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
@@ -18,6 +19,228 @@ namespace OpenRA
 {
 	public static class CryptoUtil
 	{
+		// Fixed byte pattern for the OID header
+		static readonly byte[] OIDHeader = { 0x30, 0xD, 0x6, 0x9, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0xD, 0x1, 0x1, 0x1, 0x5, 0x0 };
+
+		public static string PublicKeyFingerprint(RSAParameters parameters)
+		{
+			// Public key fingerprint is defined as the SHA1 of the modulus + exponent bytes
+			return SHA1Hash(parameters.Modulus.Append(parameters.Exponent).ToArray());
+		}
+
+		public static string EncodePEMPublicKey(RSAParameters parameters)
+		{
+			var data = Convert.ToBase64String(EncodePublicKey(parameters));
+			var output = new StringBuilder();
+			output.AppendLine("-----BEGIN PUBLIC KEY-----");
+			for (var i = 0; i < data.Length; i += 64)
+				output.AppendLine(data.Substring(i, Math.Min(64, data.Length - i)));
+			output.Append("-----END PUBLIC KEY-----");
+
+			return output.ToString();
+		}
+
+		public static RSAParameters DecodePEMPublicKey(string key)
+		{
+			try
+			{
+				// Reconstruct original key data
+				var lines = key.Split('\n');
+				var data = Convert.FromBase64String(lines.Skip(1).Take(lines.Length - 2).JoinWith(""));
+
+				// Pull the modulus and exponent bytes out of the ASN.1 tree
+				// Expect this to blow up if the key is not correctly formatted
+				using (var s = new MemoryStream(data))
+				{
+					// SEQUENCE
+					s.ReadByte();
+					ReadTLVLength(s);
+
+					// SEQUENCE -> fixed header junk
+					s.ReadByte();
+					var headerLength = ReadTLVLength(s);
+					s.Position += headerLength;
+
+					// SEQUENCE -> BIT_STRING
+					s.ReadByte();
+					ReadTLVLength(s);
+					s.ReadByte();
+
+					// SEQUENCE -> BIT_STRING -> SEQUENCE
+					s.ReadByte();
+					ReadTLVLength(s);
+
+					// SEQUENCE -> BIT_STRING -> SEQUENCE -> INTEGER (modulus)
+					s.ReadByte();
+					var modulusLength = ReadTLVLength(s);
+					s.ReadByte();
+					var modulus = s.ReadBytes(modulusLength - 1);
+
+					// SEQUENCE -> BIT_STRING -> SEQUENCE -> INTEGER (exponent)
+					s.ReadByte();
+					var exponentLength = ReadTLVLength(s);
+					s.ReadByte();
+					var exponent = s.ReadBytes(exponentLength - 1);
+
+					return new RSAParameters
+					{
+						Modulus = modulus,
+						Exponent = exponent
+					};
+				}
+			}
+			catch (Exception e)
+			{
+				throw new InvalidDataException("Invalid PEM public key", e);
+			}
+		}
+
+		static byte[] EncodePublicKey(RSAParameters parameters)
+		{
+			using (var stream = new MemoryStream())
+			{
+				var writer = new BinaryWriter(stream);
+
+				var modExpLength = TripletFullLength(parameters.Modulus.Length + 1) + TripletFullLength(parameters.Exponent.Length + 1);
+				var bitStringLength = TripletFullLength(modExpLength + 1);
+				var sequenceLength = TripletFullLength(bitStringLength + OIDHeader.Length);
+
+				// SEQUENCE
+				writer.Write((byte)0x30);
+				WriteTLVLength(writer, sequenceLength);
+
+				// SEQUENCE -> fixed header junk
+				writer.Write(OIDHeader);
+
+				// SEQUENCE -> BIT_STRING
+				writer.Write((byte)0x03);
+				WriteTLVLength(writer, bitStringLength);
+				writer.Write((byte)0x00);
+
+				// SEQUENCE -> BIT_STRING -> SEQUENCE
+				writer.Write((byte)0x30);
+				WriteTLVLength(writer, modExpLength);
+
+				// SEQUENCE -> BIT_STRING -> SEQUENCE -> INTEGER
+				// Modulus is padded with a zero to avoid issues with the sign bit
+				writer.Write((byte)0x02);
+				WriteTLVLength(writer, parameters.Modulus.Length + 1);
+				writer.Write((byte)0);
+				writer.Write(parameters.Modulus);
+
+				// SEQUENCE -> BIT_STRING -> SEQUENCE -> INTEGER
+				// Exponent is padded with a zero to avoid issues with the sign bit
+				writer.Write((byte)0x02);
+				WriteTLVLength(writer, parameters.Exponent.Length + 1);
+				writer.Write((byte)0);
+				writer.Write(parameters.Exponent);
+
+				return stream.ToArray();
+			}
+		}
+
+		static void WriteTLVLength(BinaryWriter writer, int length)
+		{
+			if (length < 0x80)
+			{
+				// Length < 128 is stored in a single byte
+				writer.Write((byte)length);
+			}
+			else
+			{
+				// If 128 <= length < 256**128 first byte encodes number of bytes required to hold the length
+				// High-bit is set as a flag to use this long-form encoding
+				var lengthBytes = BitConverter.GetBytes(length).Reverse().SkipWhile(b => b == 0).ToArray();
+				writer.Write((byte)(0x80 | lengthBytes.Length));
+				writer.Write(lengthBytes);
+			}
+		}
+
+		static int ReadTLVLength(Stream s)
+		{
+			var length = s.ReadByte();
+			if (length < 0x80)
+				return length;
+
+			var data = new byte[4];
+			s.ReadBytes(data, 0, Math.Min(length & 0x7F, 4));
+			return BitConverter.ToInt32(data.ToArray(), 0);
+		}
+
+		static int TripletFullLength(int dataLength)
+		{
+			if (dataLength < 0x80)
+				return 2 + dataLength;
+
+			return 2 + dataLength + BitConverter.GetBytes(dataLength).Reverse().SkipWhile(b => b == 0).Count();
+		}
+
+		public static string DecryptString(RSAParameters parameters, string data)
+		{
+			try
+			{
+				using (var rsa = new RSACryptoServiceProvider())
+				{
+					rsa.ImportParameters(parameters);
+					return Encoding.UTF8.GetString(rsa.Decrypt(Convert.FromBase64String(data), false));
+				}
+			}
+			catch (Exception e)
+			{
+				Log.Write("debug", "Failed to decrypt string with exception: {0}", e);
+				Console.WriteLine("String decryption failed: {0}", e);
+				return null;
+			}
+		}
+
+		public static string Sign(RSAParameters parameters, string data)
+		{
+			return Sign(parameters, Encoding.UTF8.GetBytes(data));
+		}
+
+		public static string Sign(RSAParameters parameters, byte[] data)
+		{
+			try
+			{
+				using (var rsa = new RSACryptoServiceProvider())
+				{
+					rsa.ImportParameters(parameters);
+					using (var csp = SHA1.Create())
+						return Convert.ToBase64String(rsa.SignHash(csp.ComputeHash(data), CryptoConfig.MapNameToOID("SHA1")));
+				}
+			}
+			catch (Exception e)
+			{
+				Log.Write("debug", "Failed to sign string with exception: {0}", e);
+				Console.WriteLine("String signing failed: {0}", e);
+				return null;
+			}
+		}
+
+		public static bool VerifySignature(RSAParameters parameters, string data, string signature)
+		{
+			return VerifySignature(parameters, Encoding.UTF8.GetBytes(data), signature);
+		}
+
+		public static bool VerifySignature(RSAParameters parameters, byte[] data, string signature)
+		{
+			try
+			{
+				using (var rsa = new RSACryptoServiceProvider())
+				{
+					rsa.ImportParameters(parameters);
+					using (var csp = SHA1.Create())
+						return rsa.VerifyHash(csp.ComputeHash(data), CryptoConfig.MapNameToOID("SHA1"), Convert.FromBase64String(signature));
+				}
+			}
+			catch (Exception e)
+			{
+				Log.Write("debug", "Failed to verify signature with exception: {0}", e);
+				Console.WriteLine("Signature validation failed: {0}", e);
+				return false;
+			}
+		}
+
 		public static string SHA1Hash(Stream data)
 		{
 			using (var csp = SHA1.Create())

OpenRA.Game/Download.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -43,8 +43,19 @@ namespace OpenRA
 			}
 		}
 
+		void EnableTLS12OnWindows()
+		{
+			// Enable TLS 1.2 on Windows: .NET 4.7 on Windows 10 only supports obsolete protocols by default
+			// SecurityProtocolType.Tls12 is not defined in the .NET 4.5 reference dlls used by mono,
+			// so we must use the enum's constant value directly
+			if (Platform.CurrentPlatform == PlatformType.Windows)
+				ServicePointManager.SecurityProtocol |= (SecurityProtocolType)3072;
+		}
+
 		public Download(string url, string path, Action<DownloadProgressChangedEventArgs> onProgress, Action<AsyncCompletedEventArgs> onComplete)
 		{
+			EnableTLS12OnWindows();
+
 			lock (syncObject)
 			{
 				wc = new WebClient { Proxy = null };
@@ -56,6 +67,8 @@ namespace OpenRA
 
 		public Download(string url, Action<DownloadProgressChangedEventArgs> onProgress, Action<DownloadDataCompletedEventArgs> onComplete)
 		{
+			EnableTLS12OnWindows();
+
 			lock (syncObject)
 			{
 				wc = new WebClient { Proxy = null };

OpenRA.Game/Effects/AsyncAction.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of

OpenRA.Game/Effects/DelayedAction.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of

OpenRA.Game/Effects/DelayedImpact.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -9,7 +9,6 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Traits;
@@ -43,4 +42,4 @@ namespace OpenRA.Effects
 
 		public IEnumerable<IRenderable> Render(WorldRenderer wr) { yield break; }
 	}
-}
+}

OpenRA.Game/Effects/IEffect.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -20,5 +20,8 @@ namespace OpenRA.Effects
 		IEnumerable<IRenderable> Render(WorldRenderer r);
 	}
 
+	// Identifier interface for effects that are added to ScreenMap
+	public interface ISpatiallyPartitionable { }
+
 	public interface IEffectAboveShroud { IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr); }
 }

OpenRA.Game/ExternalMods.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -12,9 +12,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
+using OpenRA.FileFormats;
 using OpenRA.Graphics;
 
 namespace OpenRA
@@ -70,20 +70,19 @@ namespace OpenRA
 			}
 		}
 
-		void LoadMod(MiniYaml yaml, string path = null)
+		void LoadMod(MiniYaml yaml, string path = null, bool forceRegistration = false)
 		{
 			var mod = FieldLoader.Load<ExternalMod>(yaml);
 			var iconNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Icon");
 			if (iconNode != null && !string.IsNullOrEmpty(iconNode.Value.Value))
 			{
 				using (var stream = new MemoryStream(Convert.FromBase64String(iconNode.Value.Value)))
-				using (var bitmap = new Bitmap(stream))
-					mod.Icon = sheetBuilder.Add(bitmap);
+					mod.Icon = sheetBuilder.Add(new Png(stream));
 			}
 
 			// Avoid possibly overwriting a valid mod with an obviously bogus one
 			var key = ExternalMod.MakeKey(mod);
-			if (File.Exists(mod.LaunchPath) && (path == null || Path.GetFileNameWithoutExtension(path) == key))
+			if ((forceRegistration || File.Exists(mod.LaunchPath)) && (path == null || Path.GetFileNameWithoutExtension(path) == key))
 				mods[key] = mod;
 		}
 
@@ -119,19 +118,16 @@ namespace OpenRA
 				sources.Add(Platform.SupportDir);
 
 			// Make sure the mod is available for this session, even if saving it fails
-			LoadMod(yaml.First().Value);
+			LoadMod(yaml.First().Value, forceRegistration: true);
 
 			foreach (var source in sources.Distinct())
 			{
-				if (!Directory.Exists(source))
-					continue;
-
 				var metadataPath = Path.Combine(source, "ModMetadata");
 
 				try
 				{
 					Directory.CreateDirectory(metadataPath);
-					File.WriteAllLines(Path.Combine(metadataPath, key + ".yaml"), yaml.ToLines(false).ToArray());
+					File.WriteAllLines(Path.Combine(metadataPath, key + ".yaml"), yaml.ToLines().ToArray());
 				}
 				catch (Exception e)
 				{
@@ -157,6 +153,7 @@ namespace OpenRA
 			if (registration.HasFlag(ModRegistration.User))
 				sources.Add(Platform.SupportDir);
 
+			var activeModKey = ExternalMod.MakeKey(activeMod);
 			foreach (var source in sources.Distinct())
 			{
 				var metadataPath = Path.Combine(source, "ModMetadata");
@@ -172,6 +169,10 @@ namespace OpenRA
 						var m = FieldLoader.Load<ExternalMod>(yaml);
 						modKey = ExternalMod.MakeKey(m);
 
+						// Continue to the next entry if it is the active mod (even if the LaunchPath is bogus)
+						if (modKey == activeModKey)
+							continue;
+
 						// Continue to the next entry if this one is valid
 						if (File.Exists(m.LaunchPath) && Path.GetFileNameWithoutExtension(path) == modKey &&
 							!(activeMod != null && m.LaunchPath == activeMod.LaunchPath && m.Id == activeMod.Id && m.Version != activeMod.Version))

OpenRA.Game/Exts.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,11 +11,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Traits;
 
@@ -79,16 +78,6 @@ namespace OpenRA
 				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());
-		}
-
 		static int WindingDirectionTest(int2 v0, int2 v1, int2 p)
 		{
 			return (v1.X - v0.X) * (p.Y - v0.Y) - (p.X - v0.X) * (v1.Y - v0.Y);
@@ -175,7 +164,11 @@ namespace OpenRA
 
 		public static IEnumerable<T> Iterate<T>(this T t, Func<T, T> f)
 		{
-			for (;;) { yield return t; t = f(t); }
+			while (true)
+			{
+				yield return t;
+				t = f(t);
+			}
 		}
 
 		public static T MinBy<T, U>(this IEnumerable<T> ts, Func<T, U> selector)
@@ -375,6 +368,10 @@ namespace OpenRA
 				var key = keySelector(item);
 				var element = elementSelector(item);
 
+				// Discard elements with null keys
+				if (!typeof(TKey).IsValueType && key == null)
+					continue;
+
 				// Check for a key conflict:
 				if (d.ContainsKey(key))
 				{
@@ -444,27 +441,6 @@ namespace OpenRA
 			return result;
 		}
 
-		public static Rectangle Bounds(this Bitmap b) { return new Rectangle(0, 0, b.Width, b.Height); }
-
-		public static Bitmap CloneWith32bbpArgbPixelFormat(this Bitmap original)
-		{
-			// Note: We would use original.Clone(original.Bounds(), PixelFormat.Format32bppArgb)
-			// but this doesn't work on mono.
-			var clone = new Bitmap(original.Width, original.Height, PixelFormat.Format32bppArgb);
-			try
-			{
-				using (var g = System.Drawing.Graphics.FromImage(clone))
-					g.DrawImage(original, original.Bounds());
-			}
-			catch (Exception)
-			{
-				clone.Dispose();
-				throw;
-			}
-
-			return clone;
-		}
-
 		public static int ToBits(this IEnumerable<bool> bits)
 		{
 			var i = 0;
@@ -484,6 +460,11 @@ namespace OpenRA
 			return int.Parse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo);
 		}
 
+		public static byte ParseByte(string s)
+		{
+			return byte.Parse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo);
+		}
+
 		public static bool TryParseIntegerInvariant(string s, out int i)
 		{
 			return int.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
@@ -494,14 +475,30 @@ namespace OpenRA
 			return long.TryParse(s, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out i);
 		}
 
-		public static bool IsTraitEnabled(this object trait)
+		public static bool IsTraitEnabled<T>(this T trait)
 		{
-			return trait as IDisabledTrait == null || !(trait as IDisabledTrait).IsTraitDisabled;
+			var disabledTrait = trait as IDisabledTrait;
+			return disabledTrait == null || !disabledTrait.IsTraitDisabled;
 		}
 
-		public static bool IsTraitEnabled<T>(T t)
+		public static T FirstEnabledTraitOrDefault<T>(this IEnumerable<T> ts)
 		{
-			return IsTraitEnabled(t as object);
+			// PERF: Avoid LINQ.
+			foreach (var t in ts)
+				if (t.IsTraitEnabled())
+					return t;
+
+			return default(T);
+		}
+
+		public static T FirstEnabledTraitOrDefault<T>(this T[] ts)
+		{
+			// PERF: Avoid LINQ.
+			foreach (var t in ts)
+				if (t.IsTraitEnabled())
+					return t;
+
+			return default(T);
 		}
 	}
 

OpenRA.Game/FieldLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -12,8 +12,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -42,7 +40,8 @@ namespace OpenRA
 				}
 			}
 
-			public MissingFieldsException(string[] missing, string header = null, string headerSingle = null) : base(null)
+			public MissingFieldsException(string[] missing, string header = null, string headerSingle = null)
+				: base(null)
 			{
 				Header = missing.Length > 1 ? header : headerSingle ?? header;
 				Missing = missing;
@@ -71,6 +70,11 @@ namespace OpenRA
 		static readonly ConcurrentCache<MemberInfo, bool> MemberHasTranslateAttribute =
 			new ConcurrentCache<MemberInfo, bool>(member => member.HasAttribute<TranslateAttribute>());
 
+		static readonly ConcurrentCache<string, BooleanExpression> BooleanExpressionCache =
+			new ConcurrentCache<string, BooleanExpression>(expression => new BooleanExpression(expression));
+		static readonly ConcurrentCache<string, IntegerExpression> IntegerExpressionCache =
+			new ConcurrentCache<string, IntegerExpression>(expression => new IntegerExpression(expression));
+
 		static readonly object TranslationsLock = new object();
 		static Dictionary<string, string> translations;
 
@@ -225,46 +229,11 @@ namespace OpenRA
 			else if (fieldType == typeof(Color))
 			{
 				Color color;
-				if (value != null && HSLColor.TryParseRGB(value, out color))
+				if (value != null && Color.TryParse(value, out color))
 					return color;
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-			else if (fieldType == typeof(Color[]))
-			{
-				if (value != null)
-				{
-					var parts = value.Split(',');
-					var colors = new Color[parts.Length];
-
-					for (var i = 0; i < colors.Length; i++)
-						if (!HSLColor.TryParseRGB(parts[i], out colors[i]))
-							return InvalidValueAction(value, fieldType, fieldName);
-
-					return colors;
-				}
-
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
-			else if (fieldType == typeof(HSLColor))
-			{
-				if (value != null)
-				{
-					Color rgb;
-					if (HSLColor.TryParseRGB(value, out rgb))
-						return new HSLColor(rgb);
-
-					// Allow old HSLColor/ColorRamp formats to be parsed as HSLColor
-					var parts = value.Split(',');
-					if (parts.Length == 3 || parts.Length == 4)
-						return new HSLColor(
-							(byte)Exts.ParseIntegerInvariant(parts[0]).Clamp(0, 255),
-							(byte)Exts.ParseIntegerInvariant(parts[1]).Clamp(0, 255),
-							(byte)Exts.ParseIntegerInvariant(parts[2]).Clamp(0, 255));
-				}
-
-				return InvalidValueAction(value, fieldType, fieldName);
-			}
 			else if (fieldType == typeof(Hotkey))
 			{
 				Hotkey res;
@@ -273,6 +242,10 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
+			else if (fieldType == typeof(HotkeyReference))
+			{
+				return Game.ModData.Hotkeys[value];
+			}
 			else if (fieldType == typeof(WDist))
 			{
 				WDist res;
@@ -404,7 +377,7 @@ namespace OpenRA
 				{
 					try
 					{
-						return new BooleanExpression(value);
+						return BooleanExpressionCache[value];
 					}
 					catch (InvalidDataException e)
 					{
@@ -420,7 +393,7 @@ namespace OpenRA
 				{
 					try
 					{
-						return new IntegerExpression(value);
+						return IntegerExpressionCache[value];
 					}
 					catch (InvalidDataException e)
 					{
@@ -441,31 +414,25 @@ namespace OpenRA
 					return InvalidValueAction(value, fieldType, fieldName);
 				}
 			}
-			else if (fieldType == typeof(ImageFormat))
+			else if (fieldType == typeof(bool))
+				return ParseYesNo(value, fieldType, fieldName);
+			else if (fieldType == typeof(int2[]))
 			{
 				if (value != null)
 				{
-					switch (value.ToLowerInvariant())
-					{
-					case "bmp":
-						return ImageFormat.Bmp;
-					case "gif":
-						return ImageFormat.Gif;
-					case "jpg":
-					case "jpeg":
-						return ImageFormat.Jpeg;
-					case "tif":
-					case "tiff":
-						return ImageFormat.Tiff;
-					default:
-						return ImageFormat.Png;
-					}
+					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					if (parts.Length % 2 != 0)
+						return InvalidValueAction(value, fieldType, fieldName);
+
+					var ints = new int2[parts.Length / 2];
+					for (var i = 0; i < ints.Length; i++)
+						ints[i] = new int2(Exts.ParseIntegerInvariant(parts[2 * i]), Exts.ParseIntegerInvariant(parts[2 * i + 1]));
+
+					return ints;
 				}
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-			else if (fieldType == typeof(bool))
-				return ParseYesNo(value, fieldType, fieldName);
 			else if (fieldType.IsArray && fieldType.GetArrayRank() == 1)
 			{
 				if (value == null)
@@ -522,6 +489,9 @@ namespace OpenRA
 				if (value != null)
 				{
 					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+					if (parts.Length != 2)
+						return InvalidValueAction(value, fieldType, fieldName);
+
 					return new int2(Exts.ParseIntegerInvariant(parts[0]), Exts.ParseIntegerInvariant(parts[1]));
 				}
 
@@ -578,14 +548,13 @@ namespace OpenRA
 
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
-			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Bits<>))
+			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(BitSet<>))
 			{
 				if (value != null)
 				{
 					var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-					var argTypes = new Type[] { typeof(string[]) };
-					var argValues = new object[] { parts };
-					return fieldType.GetConstructor(argTypes).Invoke(argValues);
+					var ctor = fieldType.GetConstructor(new[] { typeof(string[]) });
+					return ctor.Invoke(new object[] { parts.Select(p => p.Trim()).ToArray() });
 				}
 
 				return InvalidValueAction(value, fieldType, fieldName);

OpenRA.Game/FieldSaver.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -12,12 +12,11 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using OpenRA.Graphics;
+using OpenRA.Primitives;
 
 namespace OpenRA
 {
@@ -75,21 +74,9 @@ namespace OpenRA
 
 			var t = v.GetType();
 
-			// Color.ToString() does the wrong thing; force it to format as rgb[a] hex
 			if (t == typeof(Color))
 			{
-				return HSLColor.ToHexString((Color)v);
-			}
-
-			// HSLColor.ToString() does the wrong thing; force it to format as rgb[a] hex
-			if (t == typeof(HSLColor))
-			{
-				return ((HSLColor)v).ToHexString();
-			}
-
-			if (t == typeof(ImageFormat))
-			{
-				return ((ImageFormat)v).ToString();
+				return ((Color)v).ToString();
 			}
 
 			if (t == typeof(Rectangle))
@@ -98,6 +85,11 @@ namespace OpenRA
 				return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height);
 			}
 
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(BitSet<>))
+			{
+				return ((IEnumerable<string>)v).Select(FormatValue).JoinWith(", ");
+			}
+
 			if (t.IsArray && t.GetArrayRank() == 1)
 			{
 				return ((Array)v).Cast<object>().Select(FormatValue).JoinWith(", ");

OpenRA.Game/FileFormats/Png.cs

@@ -0,0 +1,355 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2019 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, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using ICSharpCode.SharpZipLib.Checksum;
+using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
+using OpenRA.Primitives;
+
+namespace OpenRA.FileFormats
+{
+	public class Png
+	{
+		static readonly byte[] Signature = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a };
+
+		public int Width { get; set; }
+		public int Height { get; set; }
+		public Color[] Palette { get; set; }
+		public byte[] Data { get; set; }
+		public Dictionary<string, string> EmbeddedData = new Dictionary<string, string>();
+
+		public Png(Stream s)
+		{
+			if (!Verify(s))
+				throw new InvalidDataException("PNG Signature is bogus");
+
+			s.Position += 8;
+			var headerParsed = false;
+			var isPaletted = false;
+			var is24Bit = false;
+			var data = new List<byte>();
+
+			while (true)
+			{
+				var length = IPAddress.NetworkToHostOrder(s.ReadInt32());
+				var type = Encoding.UTF8.GetString(s.ReadBytes(4));
+				var content = s.ReadBytes(length);
+				/*var crc = */s.ReadInt32();
+
+				if (!headerParsed && type != "IHDR")
+					throw new InvalidDataException("Invalid PNG file - header does not appear first.");
+
+				using (var ms = new MemoryStream(content))
+				{
+					switch (type)
+					{
+						case "IHDR":
+						{
+							if (headerParsed)
+								throw new InvalidDataException("Invalid PNG file - duplicate header.");
+							Width = IPAddress.NetworkToHostOrder(ms.ReadInt32());
+							Height = IPAddress.NetworkToHostOrder(ms.ReadInt32());
+
+							var bitDepth = ms.ReadUInt8();
+							var colorType = (PngColorType)ms.ReadByte();
+							isPaletted = IsPaletted(bitDepth, colorType);
+							is24Bit = colorType == PngColorType.Color;
+
+							var dataLength = Width * Height;
+							if (!isPaletted)
+								dataLength *= 4;
+
+							Data = new byte[dataLength];
+
+							var compression = ms.ReadByte();
+							/*var filter = */ms.ReadByte();
+							var interlace = ms.ReadByte();
+
+							if (compression != 0)
+								throw new InvalidDataException("Compression method not supported");
+
+							if (interlace != 0)
+								throw new InvalidDataException("Interlacing not supported");
+
+							headerParsed = true;
+
+							break;
+						}
+
+						case "PLTE":
+						{
+							Palette = new Color[256];
+							for (var i = 0; i < length / 3; i++)
+							{
+								var r = ms.ReadByte(); var g = ms.ReadByte(); var b = ms.ReadByte();
+								Palette[i] = Color.FromArgb(r, g, b);
+							}
+
+							break;
+						}
+
+						case "tRNS":
+						{
+							if (Palette == null)
+								throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
+
+							for (var i = 0; i < length; i++)
+								Palette[i] = Color.FromArgb(ms.ReadByte(), Palette[i]);
+
+							break;
+						}
+
+						case "IDAT":
+						{
+							data.AddRange(content);
+
+							break;
+						}
+
+						case "tEXt":
+						{
+							var key = ms.ReadASCIIZ();
+							EmbeddedData.Add(key, ms.ReadASCII(length - key.Length - 1));
+
+							break;
+						}
+
+						case "IEND":
+						{
+							using (var ns = new MemoryStream(data.ToArray()))
+							{
+								using (var ds = new InflaterInputStream(ns))
+								{
+									var pxStride = isPaletted ? 1 : is24Bit ? 3 : 4;
+									var srcStride = Width * pxStride;
+									var destStride = Width * (isPaletted ? 1 : 4);
+
+									var prevLine = new byte[srcStride];
+									for (var y = 0; y < Height; y++)
+									{
+										var filter = (PngFilter)ds.ReadByte();
+										var line = ds.ReadBytes(srcStride);
+
+										for (var i = 0; i < srcStride; i++)
+											line[i] = i < pxStride
+												? UnapplyFilter(filter, line[i], 0, prevLine[i], 0)
+												: UnapplyFilter(filter, line[i], line[i - pxStride], prevLine[i], prevLine[i - pxStride]);
+
+										if (is24Bit)
+										{
+											// Fold alpha channel into RGB data
+											for (var i = 0; i < line.Length / 3; i++)
+											{
+												Array.Copy(line, 3 * i, Data, y * destStride + 4 * i, 3);
+												Data[y * destStride + 4 * i + 3] = 255;
+											}
+										}
+										else
+											Array.Copy(line, 0, Data, y * destStride, line.Length);
+
+										prevLine = line;
+									}
+								}
+							}
+
+							if (isPaletted && Palette == null)
+								throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
+
+							return;
+						}
+					}
+				}
+			}
+		}
+
+		public Png(byte[] data, int width, int height, Color[] palette = null,
+			Dictionary<string, string> embeddedData = null)
+		{
+			var expectLength = width * height;
+			if (palette == null)
+				expectLength *= 4;
+
+			if (data.Length != expectLength)
+				throw new InvalidDataException("Input data does not match expected length");
+
+			Width = width;
+			Height = height;
+
+			Palette = palette;
+			Data = data;
+
+			if (embeddedData != null)
+				EmbeddedData = embeddedData;
+		}
+
+		public static bool Verify(Stream s)
+		{
+			var pos = s.Position;
+			var isPng = Signature.Aggregate(true, (current, t) => current && s.ReadUInt8() == t);
+			s.Position = pos;
+			return isPng;
+		}
+
+		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 bool IsPaletted(byte bitDepth, PngColorType colorType)
+		{
+			if (bitDepth == 8 && colorType == (PngColorType.Indexed | PngColorType.Color))
+				return true;
+
+			if (bitDepth == 8 && colorType == (PngColorType.Color | PngColorType.Alpha))
+				return false;
+
+			if (bitDepth == 8 && colorType == PngColorType.Color)
+				return false;
+
+			throw new InvalidDataException("Unknown pixel format");
+		}
+
+		void WritePngChunk(Stream output, string type, Stream input)
+		{
+			input.Position = 0;
+
+			var typeBytes = Encoding.ASCII.GetBytes(type);
+			output.Write(IPAddress.HostToNetworkOrder((int)input.Length));
+			output.WriteArray(typeBytes);
+
+			var data = input.ReadAllBytes();
+			output.WriteArray(data);
+
+			var crc32 = new Crc32();
+			crc32.Update(typeBytes);
+			crc32.Update(data);
+			output.Write(IPAddress.NetworkToHostOrder((int)crc32.Value));
+		}
+
+		public byte[] Save()
+		{
+			using (var output = new MemoryStream())
+			{
+				output.WriteArray(Signature);
+				using (var header = new MemoryStream())
+				{
+					header.Write(IPAddress.HostToNetworkOrder(Width));
+					header.Write(IPAddress.HostToNetworkOrder(Height));
+					header.WriteByte(8); // Bit depth
+
+					var colorType = Palette != null
+						? PngColorType.Indexed | PngColorType.Color
+						: PngColorType.Color | PngColorType.Alpha;
+					header.WriteByte((byte)colorType);
+
+					header.WriteByte(0); // Compression
+					header.WriteByte(0); // Filter
+					header.WriteByte(0); // Interlacing
+
+					WritePngChunk(output, "IHDR", header);
+				}
+
+				bool alphaPalette = false;
+				if (Palette != null)
+				{
+					using (var palette = new MemoryStream())
+					{
+						foreach (var c in Palette)
+						{
+							palette.WriteByte(c.R);
+							palette.WriteByte(c.G);
+							palette.WriteByte(c.B);
+							alphaPalette |= c.A > 0;
+						}
+
+						WritePngChunk(output, "PLTE", palette);
+					}
+				}
+
+				if (alphaPalette)
+				{
+					using (var alpha = new MemoryStream())
+					{
+						foreach (var c in Palette)
+							alpha.WriteByte(c.A);
+
+						WritePngChunk(output, "tRNS", alpha);
+					}
+				}
+
+				using (var data = new MemoryStream())
+				{
+					using (var compressed = new DeflaterOutputStream(data))
+					{
+						var stride = Width * (Palette != null ? 1 : 4);
+						for (var y = 0; y < Height; y++)
+						{
+							// Write uncompressed scanlines for simplicity
+							compressed.WriteByte(0);
+							compressed.Write(Data, y * stride, stride);
+						}
+
+						compressed.Flush();
+						compressed.Finish();
+
+						WritePngChunk(output, "IDAT", data);
+					}
+				}
+
+				foreach (var kv in EmbeddedData)
+				{
+					using (var text = new MemoryStream())
+					{
+						text.WriteArray(Encoding.ASCII.GetBytes(kv.Key + (char)0 + kv.Value));
+						WritePngChunk(output, "tEXt", text);
+					}
+				}
+
+				WritePngChunk(output, "IEND", new MemoryStream());
+				return output.ToArray();
+			}
+		}
+
+		public void Save(string path)
+		{
+			File.WriteAllBytes(path, Save());
+		}
+	}
+}

OpenRA.Game/FileFormats/PngLoader.cs

@@ -1,206 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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, either version 3 of
- * the License, or (at your option) any later version. 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
-{
-	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;
-				var data = new List<byte>();
-
-				try
-				{
-					for (;;)
-					{
-						var length = IPAddress.NetworkToHostOrder(br.ReadInt32());
-						var type = Encoding.UTF8.GetString(br.ReadBytes(4));
-						var content = br.ReadBytes(length);
-						/*var crc = */br.ReadInt32();
-
-						if (bitmap == null && type != "IHDR")
-							throw new InvalidDataException("Invalid PNG file - header does not appear first.");
-
-						using (var ms = new MemoryStream(content))
-						using (var cr = new BinaryReader(ms))
-							switch (type)
-							{
-								case "IHDR":
-									{
-										if (bitmap != null)
-											throw new InvalidDataException("Invalid PNG file - duplicate header.");
-
-										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 < length / 3; i++)
-										{
-											var r = cr.ReadByte(); var g = cr.ReadByte(); var b = cr.ReadByte();
-											palette[i] = Color.FromArgb(r, g, b);
-										}
-									}
-
-									break;
-
-								case "tRNS":
-									{
-										if (palette == null)
-											throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
-
-										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);
-
-										if (palette == null)
-											throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
-
-										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;
-										}
-									}
-							}
-					}
-				}
-				catch
-				{
-					if (bitmap != null)
-						bitmap.Dispose();
-					throw;
-				}
-			}
-		}
-
-		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 pixel format");
-		}
-	}
-}

OpenRA.Game/FileFormats/ReplayMetadata.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of

OpenRA.Game/FileSystem/FileSystem.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -23,6 +23,7 @@ namespace OpenRA.FileSystem
 		bool TryGetPackageContaining(string path, out IReadOnlyPackage package, out string filename);
 		bool TryOpen(string filename, out Stream s);
 		bool Exists(string filename);
+		bool IsExternalModFile(string filename);
 	}
 
 	public class FileSystem : IReadOnlyFileSystem
@@ -30,6 +31,7 @@ namespace OpenRA.FileSystem
 		public IEnumerable<IReadOnlyPackage> MountedPackages { get { return mountedPackages.Keys; } }
 		readonly Dictionary<IReadOnlyPackage, int> mountedPackages = new Dictionary<IReadOnlyPackage, int>();
 		readonly Dictionary<string, IReadOnlyPackage> explicitMounts = new Dictionary<string, IReadOnlyPackage>();
+		readonly string modID;
 
 		// Mod packages that should not be disposed
 		readonly List<IReadOnlyPackage> modPackages = new List<IReadOnlyPackage>();
@@ -38,8 +40,9 @@ namespace OpenRA.FileSystem
 
 		Cache<string, List<IReadOnlyPackage>> fileIndex = new Cache<string, List<IReadOnlyPackage>>(_ => new List<IReadOnlyPackage>());
 
-		public FileSystem(IReadOnlyDictionary<string, Manifest> installedMods, IPackageLoader[] packageLoaders)
+		public FileSystem(string modID, IReadOnlyDictionary<string, Manifest> installedMods, IPackageLoader[] packageLoaders)
 		{
+			this.modID = modID;
 			this.installedMods = installedMods;
 			this.packageLoaders = packageLoaders
 				.Append(new ZipFileLoader())
@@ -281,6 +284,25 @@ namespace OpenRA.FileSystem
 			return fileIndex.ContainsKey(filename);
 		}
 
+		/// <summary>
+		/// Returns true if the given filename references an external mod via an explicit mount
+		/// </summary>
+		public bool IsExternalModFile(string filename)
+		{
+			var explicitSplit = filename.IndexOf('|');
+			if (explicitSplit < 0)
+				return false;
+
+			IReadOnlyPackage explicitPackage;
+			if (!explicitMounts.TryGetValue(filename.Substring(0, explicitSplit), out explicitPackage))
+				return false;
+
+			if (installedMods[modID].Package == explicitPackage)
+				return false;
+
+			return modPackages.Contains(explicitPackage);
+		}
+
 		/// <summary>
 		/// Resolves a filesystem for an assembly, accounting for explicit and mod mounts.
 		/// Assemblies must exist in the native OS file system (not inside an OpenRA-defined package).
@@ -306,7 +328,7 @@ namespace OpenRA.FileSystem
 					if (!(mod.Package is Folder))
 						return null;
 
-					 path = Path.Combine(mod.Package.Name, filename);
+					path = Path.Combine(mod.Package.Name, filename);
 				}
 				else
 					path = Path.Combine(parentPath, filename);
@@ -315,5 +337,10 @@ namespace OpenRA.FileSystem
 			var resolvedPath = Platform.ResolvePath(path);
 			return File.Exists(resolvedPath) ? resolvedPath : null;
 		}
+
+		public string GetPrefix(IReadOnlyPackage package)
+		{
+			return explicitMounts.ContainsValue(package) ? explicitMounts.First(f => f.Value == package).Key : null;
+		}
 	}
 }

OpenRA.Game/FileSystem/Folder.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of

OpenRA.Game/FileSystem/IPackage.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of

OpenRA.Game/FileSystem/ZipFile.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -33,7 +33,7 @@ namespace OpenRA.FileSystem
 			public ReadOnlyZipFile(Stream s, string filename)
 			{
 				Name = filename;
-				pkg = ZipFileHelper.Create(s);
+				pkg = new ZipFile(s);
 			}
 
 			public Stream GetStream(string filename)
@@ -44,7 +44,7 @@ namespace OpenRA.FileSystem
 
 				using (var z = pkg.GetInputStream(entry))
 				{
-					var ms = new MemoryStream();
+					var ms = new MemoryStream((int)entry.Size);
 					z.CopyTo(ms);
 					ms.Seek(0, SeekOrigin.Begin);
 					return ms;
@@ -104,10 +104,16 @@ namespace OpenRA.FileSystem
 				// SharpZipLib breaks when asked to update archives loaded from outside streams or files
 				// We can work around this by creating a clean in-memory-only file, cutting all outside references
 				if (!create)
-					new MemoryStream(File.ReadAllBytes(filename)).CopyTo(pkgStream);
+				{
+					using (var copy = new MemoryStream(File.ReadAllBytes(filename)))
+					{
+						pkgStream.Capacity = (int)copy.Length;
+						copy.CopyTo(pkgStream);
+					}
+				}
 
 				pkgStream.Position = 0;
-				pkg = ZipFileHelper.Create(pkgStream);
+				pkg = new ZipFile(pkgStream);
 				Name = filename;
 			}
 

OpenRA.Game/Fonts.cs

@@ -0,0 +1,37 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2019 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, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+
+namespace OpenRA
+{
+	public class FontData
+	{
+		public readonly string Font;
+		public readonly int Size;
+		public readonly int Ascender;
+	}
+
+	public class Fonts : IGlobalModData
+	{
+		[FieldLoader.LoadUsing("LoadFonts")]
+		public readonly Dictionary<string, FontData> FontList;
+
+		static object LoadFonts(MiniYaml y)
+		{
+			var ret = new Dictionary<string, FontData>();
+			foreach (var node in y.Nodes)
+				ret.Add(node.Key, FieldLoader.Load<FontData>(node.Value));
+
+			return ret;
+		}
+	}
+}

OpenRA.Game/Game.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -12,8 +12,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -21,7 +19,6 @@ using System.Net;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-using OpenRA.Chat;
 using OpenRA.Graphics;
 using OpenRA.Network;
 using OpenRA.Primitives;
@@ -42,6 +39,7 @@ namespace OpenRA
 		public static ModData ModData;
 		public static Settings Settings;
 		public static ICursor Cursor;
+		public static bool HideCursor;
 		static WorldRenderer worldRenderer;
 
 		internal static OrderManager OrderManager;
@@ -53,13 +51,14 @@ namespace OpenRA
 		public static Sound Sound;
 		public static bool HasInputFocus = false;
 
-		public static bool BenchmarkMode = false;
-
-		public static GlobalChat GlobalChat;
-
 		public static string EngineVersion { get; private set; }
+		public static LocalPlayerProfile LocalPlayerProfile;
 
 		static Task discoverNat;
+		static bool takeScreenshot = false;
+		static Benchmark benchmark = null;
+
+		public static event Action OnShellmapLoaded = () => { };
 
 		public static OrderManager JoinServer(string host, int port, string password, bool recordReplay = true)
 		{
@@ -167,11 +166,17 @@ namespace OpenRA
 			using (new PerfTimer("NewWorld"))
 				OrderManager.World = new World(ModData, map, OrderManager, type);
 
+			OrderManager.World.GameOver += FinishBenchmark;
+
 			worldRenderer = new WorldRenderer(ModData, OrderManager.World);
 
+			GC.Collect();
+
 			using (new PerfTimer("LoadComplete"))
 				OrderManager.World.LoadComplete(worldRenderer);
 
+			GC.Collect();
+
 			if (OrderManager.GameStarted)
 				return;
 
@@ -192,7 +197,12 @@ namespace OpenRA
 			var replay = OrderManager.Connection as ReplayConnection;
 			var replayName = replay != null ? replay.Filename : null;
 			var lobbyInfo = OrderManager.LobbyInfo;
-			var orders = new[] {
+
+			// Reseed the RNG so this isn't an exact repeat of the last game
+			lobbyInfo.GlobalSettings.RandomSeed = CosmeticRandom.Next();
+
+			var orders = new[]
+			{
 					Order.Command("sync_lobby {0}".F(lobbyInfo.Serialize())),
 					Order.Command("startgame")
 			};
@@ -241,11 +251,22 @@ namespace OpenRA
 
 		public static void InitializeSettings(Arguments args)
 		{
-			Settings = new Settings(Platform.ResolvePath(Path.Combine("^", "settings.yaml")), args);
+			Settings = new Settings(Platform.ResolvePath(Path.Combine(Platform.SupportDirPrefix, "settings.yaml")), args);
 		}
 
-		internal static void Initialize(Arguments args)
+		public static RunStatus InitializeAndRun(string[] args)
 		{
+			Initialize(new Arguments(args));
+			GC.Collect();
+			return Run();
+		}
+
+		static void Initialize(Arguments args)
+		{
+			var supportDirArg = args.GetValue("Engine.SupportDir", null);
+			if (supportDirArg != null)
+				Platform.OverrideSupportDir(supportDirArg);
+
 			Console.WriteLine("Platform is {0}", Platform.CurrentPlatform);
 
 			// Load the engine version as early as possible so it can be written to exception logs
@@ -274,11 +295,10 @@ namespace OpenRA
 
 			Log.AddChannel("perf", "perf.log");
 			Log.AddChannel("debug", "debug.log");
-			Log.AddChannel("server", "server.log");
+			Log.AddChannel("server", "server.log", true);
 			Log.AddChannel("sound", "sound.log");
 			Log.AddChannel("graphics", "graphics.log");
 			Log.AddChannel("geoip", "geoip.log");
-			Log.AddChannel("irc", "irc.log");
 			Log.AddChannel("nat", "nat.log");
 
 			var platforms = new[] { Settings.Game.Platform, "Default", null };
@@ -318,15 +338,8 @@ namespace OpenRA
 
 			GeoIP.Initialize();
 
-			if (!Settings.Server.DiscoverNatDevices)
-				Settings.Server.AllowPortForward = false;
-			else
-			{
+			if (Settings.Server.DiscoverNatDevices)
 				discoverNat = UPnP.DiscoverNatDevices(Settings.Server.NatDiscoveryTimeout);
-				Settings.Server.AllowPortForward = true;
-			}
-
-			GlobalChat = new GlobalChat();
 
 			var modSearchArg = args.GetValue("Engine.ModSearchPaths", null);
 			var modSearchPaths = modSearchArg != null ?
@@ -403,6 +416,8 @@ namespace OpenRA
 
 			ModData = new ModData(Mods[mod], Mods, true);
 
+			LocalPlayerProfile = new LocalPlayerProfile(Platform.ResolvePath(Path.Combine("^", Settings.Game.AuthProfile)), ModData.Manifest.Get<PlayerDatabase>());
+
 			if (!ModData.LoadScreen.BeforeLoad())
 				return;
 
@@ -454,9 +469,11 @@ namespace OpenRA
 			{
 				Console.WriteLine("NAT discovery failed: {0}", e.Message);
 				Log.Write("nat", e.ToString());
-				Settings.Server.AllowPortForward = false;
 			}
 
+			ChromeMetrics.TryGet("ChatMessageColor", out chatMessageColor);
+			ChromeMetrics.TryGet("SystemMessageColor", out systemMessageColor);
+
 			ModData.LoadScreen.StartGame(args);
 		}
 
@@ -470,7 +487,10 @@ namespace OpenRA
 			var shellmap = ChooseShellmap();
 
 			using (new PerfTimer("StartGame"))
+			{
 				StartGame(shellmap, WorldType.Shellmap);
+				OnShellmapLoaded();
+			}
 		}
 
 		static string ChooseShellmap()
@@ -513,36 +533,26 @@ namespace OpenRA
 		// Note: These delayed actions should only be used by widgets or disposing objects
 		// - things that depend on a particular world should be queuing them on the world actor.
 		static volatile ActionQueue delayedActions = new ActionQueue();
+		static Color systemMessageColor = Color.White;
+		static Color chatMessageColor = Color.White;
 		public static void RunAfterTick(Action a) { delayedActions.Add(a, RunTime); }
 		public static void RunAfterDelay(int delayMilliseconds, Action a) { delayedActions.Add(a, RunTime + delayMilliseconds); }
 
 		static void TakeScreenshotInner()
 		{
-			Log.Write("debug", "Taking screenshot");
-
-			Bitmap bitmap;
-			using (new PerfTimer("Renderer.TakeScreenshot"))
-				bitmap = Renderer.Device.TakeScreenshot();
-
-			ThreadPool.QueueUserWorkItem(_ =>
+			using (new PerfTimer("Renderer.SaveScreenshot"))
 			{
 				var mod = ModData.Manifest.Metadata;
-				var directory = Platform.ResolvePath("^", "Screenshots", ModData.Manifest.Id, mod.Version);
+				var directory = Platform.ResolvePath(Platform.SupportDirPrefix, "Screenshots", ModData.Manifest.Id, mod.Version);
 				Directory.CreateDirectory(directory);
 
 				var filename = TimestampedFilename(true);
-				var format = Settings.Graphics.ScreenshotFormat;
-				var extension = ImageCodecInfo.GetImageEncoders().FirstOrDefault(x => x.FormatID == format.Guid)
-					.FilenameExtension.Split(';').First().ToLowerInvariant().Substring(1);
-				var destination = Path.Combine(directory, string.Concat(filename, extension));
+				var path = Path.Combine(directory, string.Concat(filename, ".png"));
+				Log.Write("debug", "Taking screenshot " + path);
 
-				using (new PerfTimer("Save Screenshot ({0})".F(format)))
-					bitmap.Save(destination, format);
-
-				bitmap.Dispose();
-
-				RunAfterTick(() => Debug("Saved screenshot " + filename));
-			});
+				Renderer.Context.SaveScreenshot(path);
+				Debug("Saved screenshot " + filename);
+			}
 		}
 
 		static void InnerLogicTick(OrderManager orderManager)
@@ -558,11 +568,11 @@ namespace OpenRA
 				var integralTickTimestep = (uiTickDelta / Timestep) * Timestep;
 				Ui.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : Timestep;
 
-				Sync.CheckSyncUnchanged(world, Ui.Tick);
+				Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, Ui.Tick);
 				Cursor.Tick();
 			}
 
-			var worldTimestep = world == null ? Timestep : world.Timestep;
+			var worldTimestep = world == null ? Timestep : world.IsLoadingGameSave ? 1 : world.Timestep;
 			var worldTickDelta = tick - orderManager.LastTickTime;
 			if (worldTimestep != 0 && worldTickDelta >= worldTimestep)
 			{
@@ -576,7 +586,7 @@ namespace OpenRA
 					orderManager.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : worldTimestep;
 
 					Sound.Tick();
-					Sync.CheckSyncUnchanged(world, orderManager.TickImmediate);
+					Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, orderManager.TickImmediate);
 
 					if (world == null)
 						return;
@@ -589,16 +599,12 @@ namespace OpenRA
 
 						Log.Write("debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local");
 
-						if (BenchmarkMode)
-							Log.Write("cpu", "{0};{1}".F(LocalTick, PerfHistory.Items["tick_time"].LastValue));
-
 						if (isNetTick)
 							orderManager.Tick();
 
-						Sync.CheckSyncUnchanged(world, () =>
+						Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, () =>
 						{
 							world.OrderGenerator.Tick(world);
-							world.Selection.Tick(world);
 						});
 
 						world.Tick();
@@ -610,8 +616,11 @@ namespace OpenRA
 
 					// Wait until we have done our first world Tick before TickRendering
 					if (orderManager.LocalFrameNumber > 0)
-						Sync.CheckSyncUnchanged(world, () => world.TickRender(worldRenderer));
+						Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, () => world.TickRender(worldRenderer));
 				}
+
+				if (benchmark != null)
+					benchmark.Tick(LocalTick);
 			}
 		}
 
@@ -630,7 +639,10 @@ namespace OpenRA
 				InnerLogicTick(worldRenderer.World.OrderManager);
 		}
 
-		public static bool TakeScreenshot = false;
+		public static void TakeScreenshot()
+		{
+			takeScreenshot = true;
+		}
 
 		static void RenderTick()
 		{
@@ -643,7 +655,10 @@ namespace OpenRA
 				{
 					Renderer.BeginFrame(worldRenderer.Viewport.TopLeft, worldRenderer.Viewport.Zoom);
 					Sound.SetListenerPosition(worldRenderer.Viewport.CenterPosition);
-					worldRenderer.Draw();
+
+					// Use worldRenderer.World instead of OrderManager.World to avoid a rendering mismatch while processing orders
+					if (!worldRenderer.World.IsLoadingGameSave)
+						worldRenderer.Draw();
 				}
 				else
 					Renderer.BeginFrame(int2.Zero, 1f);
@@ -658,17 +673,22 @@ namespace OpenRA
 
 					if (ModData != null && ModData.CursorProvider != null)
 					{
-						Cursor.SetCursor(Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default");
-						Cursor.Render(Renderer);
+						if (HideCursor)
+							Cursor.SetCursor(null);
+						else
+						{
+							Cursor.SetCursor(Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default");
+							Cursor.Render(Renderer);
+						}
 					}
 				}
 
 				using (new PerfSample("render_flip"))
 					Renderer.EndFrame(new DefaultInputHandler(OrderManager.World));
 
-				if (TakeScreenshot)
+				if (takeScreenshot)
 				{
-					TakeScreenshot = false;
+					takeScreenshot = false;
 					TakeScreenshotInner();
 				}
 			}
@@ -677,9 +697,6 @@ namespace OpenRA
 			PerfHistory.Items["batches"].Tick();
 			PerfHistory.Items["render_widgets"].Tick();
 			PerfHistory.Items["render_flip"].Tick();
-
-			if (BenchmarkMode)
-				Log.Write("render", "{0};{1}".F(RenderFrame, PerfHistory.Items["render"].LastValue));
 		}
 
 		static void Loop()
@@ -736,6 +753,13 @@ namespace OpenRA
 				var maxFramerate = Settings.Graphics.CapFramerate ? Settings.Graphics.MaxFramerate.Clamp(1, 1000) : 1000;
 				var renderInterval = 1000 / maxFramerate;
 
+				// Tick as fast as possible while restoring game saves, capping rendering at 5 FPS
+				if (OrderManager.World != null && OrderManager.World.IsLoadingGameSave)
+				{
+					logicInterval = 1;
+					renderInterval = 200;
+				}
+
 				var now = RunTime;
 
 				// If the logic has fallen behind too much, skip it and catch up
@@ -755,7 +779,7 @@ namespace OpenRA
 						LogicTick();
 
 						// Force at least one render per tick during regular gameplay
-						if (OrderManager.World != null && !OrderManager.World.IsReplay)
+						if (OrderManager.World != null && !OrderManager.World.IsLoadingGameSave && !OrderManager.World.IsReplay)
 							forceRender = true;
 					}
 
@@ -782,7 +806,7 @@ namespace OpenRA
 			}
 		}
 
-		internal static RunStatus Run()
+		static RunStatus Run()
 		{
 			if (Settings.Graphics.MaxFramerate < 1)
 			{
@@ -806,7 +830,6 @@ namespace OpenRA
 			ModData.Dispose();
 			ChromeProvider.Deinitialize();
 
-			GlobalChat.Dispose();
 			Sound.Dispose();
 			Renderer.Dispose();
 
@@ -820,14 +843,19 @@ namespace OpenRA
 			state = RunStatus.Success;
 		}
 
-		public static void AddChatLine(Color color, string name, string text)
+		public static void AddSystemLine(string name, string text)
 		{
-			OrderManager.AddChatLine(color, name, text);
+			OrderManager.AddChatLine(name, systemMessageColor, text, systemMessageColor);
+		}
+
+		public static void AddChatLine(string name, Color nameColor, string text)
+		{
+			OrderManager.AddChatLine(name, nameColor, text, chatMessageColor);
 		}
 
 		public static void Debug(string s, params object[] args)
 		{
-			AddChatLine(Color.White, "Debug", string.Format(s, args));
+			AddSystemLine("Debug", string.Format(s, args));
 		}
 
 		public static void Disconnect()
@@ -862,8 +890,7 @@ namespace OpenRA
 			{
 				Name = "Skirmish Game",
 				Map = map,
-				AdvertiseOnline = false,
-				AllowPortForward = false
+				AdvertiseOnline = false
 			};
 
 			server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), settings, ModData, false);
@@ -875,5 +902,42 @@ namespace OpenRA
 		{
 			return OrderManager != null && OrderManager.World == world && !world.Disposing;
 		}
+
+		public static bool SetClipboardText(string text)
+		{
+			return Renderer.Window.SetClipboardText(text);
+		}
+
+		public static void BenchmarkMode(string prefix)
+		{
+			benchmark = new Benchmark(prefix);
+		}
+
+		public static void LoadMap(string launchMap)
+		{
+			var orders = new List<Order>
+			{
+				Order.Command("option gamespeed {0}".F("default")),
+				Order.Command("state {0}".F(Session.ClientState.Ready))
+			};
+
+			var path = Platform.ResolvePath(launchMap);
+			var map = ModData.MapCache.SingleOrDefault(m => m.Uid == launchMap) ??
+				ModData.MapCache.SingleOrDefault(m => m.Package.Name == path);
+
+			if (map == null)
+				throw new InvalidOperationException("Could not find map '{0}'.".F(launchMap));
+
+			CreateAndStartLocalServer(map.Uid, orders);
+		}
+
+		public static void FinishBenchmark()
+		{
+			if (benchmark != null)
+			{
+				benchmark.Write();
+				Exit();
+			}
+		}
 	}
 }

OpenRA.Game/GameInformation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -12,8 +12,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Graphics;
 using OpenRA.Network;
+using OpenRA.Primitives;
 
 namespace OpenRA
 {
@@ -24,6 +24,7 @@ namespace OpenRA
 
 		public string MapUid;
 		public string MapTitle;
+		public int FinalGameTick;
 
 		/// <summary>Game start timestamp (when the recoding started).</summary>
 		public DateTime StartTimeUtc;
@@ -121,7 +122,8 @@ namespace OpenRA
 				Team = client.Team,
 				SpawnPoint = runtimePlayer.SpawnPoint,
 				IsRandomFaction = runtimePlayer.Faction.InternalName != client.Faction,
-				IsRandomSpawnPoint = runtimePlayer.SpawnPoint != client.SpawnPoint
+				IsRandomSpawnPoint = runtimePlayer.SpawnPoint != client.SpawnPoint,
+				Fingerprint = client.Fingerprint
 			};
 
 			playersByRuntime.Add(runtimePlayer, player);
@@ -154,7 +156,7 @@ namespace OpenRA
 
 			/// <summary>The faction ID, a.k.a. the faction's internal name.</summary>
 			public string FactionId;
-			public HSLColor Color;
+			public Color Color;
 
 			/// <summary>The team ID on start-up, or 0 if the player is not part of a team.</summary>
 			public int Team;
@@ -166,6 +168,9 @@ namespace OpenRA
 			/// <summary>True if the spawn point was chosen at random; otherwise, false.</summary>
 			public bool IsRandomSpawnPoint;
 
+			/// <summary>Player authentication fingerprint for the OpenRA forum.</summary>
+			public string Fingerprint;
+
 			#endregion
 
 			#region

OpenRA.Game/GameRules/ActorInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -22,6 +22,8 @@ namespace OpenRA
 	/// </summary>
 	public class ActorInfo
 	{
+		public const string AbstractActorPrefix = "^";
+
 		/// <summary>
 		/// The actor name can be anything, but the sprites used in the Render*: traits default to this one.
 		/// If you add an ^ in front of the name, the engine will recognize this as a collection of traits
@@ -38,7 +40,6 @@ namespace OpenRA
 			{
 				Name = name;
 
-				var abstractActorType = name.StartsWith("^");
 				foreach (var t in node.Nodes)
 				{
 					try
@@ -47,10 +48,11 @@ namespace OpenRA
 					}
 					catch (FieldLoader.MissingFieldsException e)
 					{
-						if (!abstractActorType)
-							throw new YamlException(e.Message);
+						throw new YamlException(e.Message);
 					}
 				}
+
+				traits.TrimExcess();
 			}
 			catch (YamlException e)
 			{
@@ -63,6 +65,7 @@ namespace OpenRA
 			Name = name;
 			foreach (var t in traitInfos)
 				traits.Add(t);
+			traits.TrimExcess();
 		}
 
 		static ITraitInfo LoadTraitInfo(ObjectCreator creator, string traitName, MiniYaml my)
@@ -144,23 +147,18 @@ namespace OpenRA
 				.Select(t => t.GetGenericArguments()[0]);
 		}
 
-		public IEnumerable<Pair<string, Type>> GetInitKeys()
-		{
-			var inits = traits.WithInterface<ITraitInfo>().SelectMany(
-				t => t.GetType().GetInterfaces()
-					.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(UsesInit<>))
-					.Select(i => i.GetGenericArguments()[0])).ToList();
-
-			inits.Add(typeof(OwnerInit));		/* not exposed by a trait; this is used by the Actor itself */
-
-			return inits.Select(
-				i => Pair.New(
-					i.Name.Replace("Init", ""), i));
-		}
-
 		public bool HasTraitInfo<T>() where T : ITraitInfoInterface { return traits.Contains<T>(); }
 		public T TraitInfo<T>() where T : ITraitInfoInterface { return traits.Get<T>(); }
 		public T TraitInfoOrDefault<T>() where T : ITraitInfoInterface { return traits.GetOrDefault<T>(); }
 		public IEnumerable<T> TraitInfos<T>() where T : ITraitInfoInterface { return traits.WithInterface<T>(); }
+
+		public BitSet<TargetableType> GetAllTargetTypes()
+		{
+			// PERF: Avoid LINQ.
+			var targetTypes = default(BitSet<TargetableType>);
+			foreach (var targetable in TraitInfos<ITargetableInfo>())
+				targetTypes = targetTypes.Union(targetable.GetTargetTypes());
+			return targetTypes;
+		}
 	}
 }

OpenRA.Game/GameRules/MusicInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,7 +10,6 @@
 #endregion
 
 using System.IO;
-using OpenRA.FileFormats;
 using OpenRA.FileSystem;
 
 namespace OpenRA.GameRules
@@ -20,6 +19,7 @@ namespace OpenRA.GameRules
 		public readonly string Filename;
 		public readonly string Title;
 		public readonly bool Hidden;
+		public readonly float VolumeModifier = 1f;
 
 		public int Length { get; private set; } // seconds
 		public bool Exists { get; private set; }
@@ -32,6 +32,9 @@ namespace OpenRA.GameRules
 			if (nd.ContainsKey("Hidden"))
 				bool.TryParse(nd["Hidden"].Value, out Hidden);
 
+			if (nd.ContainsKey("VolumeModifier"))
+				VolumeModifier = FieldLoader.GetValue<float>("VolumeModifier", nd["VolumeModifier"].Value);
+
 			var ext = nd.ContainsKey("Extension") ? nd["Extension"].Value : "aud";
 			Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key) + "." + ext;
 		}

OpenRA.Game/GameRules/Ruleset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -67,6 +67,19 @@ namespace OpenRA
 
 			foreach (var weapon in Weapons)
 			{
+				var projectileLoaded = weapon.Value.Projectile as IRulesetLoaded<WeaponInfo>;
+				if (projectileLoaded != null)
+				{
+					try
+					{
+						projectileLoaded.RulesetLoaded(this, weapon.Value);
+					}
+					catch (YamlException e)
+					{
+						throw new YamlException("Projectile type {0}: {1}".F(weapon.Key, e.Message));
+					}
+				}
+
 				foreach (var warhead in weapon.Value.Warheads)
 				{
 					var cacher = warhead as IRulesetLoaded<WeaponInfo>;
@@ -87,16 +100,24 @@ namespace OpenRA
 
 		public IEnumerable<KeyValuePair<string, MusicInfo>> InstalledMusic { get { return Music.Where(m => m.Value.Exists); } }
 
-		static IReadOnlyDictionary<string, T> MergeOrDefault<T>(string name, IReadOnlyFileSystem fileSystem, IEnumerable<string> files, MiniYaml additional,
-			IReadOnlyDictionary<string, T> defaults, Func<MiniYamlNode, T> makeObject)
+		static IReadOnlyDictionary<string, T> MergeOrDefault<T>(string name,
+			IReadOnlyFileSystem fileSystem,
+			IEnumerable<string> files,
+			MiniYaml additional,
+			IReadOnlyDictionary<string, T> defaults,
+			Func<MiniYamlNode, T> makeObject,
+			Func<MiniYamlNode, bool> filterNode = null)
 		{
 			if (additional == null && defaults != null)
 				return defaults;
 
-			var result = MiniYaml.Load(fileSystem, files, additional)
-				.ToDictionaryWithConflictLog(k => k.Key.ToLowerInvariant(), makeObject, "LoadFromManifest<" + name + ">");
+			IEnumerable<MiniYamlNode> yamlNodes = MiniYaml.Load(fileSystem, files, additional);
 
-			return new ReadOnlyDictionary<string, T>(result);
+			// Optionally, the caller can filter out elements from the loaded set of nodes. Default behavior is unfiltered.
+			if (filterNode != null)
+				yamlNodes = yamlNodes.Where(k => !filterNode(k));
+
+			return new ReadOnlyDictionary<string, T>(yamlNodes.ToDictionaryWithConflictLog(k => k.Key.ToLowerInvariant(), makeObject, "LoadFromManifest<" + name + ">"));
 		}
 
 		public static Ruleset LoadDefaults(ModData modData)
@@ -108,7 +129,8 @@ namespace OpenRA
 			Action f = () =>
 			{
 				var actors = MergeOrDefault("Manifest,Rules", fs, m.Rules, null, null,
-					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value));
+					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value),
+					filterNode: n => n.Key.StartsWith(ActorInfo.AbstractActorPrefix, StringComparison.Ordinal));
 
 				var weapons = MergeOrDefault("Manifest,Weapons", fs, m.Weapons, null, null,
 					k => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
@@ -166,7 +188,8 @@ namespace OpenRA
 			Action f = () =>
 			{
 				var actors = MergeOrDefault("Rules", fileSystem, m.Rules, mapRules, dr.Actors,
-					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value));
+					k => new ActorInfo(modData.ObjectCreator, k.Key.ToLowerInvariant(), k.Value),
+					filterNode: n => n.Key.StartsWith(ActorInfo.AbstractActorPrefix, StringComparison.Ordinal));
 
 				var weapons = MergeOrDefault("Weapons", fileSystem, m.Weapons, mapWeapons, dr.Weapons,
 					k => new WeaponInfo(k.Key.ToLowerInvariant(), k.Value));
@@ -227,10 +250,13 @@ namespace OpenRA
 					{
 						var traitName = traitNode.Key.Split('@')[0];
 						var traitType = modData.ObjectCreator.FindType(traitName + "Info");
-						if (traitType.GetInterface("ILobbyCustomRulesIgnore") == null)
+						if (traitType != null && traitType.GetInterface("ILobbyCustomRulesIgnore") == null)
 							return true;
 					}
-					catch { }
+					catch (Exception ex)
+					{
+						Log.Write("debug", "Error in AnyFlaggedTraits\r\n" + ex.ToString());
+					}
 				}
 			}
 
@@ -241,7 +267,7 @@ namespace OpenRA
 			MiniYaml mapRules, MiniYaml mapWeapons, MiniYaml mapVoices, MiniYaml mapNotifications, MiniYaml mapSequences)
 		{
 			// Maps that define any weapon, voice, notification, or sequence overrides are always flagged
-			if (AnyCustomYaml(mapWeapons) || AnyCustomYaml(mapVoices) || AnyCustomYaml(mapNotifications) ||	AnyCustomYaml(mapSequences))
+			if (AnyCustomYaml(mapWeapons) || AnyCustomYaml(mapVoices) || AnyCustomYaml(mapNotifications) || AnyCustomYaml(mapSequences))
 				return true;
 
 			// Any trait overrides that aren't explicitly whitelisted are flagged

OpenRA.Game/GameRules/SoundInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -33,18 +33,39 @@ namespace OpenRA.GameRules
 		{
 			FieldLoader.Load(this, y);
 
-			VoicePools = Exts.Lazy(() => Voices.ToDictionary(a => a.Key, a => new SoundPool(a.Value)));
-			NotificationsPools = Exts.Lazy(() => Notifications.ToDictionary(a => a.Key, a => new SoundPool(a.Value)));
+			VoicePools = Exts.Lazy(() => Voices.ToDictionary(a => a.Key, a => new SoundPool(1f, a.Value)));
+			NotificationsPools = Exts.Lazy(() => ParseSoundPool(y, "Notifications"));
+		}
+
+		Dictionary<string, SoundPool> ParseSoundPool(MiniYaml y, string key)
+		{
+			var ret = new Dictionary<string, SoundPool>();
+			var classifiction = y.Nodes.First(x => x.Key == key);
+			foreach (var t in classifiction.Value.Nodes)
+			{
+				var volumeModifier = 1f;
+				var volumeModifierNode = t.Value.Nodes.FirstOrDefault(x => x.Key == "VolumeModifier");
+				if (volumeModifierNode != null)
+					volumeModifier = FieldLoader.GetValue<float>(volumeModifierNode.Key, volumeModifierNode.Value.Value);
+
+				var names = FieldLoader.GetValue<string[]>(t.Key, t.Value.Value);
+				var sp = new SoundPool(volumeModifier, names);
+				ret.Add(t.Key, sp);
+			}
+
+			return ret;
 		}
 	}
 
 	public class SoundPool
 	{
+		public readonly float VolumeModifier;
 		readonly string[] clips;
 		readonly List<string> liveclips = new List<string>();
 
-		public SoundPool(params string[] clips)
+		public SoundPool(float volumeModifier, params string[] clips)
 		{
+			VolumeModifier = volumeModifier;
 			this.clips = clips;
 		}
 
@@ -53,8 +74,9 @@ namespace OpenRA.GameRules
 			if (liveclips.Count == 0)
 				liveclips.AddRange(clips);
 
+			// Avoid crashing if there's no clips at all
 			if (liveclips.Count == 0)
-				return null;		/* avoid crashing if there's no clips at all */
+				return null;
 
 			var i = Game.CosmeticRandom.Next(liveclips.Count);
 			var s = liveclips[i];

OpenRA.Game/GameRules/WeaponInfo.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -13,6 +13,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Effects;
+using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA.GameRules
@@ -24,6 +25,7 @@ namespace OpenRA.GameRules
 		public int[] InaccuracyModifiers;
 		public int[] RangeModifiers;
 		public int Facing;
+		public Func<int> CurrentMuzzleFacing;
 		public WPos Source;
 		public Func<WPos> CurrentSource;
 		public Actor SourceActor;
@@ -64,13 +66,14 @@ namespace OpenRA.GameRules
 		public readonly int Burst = 1;
 
 		[Desc("What types of targets are affected.")]
-		public readonly HashSet<string> ValidTargets = new HashSet<string> { "Ground", "Water" };
+		public readonly BitSet<TargetableType> ValidTargets = new BitSet<TargetableType>("Ground", "Water");
 
 		[Desc("What types of targets are unaffected.", "Overrules ValidTargets.")]
-		public readonly HashSet<string> InvalidTargets = new HashSet<string>();
+		public readonly BitSet<TargetableType> InvalidTargets;
 
-		[Desc("Delay in ticks between firing shots from the same ammo magazine.")]
-		public readonly int BurstDelay = 5;
+		[Desc("Delay in ticks between firing shots from the same ammo magazine. If one entry, it will be used for all bursts.",
+			"If multiple entries, their number needs to match Burst - 1.")]
+		public readonly int[] BurstDelays = { 5 };
 
 		[Desc("The minimum range the weapon can fire.")]
 		public readonly WDist MinRange = WDist.Zero;
@@ -115,7 +118,7 @@ namespace OpenRA.GameRules
 			return retList;
 		}
 
-		public bool IsValidTarget(IEnumerable<string> targetTypes)
+		public bool IsValidTarget(BitSet<TargetableType> targetTypes)
 		{
 			return ValidTargets.Overlaps(targetTypes) && !InvalidTargets.Overlaps(targetTypes);
 		}

OpenRA.Game/GameSpeed.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of

OpenRA.Game/GlobalChat.cs

@@ -1,387 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections;
-using System.Linq;
-using System.Threading;
-using Meebey.SmartIrc4net;
-using OpenRA.Primitives;
-
-namespace OpenRA.Chat
-{
-	public enum ChatConnectionStatus { Disconnected, Connecting, Connected, Disconnecting, Joined, Error }
-	public enum ChatMessageType { Message, Notification }
-
-	public sealed class ChatUser
-	{
-		public readonly string Name;
-		public bool IsOp;
-		public bool IsVoiced;
-
-		public ChatUser(string name, bool isOp, bool isVoice)
-		{
-			Name = name;
-			IsOp = isOp;
-			IsVoiced = isVoice;
-		}
-	}
-
-	public sealed class ChatMessage
-	{
-		static long nextUID;
-
-		public readonly DateTime Time;
-		public readonly ChatMessageType Type;
-		public readonly string Nick;
-		public readonly string Message;
-		public readonly string UID;
-
-		public ChatMessage(DateTime time, ChatMessageType type, string nick, string message)
-		{
-			Time = time;
-			Type = type;
-			Nick = nick;
-			Message = message;
-
-			UID = Interlocked.Increment(ref nextUID).ToString();
-		}
-
-		public override string ToString()
-		{
-			var time = Time.ToString(Game.Settings.Chat.TimestampFormat);
-			if (Type == ChatMessageType.Notification)
-				return "{0} {1}".F(time, Message);
-
-			return "{0} {1}: {2}".F(time, Nick, Message);
-		}
-	}
-
-	public sealed class GlobalChat : IDisposable
-	{
-		readonly IrcClient client = new IrcClient();
-		volatile Channel channel;
-
-		public readonly ObservableSortedDictionary<string, ChatUser> Users = new ObservableSortedDictionary<string, ChatUser>(StringComparer.InvariantCultureIgnoreCase);
-		public readonly ObservableList<ChatMessage> History = new ObservableList<ChatMessage>();
-
-		volatile string topic;
-		public string Topic { get { return topic; } }
-
-		volatile ChatConnectionStatus connectionStatus = ChatConnectionStatus.Disconnected;
-		public ChatConnectionStatus ConnectionStatus { get { return connectionStatus; } }
-
-		string nickname;
-
-		public GlobalChat()
-		{
-			client.Encoding = System.Text.Encoding.UTF8;
-			client.SendDelay = 100;
-			client.ActiveChannelSyncing = true;
-
-			client.OnConnecting += OnConnecting;
-			client.OnConnected += OnConnected;
-			client.OnDisconnecting += OnDisconnecting;
-			client.OnDisconnected += OnDisconnected;
-			client.OnError += OnError;
-			client.OnKick += OnKick;
-
-			client.OnRawMessage += (_, e) => Game.RunAfterTick(() => Log.Write("irc", e.Data.RawMessage));
-			client.OnJoin += OnJoin;
-			client.OnChannelActiveSynced += OnChannelActiveSynced;
-			client.OnTopic += (_, e) => topic = e.Topic;
-			client.OnTopicChange += (_, e) => topic = e.NewTopic;
-			client.OnNickChange += OnNickChange;
-
-			client.OnChannelMessage += (_, e) => AddMessage(e.Data.Nick, e.Data.Message);
-			client.OnOp += (_, e) => SetUserOp(e.Whom, true);
-			client.OnDeop += (_, e) => SetUserOp(e.Whom, false);
-			client.OnVoice += (_, e) => SetUserVoiced(e.Whom, true);
-			client.OnDevoice += (_, e) => SetUserVoiced(e.Whom, false);
-			client.OnPart += OnPart;
-			client.OnQuit += OnQuit;
-		}
-
-		void SetUserOp(string whom, bool isOp)
-		{
-			Game.RunAfterTick(() =>
-			{
-				ChatUser user;
-				if (Users.TryGetValue(whom, out user))
-					user.IsOp = isOp;
-			});
-		}
-
-		void SetUserVoiced(string whom, bool isVoiced)
-		{
-			Game.RunAfterTick(() =>
-			{
-				ChatUser user;
-				if (Users.TryGetValue(whom, out user))
-					user.IsVoiced = isVoiced;
-			});
-		}
-
-		public void Connect(string nickname)
-		{
-			if (client.IsConnected || !IsValidNickname(nickname))
-				return;
-
-			this.nickname = nickname;
-
-			new Thread(() =>
-			{
-				try
-				{
-					client.Connect(Game.Settings.Chat.Hostname, Game.Settings.Chat.Port);
-				}
-				catch (Exception e)
-				{
-					connectionStatus = ChatConnectionStatus.Error;
-					AddNotification(e.Message);
-					Game.RunAfterTick(() => Log.Write("irc", e.ToString()));
-
-					return;
-				}
-
-				client.Listen();
-			}) { Name = "IrcListenThread", IsBackground = true }.Start();
-		}
-
-		void AddNotification(string text)
-		{
-			var message = new ChatMessage(DateTime.Now, ChatMessageType.Notification, null, text);
-			Game.RunAfterTick(() =>
-			{
-				History.Add(message);
-				Log.Write("irc", text);
-			});
-		}
-
-		void AddMessage(string nick, string text)
-		{
-			var message = new ChatMessage(DateTime.Now, ChatMessageType.Message, nick, text);
-			Game.RunAfterTick(() =>
-			{
-				History.Add(message);
-				Log.Write("irc", text);
-			});
-		}
-
-		void OnConnecting(object sender, EventArgs e)
-		{
-			AddNotification("Connecting to {0}:{1}...".F(Game.Settings.Chat.Hostname, Game.Settings.Chat.Port));
-			connectionStatus = ChatConnectionStatus.Connecting;
-		}
-
-		void OnConnected(object sender, EventArgs e)
-		{
-			AddNotification("Connected.");
-			connectionStatus = ChatConnectionStatus.Connected;
-
-			client.Login(nickname, "in-game IRC client", 0, "OpenRA");
-			client.RfcJoin("#" + Game.Settings.Chat.Channel);
-		}
-
-		void OnDisconnecting(object sender, EventArgs e)
-		{
-			if (connectionStatus != ChatConnectionStatus.Error)
-				connectionStatus = ChatConnectionStatus.Disconnecting;
-		}
-
-		void OnDisconnected(object sender, EventArgs e)
-		{
-			Game.RunAfterTick(Users.Clear);
-
-			// Keep the chat window open if there is an error
-			// It will be cleared by the Disconnect button
-			if (connectionStatus != ChatConnectionStatus.Error)
-			{
-				Game.RunAfterTick(History.Clear);
-				topic = null;
-				connectionStatus = ChatConnectionStatus.Disconnected;
-			}
-		}
-
-		void OnError(object sender, ErrorEventArgs e)
-		{
-			// Ignore any errors that happen during disconnect
-			if (connectionStatus != ChatConnectionStatus.Disconnecting)
-			{
-				connectionStatus = ChatConnectionStatus.Error;
-				AddNotification("Error: " + e.ErrorMessage);
-			}
-		}
-
-		void OnKick(object sender, KickEventArgs e)
-		{
-			if (e.Whom == client.Nickname)
-			{
-				Disconnect();
-				connectionStatus = ChatConnectionStatus.Error;
-				AddNotification("You were kicked from the chat by {0}. ({1})".F(e.Who, e.KickReason));
-			}
-			else
-			{
-				Users.Remove(e.Whom);
-				AddNotification("{0} was kicked from the chat by {1}. ({2})".F(e.Whom, e.Who, e.KickReason));
-			}
-		}
-
-		void OnJoin(object sender, JoinEventArgs e)
-		{
-			if (e.Who == client.Nickname || channel == null || e.Channel != channel.Name)
-				return;
-
-			AddNotification("{0} joined the chat.".F(e.Who));
-			Game.RunAfterTick(() => Users.Add(e.Who, new ChatUser(e.Who, false, false)));
-		}
-
-		void OnChannelActiveSynced(object sender, IrcEventArgs e)
-		{
-			channel = client.GetChannel(e.Data.Channel);
-			AddNotification("{0} users online".F(channel.Users.Count));
-			connectionStatus = ChatConnectionStatus.Joined;
-
-			foreach (DictionaryEntry user in channel.Users)
-			{
-				var u = (ChannelUser)user.Value;
-				Game.RunAfterTick(() => Users.Add(u.Nick, new ChatUser(u.Nick, u.IsOp, u.IsVoice)));
-			}
-		}
-
-		void OnNickChange(object sender, NickChangeEventArgs e)
-		{
-			AddNotification("{0} is now known as {1}.".F(e.OldNickname, e.NewNickname));
-
-			Game.RunAfterTick(() =>
-			{
-				ChatUser user;
-				if (!Users.TryGetValue(e.OldNickname, out user))
-					return;
-
-				Users.Remove(e.OldNickname);
-				Users.Add(e.NewNickname, new ChatUser(e.NewNickname, user.IsOp, user.IsVoiced));
-			});
-		}
-
-		void OnQuit(object sender, QuitEventArgs e)
-		{
-			AddNotification("{0} left the chat.".F(e.Who));
-			Game.RunAfterTick(() => Users.Remove(e.Who));
-		}
-
-		void OnPart(object sender, PartEventArgs e)
-		{
-			if (channel == null || e.Data.Channel != channel.Name)
-				return;
-
-			AddNotification("{0} left the chat.".F(e.Who));
-			Game.RunAfterTick(() => Users.Remove(e.Who));
-		}
-
-		public string SanitizedName(string dirty)
-		{
-			if (string.IsNullOrEmpty(dirty))
-				return null;
-
-			// There is no need to mangle the nick if it is already valid
-			if (Rfc2812.IsValidNickname(dirty))
-				return dirty;
-
-			// TODO: some special chars are allowed as well, but not at every position
-			var clean = new string(dirty.Where(c => char.IsLetterOrDigit(c)).ToArray());
-
-			if (string.IsNullOrEmpty(clean))
-				return null;
-
-			if (char.IsDigit(clean[0]))
-				return SanitizedName(clean.Substring(1));
-
-			// Source: https://tools.ietf.org/html/rfc2812#section-1.2.1
-			if (clean.Length > 9)
-				clean = clean.Substring(0, 9);
-
-			return clean;
-		}
-
-		public bool IsValidNickname(string name)
-		{
-			return Rfc2812.IsValidNickname(name);
-		}
-
-		public void SendMessage(string text)
-		{
-			if (connectionStatus != ChatConnectionStatus.Joined)
-				return;
-
-			// Guard against a last-moment disconnection
-			try
-			{
-				client.SendMessage(SendType.Message, channel.Name, text);
-				AddMessage(client.Nickname, text);
-			}
-			catch (NotConnectedException) { }
-		}
-
-		public bool TrySetNickname(string nick)
-		{
-			// TODO: This is inconsistent with the other check
-			if (Rfc2812.IsValidNickname(nick))
-			{
-				client.RfcNick(nick);
-				return true;
-			}
-
-			return false;
-		}
-
-		public void Disconnect()
-		{
-			// Error is an alias for disconnect, but keeps the panel open
-			// so that clients can see the error
-			if (connectionStatus == ChatConnectionStatus.Error)
-			{
-				Game.RunAfterTick(History.Clear);
-				topic = null;
-				connectionStatus = ChatConnectionStatus.Disconnected;
-			}
-			else
-				connectionStatus = ChatConnectionStatus.Disconnecting;
-
-			if (!client.IsConnected)
-				return;
-
-			client.RfcQuit(Game.Settings.Chat.QuitMessage);
-
-			AddNotification("Disconnecting from {0}...".F(client.Address));
-
-			Game.RunAfterTick(() => { Game.Settings.Chat.ConnectAutomatically = false; Game.Settings.Save(); });
-		}
-
-		public void Dispose()
-		{
-			// HACK: The IRC library we are using has terrible thread-handling code that relies on Thread.Abort.
-			// There is a thread reading from the network socket which is aborted, however on Windows this is inside
-			// native code so this abort call hangs until the network socket reads something and returns to managed
-			// code where it can then be aborted.
-			//
-			// This means we may hang for several seconds during shutdown (until we receive something over IRC!) before
-			// closing.
-			//
-			// Since our IRC client currently lives forever, the only time we call this Dispose method is during the
-			// shutdown of our process. Therefore, we can work around the problem by just not bothering to disconnect
-			// properly. Since our process is about to die anyway, it's not like anyone will care.
-			////if (client.IsConnected)
-			////	client.Disconnect();
-		}
-	}
-}

OpenRA.Game/Graphics/Animation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,8 +10,8 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Primitives;
 using OpenRA.Support;
 
 namespace OpenRA.Graphics
@@ -49,10 +49,10 @@ namespace OpenRA.Graphics
 			this.paused = paused;
 		}
 
-		public int CurrentFrame { get { return backwards ? CurrentSequence.Start + CurrentSequence.Length - frame - 1 : frame; } }
+		public int CurrentFrame { get { return backwards ? CurrentSequence.Length - frame - 1 : frame; } }
 		public Sprite Image { get { return CurrentSequence.GetSprite(CurrentFrame, facingFunc()); } }
 
-		public IEnumerable<IRenderable> Render(WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale)
+		public IRenderable[] Render(WPos pos, WVec offset, int zOffset, PaletteReference palette, float scale)
 		{
 			var imageRenderable = new SpriteRenderable(Image, pos, offset, CurrentSequence.ZOffset + zOffset, palette, scale, IsDecoration);
 
@@ -66,7 +66,18 @@ namespace OpenRA.Graphics
 			return new IRenderable[] { imageRenderable };
 		}
 
-		public IEnumerable<IRenderable> Render(WPos pos, PaletteReference palette)
+		public Rectangle ScreenBounds(WorldRenderer wr, WPos pos, WVec offset, float scale)
+		{
+			var xy = wr.ScreenPxPosition(pos) + wr.ScreenPxOffset(offset);
+			var cb = CurrentSequence.Bounds;
+			return Rectangle.FromLTRB(
+				xy.X + (int)(cb.Left * scale),
+				xy.Y + (int)(cb.Top * scale),
+				xy.X + (int)(cb.Right * scale),
+				xy.Y + (int)(cb.Bottom * scale));
+		}
+
+		public IRenderable[] Render(WPos pos, PaletteReference palette)
 		{
 			return Render(pos, WVec.Zero, 0, palette, 1f);
 		}

OpenRA.Game/Graphics/AnimationWithOffset.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,7 +10,7 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -35,7 +35,7 @@ namespace OpenRA.Graphics
 			ZOffset = zOffset;
 		}
 
-		public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr, PaletteReference pal, float scale)
+		public IRenderable[] Render(Actor self, WorldRenderer wr, PaletteReference pal, float scale)
 		{
 			var center = self.CenterPosition;
 			var offset = OffsetFunc != null ? OffsetFunc() : WVec.Zero;
@@ -44,9 +44,17 @@ namespace OpenRA.Graphics
 			return Animation.Render(center, offset, z, pal, scale);
 		}
 
+		public Rectangle ScreenBounds(Actor self, WorldRenderer wr, float scale)
+		{
+			var center = self.CenterPosition;
+			var offset = OffsetFunc != null ? OffsetFunc() : WVec.Zero;
+
+			return Animation.ScreenBounds(wr, center, offset, scale);
+		}
+
 		public static implicit operator AnimationWithOffset(Animation a)
 		{
 			return new AnimationWithOffset(a, null, null, null);
 		}
 	}
-}
+}

OpenRA.Game/Graphics/ChromeProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of

OpenRA.Game/Graphics/CursorProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -12,6 +12,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Traits;
 
 namespace OpenRA.Graphics
 {
@@ -26,21 +27,18 @@ namespace OpenRA.Graphics
 			var sequenceYaml = MiniYaml.Merge(modData.Manifest.Cursors.Select(
 				s => MiniYaml.FromStream(fileSystem.Open(s), s)));
 
-			var shadowIndex = new int[] { };
-
 			var nodesDict = new MiniYaml(null, sequenceYaml).ToDictionary();
-			if (nodesDict.ContainsKey("ShadowIndex"))
-			{
-				Array.Resize(ref shadowIndex, shadowIndex.Length + 1);
-				Exts.TryParseIntegerInvariant(nodesDict["ShadowIndex"].Value,
-					out shadowIndex[shadowIndex.Length - 1]);
-			}
 
-			var palettes = new Dictionary<string, ImmutablePalette>();
-			foreach (var p in nodesDict["Palettes"].Nodes)
-				palettes.Add(p.Key, new ImmutablePalette(fileSystem.Open(p.Value.Value), shadowIndex));
+			// Overwrite previous definitions if there are duplicates
+			var pals = new Dictionary<string, IProvidesCursorPaletteInfo>();
+			foreach (var p in modData.DefaultRules.Actors["world"].TraitInfos<IProvidesCursorPaletteInfo>())
+				if (p.Palette != null)
+					pals[p.Palette] = p;
 
-			Palettes = palettes.AsReadOnly();
+			Palettes = nodesDict["Cursors"].Nodes.Select(n => n.Value.Value)
+				.Distinct()
+				.ToDictionary(p => p, p => pals[p].ReadPalette(modData.DefaultFileSystem))
+				.AsReadOnly();
 
 			var frameCache = new FrameCache(fileSystem, modData.SpriteLoaders);
 			var cursors = new Dictionary<string, CursorSequence>();

OpenRA.Game/Graphics/CursorSequence.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of

OpenRA.Game/Graphics/HSLColor.cs

@@ -1,147 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2017 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, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System.Drawing;
-using System.Globalization;
-using OpenRA.Scripting;
-
-namespace OpenRA.Graphics
-{
-	public struct HSLColor : IScriptBindable
-	{
-		public readonly byte H;
-		public readonly byte S;
-		public readonly byte L;
-		public readonly Color RGB;
-
-		public static HSLColor FromHSV(float h, float s, float v)
-		{
-			var ll = 0.5f * (2 - s) * v;
-			var ss = (ll >= 1 || v <= 0) ? 0 : 0.5f * s * v / (ll <= 0.5f ? ll : 1 - ll);
-			return new HSLColor((byte)(255 * h), (byte)(255 * ss), (byte)(255 * ll));
-		}
-
-		public HSLColor(Color color)
-		{
-			RGB = color;
-			H = (byte)((color.GetHue() / 360.0f) * 255);
-			S = (byte)(color.GetSaturation() * 255);
-			L = (byte)(color.GetBrightness() * 255);
-		}
-
-		public static HSLColor FromRGB(int r, int g, int b)
-		{
-			return new HSLColor(Color.FromArgb(r, g, b));
-		}
-
-		public static Color RGBFromHSL(float h, 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 = { h + 1 / 3.0f, h, h - 1 / 3.0f };
-			float[] rgb = { 0, 0, 0 };
-
-			for (var k = 0; k < 3; k++)
-			{
-				while (trgb[k] < 0) trgb[k] += 1.0f;
-				while (trgb[k] > 1) trgb[k] -= 1.0f;
-			}
-
-			for (var 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 TryParseRGB(string value, out Color color)
-		{
-			color = new Color();
-			value = value.Trim();
-			if (value.Length != 6 && value.Length != 8)
-				return false;
-
-			byte red, green, blue, alpha = 255;
-			if (!byte.TryParse(value.Substring(0, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out red)
-				|| !byte.TryParse(value.Substring(2, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out green)
-				|| !byte.TryParse(value.Substring(4, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out blue))
-				return false;
-
-			if (value.Length == 8
-				&& !byte.TryParse(value.Substring(6, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out alpha))
-				return false;
-
-			color = Color.FromArgb(alpha, red, green, blue);
-			return true;
-		}
-
-		public static bool operator ==(HSLColor me, HSLColor other)
-		{
-			// Binary floating point numbers (float, double) calculations can yield the same RGB color created by different functions with little different HSL representation
-			return (me.H == other.H && me.S == other.S && me.L == other.L) || me.RGB == other.RGB;
-		}
-
-		public static bool operator !=(HSLColor me, HSLColor other) { return !(me == other); }
-
-		public HSLColor(byte h, byte s, byte l)
-		{
-			H = h;
-			S = s;
-			L = l;
-			RGB = RGBFromHSL(H / 255f, S / 255f, L / 255f);
-		}
-
-		public void ToHSV(out float h, out float s, out float v)
-		{
-			var ll = 2 * L / 255f;
-			var ss = S / 255f * ((ll <= 1) ? ll : 2 - ll);
-
-			h = H / 255f;
-			s = (2 * ss) / (ll + ss);
-			v = (ll + ss) / 2;
-		}
-
-		public override string ToString()
-		{
-			return "{0},{1},{2}".F(H, S, L);
-		}
-
-		public static string ToHexString(Color color)
-		{
-			if (color.A == 255)
-				return color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2");
-			return color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2") + color.A.ToString("X2");
-		}
-
-		public string ToHexString()
-		{
-			return ToHexString(RGB);
-		}
-
-		public override int GetHashCode() { return H.GetHashCode() ^ S.GetHashCode() ^ L.GetHashCode(); }
-
-		public override bool Equals(object obj)
-		{
-			var o = obj as HSLColor?;
-			return o != null && o == this;
-		}
-	}
-}

OpenRA.Game/Graphics/HardwareCursor.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,8 +11,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -20,12 +20,26 @@ namespace OpenRA.Graphics
 	{
 		readonly Dictionary<string, IHardwareCursor[]> hardwareCursors = new Dictionary<string, IHardwareCursor[]>();
 		readonly CursorProvider cursorProvider;
+		readonly Dictionary<string, Sprite[]> sprites = new Dictionary<string, Sprite[]>();
+		readonly SheetBuilder sheetBuilder;
+		readonly HardwarePalette hardwarePalette = new HardwarePalette();
+		readonly Cache<string, PaletteReference> paletteReferences;
+
 		CursorSequence cursor;
+		bool isLocked = false;
+		int2 lockedPosition;
 
 		public HardwareCursor(CursorProvider cursorProvider)
 		{
 			this.cursorProvider = cursorProvider;
 
+			paletteReferences = new Cache<string, PaletteReference>(CreatePaletteReference);
+			foreach (var p in cursorProvider.Palettes)
+				hardwarePalette.AddPalette(p.Key, p.Value, false);
+
+			hardwarePalette.Initialize();
+
+			sheetBuilder = new SheetBuilder(SheetType.Indexed);
 			foreach (var kv in cursorProvider.Cursors)
 			{
 				var palette = cursorProvider.Palettes[kv.Value.Palette];
@@ -34,11 +48,22 @@ namespace OpenRA.Graphics
 					.ToArray();
 
 				hardwareCursors.Add(kv.Key, hc);
+
+				var s = kv.Value.Frames.Select(a => sheetBuilder.Add(a)).ToArray();
+				sprites.Add(kv.Key, s);
 			}
 
+			sheetBuilder.Current.ReleaseBuffer();
+
 			Update();
 		}
 
+		PaletteReference CreatePaletteReference(string name)
+		{
+			var pal = hardwarePalette.GetPalette(name);
+			return new PaletteReference(name, hardwarePalette.GetPaletteIndex(name), pal, hardwarePalette);
+		}
+
 		IHardwareCursor CreateCursor(ISpriteFrame f, ImmutablePalette palette, string name, CursorSequence sequence)
 		{
 			var hotspot = sequence.Hotspot - f.Offset.ToInt2() + new int2(f.Size) / 2;
@@ -80,7 +105,7 @@ namespace OpenRA.Graphics
 				}
 			}
 
-			return Game.Renderer.Device.CreateHardwareCursor(name, new Size(dataWidth, dataHeight), data, hotspot);
+			return Game.Renderer.Window.CreateHardwareCursor(name, new Size(dataWidth, dataHeight), data, hotspot);
 		}
 
 		public void SetCursor(string cursorName)
@@ -96,6 +121,7 @@ namespace OpenRA.Graphics
 
 		int frame;
 		int ticks;
+
 		public void Tick()
 		{
 			if (cursor == null || cursor.Length == 1)
@@ -112,18 +138,46 @@ namespace OpenRA.Graphics
 
 		void Update()
 		{
-			if (cursor == null)
-				Game.Renderer.Device.SetHardwareCursor(null);
-			else
-			{
-				if (frame >= cursor.Length)
-					frame = frame % cursor.Length;
+			if (cursor != null && frame >= cursor.Length)
+				frame %= cursor.Length;
 
-				Game.Renderer.Device.SetHardwareCursor(hardwareCursors[cursor.Name][frame]);
-			}
+			if (cursor == null || isLocked)
+				Game.Renderer.Window.SetHardwareCursor(null);
+			else
+				Game.Renderer.Window.SetHardwareCursor(hardwareCursors[cursor.Name][frame]);
 		}
 
-		public void Render(Renderer renderer) { }
+		public void Render(Renderer renderer)
+		{
+			if (cursor.Name == null || !isLocked)
+				return;
+
+			var cursorSequence = cursorProvider.GetCursorSequence(cursor.Name);
+			var cursorSprite = sprites[cursor.Name][frame];
+
+			var cursorOffset = cursorSequence.Hotspot + (0.5f * cursorSprite.Size.XY).ToInt2();
+
+			renderer.SetPalette(hardwarePalette);
+			renderer.SpriteRenderer.DrawSprite(cursorSprite,
+				lockedPosition - cursorOffset,
+				paletteReferences[cursorSequence.Palette],
+				cursorSprite.Size);
+		}
+
+		public void Lock()
+		{
+			lockedPosition = Viewport.LastMousePos;
+			Game.Renderer.Window.SetRelativeMouseMode(true);
+			isLocked = true;
+			Update();
+		}
+
+		public void Unlock()
+		{
+			Game.Renderer.Window.SetRelativeMouseMode(false);
+			isLocked = false;
+			Update();
+		}
 
 		public void Dispose()
 		{
@@ -131,7 +185,8 @@ namespace OpenRA.Graphics
 				foreach (var cursor in cursors.Value)
 					cursor.Dispose();
 
+			sheetBuilder.Dispose();
 			hardwareCursors.Clear();
 		}
 	}
-}
+}

OpenRA.Game/Graphics/HardwarePalette.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -27,7 +27,7 @@ namespace OpenRA.Graphics
 
 		public HardwarePalette()
 		{
-			Texture = Game.Renderer.Device.CreateTexture();
+			Texture = Game.Renderer.Context.CreateTexture();
 			readOnlyModifiablePalettes = modifiablePalettes.AsReadOnly();
 		}
 

OpenRA.Game/Graphics/MappedImage.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,7 +10,7 @@
 #endregion
 
 using System.Collections.Generic;
-using System.Drawing;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -29,7 +29,7 @@ namespace OpenRA.Graphics
 
 		public Sprite GetImage(Sheet s)
 		{
-			return new Sprite(s, rect, TextureChannel.Alpha);
+			return new Sprite(s, rect, TextureChannel.RGBA);
 		}
 
 		public MiniYaml Save(string defaultSrc)

OpenRA.Game/Graphics/Model.cs

@@ -1,6 +1,6 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,6 +11,7 @@
 
 using System;
 using OpenRA.FileSystem;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -23,6 +24,9 @@ namespace OpenRA.Graphics
 		float[] Size { get; }
 		float[] Bounds(uint frame);
 		ModelRenderData RenderData(uint section);
+
+		/// <summary>Returns the smallest rectangle that covers all rotations of all frames in a model</summary>
+		Rectangle AggregateBounds { get; }
 	}
 
 	public struct ModelRenderData

OpenRA.Game/Graphics/ModelAnimation.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,6 +11,7 @@
 
 using System;
 using System.Collections.Generic;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -32,5 +33,26 @@ namespace OpenRA.Graphics
 			FrameFunc = frame;
 			ShowShadow = showshadow;
 		}
+
+		public Rectangle ScreenBounds(WPos pos, WorldRenderer wr, float scale)
+		{
+			var r = Model.AggregateBounds;
+			var offset = OffsetFunc != null ? OffsetFunc() : WVec.Zero;
+			var xy = wr.ScreenPxPosition(pos) + wr.ScreenPxOffset(offset);
+
+			return Rectangle.FromLTRB(
+				xy.X + (int)(r.Left * scale),
+				xy.Y + (int)(r.Top * scale),
+				xy.X + (int)(r.Right * scale),
+				xy.Y + (int)(r.Bottom * scale));
+		}
+
+		public bool IsVisible
+		{
+			get
+			{
+				return DisableFunc == null || !DisableFunc();
+			}
+		}
 	}
-}
+}

OpenRA.Game/Graphics/ModelRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,7 +11,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.Primitives;
 
@@ -51,7 +50,8 @@ namespace OpenRA.Graphics
 		readonly Stack<KeyValuePair<Sheet, IFrameBuffer>> unmappedBuffers = new Stack<KeyValuePair<Sheet, IFrameBuffer>>();
 		readonly List<Pair<Sheet, Action>> doRender = new List<Pair<Sheet, Action>>();
 
-		SheetBuilder sheetBuilder;
+		SheetBuilder sheetBuilderForFrame;
+		bool isInFrame;
 
 		public ModelRenderer(Renderer renderer, IShader shader)
 		{
@@ -83,6 +83,9 @@ namespace OpenRA.Graphics
 			float[] groundNormal, WRot lightSource, float[] lightAmbientColor, float[] lightDiffuseColor,
 			PaletteReference color, PaletteReference normals, PaletteReference shadowPalette)
 		{
+			if (!isInFrame)
+				throw new InvalidOperationException("BeginFrame has not been called. You cannot render until a frame has been started.");
+
 			// Correct for inverted y-axis
 			var scaleTransform = Util.ScaleMatrix(scale, scale, scale);
 
@@ -163,8 +166,11 @@ namespace OpenRA.Graphics
 			CalculateSpriteGeometry(tl, br, 1, out spriteSize, out spriteOffset);
 			CalculateSpriteGeometry(stl, sbr, 2, out shadowSpriteSize, out shadowSpriteOffset);
 
-			var sprite = sheetBuilder.Allocate(spriteSize, 0, spriteOffset);
-			var shadowSprite = sheetBuilder.Allocate(shadowSpriteSize, 0, shadowSpriteOffset);
+			if (sheetBuilderForFrame == null)
+				sheetBuilderForFrame = new SheetBuilder(SheetType.BGRA, AllocateSheet);
+
+			var sprite = sheetBuilderForFrame.Allocate(spriteSize, 0, spriteOffset);
+			var shadowSprite = sheetBuilderForFrame.Allocate(shadowSpriteSize, 0, shadowSpriteOffset);
 			var sb = sprite.Bounds;
 			var ssb = shadowSprite.Bounds;
 			var spriteCenter = new float2(sb.Left + sb.Width / 2, sb.Top + sb.Height / 2);
@@ -271,17 +277,20 @@ namespace OpenRA.Graphics
 			shader.SetVec("AmbientLight", ambientLight, 3);
 			shader.SetVec("DiffuseLight", diffuseLight, 3);
 
-			shader.Render(() => renderer.DrawBatch(cache.VertexBuffer, renderData.Start, renderData.Count, PrimitiveType.TriangleList));
+			shader.PrepareRender();
+			renderer.DrawBatch(cache.VertexBuffer, renderData.Start, renderData.Count, PrimitiveType.TriangleList);
 		}
 
 		public void BeginFrame()
 		{
+			if (isInFrame)
+				throw new InvalidOperationException("BeginFrame has already been called. A new frame cannot be started until EndFrame has been called.");
+
+			isInFrame = true;
+
 			foreach (var kv in mappedBuffers)
 				unmappedBuffers.Push(kv);
 			mappedBuffers.Clear();
-
-			sheetBuilder = new SheetBuilder(SheetType.BGRA, AllocateSheet);
-			doRender.Clear();
 		}
 
 		IFrameBuffer EnableFrameBuffer(Sheet s)
@@ -290,19 +299,25 @@ namespace OpenRA.Graphics
 			Game.Renderer.Flush();
 			fbo.Bind();
 
-			Game.Renderer.Device.EnableDepthBuffer();
+			Game.Renderer.Context.EnableDepthBuffer();
 			return fbo;
 		}
 
 		void DisableFrameBuffer(IFrameBuffer fbo)
 		{
 			Game.Renderer.Flush();
-			Game.Renderer.Device.DisableDepthBuffer();
+			Game.Renderer.Context.DisableDepthBuffer();
 			fbo.Unbind();
 		}
 
 		public void EndFrame()
 		{
+			if (!isInFrame)
+				throw new InvalidOperationException("BeginFrame has not been called. There is no frame to end.");
+
+			isInFrame = false;
+			sheetBuilderForFrame = null;
+
 			if (doRender.Count == 0)
 				return;
 
@@ -325,6 +340,8 @@ namespace OpenRA.Graphics
 
 			if (fbo != null)
 				DisableFrameBuffer(fbo);
+
+			doRender.Clear();
 		}
 
 		public Sheet AllocateSheet()
@@ -338,7 +355,7 @@ namespace OpenRA.Graphics
 			}
 
 			var size = new Size(renderer.SheetSize, renderer.SheetSize);
-			var framebuffer = renderer.Device.CreateFrameBuffer(size);
+			var framebuffer = renderer.Context.CreateFrameBuffer(size);
 			var sheet = new Sheet(SheetType.BGRA, framebuffer.Texture);
 			mappedBuffers.Add(sheet, framebuffer);
 

OpenRA.Game/Graphics/Palette.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,11 +11,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -36,35 +33,6 @@ namespace OpenRA.Graphics
 			return Color.FromArgb((int)palette[index]);
 		}
 
-		public static ColorPalette AsSystemPalette(this IPalette palette)
-		{
-			ColorPalette pal;
-			using (var b = new Bitmap(1, 1, PixelFormat.Format8bppIndexed))
-				pal = b.Palette;
-
-			for (var i = 0; i < Size; i++)
-				pal.Entries[i] = palette.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 Bitmap AsBitmap(this IPalette palette)
-		{
-			var b = new Bitmap(Size, 1, PixelFormat.Format32bppArgb);
-			var data = b.LockBits(new Rectangle(0, 0, b.Width, b.Height),
-								  ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-			var temp = new uint[Size];
-			palette.CopyToArray(temp, 0);
-			Marshal.Copy((int[])(object)temp, 0, data.Scan0, Size);
-			b.UnlockBits(data);
-			return b;
-		}
-
 		public static IPalette AsReadOnly(this IPalette palette)
 		{
 			if (palette is ImmutablePalette)
@@ -117,6 +85,12 @@ namespace OpenRA.Graphics
 					var r = (byte)(reader.ReadByte() << 2);
 					var g = (byte)(reader.ReadByte() << 2);
 					var b = (byte)(reader.ReadByte() << 2);
+
+					// Replicate high bits into the (currently zero) low bits.
+					r |= (byte)(r >> 6);
+					g |= (byte)(g >> 6);
+					b |= (byte)(b >> 6);
+
 					colors[i] = (uint)((255 << 24) | (r << 16) | (g << 8) | b);
 				}
 

OpenRA.Game/Graphics/PaletteReference.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of

OpenRA.Game/Graphics/PlatformInterfaces.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,15 +10,16 @@
 #endregion
 
 using System;
-using System.Drawing;
 using OpenRA.Graphics;
+using OpenRA.Primitives;
 
 namespace OpenRA
 {
 	public interface IPlatform
 	{
-		IGraphicsDevice CreateGraphics(Size size, WindowMode windowMode);
+		IPlatformWindow CreateWindow(Size size, WindowMode windowMode, int batchSize);
 		ISoundEngine CreateSound(string device);
+		IFont CreateFont(byte[] data);
 	}
 
 	public interface IHardwareCursor : IDisposable { }
@@ -34,41 +35,42 @@ namespace OpenRA
 		DoubleMultiplicative
 	}
 
-	public interface IGraphicsDevice : IDisposable
+	public interface IPlatformWindow : IDisposable
 	{
-		IVertexBuffer<Vertex> CreateVertexBuffer(int length);
-		ITexture CreateTexture(Bitmap bitmap);
-		ITexture CreateTexture();
-		IFrameBuffer CreateFrameBuffer(Size s);
-		IShader CreateShader(string name);
+		IGraphicsContext Context { get; }
 
 		Size WindowSize { get; }
 		float WindowScale { get; }
 		event Action<float, float> OnWindowScaleChanged;
 
-		void Clear();
-		void Present();
-		Bitmap TakeScreenshot();
 		void PumpInput(IInputHandler inputHandler);
 		string GetClipboardText();
 		bool SetClipboardText(string text);
-		void DrawPrimitives(PrimitiveType type, int firstVertex, int numVertices);
-
-		void EnableScissor(int left, int top, int width, int height);
-		void DisableScissor();
-
-		void EnableDepthBuffer();
-		void DisableDepthBuffer();
-		void ClearDepthBuffer();
-
-		void SetBlendMode(BlendMode mode);
 
 		void GrabWindowMouseFocus();
 		void ReleaseWindowMouseFocus();
 
 		IHardwareCursor CreateHardwareCursor(string name, Size size, byte[] data, int2 hotspot);
 		void SetHardwareCursor(IHardwareCursor cursor);
+		void SetRelativeMouseMode(bool mode);
+	}
 
+	public interface IGraphicsContext : IDisposable
+	{
+		IVertexBuffer<Vertex> CreateVertexBuffer(int size);
+		ITexture CreateTexture();
+		IFrameBuffer CreateFrameBuffer(Size s);
+		IShader CreateShader(string name);
+		void EnableScissor(int left, int top, int width, int height);
+		void DisableScissor();
+		void SaveScreenshot(string path);
+		void Present();
+		void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices);
+		void Clear();
+		void EnableDepthBuffer();
+		void DisableDepthBuffer();
+		void ClearDepthBuffer();
+		void SetBlendMode(BlendMode mode);
 		string GLVersion { get; }
 	}
 
@@ -89,14 +91,13 @@ namespace OpenRA
 		void SetVec(string name, float[] vec, int length);
 		void SetTexture(string param, ITexture texture);
 		void SetMatrix(string param, float[] mtx);
-		void Render(Action a);
+		void PrepareRender();
 	}
 
 	public enum TextureScaleFilter { Nearest, Linear }
 
 	public interface ITexture : IDisposable
 	{
-		void SetData(Bitmap bitmap);
 		void SetData(uint[,] colors);
 		void SetData(byte[] colors, int width, int height);
 		byte[] GetData();
@@ -130,4 +131,17 @@ namespace OpenRA
 		Fullscreen,
 		PseudoFullscreen,
 	}
+
+	public interface IFont : IDisposable
+	{
+		FontGlyph CreateGlyph(char c, int size, float deviceScale);
+	}
+
+	public struct FontGlyph
+	{
+		public int2 Offset;
+		public Size Size;
+		public float Advance;
+		public byte[] Data;
+	}
 }

OpenRA.Game/Graphics/PlayerColorRemap.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,7 +11,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.Primitives;
 
@@ -26,12 +25,16 @@ namespace OpenRA.Graphics
 			return ramp[i];
 		}
 
-		public PlayerColorRemap(int[] ramp, HSLColor c, float rampFraction)
+		public PlayerColorRemap(int[] ramp, Color c, float rampFraction)
 		{
+			var h = c.GetHue() / 360.0f;
+			var s = c.GetSaturation();
+			var l = c.GetBrightness();
+
 			// Increase luminosity if required to represent the full ramp
-			var rampRange = (byte)((1 - rampFraction) * c.L);
-			var c1 = new HSLColor(c.H, c.S, Math.Max(rampRange, c.L)).RGB;
-			var c2 = new HSLColor(c.H, c.S, (byte)Math.Max(0, c.L - rampRange)).RGB;
+			var rampRange = (byte)((1 - rampFraction) * l);
+			var c1 = Color.FromAhsl(h, s, Math.Max(rampRange, l));
+			var c2 = Color.FromAhsl(h, s, (byte)Math.Max(0, l - rampRange));
 			var baseIndex = ramp[0];
 			var remapRamp = ramp.Select(r => r - ramp[0]);
 			var rampMaxIndex = ramp.Length - 1;

OpenRA.Game/Graphics/Renderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -9,7 +9,7 @@
  */
 #endregion
 
-using System.Drawing;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {

OpenRA.Game/Graphics/RgbaColorRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,49 +11,25 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
-	public class RgbaColorRenderer : Renderer.IBatchRenderer
+	public class RgbaColorRenderer
 	{
-		static readonly float2 Offset = new float2(0.5f, 0.5f);
+		static readonly float3 Offset = new float3(0.5f, 0.5f, 0f);
 
-		readonly Renderer renderer;
-		readonly IShader shader;
-		readonly Action renderAction;
+		readonly SpriteRenderer parent;
+		readonly Vertex[] vertices = new Vertex[6];
 
-		readonly Vertex[] vertices;
-		int nv = 0;
-
-		public RgbaColorRenderer(Renderer renderer, IShader shader)
+		public RgbaColorRenderer(SpriteRenderer parent)
 		{
-			this.renderer = renderer;
-			this.shader = shader;
-			vertices = new Vertex[renderer.TempBufferSize];
-			renderAction = () => renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList);
-		}
-
-		public void Flush()
-		{
-			if (nv > 0)
-			{
-				renderer.Device.SetBlendMode(BlendMode.Alpha);
-				shader.Render(renderAction);
-				renderer.Device.SetBlendMode(BlendMode.None);
-
-				nv = 0;
-			}
+			this.parent = parent;
 		}
 
 		public void DrawLine(float3 start, float3 end, float width, Color startColor, Color endColor)
 		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (nv + 6 > renderer.TempBufferSize)
-				Flush();
-
 			var delta = (end - start) / (end - start).XY.Length;
 			var corner = width / 2 * new float3(-delta.Y, delta.X, delta.Z);
 
@@ -69,21 +45,18 @@ namespace OpenRA.Graphics
 			var eb = endColor.B / 255.0f;
 			var ea = endColor.A / 255.0f;
 
-			vertices[nv++] = new Vertex(start - corner + Offset, sr, sg, sb, sa, 0, 0);
-			vertices[nv++] = new Vertex(start + corner + Offset, sr, sg, sb, sa, 0, 0);
-			vertices[nv++] = new Vertex(end + corner + Offset, er, eg, eb, ea, 0, 0);
-			vertices[nv++] = new Vertex(end + corner + Offset, er, eg, eb, ea, 0, 0);
-			vertices[nv++] = new Vertex(end - corner + Offset, er, eg, eb, ea, 0, 0);
-			vertices[nv++] = new Vertex(start - corner + Offset, sr, sg, sb, sa, 0, 0);
+			vertices[0] = new Vertex(start - corner + Offset, sr, sg, sb, sa, 0, 0);
+			vertices[1] = new Vertex(start + corner + Offset, sr, sg, sb, sa, 0, 0);
+			vertices[2] = new Vertex(end + corner + Offset, er, eg, eb, ea, 0, 0);
+			vertices[3] = new Vertex(end + corner + Offset, er, eg, eb, ea, 0, 0);
+			vertices[4] = new Vertex(end - corner + Offset, er, eg, eb, ea, 0, 0);
+			vertices[5] = new Vertex(start - corner + Offset, sr, sg, sb, sa, 0, 0);
+
+			parent.DrawRGBAVertices(vertices);
 		}
 
 		public void DrawLine(float3 start, float3 end, float width, Color color)
 		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (nv + 6 > renderer.TempBufferSize)
-				Flush();
-
 			var delta = (end - start) / (end - start).XY.Length;
 			var corner = width / 2 * new float2(-delta.Y, delta.X);
 
@@ -93,12 +66,13 @@ namespace OpenRA.Graphics
 			var b = color.B / 255.0f;
 			var a = color.A / 255.0f;
 
-			vertices[nv++] = new Vertex(start - corner + Offset, r, g, b, a, 0, 0);
-			vertices[nv++] = new Vertex(start + corner + Offset, r, g, b, a, 0, 0);
-			vertices[nv++] = new Vertex(end + corner + Offset, r, g, b, a, 0, 0);
-			vertices[nv++] = new Vertex(end + corner + Offset, r, g, b, a, 0, 0);
-			vertices[nv++] = new Vertex(end - corner + Offset, r, g, b, a, 0, 0);
-			vertices[nv++] = new Vertex(start - corner + Offset, r, g, b, a, 0, 0);
+			vertices[0] = new Vertex(start - corner + Offset, r, g, b, a, 0, 0);
+			vertices[1] = new Vertex(start + corner + Offset, r, g, b, a, 0, 0);
+			vertices[2] = new Vertex(end + corner + Offset, r, g, b, a, 0, 0);
+			vertices[3] = new Vertex(end + corner + Offset, r, g, b, a, 0, 0);
+			vertices[4] = new Vertex(end - corner + Offset, r, g, b, a, 0, 0);
+			vertices[5] = new Vertex(start - corner + Offset, r, g, b, a, 0, 0);
+			parent.DrawRGBAVertices(vertices);
 		}
 
 		/// <summary>
@@ -146,7 +120,6 @@ namespace OpenRA.Graphics
 				return;
 			}
 
-			renderer.CurrentBatchRenderer = this;
 			color = Util.PremultiplyAlpha(color);
 			var r = color.R / 255.0f;
 			var g = color.G / 255.0f;
@@ -184,15 +157,13 @@ namespace OpenRA.Graphics
 				var cd = closed || i < limit ? IntersectionOf(end - corner, dir, end - nextCorner, nextDir) : end - corner;
 
 				// Fill segment
-				if (nv + 6 > renderer.TempBufferSize)
-					Flush();
-
-				vertices[nv++] = new Vertex(ca + Offset, r, g, b, a, 0, 0);
-				vertices[nv++] = new Vertex(cb + Offset, r, g, b, a, 0, 0);
-				vertices[nv++] = new Vertex(cc + Offset, r, g, b, a, 0, 0);
-				vertices[nv++] = new Vertex(cc + Offset, r, g, b, a, 0, 0);
-				vertices[nv++] = new Vertex(cd + Offset, r, g, b, a, 0, 0);
-				vertices[nv++] = new Vertex(ca + Offset, r, g, b, a, 0, 0);
+				vertices[0] = new Vertex(ca + Offset, r, g, b, a, 0, 0);
+				vertices[1] = new Vertex(cb + Offset, r, g, b, a, 0, 0);
+				vertices[2] = new Vertex(cc + Offset, r, g, b, a, 0, 0);
+				vertices[3] = new Vertex(cc + Offset, r, g, b, a, 0, 0);
+				vertices[4] = new Vertex(cd + Offset, r, g, b, a, 0, 0);
+				vertices[5] = new Vertex(ca + Offset, r, g, b, a, 0, 0);
+				parent.DrawRGBAVertices(vertices);
 
 				// Advance line segment
 				end = next;
@@ -204,11 +175,6 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public void DrawLine(IEnumerable<float2> points, float width, Color color, bool connectSegments = false)
-		{
-			DrawLine(points.Select(p => new float3(p, 0)), width, color, connectSegments);
-		}
-
 		public void DrawLine(IEnumerable<float3> points, float width, Color color, bool connectSegments = false)
 		{
 			if (!connectSegments)
@@ -234,6 +200,20 @@ namespace OpenRA.Graphics
 			DrawPolygon(new[] { tl, tr, br, bl }, width, color);
 		}
 
+		public void FillTriangle(float3 a, float3 b, float3 c, Color color)
+		{
+			color = Util.PremultiplyAlpha(color);
+			var cr = color.R / 255.0f;
+			var cg = color.G / 255.0f;
+			var cb = color.B / 255.0f;
+			var ca = color.A / 255.0f;
+
+			vertices[0] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[1] = new Vertex(b + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[2] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
+			parent.DrawRGBAVertices(vertices);
+		}
+
 		public void FillRect(float3 tl, float3 br, Color color)
 		{
 			var tr = new float3(br.X, tl.Y, tl.Z);
@@ -243,23 +223,42 @@ namespace OpenRA.Graphics
 
 		public void FillRect(float3 a, float3 b, float3 c, float3 d, Color color)
 		{
-			renderer.CurrentBatchRenderer = this;
-
-			if (nv + 6 > renderer.TempBufferSize)
-				Flush();
-
 			color = Util.PremultiplyAlpha(color);
 			var cr = color.R / 255.0f;
 			var cg = color.G / 255.0f;
 			var cb = color.B / 255.0f;
 			var ca = color.A / 255.0f;
 
-			vertices[nv++] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
-			vertices[nv++] = new Vertex(b + Offset, cr, cg, cb, ca, 0, 0);
-			vertices[nv++] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
-			vertices[nv++] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
-			vertices[nv++] = new Vertex(d + Offset, cr, cg, cb, ca, 0, 0);
-			vertices[nv++] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[0] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[1] = new Vertex(b + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[2] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[3] = new Vertex(c + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[4] = new Vertex(d + Offset, cr, cg, cb, ca, 0, 0);
+			vertices[5] = new Vertex(a + Offset, cr, cg, cb, ca, 0, 0);
+			parent.DrawRGBAVertices(vertices);
+		}
+
+		public void FillRect(float3 a, float3 b, float3 c, float3 d, Color topLeftColor, Color topRightColor, Color bottomRightColor, Color bottomLeftColor)
+		{
+			vertices[0] = VertexWithColor(a + Offset, topLeftColor);
+			vertices[1] = VertexWithColor(b + Offset, topRightColor);
+			vertices[2] = VertexWithColor(c + Offset, bottomRightColor);
+			vertices[3] = VertexWithColor(c + Offset, bottomRightColor);
+			vertices[4] = VertexWithColor(d + Offset, bottomLeftColor);
+			vertices[5] = VertexWithColor(a + Offset, topLeftColor);
+
+			parent.DrawRGBAVertices(vertices);
+		}
+
+		static Vertex VertexWithColor(float3 xyz, Color color)
+		{
+			color = Util.PremultiplyAlpha(color);
+			var cr = color.R / 255.0f;
+			var cg = color.G / 255.0f;
+			var cb = color.B / 255.0f;
+			var ca = color.A / 255.0f;
+
+			return new Vertex(xyz, cr, cg, cb, ca, 0, 0);
 		}
 
 		public void FillEllipse(float3 tl, float3 br, Color color, int vertices = 32)
@@ -276,20 +275,5 @@ namespace OpenRA.Graphics
 				DrawLine(new float3(xc - dx, y, z), new float3(xc + dx, y, z), 1, color);
 			}
 		}
-
-		public void SetViewportParams(Size screen, float depthScale, float depthOffset, float zoom, int2 scroll)
-		{
-			shader.SetVec("Scroll", scroll.X, scroll.Y, scroll.Y);
-			shader.SetVec("r1",
-				zoom * 2f / screen.Width,
-				-zoom * 2f / screen.Height,
-				-depthScale * zoom / screen.Height);
-			shader.SetVec("r2", -1, 1, 1 - depthOffset);
-		}
-
-		public void SetDepthPreviewEnabled(bool enabled)
-		{
-			shader.SetBool("EnableDepthPreview", enabled);
-		}
 	}
 }

OpenRA.Game/Graphics/RgbaSpriteRenderer.cs

@@ -0,0 +1,49 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2019 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, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+
+namespace OpenRA.Graphics
+{
+	public class RgbaSpriteRenderer
+	{
+		readonly SpriteRenderer parent;
+
+		public RgbaSpriteRenderer(SpriteRenderer parent)
+		{
+			this.parent = parent;
+		}
+
+		public void DrawSprite(Sprite s, float3 location, float3 size)
+		{
+			if (s.Channel != TextureChannel.RGBA)
+				throw new InvalidOperationException("DrawRGBASprite requires a RGBA sprite.");
+
+			parent.DrawSprite(s, location, 0, size);
+		}
+
+		public void DrawSprite(Sprite s, float3 location)
+		{
+			if (s.Channel != TextureChannel.RGBA)
+				throw new InvalidOperationException("DrawRGBASprite requires a RGBA sprite.");
+
+			parent.DrawSprite(s, location, 0, s.Size);
+		}
+
+		public void DrawSprite(Sprite s, float3 a, float3 b, float3 c, float3 d)
+		{
+			if (s.Channel != TextureChannel.RGBA)
+				throw new InvalidOperationException("DrawRGBASprite requires a RGBA sprite.");
+
+			parent.DrawSprite(s, a, b, c, d);
+		}
+	}
+}

OpenRA.Game/Graphics/SequenceProvider.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,8 +11,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using OpenRA.FileSystem;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -31,6 +31,7 @@ namespace OpenRA.Graphics
 		int ShadowStart { get; }
 		int ShadowZOffset { get; }
 		int[] Frames { get; }
+		Rectangle Bounds { get; }
 
 		Sprite GetSprite(int frame);
 		Sprite GetSprite(int frame, int facing);

OpenRA.Game/Graphics/Sheet.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,10 +10,9 @@
 #endregion
 
 using System;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
-using System.Runtime.InteropServices;
+using OpenRA.FileFormats;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -50,13 +49,10 @@ namespace OpenRA.Graphics
 
 		public Sheet(SheetType type, Stream stream)
 		{
-			using (var bitmap = (Bitmap)Image.FromStream(stream))
-			{
-				Size = bitmap.Size;
-				data = new byte[4 * Size.Width * Size.Height];
-
-				Util.FastCopyIntoSprite(new Sprite(this, bitmap.Bounds(), TextureChannel.Red), bitmap);
-			}
+			var png = new Png(stream);
+			Size = new Size(png.Width, png.Height);
+			data = new byte[4 * Size.Width * Size.Height];
+			Util.FastCopyIntoSprite(new Sprite(this, new Rectangle(0, 0, png.Width, png.Height), TextureChannel.Red), png);
 
 			Type = type;
 			ReleaseBuffer();
@@ -66,7 +62,7 @@ namespace OpenRA.Graphics
 		{
 			if (texture == null)
 			{
-				texture = Game.Renderer.Device.CreateTexture();
+				texture = Game.Renderer.Context.CreateTexture();
 				dirty = true;
 			}
 
@@ -81,48 +77,27 @@ namespace OpenRA.Graphics
 			return texture;
 		}
 
-		public Bitmap AsBitmap()
+		public Png AsPng()
 		{
-			var d = GetData();
-			var dataStride = 4 * Size.Width;
-			var bitmap = new Bitmap(Size.Width, Size.Height);
-
-			var bd = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-			for (var y = 0; y < Size.Height; y++)
-				Marshal.Copy(d, y * dataStride, IntPtr.Add(bd.Scan0, y * bd.Stride), dataStride);
-			bitmap.UnlockBits(bd);
-
-			return bitmap;
+			return new Png(GetData(), Size.Width, Size.Height);
 		}
 
-		public Bitmap AsBitmap(TextureChannel channel, IPalette pal)
+		public Png AsPng(TextureChannel channel, IPalette pal)
 		{
 			var d = GetData();
+			var plane = new byte[Size.Width * Size.Height];
 			var dataStride = 4 * Size.Width;
-			var bitmap = new Bitmap(Size.Width, Size.Height);
 			var channelOffset = (int)channel;
 
-			var bd = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
-			unsafe
-			{
-				var colors = (uint*)bd.Scan0;
-				for (var y = 0; y < Size.Height; y++)
-				{
-					var dataRowIndex = y * dataStride + channelOffset;
-					var bdRowIndex = y * bd.Stride / 4;
-					for (var x = 0; x < Size.Width; x++)
-					{
-						var paletteIndex = d[dataRowIndex + 4 * x];
-						colors[bdRowIndex + x] = pal[paletteIndex];
-					}
-				}
-			}
+			for (var y = 0; y < Size.Height; y++)
+				for (var x = 0; x < Size.Width; x++)
+					plane[y * Size.Width + x] = d[y * dataStride + channelOffset + 4 * x];
 
-			bitmap.UnlockBits(bd);
+			var palColors = new Color[Palette.Size];
+			for (var i = 0; i < Palette.Size; i++)
+				palColors[i] = pal.GetColor(i);
 
-			return bitmap;
+			return new Png(plane, Size.Width, Size.Height, palColors);
 		}
 
 		public void CreateBuffer()
@@ -153,6 +128,10 @@ namespace OpenRA.Graphics
 				return;
 			dirty = true;
 			releaseBufferOnCommit = true;
+
+			// Commit data from the buffer to the texture, allowing the buffer to be released and reclaimed by GC.
+			if (Game.Renderer != null)
+				GetTexture();
 		}
 
 		public void Dispose()

OpenRA.Game/Graphics/SheetBuilder.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,7 +11,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
+using OpenRA.FileFormats;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -39,7 +40,7 @@ namespace OpenRA.Graphics
 		Sheet current;
 		TextureChannel channel;
 		int rowHeight = 0;
-		Point p;
+		int2 p;
 
 		public static Sheet AllocateSheet(SheetType type, int sheetSize)
 		{
@@ -54,7 +55,7 @@ namespace OpenRA.Graphics
 
 		public SheetBuilder(SheetType t, Func<Sheet> allocateSheet)
 		{
-			channel = TextureChannel.Red;
+			channel = t == SheetType.Indexed ? TextureChannel.Red : TextureChannel.RGBA;
 			Type = t;
 			current = allocateSheet();
 			sheets.Add(current);
@@ -75,9 +76,9 @@ namespace OpenRA.Graphics
 			return rect;
 		}
 
-		public Sprite Add(Bitmap src)
+		public Sprite Add(Png src)
 		{
-			var rect = Allocate(src.Size);
+			var rect = Allocate(new Size(src.Width, src.Height));
 			Util.FastCopyIntoSprite(rect, src);
 			current.CommitBufferedData();
 			return rect;
@@ -106,7 +107,7 @@ namespace OpenRA.Graphics
 		{
 			if (imageSize.Width + p.X > current.Size.Width)
 			{
-				p = new Point(0, p.Y + rowHeight);
+				p = new int2(0, p.Y + rowHeight);
 				rowHeight = imageSize.Height;
 			}
 
@@ -121,22 +122,24 @@ namespace OpenRA.Graphics
 					current.ReleaseBuffer();
 					current = allocateSheet();
 					sheets.Add(current);
-					channel = TextureChannel.Red;
+					channel = Type == SheetType.Indexed ? TextureChannel.Red : TextureChannel.RGBA;
 				}
 				else
 					channel = next.Value;
 
 				rowHeight = imageSize.Height;
-				p = new Point(0, 0);
+				p = int2.Zero;
 			}
 
-			var rect = new Sprite(current, new Rectangle(p, imageSize), zRamp, spriteOffset, channel, BlendMode.Alpha);
-			p.X += imageSize.Width;
+			var rect = new Sprite(current, new Rectangle(p.X, p.Y, imageSize.Width, imageSize.Height), zRamp, spriteOffset, channel, BlendMode.Alpha);
+			p += new int2(imageSize.Width, 0);
 
 			return rect;
 		}
 
 		public Sheet Current { get { return current; } }
+		public TextureChannel CurrentChannel { get { return channel; } }
+		public IEnumerable<Sheet> AllSheets { get { return sheets; } }
 
 		public void Dispose()
 		{

OpenRA.Game/Graphics/SoftwareCursor.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -21,6 +21,8 @@ namespace OpenRA.Graphics
 		void Render(Renderer renderer);
 		void SetCursor(string cursor);
 		void Tick();
+		void Lock();
+		void Unlock();
 	}
 
 	public sealed class SoftwareCursor : ICursor
@@ -31,6 +33,9 @@ namespace OpenRA.Graphics
 		readonly CursorProvider cursorProvider;
 		readonly SheetBuilder sheetBuilder;
 
+		bool isLocked = false;
+		int2 lockedPosition;
+
 		public SoftwareCursor(CursorProvider cursorProvider)
 		{
 			this.cursorProvider = cursorProvider;
@@ -50,7 +55,7 @@ namespace OpenRA.Graphics
 
 			sheetBuilder.Current.ReleaseBuffer();
 
-			Game.Renderer.Device.SetHardwareCursor(null);
+			Game.Renderer.Window.SetHardwareCursor(null);
 		}
 
 		PaletteReference CreatePaletteReference(string name)
@@ -77,7 +82,7 @@ namespace OpenRA.Graphics
 				return;
 
 			var cursorSequence = cursorProvider.GetCursorSequence(cursorName);
-			var cursorSprite = sprites[cursorName][((int)cursorFrame % cursorSequence.Length)];
+			var cursorSprite = sprites[cursorName][(int)cursorFrame % cursorSequence.Length];
 			var cursorSize = CursorProvider.CursorViewportZoomed ? 2.0f * cursorSprite.Size : cursorSprite.Size;
 
 			var cursorOffset = CursorProvider.CursorViewportZoomed ?
@@ -85,12 +90,26 @@ namespace OpenRA.Graphics
 				cursorSequence.Hotspot + (0.5f * cursorSprite.Size.XY).ToInt2();
 
 			renderer.SetPalette(palette);
+			var mousePos = isLocked ? lockedPosition : Viewport.LastMousePos;
 			renderer.SpriteRenderer.DrawSprite(cursorSprite,
-				Viewport.LastMousePos - cursorOffset,
+				mousePos - cursorOffset,
 				paletteReferences[cursorSequence.Palette],
 				cursorSize);
 		}
 
+		public void Lock()
+		{
+			Game.Renderer.Window.SetRelativeMouseMode(true);
+			lockedPosition = Viewport.LastMousePos;
+			isLocked = true;
+		}
+
+		public void Unlock()
+		{
+			Game.Renderer.Window.SetRelativeMouseMode(false);
+			isLocked = false;
+		}
+
 		public void Dispose()
 		{
 			palette.Dispose();

OpenRA.Game/Graphics/Sprite.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,7 +10,7 @@
 #endregion
 
 using System;
-using System.Drawing;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -50,13 +50,15 @@ namespace OpenRA.Graphics
 
 	public class SpriteWithSecondaryData : Sprite
 	{
+		public readonly Sheet SecondarySheet;
 		public readonly Rectangle SecondaryBounds;
 		public readonly TextureChannel SecondaryChannel;
 		public readonly float SecondaryTop, SecondaryLeft, SecondaryBottom, SecondaryRight;
 
-		public SpriteWithSecondaryData(Sprite s, Rectangle secondaryBounds, TextureChannel secondaryChannel)
+		public SpriteWithSecondaryData(Sprite s, Sheet secondarySheet, Rectangle secondaryBounds, TextureChannel secondaryChannel)
 			: base(s.Sheet, s.Bounds, s.ZRamp, s.Offset, s.Channel, s.BlendMode)
 		{
+			SecondarySheet = secondarySheet;
 			SecondaryBounds = secondaryBounds;
 			SecondaryChannel = secondaryChannel;
 			SecondaryLeft = (float)Math.Min(secondaryBounds.Left, secondaryBounds.Right) / s.Sheet.Size.Width;
@@ -72,5 +74,6 @@ namespace OpenRA.Graphics
 		Green = 1,
 		Blue = 2,
 		Alpha = 3,
+		RGBA = 4
 	}
 }

OpenRA.Game/Graphics/SpriteFont.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,28 +10,25 @@
 #endregion
 
 using System;
-using System.Drawing;
 using System.Linq;
 using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Widgets;
-using SharpFont;
 
 namespace OpenRA.Graphics
 {
 	public sealed class SpriteFont : IDisposable
 	{
-		static readonly Library Library = new Library();
-
+		public int TopOffset { get; private set; }
 		readonly int size;
 		readonly SheetBuilder builder;
 		readonly Func<string, float> lineWidth;
-		readonly Face face;
+		readonly IFont font;
 		readonly Cache<Pair<char, Color>, GlyphInfo> glyphs;
 
 		float deviceScale;
 
-		public SpriteFont(string name, byte[] data, int size, float scale, SheetBuilder builder)
+		public SpriteFont(string name, byte[] data, int size, int ascender, float scale, SheetBuilder builder)
 		{
 			if (builder.Type != SheetType.BGRA)
 				throw new ArgumentException("The sheet builder must create BGRA sheets.", "builder");
@@ -40,8 +37,7 @@ namespace OpenRA.Graphics
 			this.size = size;
 			this.builder = builder;
 
-			face = new Face(Library, data, 0);
-			face.SetPixelSizes((uint)(size * deviceScale), (uint)(size * deviceScale));
+			font = Game.Renderer.CreateFont(data);
 
 			glyphs = new Cache<Pair<char, Color>, GlyphInfo>(CreateGlyph, Pair<char, Color>.EqualityComparer);
 
@@ -49,20 +45,21 @@ namespace OpenRA.Graphics
 			Func<char, float> characterWidth = character => glyphs[Pair.New(character, Color.White)].Advance;
 			lineWidth = line => line.Sum(characterWidth) / deviceScale;
 
-			PrecacheColor(Color.White, name);
-			PrecacheColor(Color.Red, name);
+			if (size <= 24)
+				PrecacheColor(Color.White, name);
+
+			TopOffset = size - ascender;
 		}
 
 		public void SetScale(float scale)
 		{
 			deviceScale = scale;
-			face.SetPixelSizes((uint)(size * deviceScale), (uint)(size * deviceScale));
 			glyphs.Clear();
 		}
 
 		void PrecacheColor(Color c, string name)
 		{
-			using (new PerfTimer("PrecacheColor {0} {1}px {2}".F(name, size, c.Name)))
+			using (new PerfTimer("PrecacheColor {0} {1}px {2}".F(name, size, c)))
 				for (var n = (char)0x20; n < (char)0x7f; n++)
 					if (glyphs[Pair.New(n, c)] == null)
 						throw new InvalidOperationException();
@@ -70,25 +67,74 @@ namespace OpenRA.Graphics
 
 		public void DrawText(string text, float2 location, Color c)
 		{
-			location.Y += size;	// baseline vs top
+			// Offset from the baseline position to the top-left of the glyph for rendering
+			location += new float2(0, size);
 
 			var p = location;
 			foreach (var s in text)
 			{
 				if (s == '\n')
 				{
-					location.Y += size;
+					location += new float2(0, size);
 					p = location;
 					continue;
 				}
 
 				var g = glyphs[Pair.New(s, c)];
-				Game.Renderer.RgbaSpriteRenderer.DrawSprite(g.Sprite,
-					new float2(
-						(int)Math.Round(p.X * deviceScale + g.Offset.X, 0) / deviceScale,
-						p.Y + g.Offset.Y / deviceScale),
+				if (g.Sprite != null)
+					Game.Renderer.RgbaSpriteRenderer.DrawSprite(g.Sprite,
+						new float2(
+							(int)Math.Round(p.X * deviceScale + g.Offset.X, 0) / deviceScale,
+							p.Y + g.Offset.Y / deviceScale),
 						g.Sprite.Size / deviceScale);
-				p.X += g.Advance / deviceScale;
+
+				p += new float2(g.Advance / deviceScale, 0);
+			}
+		}
+
+		float3 Rotate(float3 v, float sina, float cosa, float2 offset)
+		{
+			return new float3(
+				v.X * cosa - v.Y * sina + offset.X,
+				v.X * sina + v.Y * cosa + offset.Y,
+				0);
+		}
+
+		public void DrawText(string text, float2 location, Color c, float angle)
+		{
+			// Offset from the baseline position to the top-left of the glyph for rendering
+			var offset = new float2(0, size);
+			var cosa = (float)Math.Cos(-angle);
+			var sina = (float)Math.Sin(-angle);
+
+			var p = offset;
+			foreach (var s in text)
+			{
+				if (s == '\n')
+				{
+					offset += new float2(0, size);
+					p = offset;
+					continue;
+				}
+
+				var g = glyphs[Pair.New(s, c)];
+				if (g.Sprite != null)
+				{
+					var tl = new float3(
+						(int)Math.Round(p.X * deviceScale + g.Offset.X, 0) / deviceScale,
+						p.Y + g.Offset.Y / deviceScale, 0);
+					var br = tl + g.Sprite.Size / deviceScale;
+					var tr = new float3(br.X, tl.Y, 0);
+					var bl = new float3(tl.X, br.Y, 0);
+
+					Game.Renderer.RgbaSpriteRenderer.DrawSprite(g.Sprite,
+						Rotate(tl, sina, cosa, location),
+						Rotate(tr, sina, cosa, location),
+						Rotate(br, sina, cosa, location),
+						Rotate(bl, sina, cosa, location));
+				}
+
+				p += new float2(g.Advance / deviceScale, 0);
 			}
 		}
 
@@ -107,7 +153,7 @@ namespace OpenRA.Graphics
 
 		public void DrawTextWithContrast(string text, float2 location, Color fg, Color bgDark, Color bgLight, int offset)
 		{
-			DrawTextWithContrast(text, location, fg, WidgetUtils.GetContrastColor(fg, bgDark, bgLight), offset);
+			DrawTextWithContrast(text, location, fg, GetContrastColor(fg, bgDark, bgLight), offset);
 		}
 
 		public void DrawTextWithShadow(string text, float2 location, Color fg, Color bg, int offset)
@@ -120,7 +166,20 @@ namespace OpenRA.Graphics
 
 		public void DrawTextWithShadow(string text, float2 location, Color fg, Color bgDark, Color bgLight, int offset)
 		{
-			DrawTextWithShadow(text, location, fg, WidgetUtils.GetContrastColor(fg, bgDark, bgLight), offset);
+			DrawTextWithShadow(text, location, fg, GetContrastColor(fg, bgDark, bgLight), offset);
+		}
+
+		public void DrawTextWithShadow(string text, float2 location, Color fg, Color bg, int offset, float angle)
+		{
+			if (offset != 0)
+				DrawText(text, location + new float2(offset, offset), bg, angle);
+
+			DrawText(text, location, fg, angle);
+		}
+
+		public void DrawTextWithShadow(string text, float2 location, Color fg, Color bgDark, Color bgLight, int offset, float angle)
+		{
+			DrawTextWithShadow(text, location, fg, GetContrastColor(fg, bgDark, bgLight), offset, angle);
 		}
 
 		public int2 Measure(string text)
@@ -134,45 +193,43 @@ namespace OpenRA.Graphics
 
 		GlyphInfo CreateGlyph(Pair<char, Color> c)
 		{
-			face.LoadChar(c.First, LoadFlags.Default, LoadTarget.Normal);
-			face.Glyph.RenderGlyph(RenderMode.Normal);
+			var glyph = font.CreateGlyph(c.First, size, deviceScale);
 
-			var size = new Size((int)face.Glyph.Metrics.Width, (int)face.Glyph.Metrics.Height);
-			var s = builder.Allocate(size);
+			if (glyph.Data == null)
+			{
+				return new GlyphInfo
+				{
+					Sprite = null,
+					Advance = 0,
+					Offset = int2.Zero
+				};
+			}
 
+			var s = builder.Allocate(glyph.Size);
 			var g = new GlyphInfo
 			{
 				Sprite = s,
-				Advance = (float)face.Glyph.Metrics.HorizontalAdvance,
-				Offset = new int2(face.Glyph.BitmapLeft, -face.Glyph.BitmapTop)
+				Advance = glyph.Advance,
+				Offset = glyph.Offset
 			};
 
-			// A new bitmap is generated each time this property is accessed, so we do need to dispose it.
-			using (var bitmap = face.Glyph.Bitmap)
+			var dest = s.Sheet.GetData();
+			var destStride = s.Sheet.Size.Width * 4;
+
+			for (var j = 0; j < s.Size.Y; j++)
 			{
-				unsafe
+				for (var i = 0; i < s.Size.X; i++)
 				{
-					var p = (byte*)bitmap.Buffer;
-					var dest = s.Sheet.GetData();
-					var destStride = s.Sheet.Size.Width * 4;
-
-					for (var j = 0; j < s.Size.Y; j++)
+					var p = glyph.Data[j * glyph.Size.Width + i];
+					if (p != 0)
 					{
-						for (var i = 0; i < s.Size.X; i++)
-						{
-							if (p[i] != 0)
-							{
-								var q = destStride * (j + s.Bounds.Top) + 4 * (i + s.Bounds.Left);
-								var pmc = Util.PremultiplyAlpha(Color.FromArgb(p[i], c.Second));
+						var q = destStride * (j + s.Bounds.Top) + 4 * (i + s.Bounds.Left);
+						var pmc = Util.PremultiplyAlpha(Color.FromArgb(p, c.Second));
 
-								dest[q] = pmc.B;
-								dest[q + 1] = pmc.G;
-								dest[q + 2] = pmc.R;
-								dest[q + 3] = pmc.A;
-							}
-						}
-
-						p += bitmap.Pitch;
+						dest[q] = pmc.B;
+						dest[q + 1] = pmc.G;
+						dest[q + 2] = pmc.R;
+						dest[q + 3] = pmc.A;
 					}
 				}
 			}
@@ -182,9 +239,14 @@ namespace OpenRA.Graphics
 			return g;
 		}
 
+		static Color GetContrastColor(Color fgColor, Color bgDark, Color bgLight)
+		{
+			return fgColor == Color.White || fgColor.GetBrightness() > 0.33 ? bgDark : bgLight;
+		}
+
 		public void Dispose()
 		{
-			face.Dispose();
+			font.Dispose();
 		}
 	}
 

OpenRA.Game/Graphics/SpriteLoader.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -9,8 +9,8 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using OpenRA.FileSystem;
@@ -20,7 +20,7 @@ namespace OpenRA.Graphics
 {
 	public interface ISpriteLoader
 	{
-		bool TryParseSprite(Stream s, out ISpriteFrame[] frames);
+		bool TryParseSprite(Stream s, out ISpriteFrame[] frames, out TypeDictionary metadata);
 	}
 
 	public interface ISpriteFrame
@@ -48,6 +48,8 @@ namespace OpenRA.Graphics
 		readonly IReadOnlyFileSystem fileSystem;
 
 		readonly Dictionary<string, List<Sprite[]>> sprites = new Dictionary<string, List<Sprite[]>>();
+		readonly Dictionary<string, ISpriteFrame[]> unloadedFrames = new Dictionary<string, ISpriteFrame[]>();
+		readonly Dictionary<string, TypeDictionary> metadata = new Dictionary<string, TypeDictionary>();
 
 		public SpriteCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
 		{
@@ -56,34 +58,76 @@ namespace OpenRA.Graphics
 			this.loaders = loaders;
 		}
 
-		Sprite[] LoadSprite(string filename, List<Sprite[]> cache)
-		{
-			var sprite = SpriteLoader.GetSprites(fileSystem, filename, loaders, SheetBuilder);
-			cache.Add(sprite);
-			return sprite;
-		}
-
-		/// <summary>Returns the first set of sprites with the given filename.</summary>
-		public Sprite[] this[string filename]
+		/// <summary>
+		/// Returns the first set of sprites with the given filename.
+		/// If getUsedFrames is defined then the indices returned by the function call
+		/// are guaranteed to be loaded.  The value of other indices in the returned
+		/// array are undefined and should never be accessed.
+		/// </summary>
+		public Sprite[] this[string filename, Func<int, IEnumerable<int>> getUsedFrames = null]
 		{
 			get
 			{
 				var allSprites = sprites.GetOrAdd(filename);
 				var sprite = allSprites.FirstOrDefault();
-				return sprite ?? LoadSprite(filename, allSprites);
+
+				ISpriteFrame[] unloaded;
+				if (!unloadedFrames.TryGetValue(filename, out unloaded))
+					unloaded = null;
+
+				// This is the first time that the file has been requested
+				// Load all of the frames into the unused buffer and initialize
+				// the loaded cache (initially empty)
+				if (sprite == null)
+				{
+					TypeDictionary fileMetadata = null;
+					unloaded = FrameLoader.GetFrames(fileSystem, filename, loaders, out fileMetadata);
+					unloadedFrames[filename] = unloaded;
+					metadata[filename] = fileMetadata;
+
+					sprite = new Sprite[unloaded.Length];
+					allSprites.Add(sprite);
+				}
+
+				// HACK: The sequency code relies on side-effects from getUsedFrames
+				var indices = getUsedFrames != null ? getUsedFrames(sprite.Length) :
+					Enumerable.Range(0, sprite.Length);
+
+				// Load any unused frames into the SheetBuilder
+				if (unloaded != null)
+				{
+					foreach (var i in indices)
+					{
+						if (unloaded[i] != null)
+						{
+							sprite[i] = SheetBuilder.Add(unloaded[i]);
+							unloaded[i] = null;
+						}
+					}
+
+					// All frames have been loaded
+					if (unloaded.All(f => f == null))
+						unloadedFrames.Remove(filename);
+				}
+
+				return sprite;
 			}
 		}
 
-		/// <summary>Returns all instances of sets of sprites with the given filename</summary>
-		public IEnumerable<Sprite[]> AllCached(string filename)
+		/// <summary>
+		/// Returns a TypeDictionary containing any metadata defined by the frame
+		/// or null if the frame does not define metadata.
+		/// </summary>
+		public TypeDictionary FrameMetadata(string filename)
 		{
-			return sprites.GetOrAdd(filename);
-		}
+			TypeDictionary fileMetadata;
+			if (!metadata.TryGetValue(filename, out fileMetadata))
+			{
+				FrameLoader.GetFrames(fileSystem, filename, loaders, out fileMetadata);
+				metadata[filename] = fileMetadata;
+			}
 
-		/// <summary>Loads and caches a new instance of sprites with the given filename</summary>
-		public Sprite[] Reload(string filename)
-		{
-			return LoadSprite(filename, sprites.GetOrAdd(filename));
+			return fileMetadata;
 		}
 	}
 
@@ -93,24 +137,20 @@ namespace OpenRA.Graphics
 
 		public FrameCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders)
 		{
-			frames = new Cache<string, ISpriteFrame[]>(filename => SpriteLoader.GetFrames(fileSystem, filename, loaders));
+			TypeDictionary metadata;
+			frames = new Cache<string, ISpriteFrame[]>(filename => FrameLoader.GetFrames(fileSystem, filename, loaders, out metadata));
 		}
 
 		public ISpriteFrame[] this[string filename] { get { return frames[filename]; } }
 	}
 
-	public static class SpriteLoader
+	public static class FrameLoader
 	{
-		public static Sprite[] GetSprites(IReadOnlyFileSystem fileSystem, string filename, ISpriteLoader[] loaders, SheetBuilder sheetBuilder)
-		{
-			return GetFrames(fileSystem, filename, loaders).Select(a => sheetBuilder.Add(a)).ToArray();
-		}
-
-		public static ISpriteFrame[] GetFrames(IReadOnlyFileSystem fileSystem, string filename, ISpriteLoader[] loaders)
+		public static ISpriteFrame[] GetFrames(IReadOnlyFileSystem fileSystem, string filename, ISpriteLoader[] loaders, out TypeDictionary metadata)
 		{
 			using (var stream = fileSystem.Open(filename))
 			{
-				var spriteFrames = GetFrames(stream, loaders);
+				var spriteFrames = GetFrames(stream, loaders, out metadata);
 				if (spriteFrames == null)
 					throw new InvalidDataException(filename + " is not a valid sprite file!");
 
@@ -118,11 +158,13 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public static ISpriteFrame[] GetFrames(Stream stream, ISpriteLoader[] loaders)
+		public static ISpriteFrame[] GetFrames(Stream stream, ISpriteLoader[] loaders, out TypeDictionary metadata)
 		{
 			ISpriteFrame[] frames;
+			metadata = null;
+
 			foreach (var loader in loaders)
-				if (loader.TryParseSprite(stream, out frames))
+				if (loader.TryParseSprite(stream, out frames, out metadata))
 					return frames;
 
 			return null;

OpenRA.Game/Graphics/SpriteRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,14 +10,13 @@
 #endregion
 
 using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
 	public struct SpriteRenderable : IRenderable, IFinalizedRenderable
 	{
-		public static readonly IEnumerable<IRenderable> None = new IRenderable[0].AsEnumerable();
+		public static readonly IEnumerable<IRenderable> None = new IRenderable[0];
 
 		readonly Sprite sprite;
 		readonly WPos pos;

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,7 +10,7 @@
 #endregion
 
 using System;
-using System.Drawing;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -18,45 +18,97 @@ namespace OpenRA.Graphics
 	{
 		readonly Renderer renderer;
 		readonly IShader shader;
-		readonly Action renderAction;
 
 		readonly Vertex[] vertices;
-		Sheet currentSheet;
+		readonly Sheet[] sheets = new Sheet[7];
+
 		BlendMode currentBlend = BlendMode.Alpha;
 		int nv = 0;
+		int ns = 0;
 
 		public SpriteRenderer(Renderer renderer, IShader shader)
 		{
 			this.renderer = renderer;
 			this.shader = shader;
 			vertices = new Vertex[renderer.TempBufferSize];
-			renderAction = () => renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList);
 		}
 
 		public void Flush()
 		{
 			if (nv > 0)
 			{
-				shader.SetTexture("DiffuseTexture", currentSheet.GetTexture());
+				for (var i = 0; i < ns; i++)
+				{
+					shader.SetTexture("Texture{0}".F(i), sheets[i].GetTexture());
+					sheets[i] = null;
+				}
 
-				renderer.Device.SetBlendMode(currentBlend);
-				shader.Render(renderAction);
-				renderer.Device.SetBlendMode(BlendMode.None);
+				renderer.Context.SetBlendMode(currentBlend);
+				shader.PrepareRender();
+				renderer.DrawBatch(vertices, nv, PrimitiveType.TriangleList);
+				renderer.Context.SetBlendMode(BlendMode.None);
 
 				nv = 0;
-				currentSheet = null;
+				ns = 0;
 			}
 		}
 
-		void SetRenderStateForSprite(Sprite s)
+		int2 SetRenderStateForSprite(Sprite s)
 		{
 			renderer.CurrentBatchRenderer = this;
 
-			if (s.BlendMode != currentBlend || s.Sheet != currentSheet || nv + 6 > renderer.TempBufferSize)
+			if (s.BlendMode != currentBlend || nv + 6 > renderer.TempBufferSize)
 				Flush();
 
 			currentBlend = s.BlendMode;
-			currentSheet = s.Sheet;
+
+			// Check if the sheet (or secondary data sheet) have already been mapped
+			var sheet = s.Sheet;
+			var sheetIndex = 0;
+			for (; sheetIndex < ns; sheetIndex++)
+				if (sheets[sheetIndex] == sheet)
+					break;
+
+			var secondarySheetIndex = 0;
+			var ss = s as SpriteWithSecondaryData;
+			if (ss != null)
+			{
+				var secondarySheet = ss.SecondarySheet;
+				for (; secondarySheetIndex < ns; secondarySheetIndex++)
+					if (sheets[secondarySheetIndex] == secondarySheet)
+						break;
+			}
+
+			// Make sure that we have enough free samplers to map both if needed, otherwise flush
+			var needSamplers = (sheetIndex == ns ? 1 : 0) + (secondarySheetIndex == ns ? 1 : 0);
+			if (ns + needSamplers >= sheets.Length)
+			{
+				Flush();
+				sheetIndex = 0;
+				if (ss != null)
+					secondarySheetIndex = 1;
+			}
+
+			if (sheetIndex >= ns)
+			{
+				sheets[sheetIndex] = sheet;
+				ns += 1;
+			}
+
+			if (secondarySheetIndex >= ns && ss != null)
+			{
+				sheets[secondarySheetIndex] = ss.SecondarySheet;
+				ns += 1;
+			}
+
+			return new int2(sheetIndex, secondarySheetIndex);
+		}
+
+		internal void DrawSprite(Sprite s, float3 location, float paletteTextureIndex, float3 size)
+		{
+			var samplers = SetRenderStateForSprite(s);
+			Util.FastCreateQuad(vertices, location + s.FractionalOffset * size, s, samplers, paletteTextureIndex, nv, size);
+			nv += 6;
 		}
 
 		public void DrawSprite(Sprite s, float3 location, PaletteReference pal)
@@ -69,44 +121,33 @@ namespace OpenRA.Graphics
 			DrawSprite(s, location, pal.TextureIndex, size);
 		}
 
-		void DrawSprite(Sprite s, float3 location, float paletteTextureIndex, float3 size)
-		{
-			SetRenderStateForSprite(s);
-			Util.FastCreateQuad(vertices, location + s.FractionalOffset * size, s, paletteTextureIndex, nv, size);
-			nv += 6;
-		}
-
-		// For RGBASpriteRenderer, which doesn't use palettes
-		public void DrawSprite(Sprite s, float3 location)
-		{
-			DrawSprite(s, location, 0, s.Size);
-		}
-
-		public void DrawSprite(Sprite s, float3 location, float3 size)
-		{
-			DrawSprite(s, location, 0, size);
-		}
-
 		public void DrawSprite(Sprite s, float3 a, float3 b, float3 c, float3 d)
 		{
-			SetRenderStateForSprite(s);
-			Util.FastCreateQuad(vertices, a, b, c, d, s, 0, nv);
-			nv += 6;
-		}
-
-		public void DrawSprite(Sprite s, Vertex[] sourceVertices, int offset)
-		{
-			SetRenderStateForSprite(s);
-			Array.Copy(sourceVertices, offset, vertices, nv, 6);
+			var samplers = SetRenderStateForSprite(s);
+			Util.FastCreateQuad(vertices, a, b, c, d, s, samplers, 0, nv);
 			nv += 6;
 		}
 
 		public void DrawVertexBuffer(IVertexBuffer<Vertex> buffer, int start, int length, PrimitiveType type, Sheet sheet, BlendMode blendMode)
 		{
-			shader.SetTexture("DiffuseTexture", sheet.GetTexture());
-			renderer.Device.SetBlendMode(blendMode);
-			shader.Render(() => renderer.DrawBatch(buffer, start, length, type));
-			renderer.Device.SetBlendMode(BlendMode.None);
+			shader.SetTexture("Texture0", sheet.GetTexture());
+			renderer.Context.SetBlendMode(blendMode);
+			shader.PrepareRender();
+			renderer.DrawBatch(buffer, start, length, type);
+			renderer.Context.SetBlendMode(BlendMode.None);
+		}
+
+		// For RGBAColorRenderer
+		internal void DrawRGBAVertices(Vertex[] v)
+		{
+			renderer.CurrentBatchRenderer = this;
+
+			if (currentBlend != BlendMode.Alpha || nv + v.Length > renderer.TempBufferSize)
+				Flush();
+
+			currentBlend = BlendMode.Alpha;
+			Array.Copy(v, 0, vertices, nv, v.Length);
+			nv += v.Length;
 		}
 
 		public void SetPalette(ITexture palette)

OpenRA.Game/Graphics/TargetLineRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,8 +10,8 @@
 #endregion
 
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -19,11 +19,15 @@ namespace OpenRA.Graphics
 	{
 		readonly IEnumerable<WPos> waypoints;
 		readonly Color color;
+		readonly int width;
+		readonly int markerSize;
 
-		public TargetLineRenderable(IEnumerable<WPos> waypoints, Color color)
+		public TargetLineRenderable(IEnumerable<WPos> waypoints, Color color, int width = 1, int markerSize = 1)
 		{
 			this.waypoints = waypoints;
 			this.color = color;
+			this.width = width;
+			this.markerSize = markerSize;
 		}
 
 		public WPos Pos { get { return waypoints.First(); } }
@@ -42,23 +46,23 @@ namespace OpenRA.Graphics
 			if (!waypoints.Any())
 				return;
 
-			var iz = 1 / wr.Viewport.Zoom;
+			var sw = width / wr.Viewport.Zoom;
 			var first = wr.Screen3DPosition(waypoints.First());
 			var a = first;
 			foreach (var b in waypoints.Skip(1).Select(pos => wr.Screen3DPosition(pos)))
 			{
-				Game.Renderer.WorldRgbaColorRenderer.DrawLine(a, b, iz, color);
-				DrawTargetMarker(wr, color, b);
+				Game.Renderer.WorldRgbaColorRenderer.DrawLine(a, b, sw, color);
+				DrawTargetMarker(wr, color, b, markerSize);
 				a = b;
 			}
 
 			DrawTargetMarker(wr, color, first);
 		}
 
-		public static void DrawTargetMarker(WorldRenderer wr, Color color, float3 location)
+		public static void DrawTargetMarker(WorldRenderer wr, Color color, float3 location, int size = 1)
 		{
-			var iz = 1 / wr.Viewport.Zoom;
-			var offset = new float2(iz, iz);
+			var sw = size / wr.Viewport.Zoom;
+			var offset = new float2(sw, sw);
 			var tl = location - offset;
 			var br = location + offset;
 			Game.Renderer.WorldRgbaColorRenderer.FillRect(tl, br, color);

OpenRA.Game/Graphics/TerrainSpriteLayer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,8 +11,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -46,7 +46,7 @@ namespace OpenRA.Graphics
 			rowStride = 6 * map.MapSize.X;
 
 			vertices = new Vertex[rowStride * map.MapSize.Y];
-			vertexBuffer = Game.Renderer.Device.CreateVertexBuffer(vertices.Length);
+			vertexBuffer = Game.Renderer.Context.CreateVertexBuffer(vertices.Length);
 			emptySprite = new Sprite(sheet, Rectangle.Empty, TextureChannel.Alpha);
 
 			wr.PaletteInvalidated += UpdatePaletteIndices;
@@ -92,7 +92,7 @@ namespace OpenRA.Graphics
 				return;
 
 			var offset = rowStride * uv.V + 6 * uv.U;
-			Util.FastCreateQuad(vertices, pos, sprite, palette.TextureIndex, offset, sprite.Size);
+			Util.FastCreateQuad(vertices, pos, sprite, int2.Zero, palette.TextureIndex, offset, sprite.Size);
 
 			dirtyRows.Add(uv.V);
 		}

OpenRA.Game/Graphics/Theater.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,8 +11,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
+using OpenRA.Primitives;
 using OpenRA.Support;
 
 namespace OpenRA.Graphics
@@ -85,7 +85,7 @@ namespace OpenRA.Graphics
 
 							// s and ss are guaranteed to use the same sheet
 							// because of the custom terrain sheet allocation
-							s = new SpriteWithSecondaryData(s, ss.Bounds, ss.Channel);
+							s = new SpriteWithSecondaryData(s, s.Sheet, ss.Bounds, ss.Channel);
 						}
 
 						return s;

OpenRA.Game/Graphics/UISpriteRenderable.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -9,7 +9,7 @@
  */
 #endregion
 
-using System.Drawing;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {

OpenRA.Game/Graphics/Util.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,8 +10,8 @@
 #endregion
 
 using System;
-using System.Drawing;
-using System.Drawing.Imaging;
+using OpenRA.FileFormats;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -19,24 +19,25 @@ namespace OpenRA.Graphics
 	{
 		// yes, our channel order is nuts.
 		static readonly int[] ChannelMasks = { 2, 1, 0, 3 };
-		static readonly float[] ChannelSelect = { 0.2f, 0.4f, 0.6f, 0.8f };
 
-		public static void FastCreateQuad(Vertex[] vertices, float3 o, Sprite r, float paletteTextureIndex, int nv, float3 size)
+		public static void FastCreateQuad(Vertex[] vertices, float3 o, Sprite r, int2 samplers, float paletteTextureIndex, int nv, float3 size)
 		{
 			var b = new float3(o.X + size.X, o.Y, o.Z);
 			var c = new float3(o.X + size.X, o.Y + size.Y, o.Z + size.Z);
 			var d = new float3(o.X, o.Y + size.Y, o.Z + size.Z);
-			FastCreateQuad(vertices, o, b, c, d, r, paletteTextureIndex, nv);
+			FastCreateQuad(vertices, o, b, c, d, r, samplers, paletteTextureIndex, nv);
 		}
 
-		public static void FastCreateQuad(Vertex[] vertices, float3 a, float3 b, float3 c, float3 d, Sprite r, float paletteTextureIndex, int nv)
+		public static void FastCreateQuad(Vertex[] vertices, float3 a, float3 b, float3 c, float3 d, Sprite r, int2 samplers, float paletteTextureIndex, int nv)
 		{
 			float sl = 0;
 			float st = 0;
 			float sr = 0;
 			float sb = 0;
-			var attribC = ChannelSelect[(int)r.Channel];
 
+			// See shp.vert for documentation on the channel attribute format
+			var attribC = r.Channel == TextureChannel.RGBA ? 0x02 : ((byte)r.Channel) << 1 | 0x01;
+			attribC |= samplers.X << 6;
 			var ss = r as SpriteWithSecondaryData;
 			if (ss != null)
 			{
@@ -44,15 +45,18 @@ namespace OpenRA.Graphics
 				st = ss.SecondaryTop;
 				sr = ss.SecondaryRight;
 				sb = ss.SecondaryBottom;
-				attribC = -(attribC + ChannelSelect[(int)ss.SecondaryChannel] / 10);
+
+				attribC |= ((byte)ss.SecondaryChannel) << 4 | 0x08;
+				attribC |= samplers.Y << 9;
 			}
 
-			vertices[nv] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, attribC);
-			vertices[nv + 1] = new Vertex(b, r.Right, r.Top, sr, st, paletteTextureIndex, attribC);
-			vertices[nv + 2] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, attribC);
-			vertices[nv + 3] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, attribC);
-			vertices[nv + 4] = new Vertex(d, r.Left, r.Bottom, sl, sb, paletteTextureIndex, attribC);
-			vertices[nv + 5] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, attribC);
+			var fAttribC = (float)attribC;
+			vertices[nv] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, fAttribC);
+			vertices[nv + 1] = new Vertex(b, r.Right, r.Top, sr, st, paletteTextureIndex, fAttribC);
+			vertices[nv + 2] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, fAttribC);
+			vertices[nv + 3] = new Vertex(c, r.Right, r.Bottom, sr, sb, paletteTextureIndex, fAttribC);
+			vertices[nv + 4] = new Vertex(d, r.Left, r.Bottom, sl, sb, paletteTextureIndex, fAttribC);
+			vertices[nv + 5] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, fAttribC);
 		}
 
 		public static void FastCopyIntoChannel(Sprite dest, byte[] src)
@@ -77,53 +81,43 @@ namespace OpenRA.Graphics
 			}
 		}
 
-		public static void FastCopyIntoSprite(Sprite dest, Bitmap src)
+		public static void FastCopyIntoSprite(Sprite dest, Png src)
 		{
-			var createdTempBitmap = false;
-			if (src.PixelFormat != PixelFormat.Format32bppArgb)
+			var destData = dest.Sheet.GetData();
+			var destStride = dest.Sheet.Size.Width;
+			var width = dest.Bounds.Width;
+			var height = dest.Bounds.Height;
+
+			unsafe
 			{
-				src = src.CloneWith32bbpArgbPixelFormat();
-				createdTempBitmap = true;
-			}
-
-			try
-			{
-				var destData = dest.Sheet.GetData();
-				var destStride = dest.Sheet.Size.Width;
-				var width = dest.Bounds.Width;
-				var height = dest.Bounds.Height;
-
-				var srcData = src.LockBits(src.Bounds(),
-					ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-
-				unsafe
+				// Cast the data to an int array so we can copy the src data directly
+				fixed (byte* bd = &destData[0])
 				{
-					var c = (int*)srcData.Scan0;
+					var data = (int*)bd;
+					var x = dest.Bounds.Left;
+					var y = dest.Bounds.Top;
 
-					// Cast the data to an int array so we can copy the src data directly
-					fixed (byte* bd = &destData[0])
+					var k = 0;
+					for (var j = 0; j < height; j++)
 					{
-						var data = (int*)bd;
-						var x = dest.Bounds.Left;
-						var y = dest.Bounds.Top;
-
-						for (var j = 0; j < height; j++)
+						for (var i = 0; i < width; i++)
 						{
-							for (var i = 0; i < width; i++)
+							Color cc;
+							if (src.Palette == null)
 							{
-								var cc = Color.FromArgb(*(c + (j * srcData.Stride >> 2) + i));
-								data[(y + j) * destStride + x + i] = PremultiplyAlpha(cc).ToArgb();
+								var r = src.Data[k++];
+								var g = src.Data[k++];
+								var b = src.Data[k++];
+								var a = src.Data[k++];
+								cc = Color.FromArgb(a, r, g, b);
 							}
+							else
+								cc = src.Palette[src.Data[k++]];
+
+							data[(y + j) * destStride + x + i] = PremultiplyAlpha(cc).ToArgb();
 						}
 					}
 				}
-
-				src.UnlockBits(srcData);
-			}
-			finally
-			{
-				if (createdTempBitmap)
-					src.Dispose();
 			}
 		}
 
@@ -323,12 +317,31 @@ namespace OpenRA.Graphics
 			return mtx;
 		}
 
-		public static float[] MakeFloatMatrix(int[] imtx)
+		public static float[] MakeFloatMatrix(Int32Matrix4x4 imtx)
 		{
-			var fmtx = new float[16];
-			for (var i = 0; i < 16; i++)
-				fmtx[i] = imtx[i] * 1f / imtx[15];
-			return fmtx;
+			var multipler = 1f / imtx.M44;
+			return new[]
+			{
+				imtx.M11 * multipler,
+				imtx.M12 * multipler,
+				imtx.M13 * multipler,
+				imtx.M14 * multipler,
+
+				imtx.M21 * multipler,
+				imtx.M22 * multipler,
+				imtx.M23 * multipler,
+				imtx.M24 * multipler,
+
+				imtx.M31 * multipler,
+				imtx.M32 * multipler,
+				imtx.M33 * multipler,
+				imtx.M34 * multipler,
+
+				imtx.M41 * multipler,
+				imtx.M42 * multipler,
+				imtx.M43 * multipler,
+				imtx.M44 * multipler,
+			};
 		}
 
 		public static float[] MatrixAABBMultiply(float[] mtx, float[] bounds)
@@ -339,13 +352,16 @@ namespace OpenRA.Graphics
 			var iz = new uint[] { 2, 5, 2, 5, 2, 5, 2, 5 };
 
 			// Vectors to opposing corner
-			var ret = new float[] { float.MaxValue, float.MaxValue, float.MaxValue,
-				float.MinValue, float.MinValue, float.MinValue };
+			var ret = new[]
+			{
+				float.MaxValue, float.MaxValue, float.MaxValue,
+				float.MinValue, float.MinValue, float.MinValue
+			};
 
 			// Transform vectors and find new bounding box
 			for (var i = 0; i < 8; i++)
 			{
-				var vec = new float[] { bounds[ix[i]], bounds[iy[i]], bounds[iz[i]], 1 };
+				var vec = new[] { bounds[ix[i]], bounds[iy[i]], bounds[iz[i]], 1 };
 				var tvec = MatrixVectorMultiply(mtx, vec);
 
 				ret[0] = Math.Min(ret[0], tvec[0] / tvec[3]);

OpenRA.Game/Graphics/Vertex.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of

OpenRA.Game/Graphics/Viewport.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,8 +11,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
+using OpenRA.Primitives;
 
 namespace OpenRA.Graphics
 {
@@ -311,4 +311,4 @@ namespace OpenRA.Graphics
 			}
 		}
 	}
-}
+}

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,9 +11,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.Effects;
+using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA.Graphics
@@ -31,13 +31,16 @@ namespace OpenRA.Graphics
 
 		public event Action PaletteInvalidated = null;
 
+		readonly HashSet<Actor> onScreenActors = new HashSet<Actor>();
 		readonly HardwarePalette palette = new HardwarePalette();
 		readonly Dictionary<string, PaletteReference> palettes = new Dictionary<string, PaletteReference>();
-		readonly TerrainRenderer terrainRenderer;
-		readonly Lazy<DeveloperMode> devTrait;
+		readonly IRenderTerrain terrainRenderer;
+		readonly Lazy<DebugVisualizations> debugVis;
 		readonly Func<string, PaletteReference> createPaletteReference;
 		readonly bool enableDepthBuffer;
 
+		bool lastDepthPreviewEnabled;
+
 		internal WorldRenderer(ModData modData, World world)
 		{
 			World = world;
@@ -59,12 +62,12 @@ namespace OpenRA.Graphics
 			palette.Initialize();
 
 			Theater = new Theater(world.Map.Rules.TileSet);
-			terrainRenderer = new TerrainRenderer(world, this);
+			terrainRenderer = world.WorldActor.TraitOrDefault<IRenderTerrain>();
 
-			devTrait = Exts.Lazy(() => world.LocalPlayer != null ? world.LocalPlayer.PlayerActor.Trait<DeveloperMode>() : null);
+			debugVis = Exts.Lazy(() => world.WorldActor.TraitOrDefault<DebugVisualizations>());
 		}
 
-		public void UpdatePalettesForPlayer(string internalName, HSLColor color, bool replaceExisting)
+		public void UpdatePalettesForPlayer(string internalName, Color color, bool replaceExisting)
 		{
 			foreach (var pal in World.WorldActor.TraitsImplementing<ILoadsPlayerPalettes>())
 				pal.LoadPlayerPalettes(this, internalName, color, replaceExisting);
@@ -102,7 +105,7 @@ namespace OpenRA.Graphics
 
 		List<IFinalizedRenderable> GenerateRenderables()
 		{
-			var actors = World.ScreenMap.ActorsInBox(Viewport.TopLeft, Viewport.BottomRight).Append(World.WorldActor);
+			var actors = onScreenActors.Append(World.WorldActor);
 			if (World.RenderPlayer != null)
 				actors = actors.Append(World.RenderPlayer.PlayerActor);
 
@@ -110,7 +113,13 @@ namespace OpenRA.Graphics
 			if (World.OrderGenerator != null)
 				worldRenderables = worldRenderables.Concat(World.OrderGenerator.Render(this, World));
 
-			worldRenderables = worldRenderables.Concat(World.Effects.SelectMany(e => e.Render(this)));
+			// Unpartitioned effects
+			worldRenderables = worldRenderables.Concat(World.UnpartitionedEffects.SelectMany(e => e.Render(this)));
+
+			// Partitioned, currently on-screen effects
+			var effectRenderables = World.ScreenMap.RenderableEffectsInBox(Viewport.TopLeft, Viewport.BottomRight);
+			worldRenderables = worldRenderables.Concat(effectRenderables.SelectMany(e => e.Render(this)));
+
 			worldRenderables = worldRenderables.OrderBy(RenderableScreenZPositionComparisonKey);
 
 			Game.Renderer.WorldModelRenderer.BeginFrame();
@@ -120,28 +129,61 @@ namespace OpenRA.Graphics
 			return renderables;
 		}
 
+		List<IFinalizedRenderable> GenerateOverlayRenderables()
+		{
+			var aboveShroud = World.ActorsWithTrait<IRenderAboveShroud>()
+				.Where(a => a.Actor.IsInWorld && !a.Actor.Disposed && (!a.Trait.SpatiallyPartitionable || onScreenActors.Contains(a.Actor)))
+					.SelectMany(a => a.Trait.RenderAboveShroud(a.Actor, this));
+
+			var aboveShroudSelected = World.Selection.Actors.Where(a => a.IsInWorld && !a.Disposed)
+				.SelectMany(a => a.TraitsImplementing<IRenderAboveShroudWhenSelected>()
+					.Where(t => !t.SpatiallyPartitionable || onScreenActors.Contains(a))
+					.SelectMany(t => t.RenderAboveShroud(a, this)));
+
+			var aboveShroudEffects = World.Effects.Select(e => e as IEffectAboveShroud)
+				.Where(e => e != null)
+				.SelectMany(e => e.RenderAboveShroud(this));
+
+			var aboveShroudOrderGenerator = SpriteRenderable.None;
+			if (World.OrderGenerator != null)
+				aboveShroudOrderGenerator = World.OrderGenerator.RenderAboveShroud(this, World);
+
+			var overlayRenderables = aboveShroud
+				.Concat(aboveShroudSelected)
+				.Concat(aboveShroudEffects)
+				.Concat(aboveShroudOrderGenerator);
+
+			Game.Renderer.WorldModelRenderer.BeginFrame();
+			var finalOverlayRenderables = overlayRenderables.Select(r => r.PrepareRender(this)).ToList();
+			Game.Renderer.WorldModelRenderer.EndFrame();
+
+			return finalOverlayRenderables;
+		}
+
 		public void Draw()
 		{
 			if (World.WorldActor.Disposed)
 				return;
 
-			if (devTrait.Value != null)
+			if (debugVis.Value != null && lastDepthPreviewEnabled != debugVis.Value.DepthBuffer)
 			{
-				Game.Renderer.WorldSpriteRenderer.SetDepthPreviewEnabled(devTrait.Value.ShowDepthPreview);
-				Game.Renderer.WorldRgbaSpriteRenderer.SetDepthPreviewEnabled(devTrait.Value.ShowDepthPreview);
-				Game.Renderer.WorldRgbaColorRenderer.SetDepthPreviewEnabled(devTrait.Value.ShowDepthPreview);
+				lastDepthPreviewEnabled = debugVis.Value.DepthBuffer;
+				Game.Renderer.WorldSpriteRenderer.SetDepthPreviewEnabled(lastDepthPreviewEnabled);
 			}
 
 			RefreshPalette();
 
+			onScreenActors.UnionWith(World.ScreenMap.RenderableActorsInBox(Viewport.TopLeft, Viewport.BottomRight));
 			var renderables = GenerateRenderables();
 			var bounds = Viewport.GetScissorBounds(World.Type != WorldType.Editor);
 			Game.Renderer.EnableScissor(bounds);
 
 			if (enableDepthBuffer)
-				Game.Renderer.Device.EnableDepthBuffer();
+				Game.Renderer.Context.EnableDepthBuffer();
+
+			if (terrainRenderer != null)
+				terrainRenderer.RenderTerrain(this, Viewport);
 
-			terrainRenderer.Draw(this, Viewport);
 			Game.Renderer.Flush();
 
 			for (var i = 0; i < renderables.Count; i++)
@@ -163,50 +205,47 @@ namespace OpenRA.Graphics
 				a.Trait.RenderShroud(renderShroud, this);
 
 			if (enableDepthBuffer)
-				Game.Renderer.Device.DisableDepthBuffer();
+				Game.Renderer.Context.DisableDepthBuffer();
 
 			Game.Renderer.DisableScissor();
 
-			var aboveShroud = World.ActorsWithTrait<IRenderAboveShroud>().Where(a => a.Actor.IsInWorld && !a.Actor.Disposed)
-				.SelectMany(a => a.Trait.RenderAboveShroud(a.Actor, this));
-
-			var aboveShroudSelected = World.Selection.Actors.Where(a => !a.Disposed)
-				.SelectMany(a => a.TraitsImplementing<IRenderAboveShroudWhenSelected>()
-					.SelectMany(t => t.RenderAboveShroud(a, this)));
-
-			var aboveShroudEffects = World.Effects.Select(e => e as IEffectAboveShroud)
-				.Where(e => e != null)
-				.SelectMany(e => e.RenderAboveShroud(this));
-
-			var aboveShroudOrderGenerator = SpriteRenderable.None;
-			if (World.OrderGenerator != null)
-				aboveShroudOrderGenerator = World.OrderGenerator.RenderAboveShroud(this, World);
-
-			Game.Renderer.WorldModelRenderer.BeginFrame();
-			var finalOverlayRenderables = aboveShroud
-				.Concat(aboveShroudSelected)
-				.Concat(aboveShroudEffects)
-				.Concat(aboveShroudOrderGenerator)
-				.Select(r => r.PrepareRender(this))
-				.ToList();
-			Game.Renderer.WorldModelRenderer.EndFrame();
+			var finalOverlayRenderables = GenerateOverlayRenderables();
 
 			// HACK: Keep old grouping behaviour
-			foreach (var g in finalOverlayRenderables.GroupBy(prs => prs.GetType()))
+			var groupedOverlayRenderables = finalOverlayRenderables.GroupBy(prs => prs.GetType());
+			foreach (var g in groupedOverlayRenderables)
 				foreach (var r in g)
 					r.Render(this);
 
-			if (devTrait.Value != null && devTrait.Value.ShowDebugGeometry)
+			if (debugVis.Value != null && debugVis.Value.RenderGeometry)
 			{
 				for (var i = 0; i < renderables.Count; i++)
 					renderables[i].RenderDebugGeometry(this);
 
-				foreach (var g in finalOverlayRenderables.GroupBy(prs => prs.GetType()))
+				foreach (var g in groupedOverlayRenderables)
 					foreach (var r in g)
 						r.RenderDebugGeometry(this);
 			}
 
+			if (debugVis.Value != null && debugVis.Value.ScreenMap)
+			{
+				foreach (var r in World.ScreenMap.RenderBounds(World.RenderPlayer))
+					Game.Renderer.WorldRgbaColorRenderer.DrawRect(
+						new float3(r.Left, r.Top, r.Bottom),
+						new float3(r.Right, r.Bottom, r.Bottom),
+						1 / Viewport.Zoom, Color.MediumSpringGreen);
+
+				foreach (var r in World.ScreenMap.MouseBounds(World.RenderPlayer))
+					Game.Renderer.WorldRgbaColorRenderer.DrawRect(
+						new float3(r.Left, r.Top, r.Bottom),
+						new float3(r.Right, r.Bottom, r.Bottom),
+						1 / Viewport.Zoom, Color.OrangeRed);
+			}
+
 			Game.Renderer.Flush();
+
+			// PERF: Reuse collection to avoid allocations.
+			onScreenActors.Clear();
 		}
 
 		public void RefreshPalette()
@@ -293,7 +332,6 @@ namespace OpenRA.Graphics
 
 			palette.Dispose();
 			Theater.Dispose();
-			terrainRenderer.Dispose();
 		}
 	}
 }

OpenRA.Game/HotkeyDefinition.cs

@@ -0,0 +1,40 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2019 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, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenRA
+{
+	public sealed class HotkeyDefinition
+	{
+		public readonly string Name;
+		public readonly Hotkey Default = Hotkey.Invalid;
+		public readonly string Description = "";
+		public readonly HashSet<string> Types = new HashSet<string>();
+
+		public HotkeyDefinition(string name, MiniYaml node)
+		{
+			Name = name;
+
+			if (!string.IsNullOrEmpty(node.Value))
+				Default = FieldLoader.GetValue<Hotkey>("value", node.Value);
+
+			var descriptionNode = node.Nodes.FirstOrDefault(n => n.Key == "Description");
+			if (descriptionNode != null)
+				Description = descriptionNode.Value.Value;
+
+			var typesNode = node.Nodes.FirstOrDefault(n => n.Key == "Types");
+			if (typesNode != null)
+				Types = FieldLoader.GetValue<HashSet<string>>("Types", typesNode.Value.Value);
+		}
+	}
+}

OpenRA.Game/HotkeyManager.cs

@@ -0,0 +1,94 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2019 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, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using OpenRA.FileSystem;
+
+namespace OpenRA
+{
+	public sealed class HotkeyManager
+	{
+		readonly Dictionary<string, Hotkey> settings;
+		readonly Dictionary<string, HotkeyDefinition> definitions = new Dictionary<string, HotkeyDefinition>();
+		readonly Dictionary<string, Hotkey> keys = new Dictionary<string, Hotkey>();
+
+		public HotkeyManager(IReadOnlyFileSystem fileSystem, Dictionary<string, Hotkey> settings, Manifest manifest)
+		{
+			this.settings = settings;
+
+			var keyDefinitions = MiniYaml.Load(fileSystem, manifest.Hotkeys, null);
+			foreach (var kd in keyDefinitions)
+			{
+				var definition = new HotkeyDefinition(kd.Key, kd.Value);
+				definitions[kd.Key] = definition;
+				keys[kd.Key] = definition.Default;
+			}
+
+			foreach (var kv in settings)
+			{
+				if (definitions.ContainsKey(kv.Key))
+					keys[kv.Key] = kv.Value;
+			}
+		}
+
+		internal Func<Hotkey> GetHotkeyReference(string name)
+		{
+			// Is this a mod-defined hotkey?
+			if (keys.ContainsKey(name))
+				return () => keys[name];
+
+			// Try and parse as a hardcoded definition
+			Hotkey key;
+			if (!Hotkey.TryParse(name, out key))
+				key = Hotkey.Invalid;
+
+			return () => key;
+		}
+
+		public void Set(string name, Hotkey value)
+		{
+			HotkeyDefinition definition;
+			if (!definitions.TryGetValue(name, out definition))
+				return;
+
+			keys[name] = value;
+			if (value != definition.Default)
+				settings[name] = value;
+			else
+				settings.Remove(name);
+		}
+
+		public HotkeyDefinition GetFirstDuplicate(string name, Hotkey value, HotkeyDefinition definition)
+		{
+			foreach (var kv in keys)
+			{
+				if (kv.Key == name)
+					continue;
+
+				if (kv.Value == value && definitions[kv.Key].Types.Overlaps(definition.Types))
+					return definitions[kv.Key];
+			}
+
+			return null;
+		}
+
+		public HotkeyReference this[string name]
+		{
+			get
+			{
+				return new HotkeyReference(GetHotkeyReference(name));
+			}
+		}
+
+		public IEnumerable<HotkeyDefinition> Definitions { get { return definitions.Values; } }
+	}
+}

OpenRA.Game/IUtilityCommand.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of

OpenRA.Game/Input/Hotkey.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of

OpenRA.Game/Input/HotkeyReference.cs

@@ -0,0 +1,46 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2019 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, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+
+namespace OpenRA
+{
+	/// <summary>
+	/// A reference to either a named hotkey (defined in the game settings) or a statically assigned hotkey
+	/// </summary>
+	public class HotkeyReference
+	{
+		static readonly Func<Hotkey> Invalid = () => Hotkey.Invalid;
+
+		readonly Func<Hotkey> getValue;
+
+		public HotkeyReference()
+		{
+			getValue = Invalid;
+		}
+
+		internal HotkeyReference(Func<Hotkey> getValue)
+		{
+			this.getValue = getValue;
+		}
+
+		public Hotkey GetValue()
+		{
+			return getValue();
+		}
+
+		public bool IsActivatedBy(KeyInput e)
+		{
+			var currentValue = getValue();
+			return currentValue.Key == e.Key && currentValue.Modifiers == e.Modifiers;
+		}
+	}
+}

OpenRA.Game/Input/IInputHandler.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -26,17 +26,17 @@ namespace OpenRA
 	{
 		public MouseInputEvent Event;
 		public MouseButton Button;
-		public int ScrollDelta;
 		public int2 Location;
+		public int2 Delta;
 		public Modifiers Modifiers;
 		public int MultiTapCount;
 
-		public MouseInput(MouseInputEvent ev, MouseButton button, int scrollDelta, int2 location, Modifiers mods, int multiTapCount)
+		public MouseInput(MouseInputEvent ev, MouseButton button, int2 location, int2 delta, Modifiers mods, int multiTapCount)
 		{
 			Event = ev;
 			Button = button;
-			ScrollDelta = scrollDelta;
 			Location = location;
+			Delta = delta;
 			Modifiers = mods;
 			MultiTapCount = multiTapCount;
 		}

OpenRA.Game/Input/InputHandler.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -37,17 +37,17 @@ namespace OpenRA
 
 		public void OnKeyInput(KeyInput input)
 		{
-			Sync.CheckSyncUnchanged(world, () => Ui.HandleKeyPress(input));
+			Sync.RunUnsynced(Game.Settings.Debug.SyncCheckUnsyncedCode, world, () => Ui.HandleKeyPress(input));
 		}
 
 		public void OnTextInput(string text)
 		{
-			Sync.CheckSyncUnchanged(world, () => Ui.HandleTextInput(text));
+			Sync.RunUnsynced(Game.Settings.Debug.SyncCheckUnsyncedCode, world, () => Ui.HandleTextInput(text));
 		}
 
 		public void OnMouseInput(MouseInput input)
 		{
-			Sync.CheckSyncUnchanged(world, () => Ui.HandleInput(input));
+			Sync.RunUnsynced(Game.Settings.Debug.SyncCheckUnsyncedCode, world, () => Ui.HandleInput(input));
 		}
 	}
 

OpenRA.Game/Input/Keycode.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -258,7 +258,7 @@ namespace OpenRA
 	{
 		static readonly Dictionary<Keycode, string> KeyNames = new Dictionary<Keycode, string>
 		{
-			{ Keycode.UNKNOWN, "Unknown" },
+			{ Keycode.UNKNOWN, "Undefined" },
 			{ Keycode.RETURN, "Return" },
 			{ Keycode.ESCAPE, "Escape" },
 			{ Keycode.BACKSPACE, "Backspace" },

OpenRA.Game/InstalledMods.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -12,9 +12,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
+using OpenRA.FileFormats;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Primitives;
@@ -83,8 +83,7 @@ namespace OpenRA
 					{
 						using (var stream = package.GetStream("icon.png"))
 							if (stream != null)
-								using (var bitmap = new Bitmap(stream))
-									icons[id] = sheetBuilder.Add(bitmap);
+								icons[id] = sheetBuilder.Add(new Png(stream));
 					}
 					else if (!manifest.Metadata.Hidden)
 						Log.Write("debug", "Mod '{0}' is missing 'icon.png'.".F(path));
@@ -128,4 +127,4 @@ namespace OpenRA
 		public bool TryGetValue(string key, out Manifest value) { return mods.TryGetValue(key, out value); }
 		IEnumerator IEnumerable.GetEnumerator() { return mods.GetEnumerator(); }
 	}
-}
+}

OpenRA.Game/LocalPlayerProfile.cs

@@ -0,0 +1,188 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2019 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, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenRA
+{
+	public sealed class LocalPlayerProfile
+	{
+		const int AuthKeySize = 2048;
+		public enum LinkState { Uninitialized, GeneratingKeys, Unlinked, CheckingLink, ConnectionFailed, Linked }
+
+		public LinkState State { get { return innerState; } }
+		public string Fingerprint { get { return innerFingerprint; } }
+		public string PublicKey { get { return innerPublicKey; } }
+
+		public PlayerProfile ProfileData { get { return innerData; } }
+
+		volatile LinkState innerState;
+		volatile PlayerProfile innerData;
+		volatile string innerFingerprint;
+		volatile string innerPublicKey;
+
+		RSAParameters parameters;
+		readonly string filePath;
+		readonly PlayerDatabase playerDatabase;
+
+		public LocalPlayerProfile(string filePath, PlayerDatabase playerDatabase)
+		{
+			this.filePath = filePath;
+			this.playerDatabase = playerDatabase;
+			innerState = LinkState.Uninitialized;
+
+			try
+			{
+				if (File.Exists(filePath))
+				{
+					using (var rsa = new RSACryptoServiceProvider())
+					{
+						using (var data = File.OpenRead(filePath))
+						{
+							var keyData = Convert.FromBase64String(data.ReadAllText());
+							rsa.FromXmlString(new string(Encoding.ASCII.GetChars(keyData)));
+						}
+
+						parameters = rsa.ExportParameters(true);
+						innerPublicKey = CryptoUtil.EncodePEMPublicKey(parameters);
+						innerFingerprint = CryptoUtil.PublicKeyFingerprint(parameters);
+						innerState = LinkState.Unlinked;
+					}
+				}
+			}
+			catch (Exception e)
+			{
+				Console.WriteLine("Failed to load keys: {0}", e);
+				Log.Write("debug", "Failed to load player keypair from `{0}` with exception: {1}", filePath, e);
+			}
+		}
+
+		public void RefreshPlayerData(Action onComplete = null)
+		{
+			if (State != LinkState.Unlinked && State != LinkState.Linked && State != LinkState.ConnectionFailed)
+				return;
+
+			Action<DownloadDataCompletedEventArgs> onQueryComplete = i =>
+			{
+				try
+				{
+					innerState = LinkState.Unlinked;
+
+					if (i.Error != null)
+					{
+						innerState = LinkState.ConnectionFailed;
+						return;
+					}
+
+					var yaml = MiniYaml.FromString(Encoding.UTF8.GetString(i.Result)).First();
+					if (yaml.Key == "Player")
+					{
+						innerData = FieldLoader.Load<PlayerProfile>(yaml.Value);
+						if (innerData.KeyRevoked)
+						{
+							Log.Write("debug", "Revoking key with fingerprint {0}", Fingerprint);
+							DeleteKeypair();
+						}
+						else
+							innerState = LinkState.Linked;
+					}
+				}
+				catch (Exception e)
+				{
+					Log.Write("debug", "Failed to parse player data result with exception: {0}", e);
+					innerState = LinkState.ConnectionFailed;
+				}
+				finally
+				{
+					if (onComplete != null)
+						onComplete();
+				}
+			};
+
+			innerState = LinkState.CheckingLink;
+			new Download(playerDatabase.Profile + Fingerprint, _ => { }, onQueryComplete);
+		}
+
+		public void GenerateKeypair()
+		{
+			if (State != LinkState.Uninitialized)
+				return;
+
+			innerState = LinkState.GeneratingKeys;
+			new Task(() =>
+			{
+				try
+				{
+					var rsa = new RSACryptoServiceProvider(AuthKeySize);
+					parameters = rsa.ExportParameters(true);
+					innerPublicKey = CryptoUtil.EncodePEMPublicKey(parameters);
+					innerFingerprint = CryptoUtil.PublicKeyFingerprint(parameters);
+
+					var data = Convert.ToBase64String(Encoding.ASCII.GetBytes(rsa.ToXmlString(true)));
+					File.WriteAllText(filePath, data);
+
+					innerState = LinkState.Unlinked;
+				}
+				catch (Exception e)
+				{
+					Log.Write("debug", "Failed to generate keypair with exception: {1}", e);
+					Console.WriteLine("Key generation failed: {0}", e);
+
+					innerState = LinkState.Uninitialized;
+				}
+			}).Start();
+		}
+
+		public void DeleteKeypair()
+		{
+			try
+			{
+				File.Delete(filePath);
+			}
+			catch (Exception e)
+			{
+				Log.Write("debug", "Failed to delete keypair with exception: {1}", e);
+				Console.WriteLine("Key deletion failed: {0}", e);
+			}
+
+			innerState = LinkState.Uninitialized;
+			parameters = default(RSAParameters);
+			innerFingerprint = null;
+			innerData = null;
+		}
+
+		public string Sign(params string[] data)
+		{
+			// If we don't have any keys, or we know for sure that they haven't been linked to the forum
+			// then we can't do much here. If we have keys but don't yet know if they have been linked to the
+			// forum (LinkState.CheckingLink or ConnectionFailed) then we sign to avoid blocking the main thread
+			// but accept that - if the cert is invalid - the server will reject the result.
+			if (State <= LinkState.Unlinked)
+				return null;
+
+			return CryptoUtil.Sign(parameters, data.Where(x => !string.IsNullOrEmpty(x)).JoinWith(string.Empty));
+		}
+
+		public string DecryptString(string data)
+		{
+			if (State <= LinkState.Unlinked)
+				return null;
+
+			return CryptoUtil.DecryptString(parameters, data);
+		}
+	}
+}

OpenRA.Game/LogProxy.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of

OpenRA.Game/MPos.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -10,7 +10,7 @@
 #endregion
 
 using System;
-using System.Drawing;
+using OpenRA.Primitives;
 
 namespace OpenRA
 {
@@ -92,4 +92,4 @@ namespace OpenRA
 
 		public override string ToString() { return U + "," + V; }
 	}
-}
+}

OpenRA.Game/Manifest.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -46,6 +46,8 @@ namespace OpenRA
 	{
 		public string Title;
 		public string Version;
+		public string Website;
+		public string WebIcon32;
 		public bool Hidden;
 	}
 
@@ -59,22 +61,24 @@ namespace OpenRA
 			Rules, ServerTraits,
 			Sequences, ModelSequences, Cursors, Chrome, Assemblies, ChromeLayout,
 			Weapons, Voices, Notifications, Music, Translations, TileSets,
-			ChromeMetrics, MapCompatibility, Missions;
+			ChromeMetrics, MapCompatibility, Missions, Hotkeys;
 
 		public readonly IReadOnlyDictionary<string, string> Packages;
 		public readonly IReadOnlyDictionary<string, string> MapFolders;
 		public readonly MiniYaml LoadScreen;
-		public readonly Dictionary<string, Pair<string, int>> Fonts;
 
 		public readonly string[] SoundFormats = { };
 		public readonly string[] SpriteFormats = { };
 		public readonly string[] PackageFormats = { };
 
-		readonly string[] reservedModuleNames = { "Metadata", "Folders", "MapFolders", "Packages", "Rules",
+		readonly string[] reservedModuleNames =
+		{
+			"Metadata", "Folders", "MapFolders", "Packages", "Rules",
 			"Sequences", "ModelSequences", "Cursors", "Chrome", "Assemblies", "ChromeLayout", "Weapons",
-			"Voices", "Notifications", "Music", "Translations", "TileSets", "ChromeMetrics", "Missions",
-			"ServerTraits", "LoadScreen", "Fonts", "SupportsMapsFrom", "SoundFormats", "SpriteFormats",
-			"RequiresMods", "PackageFormats" };
+			"Voices", "Notifications", "Music", "Translations", "TileSets", "ChromeMetrics", "Missions", "Hotkeys",
+			"ServerTraits", "LoadScreen", "SupportsMapsFrom", "SoundFormats", "SpriteFormats",
+			"RequiresMods", "PackageFormats"
+		};
 
 		readonly TypeDictionary modules = new TypeDictionary();
 		readonly Dictionary<string, MiniYaml> yaml;
@@ -111,18 +115,13 @@ namespace OpenRA
 			TileSets = YamlList(yaml, "TileSets");
 			ChromeMetrics = YamlList(yaml, "ChromeMetrics");
 			Missions = YamlList(yaml, "Missions");
+			Hotkeys = YamlList(yaml, "Hotkeys");
 
 			ServerTraits = YamlList(yaml, "ServerTraits");
 
 			if (!yaml.TryGetValue("LoadScreen", out LoadScreen))
 				throw new InvalidDataException("`LoadScreen` section is not defined.");
 
-			Fonts = yaml["Fonts"].ToDictionary(my =>
-			{
-				var nd = my.ToDictionary();
-				return Pair.New(nd["Font"].Value, Exts.ParseIntegerInvariant(nd["Size"].Value));
-			});
-
 			// Allow inherited mods to import parent maps.
 			var compat = new List<string> { Id };
 

OpenRA.Game/Map/ActorInitializer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -49,7 +49,9 @@ namespace OpenRA
 
 	public class LocationInit : IActorInit<CPos>
 	{
-		[FieldFromYamlKey] readonly CPos value = CPos.Zero;
+		[FieldFromYamlKey]
+		readonly CPos value = CPos.Zero;
+
 		public LocationInit() { }
 		public LocationInit(CPos init) { value = init; }
 		public CPos Value(World world) { return value; }
@@ -57,7 +59,9 @@ namespace OpenRA
 
 	public class OwnerInit : IActorInit<Player>
 	{
-		[FieldFromYamlKey] public readonly string PlayerName = "Neutral";
+		[FieldFromYamlKey]
+		public readonly string PlayerName = "Neutral";
+
 		Player player;
 
 		public OwnerInit() { }

OpenRA.Game/Map/ActorReference.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -28,7 +28,8 @@ namespace OpenRA
 
 		Lazy<TypeDictionary> initDict;
 
-		public ActorReference(string type) : this(type, new Dictionary<string, MiniYaml>()) { }
+		public ActorReference(string type)
+			: this(type, new Dictionary<string, MiniYaml>()) { }
 
 		public ActorReference(string type, Dictionary<string, MiniYaml> inits)
 		{

OpenRA.Game/Map/CellLayer.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -12,7 +12,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Drawing;
+using OpenRA.Primitives;
 
 namespace OpenRA
 {

OpenRA.Game/Map/CellRegion.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -40,6 +40,16 @@ namespace OpenRA
 			mapBottomRight = BottomRight.ToMPos(gridType);
 		}
 
+		public CellRegion(MapGridType gridType, MPos topLeft, MPos bottomRight)
+		{
+			this.gridType = gridType;
+			mapTopLeft = topLeft;
+			mapBottomRight = bottomRight;
+
+			TopLeft = topLeft.ToCPos(gridType);
+			BottomRight = bottomRight.ToCPos(gridType);
+		}
+
 		/// <summary>Expand the specified region with an additional cordon. This may expand the region outside the map borders.</summary>
 		public static CellRegion Expand(CellRegion region, int cordon)
 		{

OpenRA.Game/Map/Map.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -11,14 +11,13 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using OpenRA.FileFormats;
 using OpenRA.FileSystem;
-using OpenRA.Graphics;
+using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Traits;
 
@@ -214,6 +213,7 @@ namespace OpenRA
 
 		public Ruleset Rules { get; private set; }
 		public bool InvalidCustomRules { get; private set; }
+		public Exception InvalidCustomRulesException { get; private set; }
 
 		/// <summary>
 		/// The top-left of the playable area in projected world coordinates
@@ -253,16 +253,27 @@ namespace OpenRA
 				if (!contents.Contains(required))
 					throw new FileNotFoundException("Required file {0} not present in this map".F(required));
 
-			using (var ms = new MemoryStream())
+			var streams = new List<Stream>();
+			try
 			{
 				foreach (var filename in contents)
 					if (filename.EndsWith(".yaml") || filename.EndsWith(".bin") || filename.EndsWith(".lua"))
-						using (var s = package.GetStream(filename))
-							s.CopyTo(ms);
+						streams.Add(package.GetStream(filename));
 
 				// Take the SHA1
-				ms.Seek(0, SeekOrigin.Begin);
-				return CryptoUtil.SHA1Hash(ms);
+				if (streams.Count == 0)
+					return CryptoUtil.SHA1Hash(new byte[0]);
+
+				var merged = streams[0];
+				for (var i = 1; i < streams.Count; i++)
+					merged = new MergedStream(merged, streams[i]);
+
+				return CryptoUtil.SHA1Hash(merged);
+			}
+			finally
+			{
+				foreach (var stream in streams)
+					stream.Dispose();
 			}
 		}
 
@@ -393,6 +404,7 @@ namespace OpenRA
 			{
 				Log.Write("debug", "Failed to load rules for {0} with error {1}", Title, e);
 				InvalidCustomRules = true;
+				InvalidCustomRulesException = e;
 				Rules = Ruleset.LoadDefaultsForTileSet(modData, Tileset);
 			}
 
@@ -429,7 +441,7 @@ namespace OpenRA
 			{
 				var uv = cell.ToMPos(Grid.Type);
 				cellProjection[uv] = new PPos[0];
-				inverseCellProjection[uv] = new List<MPos>();
+				inverseCellProjection[uv] = new List<MPos>(1);
 			}
 
 			// Initialize projections
@@ -554,6 +566,10 @@ namespace OpenRA
 			foreach (var field in YamlFields)
 				field.Serialize(this, root);
 
+			// HACK: map.yaml is expected to have empty lines between top-level blocks
+			for (var i = root.Count - 1; i > 0; i--)
+				root.Insert(i, new MiniYamlNode("", ""));
+
 			// Saving to a new package: copy over all the content from the map
 			if (Package != null && toPackage != Package)
 				foreach (var file in Package.Contents)
@@ -634,8 +650,24 @@ namespace OpenRA
 		public byte[] SavePreview()
 		{
 			var tileset = Rules.TileSet;
-			var resources = Rules.Actors["world"].TraitInfos<ResourceTypeInfo>()
-				.ToDictionary(r => r.ResourceType, r => r.TerrainType);
+			var actorTypes = Rules.Actors.Values.Where(a => a.HasTraitInfo<IMapPreviewSignatureInfo>());
+			var actors = ActorDefinitions.Where(a => actorTypes.Where(ai => ai.Name == a.Value.Value).Any());
+			var positions = new List<Pair<MPos, Color>>();
+			foreach (var actor in actors)
+			{
+				var s = new ActorReference(actor.Value.Value, actor.Value.ToDictionary());
+
+				var ai = Rules.Actors[actor.Value.Value];
+				var impsis = ai.TraitInfos<IMapPreviewSignatureInfo>();
+				foreach (var impsi in impsis)
+					impsi.PopulateMapPreviewSignatureCells(this, ai, s, positions);
+			}
+
+			// ResourceLayer is on world actor, which isn't caught above, so an extra check for it.
+			var worldActorInfo = Rules.Actors["world"];
+			var worldimpsis = worldActorInfo.TraitInfos<IMapPreviewSignatureInfo>();
+			foreach (var worldimpsi in worldimpsis)
+				worldimpsi.PopulateMapPreviewSignatureCells(this, worldActorInfo, null, positions);
 
 			using (var stream = new MemoryStream())
 			{
@@ -651,61 +683,64 @@ namespace OpenRA
 				if (isRectangularIsometric)
 					bitmapWidth = 2 * bitmapWidth - 1;
 
-				using (var bitmap = new Bitmap(bitmapWidth, height))
+				var stride = bitmapWidth * 4;
+				var pxStride = 4;
+				var minimapData = new byte[stride * height];
+				Color leftColor, rightColor;
+				for (var y = 0; y < height; y++)
 				{
-					var bitmapData = bitmap.LockBits(bitmap.Bounds(),
-						ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-
-					unsafe
+					for (var x = 0; x < width; x++)
 					{
-						var colors = (int*)bitmapData.Scan0;
-						var stride = bitmapData.Stride / 4;
-						Color leftColor, rightColor;
-
-						for (var y = 0; y < height; y++)
+						var uv = new MPos(x + Bounds.Left, y + Bounds.Top);
+						var actorsThere = positions.Where(ap => ap.First == uv);
+						if (actorsThere.Any())
 						{
-							for (var x = 0; x < width; x++)
+							leftColor = rightColor = actorsThere.First().Second;
+						}
+						else
+						{
+							// Cell contains terrain
+							var type = tileset.GetTileInfo(Tiles[uv]);
+							leftColor = type != null ? type.LeftColor : Color.Black;
+							rightColor = type != null ? type.RightColor : Color.Black;
+						}
+
+						if (isRectangularIsometric)
+						{
+							// Odd rows are shifted right by 1px
+							var dx = uv.V & 1;
+							var xOffset = pxStride * (2 * x + dx);
+							if (x + dx > 0)
 							{
-								var uv = new MPos(x + Bounds.Left, y + Bounds.Top);
-								var resourceType = Resources[uv].Type;
-								if (resourceType != 0)
-								{
-									// Cell contains resources
-									string res;
-									if (!resources.TryGetValue(resourceType, out res))
-										continue;
+								var z = y * stride + xOffset - pxStride;
+								minimapData[z++] = leftColor.R;
+								minimapData[z++] = leftColor.G;
+								minimapData[z++] = leftColor.B;
+								minimapData[z++] = leftColor.A;
+							}
 
-									leftColor = rightColor = tileset[tileset.GetTerrainIndex(res)].Color;
-								}
-								else
-								{
-									// Cell contains terrain
-									var type = tileset.GetTileInfo(Tiles[uv]);
-									leftColor = type != null ? type.LeftColor : Color.Black;
-									rightColor = type != null ? type.RightColor : Color.Black;
-								}
-
-								if (isRectangularIsometric)
-								{
-									// Odd rows are shifted right by 1px
-									var dx = uv.V & 1;
-									if (x + dx > 0)
-										colors[y * stride + 2 * x + dx - 1] = leftColor.ToArgb();
-
-									if (2 * x + dx < stride)
-										colors[y * stride + 2 * x + dx] = rightColor.ToArgb();
-								}
-								else
-									colors[y * stride + x] = leftColor.ToArgb();
+							if (xOffset < stride)
+							{
+								var z = y * stride + xOffset;
+								minimapData[z++] = rightColor.R;
+								minimapData[z++] = rightColor.G;
+								minimapData[z++] = rightColor.B;
+								minimapData[z++] = rightColor.A;
 							}
 						}
+						else
+						{
+							var z = y * stride + pxStride * x;
+							minimapData[z++] = leftColor.R;
+							minimapData[z++] = leftColor.G;
+							minimapData[z++] = leftColor.B;
+							minimapData[z++] = leftColor.A;
+						}
 					}
-
-					bitmap.UnlockBits(bitmapData);
-					bitmap.Save(stream, ImageFormat.Png);
 				}
 
-				return stream.ToArray();
+				var png = new Png(minimapData, bitmapWidth, height);
+				return png.Save();
 			}
 		}
 
@@ -717,6 +752,11 @@ namespace OpenRA
 			if (Grid.Type == MapGridType.RectangularIsometric && cell.X < cell.Y)
 				return false;
 
+			// If the mod uses flat & rectangular maps, ToMPos and Contains(MPos) create unnecessary cost.
+			// Just check if CPos is within map bounds.
+			if (Grid.MaximumTerrainHeight == 0 && Grid.Type == MapGridType.Rectangular)
+				return Bounds.Contains(cell.X, cell.Y);
+
 			return Contains(cell.ToMPos(this));
 		}
 
@@ -772,7 +812,7 @@ namespace OpenRA
 		public WPos CenterOfSubCell(CPos cell, SubCell subCell)
 		{
 			var index = (int)subCell;
-			if (index >= 0 && index <= Grid.SubCellOffsets.Length)
+			if (index >= 0 && index < Grid.SubCellOffsets.Length)
 				return CenterOfCell(cell) + Grid.SubCellOffsets[index];
 			return CenterOfCell(cell);
 		}
@@ -784,6 +824,19 @@ namespace OpenRA
 			return new WDist(delta.Z);
 		}
 
+		/// <summary>
+		/// The size of the map Height step in world units
+		/// </summary>
+		public WDist CellHeightStep
+		{
+			get
+			{
+				// RectangularIsometric defines 1024 units along the diagonal axis,
+				// giving a half-tile height step of sqrt(2) * 512
+				return new WDist(Grid.Type == MapGridType.RectangularIsometric ? 724 : 512);
+			}
+		}
+
 		public CPos CellContaining(WPos pos)
 		{
 			if (Grid.Type == MapGridType.Rectangular)
@@ -1031,7 +1084,8 @@ namespace OpenRA
 				var v = rand.Next(Bounds.Top, Bounds.Bottom);
 
 				cells = Unproject(new PPos(u, v));
-			} while (!cells.Any());
+			}
+			while (!cells.Any());
 
 			return cells.Random(rand).ToCPos(Grid.Type);
 		}
@@ -1204,5 +1258,14 @@ namespace OpenRA
 
 			return modData.DefaultFileSystem.Exists(filename);
 		}
+
+		public bool IsExternalModFile(string filename)
+		{
+			// Explicit package paths never refer to a map
+			if (filename.Contains("|"))
+				return modData.DefaultFileSystem.IsExternalModFile(filename);
+
+			return false;
+		}
 	}
 }

OpenRA.Game/Map/MapCache.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2019 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, either version 3 of
@@ -28,6 +28,7 @@ namespace OpenRA
 	{
 		public static readonly MapPreview UnknownMap = new MapPreview(null, null, MapGridType.Rectangular, null);
 		public readonly IReadOnlyDictionary<IReadOnlyPackage, MapClassification> MapLocations;
+		readonly Dictionary<IReadOnlyPackage, MapClassification> mapLocations = new Dictionary<IReadOnlyPackage, MapClassification>();
 
 		readonly Cache<string, MapPreview> previews;
 		readonly ModData modData;
@@ -45,8 +46,16 @@ namespace OpenRA
 			previews = new Cache<string, MapPreview>(uid => new MapPreview(modData, uid, gridType.Value, this));
 			sheetBuilder = new SheetBuilder(SheetType.BGRA);
 
+			MapLocations = new ReadOnlyDictionary<IReadOnlyPackage, MapClassification>(mapLocations);
+		}
+
+		public void LoadMaps()
+		{
+			// Utility mod that does not support maps
+			if (!modData.Manifest.Contains<MapGrid>())
+				return;
+
 			// Enumerate map directories
-			var mapLocations = new Dictionary<IReadOnlyPackage, MapClassification>();
 			foreach (var kv in modData.Manifest.MapFolders)
 			{
 				var name = kv.Key;
@@ -61,7 +70,7 @@ namespace OpenRA
 				try
 				{
 					// HACK: If the path is inside the the support directory then we may need to create it
-					if (name.StartsWith("^", StringComparison.Ordinal))
+					if (Platform.IsPathRelativeToSupportDirectory(name))
 					{
 						// Assume that the path is a directory if there is not an existing file with the same name
 						var resolved = Platform.ResolvePath(name);
@@ -82,15 +91,6 @@ namespace OpenRA
 				mapLocations.Add(package, classification);
 			}
 
-			MapLocations = new ReadOnlyDictionary<IReadOnlyPackage, MapClassification>(mapLocations);
-		}
-
-		public void LoadMaps()
-		{
-			// Utility mod that does not support maps
-			if (!modData.Manifest.Contains<MapGrid>())
-				return;
-
 			var mapGrid = modData.Manifest.Get<MapGrid>();
 			foreach (var kv in MapLocations)
 			{
@@ -122,6 +122,53 @@ namespace OpenRA
 			}
 		}
 
+		public IEnumerable<IReadWritePackage> EnumerateMapPackagesWithoutCaching(MapClassification classification = MapClassification.System)
+		{
+			// Utility mod that does not support maps
+			if (!modData.Manifest.Contains<MapGrid>())
+				yield break;
+
+			// Enumerate map directories
+			foreach (var kv in modData.Manifest.MapFolders)
+			{
+				MapClassification packageClassification;
+				if (!Enum.TryParse(kv.Value, out packageClassification))
+					continue;
+
+				if (!classification.HasFlag(packageClassification))
+					continue;
+
+				var name = kv.Key;
+				var optional = name.StartsWith("~", StringComparison.Ordinal);
+				if (optional)
+					name = name.Substring(1);
+
+				// Don't try to open the map directory in the support directory if it doesn't exist
+				if (Platform.IsPathRelativeToSupportDirectory(name))
+				{
+					var resolved = Platform.ResolvePath(name);
+					if (!Directory.Exists(resolved) || !File.Exists(resolved))
+						continue;
+				}
+
+				using (var package = (IReadWritePackage)modData.ModFiles.OpenPackage(name))
+				{
+					foreach (var map in package.Contents)
+					{
+						var mapPackage = package.OpenPackage(map, modData.ModFiles) as IReadWritePackage;
+						if (mapPackage != null)
+							yield return mapPackage;
+					}
+				}
+			}
+		}
+
+		public IEnumerable<Map> EnumerateMapsWithoutCaching(MapClassification classification = MapClassification.System)
+		{
+			foreach (var mapPackage in EnumerateMapPackagesWithoutCaching(classification))
+				yield return new Map(modData, mapPackage);
+		}
+
 		public void QueryRemoteMapDetails(string repositoryUrl, IEnumerable<string> uids, Action<MapPreview> mapDetailsReceived = null, Action queryFailed = null)
 		{
 			var maps = uids.Distinct()
@@ -158,6 +205,10 @@ namespace OpenRA
 					var yaml = MiniYaml.FromString(data);
 					foreach (var kv in yaml)
 						maps[kv.Key].UpdateRemoteSearch(MapStatus.DownloadAvailable, kv.Value, mapDetailsReceived);
+
+					foreach (var map in maps)
+						if (map.Value.Status != MapStatus.DownloadAvailable)
+							map.Value.UpdateRemoteSearch(MapStatus.Unavailable, null);
 				}
 				catch (Exception e)
 				{
@@ -182,7 +233,7 @@ namespace OpenRA
 			var maxKeepAlive = 5000 / emptyDelay;
 			var keepAlive = maxKeepAlive;
 
-			for (;;)
+			while (true)
 			{
 				List<MapPreview> todo;
 				lock (syncRoot)
@@ -229,13 +280,8 @@ namespace OpenRA
 				}
 			}
 
-			// The buffer is not fully reclaimed until changes are written out to the texture.
-			// We will access the texture in order to force changes to be written out, allowing the buffer to be freed.
-			Game.RunAfterTick(() =>
-			{
-				sheetBuilder.Current.ReleaseBuffer();
-				sheetBuilder.Current.GetTexture();
-			});
+			// Release the buffer by forcing changes to be written out to the texture, allowing the buffer to be reclaimed by GC.
+			Game.RunAfterTick(sheetBuilder.Current.ReleaseBuffer);
 			Log.Write("debug", "MapCache.LoadAsyncInternal ended");
 		}
 
@@ -290,8 +336,8 @@ namespace OpenRA
 			if (string.IsNullOrEmpty(initialUid) || previews[initialUid].Status != MapStatus.Available)
 			{
 				var selected = previews.Values.Where(IsSuitableInitialMap).RandomOrDefault(random) ??
-					previews.Values.First(m => m.Status == MapStatus.Available && m.Visibility.HasFlag(MapVisibility.Lobby));
-				return selected.Uid;
+					previews.Values.FirstOrDefault(m => m.Status == MapStatus.Available && m.Visibility.HasFlag(MapVisibility.Lobby));
+				return selected == null ? string.Empty : selected.Uid;
 			}
 
 			return initialUid;