codebase:
origin https://github.com/MeridianOXC/OpenXcom.git (fetch)
* master 9d44544 Multiple calls to SDL_GetVideoMode crash on various systems. Users will just have to manually restart after changing the Window Position option.
FYI, "master" is just a copy of SupSuper's vanilla repo... you need the branch from the first post if you want any of my changes.
Yes, I was talking about Warboy's "civilians can use weapons" new feature.
I spent 3+ hours trying to cherry-pick even the first (tiny) commit for this feature.
After giving up hope on automatic merge because of different line endings (and yes, I tried the first 10 ways I could google to do it... all failed), I eventually merged it by hand... yes, by hand.
Still, it doesn't compile:
- because it requires also next commit (wouldn't be so bad)
- and because it depends on at least another 2 previous commits, which I really can't be bothered to search for and painfully cherry-pick and test
If anyone has nerves from steel, feel free to do it... I'll happily commit your PR.
PS: once (if at all) Yankes merges OXC into OXCE, I am really not looking forward to re-implementing half of OXCE+ again because it's gonna be incompatible with both OXC and OXCE