From 5310ecc2c31df58150c696462113142dd256b2d8 Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sun, 31 Mar 2019 17:35:12 +0300
Subject: [PATCH 1/8] - removed obsolete hack for Hexen main menu dimming

https://forum.zdoom.org/viewtopic.php?t=64122
---
 src/menu/menu.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
index e6cf53a89..d50b56b67 100644
--- a/src/menu/menu.cpp
+++ b/src/menu/menu.cpp
@@ -866,12 +866,6 @@ static void M_Dim()
 		amount = gameinfo.dimamount;
 	}
 
-	if (gameinfo.gametype == GAME_Hexen && gamestate == GS_DEMOSCREEN)
-	{ // On the Hexen title screen, the default dimming is not
-	  // enough to make the menus readable.
-		amount = MIN<float>(1.f, amount*2.f);
-	}
-
 	screen->Dim(dimmer, amount, 0, 0, screen->GetWidth(), screen->GetHeight());
 }
 

From a6593e14008726a98d6b835046672d61173a3093 Mon Sep 17 00:00:00 2001
From: Nemrtvi <26684396+Nemrtvi@users.noreply.github.com>
Date: Sun, 31 Mar 2019 23:31:45 +0200
Subject: [PATCH 2/8] Update language list in MENUDEF
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The file renames “enu” to “default” for consistency and only contains languages that are complete/up to date, i.e. American English, British English, German, Castilian Spanish, Latin American Spanish, French, and Russian. Italian, while not 100% complete, contains a full engine translation, so it has enough material to make it here.
---
 wadsrc/static/menudef.txt | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 37053129d..a8270496f 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -2651,12 +2651,14 @@ OptionMenu "ReverbSave" protected
 OptionString "LanguageOptions"
 {
 	"auto", "Auto"
+	"default", "English (US)"
 	"eng", "English (UK)"
-	"enu", "English (US)"
-	"fr", "Français (FR)"
-	"ita", "Italiano (ITA)"
-	"ptb", "Português do Brasil (PTB)"
-	"rus", "Русский (RU)"
+	"de", "Deutsch"
+	"es", "Español (España)"
+	"esm", "Español (Latino)"
+	"fr", "Français"
+	"it", "Italiano"
+	"ru", "Русский"
 }
 
 /*=======================================

From 55e00f350bc4df3a3deea1aaef7227b73c26de85 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 1 Apr 2019 00:27:43 +0200
Subject: [PATCH 3/8] - use a more reliable menu check for the player menu
 items.

This needs to ensure that it only allows modification from within a menu's event handlers and nowhere else.
---
 src/menu/playermenu.cpp                     | 40 ++++++++++-----------
 wadsrc/static/zscript/ui/menu/playermenu.zs | 20 +++++------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/menu/playermenu.cpp b/src/menu/playermenu.cpp
index 973a49fdf..add7ed363 100644
--- a/src/menu/playermenu.cpp
+++ b/src/menu/playermenu.cpp
@@ -53,12 +53,12 @@ EXTERN_CVAR(Bool, cl_run)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, ColorChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(r);
 	PARAM_INT(g);
 	PARAM_INT(b);
 	// only allow if the menu is active to prevent abuse.
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		char command[24];
 		players[consoleplayer].userinfo.ColorChanged(MAKERGB(r, g, b));
@@ -78,12 +78,12 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, ColorChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, PlayerNameChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_STRING(s);
 	const char *pp = s;
 	FString command("name \"");
 
-	if (self == CurrentMenu || self == CurrentMenu->mParentMenu)
+	if (DMenu::InMenu)
 	{
 		// Escape any backslashes or quotation marks before sending the name to the console.
 		for (auto p = pp; *p != '\0'; ++p)
@@ -108,9 +108,9 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, PlayerNameChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, ColorSetChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(sel);
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		players[consoleplayer].userinfo.ColorSetChanged(sel);
 		char command[24];
@@ -128,10 +128,10 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, ColorSetChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, ClassChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(sel);
 	PARAM_POINTER(cls, FPlayerClass);
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		players[consoleplayer].userinfo.PlayerClassNumChanged(gameinfo.norandomplayerclass ? sel : sel - 1);
 		cvar_set("playerclass", sel == 0 && !gameinfo.norandomplayerclass ? "Random" : GetPrintableDisplayName(cls->Type).GetChars());
@@ -148,9 +148,9 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, ClassChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, SkinChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(sel);
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		players[consoleplayer].userinfo.SkinNumChanged(sel);
 		cvar_set("skin", Skins[sel].Name);
@@ -166,10 +166,10 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, SkinChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, AutoaimChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_FLOAT(val);
 	// only allow if the menu is active to prevent abuse.
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		autoaim = float(val);
 	}
@@ -184,10 +184,10 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, AutoaimChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, TeamChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(val);
 	// only allow if the menu is active to prevent abuse.
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		team = val == 0 ? TEAM_NONE : val - 1;
 	}
@@ -202,10 +202,10 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, TeamChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, GenderChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(v);
 	// only allow if the menu is active to prevent abuse.
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		switch(v)
 		{
@@ -226,10 +226,10 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, GenderChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, SwitchOnPickupChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(v);
 	// only allow if the menu is active to prevent abuse.
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		neverswitchonpickup = !!v;
 	}
@@ -244,10 +244,10 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, SwitchOnPickupChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, AlwaysRunChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(v);
 	// only allow if the menu is active to prevent abuse.
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		cl_run = !!v;
 	}
diff --git a/wadsrc/static/zscript/ui/menu/playermenu.zs b/wadsrc/static/zscript/ui/menu/playermenu.zs
index 38c70353b..1aefb0ba0 100644
--- a/wadsrc/static/zscript/ui/menu/playermenu.zs
+++ b/wadsrc/static/zscript/ui/menu/playermenu.zs
@@ -42,16 +42,16 @@ class PlayerMenu : ListMenu
 	Array<int> mPlayerSkins;
 	
 	// All write function for the player config are native to prevent abuse.
-	protected native void AutoaimChanged(float val);
-	protected native void TeamChanged(int val);
-	protected native void AlwaysRunChanged(int val);
-	protected native void GenderChanged(int val);
-	protected native void SwitchOnPickupChanged(int val);
-	protected native void ColorChanged(int red, int green, int blue);
-	protected native void ColorSetChanged(int red);
-	protected native void PlayerNameChanged(String name);
-	protected native void SkinChanged (int val);
-	protected native void ClassChanged(int sel, PlayerClass cls);
+	protected static native void AutoaimChanged(float val);
+	protected static native void TeamChanged(int val);
+	protected static native void AlwaysRunChanged(int val);
+	protected static native void GenderChanged(int val);
+	protected static native void SwitchOnPickupChanged(int val);
+	protected static native void ColorChanged(int red, int green, int blue);
+	protected static native void ColorSetChanged(int red);
+	protected static native void PlayerNameChanged(String name);
+	protected static native void SkinChanged (int val);
+	protected static native void ClassChanged(int sel, PlayerClass cls);
 	
 	//=============================================================================
 	//

From bf58c6aaee894bd554835e4fe58e03ec41d6a655 Mon Sep 17 00:00:00 2001
From: Nemrtvi <26684396+Nemrtvi@users.noreply.github.com>
Date: Wed, 3 Apr 2019 20:51:29 +0200
Subject: [PATCH 4/8] Accent spacings for Strife letters
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GZDoom now has the line spacing to accomodate this. Also fixes an extra pixel in one of the French letters and touched up on the Russian Й.
---
 .../game-strife/fonts/defsmallfont/00C0.lmp     | Bin 172 -> 180 bytes
 .../game-strife/fonts/defsmallfont/00C1.lmp     | Bin 172 -> 180 bytes
 .../game-strife/fonts/defsmallfont/00C2.lmp     | Bin 176 -> 185 bytes
 .../game-strife/fonts/defsmallfont/00C4.lmp     | Bin 175 -> 179 bytes
 .../game-strife/fonts/defsmallfont/00C8.lmp     | Bin 148 -> 155 bytes
 .../game-strife/fonts/defsmallfont/00C9.lmp     | Bin 147 -> 155 bytes
 .../game-strife/fonts/defsmallfont/00CA.lmp     | Bin 149 -> 155 bytes
 .../game-strife/fonts/defsmallfont/00CB.lmp     | Bin 150 -> 154 bytes
 .../game-strife/fonts/defsmallfont/00CC.lmp     | Bin 83 -> 87 bytes
 .../game-strife/fonts/defsmallfont/00CD.lmp     | Bin 83 -> 87 bytes
 .../game-strife/fonts/defsmallfont/00CE.lmp     | Bin 118 -> 122 bytes
 .../game-strife/fonts/defsmallfont/00CF.lmp     | Bin 116 -> 120 bytes
 .../game-strife/fonts/defsmallfont/00D1.lmp     | Bin 178 -> 192 bytes
 .../game-strife/fonts/defsmallfont/00D2.lmp     | Bin 170 -> 178 bytes
 .../game-strife/fonts/defsmallfont/00D3.lmp     | Bin 170 -> 178 bytes
 .../game-strife/fonts/defsmallfont/00D4.lmp     | Bin 172 -> 180 bytes
 .../game-strife/fonts/defsmallfont/00D6.lmp     | Bin 174 -> 178 bytes
 .../game-strife/fonts/defsmallfont/00D9.lmp     | Bin 157 -> 164 bytes
 .../game-strife/fonts/defsmallfont/00DA.lmp     | Bin 157 -> 164 bytes
 .../game-strife/fonts/defsmallfont/00DB.lmp     | Bin 157 -> 164 bytes
 .../game-strife/fonts/defsmallfont/00DC.lmp     | Bin 158 -> 162 bytes
 .../game-strife/fonts/defsmallfont/00DD.lmp     | Bin 154 -> 174 bytes
 .../game-strife/fonts/defsmallfont/0150.lmp     | Bin 177 -> 184 bytes
 .../game-strife/fonts/defsmallfont/0170.lmp     | Bin 160 -> 170 bytes
 .../game-strife/fonts/defsmallfont/0178.lmp     | Bin 156 -> 160 bytes
 .../game-strife/fonts/defsmallfont/0401.lmp     | Bin 150 -> 154 bytes
 .../game-strife/fonts/defsmallfont/0419.lmp     | Bin 175 -> 196 bytes
 27 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C0.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C0.lmp
index f6a85de06032b0f416f102403ee91817f0f518dc..99b151f12e3b9d4f2c9f61b6c070385bef6a9105 100644
GIT binary patch
literal 180
zcmd;L;ACK6U}7*}U|_IkU|{fLU|@)1U|`5*U|^_VU|?urU|^WYz`!t%fq`KaNF}p3
z2(Uq@|4hu@-jBS!LEOjQ-v61{y}ciMdp`!T85q62y}<&HA3uKL?fsvD10??V353J`
u<jG@i5Clnhdq07&z5g?Eczb(4dHfip7HppPlP6C=+L>8F7JGYp{|5kcZa#$o

literal 172
zcmd;L;9y{2U}P|0U|_IkU|{fLU|@)1U|>jRU|=X_U|^_YU|{HCU|^WWz`(Ewq>|Yi
z1Xv-|e@13+??>L=Ans#t@BfVK-rkSBy&r?v3>@Ad*5k)dyuJT3us?q6{rCxl&GzI8
mhzAz-_I~mhqy?h)$>Yahy&!YEpFDX2(#pgNve4Vx`#%5*=RA%8

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C1.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C1.lmp
index 4f9cee771a4bc3c14be1ade0712588a0e5beb065..c7dc0efa6697601f057494c3173d406858107886 100644
GIT binary patch
literal 180
zcmd;L;ACK6U}7*}U|_IkU|{fLU|@)1U|>jNU|=X>U|^_YU|{HGU|^WZz`(Eyq>|Yi
z1lS<de<o&c??>L=Ans#t@Bd8f-rkSBy&uEbj~_pN;_dyPk=@(d`|%Snn*prmF-YBi
t1`d!snC<<af%C}|Z|^6MAA_|sFnW7?gUs`O@&qLQpP3b8vA4JPe*mF8K4|~|

literal 172
zcmd;L;9y{2U}P|0U|_IkU|{fLU|@)1U|>jNU|=X@U|^_WU|{HAU|^Waz`(Ewq>|Yi
z1Xv-|e@13+??>L=Ans#t@BfVK-rkSBy&uEbj~_pN0upEQ_I~^X%wzyDAA?l=XJCK)
m_z9Tl{hxv3$rJA<j~|1zGH`(Gc=F^4NG}sBh~w?;{T~45Z#;$o

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C2.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C2.lmp
index 0e1ca243117919e2e8130f9536862d3d1094feea..7f5ccd71780197bc49b7799ebba3613964bd4d97 100644
GIT binary patch
literal 185
zcmd;L;ACK6U}7*}U|_IkU|{fPU|@)4U|`5*U|^_VU|?urU|^WYz`!t{fq`KyNF}p3
z2(Uq@|BNi&-rkSAy+QoP-roNiI6>UU-rkQPyho27dp~~s`0*2v90y47@e>G#9nA3t
nD}zXY*dP<0JbCQ>1f&V1htu2piMRKYCr>~oFtUT}2IKz#`3gl=

literal 176
zcmd;L;9y{2U}P|0U|_IkU|{fLU|@)5U|`5#U|=X=U|^_cU|{HGU|^WRz`(E+q>|Yi
z1Xv-|e@13+??>L=Ans#t@Ba)O-rkQMdwV~Ia2`E+3<6I;GVG5Zdp~~i7|dn^vAw}+
kz``IVNb{2?kDq`vfYft%dq44h^5h9f10x&AP7wYN0P|%+fdBvi

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C4.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C4.lmp
index fc935dac907aa35a80c708f7a3bb70fedf2c6844..e3a5aa1cd61c91d173dfc832bbbad9bd6e4c660b 100644
GIT binary patch
literal 179
zcmd;L;ACK6U}7*}U|_IkU|{fLU|@)5U|`5(U|=X?U|?uuU|{HDU|^WTz`(E)q>|Yi
z1lS<de<o&c??>L=Ans#t@BfS(-rnAiy}ciUI1HR1xyO$mKYrrv{hxuu+xv<4<0oJa
pBO6#9SQQ6Y6-bx&e~^|Z-cLY!V5WILdGZ9LpP3b8ueZ1Ne*iR+J&*tZ

literal 175
zcmd;L;9y{2U}P|0U|_IkU|{fLU|@)5U|`5#U|=X=U|^_cU|{HGU|^WRz`(E+q>|Yi
z1Xv-|e@13+??>L=Ans#t@Ba)O-rnAiy}chpIFBBAKYsl9@e_~?`;#Z$kDox;Y+zMj
lHS8cYAT1!xPo8)`0cilK2btvk<jE6|W+qmUo!;Kw{{iXhKBfQw

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C8.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C8.lmp
index 27eab31ac4c2e22631f56815acd1980450c23428..b4f896f4d949c6deaa22d0188e1181ab84060cbe 100644
GIT binary patch
literal 155
zcmd;N;ACK6U}Df=U|=v~U|?`$U|<MhU|>jKU|`5&U|^_WU|{HEU|^UGQpM^G0sooU
zyuBYie(de-{hxu++uNIo-P`-|6Q}?uh<*&>gQPj1JbCO5f!_ZaIK91}fO${6z5g?E
aczb(4_I?5~^gk0TND5>k6EjG_`#%6g3^XkO

literal 148
zcmd;N;9y{2U}Vr?U|=v~U|?`$U|{fLU|@)5U|`5#U|=X^U|?uuU|{G5sbckpfd7na
z-rkQMKlb+a{?EYS?d|>e35@gjvG-#T7cBDxBn%ROD0>28KJoVc&&clW{n+~n$guy6
Otllsd3rN7*`#%6ohcbl#

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C9.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C9.lmp
index 5b484d57994f25060e780c617c35e9bc8c09ee2f..ba4cbb93a96ab0cb1ea58508f03d49c32169ef74 100644
GIT binary patch
literal 155
zcmd;N;ACK6U}Df=U|=v~U|?`$U|{fNU|@)1U|`5#U|=X?U|?urU|^UGQpM^G0sooU
zyuBYie(de-{hx{5+xzho2%C|^+uQpwi0keBpMew12JykX$B&<Y*-yZ{Cr?1KPeA7V
VXJGX9_GV)B_J(kom_ef6{{d;MG!Xy*

literal 147
zcmd;N;9y{2U}Vr?U|=v~U|?`$U|{fNU|@)3U|>jNU|=X_U|?uqU|{G5sbckpfd7na
z-rkQMKlb+a{?Ewn?fv)(5*x(x_WsYn;qCqSu{Q{UIFBDc0WqI|Wu83oe(e1OWY&KM
PHg9hzlaU!D;{6{0@V+uJ

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CA.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CA.lmp
index ee4f669e9dd826a881c3d2dc799942747b0ca266..c24063ee307f733756ba4c442373f17f95ed16af 100644
GIT binary patch
literal 155
zcmd;N;ACK6U}Df=U|=v~U|?`!U|<MfU|@)2U|`5$U|^_XU|{HAU|^UGQpM^G0sk4<
zy}i93J$~%%?fsvD)7$%z_v0rp-lIp4y&r@4U^$Q|m=ESXc>-ZS0rR}QpLjp^egZP{
SKO>trhzl~1i5Vo~{T~1ctv43{

literal 149
zcmd;N;9y{2U}Vr?U|=v~U|?`$U|{fLU|@)5U|`5#U|=X^U|?usU|{G0sbckpfd7na
z-rkQMKlb+a{?EVxVm^U!9)W}(KY0w6dHmQL0zt~2fYdzpegc;9_I?6pdVBw8Wc3CK
Jf><n2;{o=+H7@`F

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CB.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CB.lmp
index 98f428501b1490fff0bde868dd7a46ab82c576b6..624aa66b791b975e9c7af4b660716c5737fd724f 100644
GIT binary patch
literal 154
zcmd;N;ACK6U}Df=U|=v~U|?`!U|<MfU|@)2U|`5*U|^_ZU|?uxU|^U8QpM^G0sk4<
zy}i93J$~%%?fsvD)7$%z_v0rB-V^V~AilTve?|^(ZxF}(F+!pDWA7(W9!TL6kdglx
S*}T0$!rtEhnV3N$-v0p$`7<~G

literal 150
zcmd;N;9y{2U}Vr?U|=v~U|?`!U|{fPU|@)0U|`5(U|=X?U|?uwU|{G2sbckpfd35a
z-rnAi9zXW>_WsYn@#vBF<0mlAlPBJfL0qtmw>OC6{TR#vDf52p{RGSbD|-Sm?mq*Y
Rw>L=C+xtHwGf2eyKLFi_G*JKm

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CC.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CC.lmp
index 6560c2ba70d714dfe9b7a896b2f633898339bd7e..f7dd1ee49f95de4bb4964efe03de4b51e34504cb 100644
GIT binary patch
literal 87
zcmZQ&;ACK6U}BJAU|>*UU|`T^U|_IiU|{fOU|?Wi^!E1t&%p8cu{RX_XW)GD<gxdo
c$B#i`{~0*Fy`OkL0ReCC|BUQVRo>qJ0c4^aj{pDw

literal 83
zcmZQ&;9y{2U}TVCU|>*UU|`T=U|_IjU|{fI01110d;e!(fBe`R0{$~_JbCi?(c{M;
Xk^c-F-ri5Zz}x#jBO64CxA%Vl2Rj>A

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CD.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CD.lmp
index 4bafd8b2ecfecacfa6a74a5628dd32ecc6aee9ef..87403a4f60ecdd3fca0309012d24a00adfb5b06d 100644
GIT binary patch
literal 87
zcmZQ&;ACK6U}BJAU|`T-U|=v~U|?`zU|<MjU|?Wm_lAN044mHHkG&r~e*E~cxA%Vr
Y&c~0Rcs~IF5Rc=@6NExWZ*TAa0BUj^sQ>@~

literal 83
zcmZQ&;9y{2U}TVCU|>*ZU|=v|U|?`$U|{eCiL!Y^!G8u0Z|}#C9zTBk*xUO*1IOdX
TPrv}gVSn-ju8Psy+xtHN5X2j8

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CE.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CE.lmp
index ff19a7c40dc354e683c5b5c5471b501a45e01097..2dcedf4fd3c6bace1516c49410ce287eb099a9d0 100644
GIT binary patch
literal 122
zcmd;J;ACK6U}Df<U|`T=U|=v~U|?`&U|<MjU|@)6U|`5$U|=X=U|?Wm^!E1t&%o^M
v{Rl*JJbLul8v_0_a6W$Q?fvNSV-N-9Jplo*!Y5A<3YopVpLl!!hnNKb{#hug

literal 118
zcmd;J;9y{2U}Vr>U|`T=U|=v~U|?`!U|{fPU|@)0U|`5#U|=W!sbKW>_WsYn?Ct#s
wM6*A7^w=8={xfhqe(e3|@#DvjK@uR&6A%D#*q=Ost77){e&X%@pAl>h0Cor`X#fBK

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CF.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CF.lmp
index e2534ddfa29ffcd27981994d784d99050a5010ba..99264f4294942e26af1a9de8185d6ad925269d1e 100644
GIT binary patch
literal 120
zcmd;J;ACK6U}Df<U|`T=U|=v~U|?`&U|<MfU|@)4U|`5%U|=X>U|?Wm^!E1t&%o^M
t{Rl*JczZwbhJgQ!9NymEj~+jM{Mg$Y!g&G$P-TxGsvvrwfK-4@0s!ldBTN7Q

literal 116
zcmd;J;9y{2U}Vr>U|`T=U|=v~U|?`!U|{fLU|@)1U|>jNU|`4tsbKW>_WsYn?Ct#s
qM6-K)Kk){G|BUS3-j5zXe*D<m8_a$J0#G%Nz)B$co`B@RrT_qOts)En

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D1.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D1.lmp
index 38784b44d59cc477ac82743c7f2824ebec1f9449..618200805bfa497e331bbea56e06747b304ff416 100644
GIT binary patch
literal 192
zcmd;L;9_84U}7*}U|_IiU|{fOU|@)1U|`5(U|=X?U|?uxU|^Waz`(GWfq`KQNF|3i
z9Q<eG^!E0C^cV!Zz5g?Cd3!(ce*E~!lP6EW+{cf-y`MaWDF4sE0TPAq|1&Uqdq4K}
tW?_XY_|L!z((4W3{%7C>sRbGP7-SHmx3@PFySF#UV35fmHpEo#{{VYBMn(Vt

literal 178
zcmd;L;ACK6U}P|0U|_IiU|{fKU|@(~U|>jNU|=X>U|^_cU|{HBU|^WZz`(E!q>{rM
z4*oN8czZv33<BQX{~0*Fy`MaO{N%}#Ct%*=$KFpKL)89fU<V0;x&IkByuBZTlzM}d
iad>+_@rLmJGjKe4;tewGF;vDIWEjXaMs|onAT0n|XG0YL

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D2.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D2.lmp
index 80788d6f9fe07ba6056709783a810074ab461f72..ce2887a7bce48b4ad6d3d571d2736a3dde347587 100644
GIT binary patch
literal 178
zcmd;L;ACK6U}7*}U|_IhU|?`zU|<MkU|>jQU|=X=U|?uvU|^WUz`!t%fq`Kq0|Nsy
zi#HhjXJYgA_I~u(+uQp;1EaUMHxs+J_oF9IAOf6^AA5U0_VxyG|1+?Hgdcl*voV7O
o|1+?9dp`k5!vq*PyumV$pLl!!2O0F_F^K66vE<1UkR@=70U2jH)c^nh

literal 170
zcmd;L;9y{2U}P|0U|_IhU|?`zU|<MjU|@)2U|`5&U|^_YU|{HCU|^WWz`(GOfq{XE
z#TyL%GqQPmdp~;Y?d|=afdj;R@&w9x{Mh@kw>OCQpMmAclgE#}y;+&PL1O<ISRfKG
eJ|jC={P7cS@Bbk7lgA*YH^lHKPe6vlEd&6`mN?b`

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D3.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D3.lmp
index 9aebc7b42b02edd95743214b60aefb0a3b55ce8f..3067208429f5299ed0d8aff120d44de764b0c2c4 100644
GIT binary patch
literal 178
zcmd;L;ACK6U}7*}U|_IhU|?`zU|<MfU|@)4U|`5&U|^_cU|{HFU|^WXz`(GQfq{XU
z#TyL%GqHJldp~;Y?d|=aiQU`#(UT`&HY10(xA$XjZxHW411pIA*xQ?p8N~4Z&%pZl
p@e`0VT!8b*6R_0dC*I!w85q62y+Niu0VxBS46+2I!uvnmVgM$(I=KJ<

literal 170
zcmd;L;9y{2U}P|0U|_IhU|?`zU|<MfU|@)0U|`5$U|^_WU|{HEU|^WWz`(GOfq{XE
z#TyL%GqQPmdp~;Y?d|=ak=@(-(UT`|_G52v5a&Mwi?{dV$KKwo%--IQy}kc4usnVY
gl7RC$o;(3bJbnU_<nRV*1F^j!hCg`%G8}Fp0FMAT&Hw-a

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D4.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D4.lmp
index ef2dacfc5e5f34b4361ee5967421758e1d5ab823..6b9794005ab7c1a6ea06e5d00ba14e3537f9e15f 100644
GIT binary patch
literal 180
zcmd;L;ACK6U}7*}U|_IhU|?`%U|<MlU|>jOU|=X>U|?uwU|^WYz`!t{fq`K)0|Nsy
zi#HhjXJiM_j~;t_d;e$P^!9$_{piUPDDTmu$KH><y+Pdn46KhIdxLmv%wP(O04GQz
ZNYN9hSx>y5JbwHHWHQ8-Ctx<*Y5=KbKZpPT

literal 172
zcmd;L;9y{2U}P|0U|_IhU|?`zU|<MjU|@)2U|`5&U|^_YU|{HGU|^WRz`(GWfq{XE
z#TyL%GqQPmdp~;Y?d|=afy3MT(W56%pqxjK9zXW>2J!wgusnY3{n*=^mDw9aVe&bi
YJOL?w`~+$Yi2DR&CfN8VU?$v30QX%y{r~^~

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D6.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D6.lmp
index 8af056f02c0b3ebef078d3b3cdb4f50d66f74bfe..a339479da559dddb95d5ec923c4175f555e74cd6 100644
GIT binary patch
literal 178
zcmd;L;ACK6U}7*}U|_IhU|?`%U|<MlU|>jOU|=X@U|?uuU|{HHU|^Wbz`(GQfq{XU
z#TyL%GqQu|M~}U|z5g?CdV4?ee)QxCocF~0v9~vf`=1e{;jy<j8?!e^41*8R``Fw2
Y@e`;?PrRQz264Qhc073kvIA~00PgQPDF6Tf

literal 174
zcmd;L;9y{2U}P|0U|_IhU|?`%U|<MhU|@)6U|`5+U|^_cU|{HBU|^WZz`(GSfq{XE
z#TyL%Gq8i`M~}U|z5g?CJbL8)=*bf(=gAZA$KKu`-hT#=^2grZtjyjZF-$&4=VNd0
Z$4|h<JbB{%<S~ft4K@GC6Oj3EO98=(J3RmZ

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D9.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D9.lmp
index 0c6ad26e9b481e43e606b1479450a5144d6c5790..646c9c1ea3ef77c29cd18ec6816063463c51b78e 100644
GIT binary patch
literal 164
zcmd;N;ACK6U}Df=U|=w3U|{fIU|<MiU|>jLU|=X_U|?uqU|{HBU|^U5QpM&C1^*cs
zy}iAe*uA|UJ%0Sy+uQp;11E@n^5n^r$6y|q_V)G$^O(K8pLlz-F+;eF98gn0axgPs
MY?uikaj3HY0M3;+m;e9(

literal 157
zcmd;N;9y{2U}Vr?U|=w3U|?`zU|<MjU|@)2U|`5)U|^_ZU|?uvU|^UCQpM&C1^*d1
zyuH02J%0Sy+uQp;1IOdX-cO!9dGZ*{0n^^zU=Fjl_Y-e#R%Qs7ksYERBn4uF41lp=
L`a$9lRo?#r)(17~

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DA.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DA.lmp
index c24bc273cfee6768ee7ccdbbc2811393fd924b44..b3290b18f29d1f02e5cd6a7e7b5a35c43c659b90 100644
GIT binary patch
literal 164
zcmd;N;ACK6U}Df=U|=w3U|?`&U|{fPU|@)0U|`5*U|^_ZU|?uxU|^U5QpM&C1^=1Y
zy}chje*D<m+Z)V&^5n^r$KKxm89AUTKpX~UZ|}$6-fR%+KLh9E$4|i0U`fs=PatN1
Ud5qrP-XKF^27%aMwcg(U0m~{kZ~y=R

literal 157
zcmd;N;9y{2U}Vr?U|=w3U|?`&U|{fPU|@)5U|`5%U|=X`U|?urU|^UCQpM&C1^*e@
zy}chje*D<m+Z)V&^5n^r$51v%4T#Oa?Ct&7+nW_a{b%5K{P+o6j^oJ_umNC&9NymE
J=q7+n1^{?iHQxXL

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DB.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DB.lmp
index b69367766e7b1b3f991af298cbc83cf833a6711c..43156b20749eaf52876421569b8630892393723d 100644
GIT binary patch
literal 164
zcmd;N;ACK6U}Df=U|=w3U|?`zU|<MhU|>jKU|`5+U|^_aU|{HGU|^U5QpM&C1^*d2
zyuH02J%0Sy+uQp;1E;t5Bkw0qo;-OB<~@1@68826^O(VE*qEVQPOu_x7|+}L3D_8r
RQm~mYQ<&JHR(X5>2LOroI(7g6

literal 157
zcmd;N;9y{2U}Vr?U|=w3U|?`&U|<MfU|@)4U|`5*U|^_VU|?uvU|^UCQpM&C1^*e@
zy}chje*D<m+xtHQhqw2mCr_R{c?{+}dIS>n26LD|Dp;AlAv_MS5*WwZ`w7SdkUEfQ
KFatnrm@NP_aX3K$

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DC.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DC.lmp
index da7971a2f56ef8a697f9889fc8c4ca463293d96e..78e2ad274063d15f7637d779f15dbe3455a3050e 100644
GIT binary patch
literal 162
zcmd;N;ACK6U}Df=U|=w3U|?`zU|<MhU|>jKU|`5)U|^_bU|{HEU|^UAQpM&C1^*d2
zyuH02J%0Sy+uQp;1E;t5Bkw0qo;-OB<vjtb1MwIcy}iBJn7zG09Ed`Y9E|q_YzT-4
PHW6k96FW!|82<+VLV-3%

literal 158
zcmd;N;9y{2U}Vr?U|=w3U|?`zU|<MjU|@)2U|`5*U|^_VU|?uvU|^U8QpM&C1^*d1
zyuH02J%0Sy+uQp;1IMFB-cO!9dGZ*{dGZ9T3d~{j_V#9F_VxyIK*~T;5YCe)U;`i=
PZ*RB(jO-vaVEi8d8_G9d

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DD.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DD.lmp
index 0b9179a65e049165a1fb83e3c2015dc4732fc54a..9999087d4fecffda9e07baccf06cf0a7596b41e8 100644
GIT binary patch
literal 174
zcmd;L;ACK6U}7*}U|_IdU|?`$U|{fOU|@)5U|`5$U|^_aU|{HDU|^Wbz`(E!q>|Yi
z1pYIzczZwc_V)hI#Om$+<S~fF$ms3u&CCYndjDr&_V#}4?ajjK?fv-iV{eea<Ht{+
g0#BZR1eib+NDD|DBmgo3Wa6VIAQM5BKp0S40T<#lvH$=8

literal 154
zcmd;L;9y{2U}P|0U|_IdU|?`$U|{fOU|<MmU|>jLU|=X@U|^_YU|{HEU|^U8QpxNM
z0{<CVyuBZJdwc(9WcBub@)*ow_l7dP|1)rSdq4K}e*E~cH;D82@e^<F$4{PsIUowe
W2XWZEy}chj0qbV*_J%N^HUIz<Krvka

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0150.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0150.lmp
index 24e9055593651b602a21375a49c267dec6491042..d60a1ab340603804cf8203e508342fa4e1b2a237 100644
GIT binary patch
literal 184
zcmd;L;ACK6U}7*}U|_IhU|?`zU|<MjU|@)6U|=X<U|?uuU|{HHU|^Wbz`(GIfq{XU
z#TyL%GqHJldp~;Y?d|=akpskh@&wFb;Pm!>?ETo=8^rz3!20;{6A+J$86@oepMmws
n6EF)d08{_?iMRKE22POrCm;gE;{Yl41{41o7`?r{;no8HMt(pS

literal 177
zcmd;L;9y{2U}P|0U|_IhU|?`zU|<MfU|@)4U|`5)U|^_aU|{HCU|^Wez`(GWfq{XE
z#TyL%GqQPmdp~;Y?d|=ak=@(-(UT`&HUo#Z_v6Rj-XPw82A0Q<K@3)AZ|}$6-v1d`
so;(3D;C!g!$4@|#9FHGAdGZ*<_WsYn{^W_bHwb(GXJGX9_J-RF0Ko4(-~a#s

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0170.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0170.lmp
index 9fad344057671d63ee3f635e155dc3d834e4caf7..59b3a145de48925d97d268b32e0019339887240f 100644
GIT binary patch
literal 170
zcmd;N;ACK6U}Df=U|=w3U|?`zU|<MhU|>jKU|`5+U|^_aU|{HGU|^UDQpM&C1^*d2
zyuH02J%0Sy+uQp;1E;t5WA7(Vo;-OB<~@G=1gs9sV}1hSurY&_z?6by!IGRHr66M<
UJdjejF^t~c-c0NurC|IY0Q4+8+5i9m

literal 160
zcmd;N;9y{2U}Vr?U|=w3U|?`&U|<MfU|@)4U|`5$U|^_ZU|?utU|^UGQpM&C1^*e@
zy}chje*D<m+xtHQhqw3RCr_R{c?{+}e*6Ta3d~`C0%Ef=dwYYqAcb%_j>nImfQ*31
PJbB`cFao3og8u^m;N3c2

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0178.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0178.lmp
index 99a9692b813b1078117151d6cb15c4929fb6ecef..1dcf6883ca72a4395cfc4044a11846f8c67ef8a4 100644
GIT binary patch
literal 160
zcmd;L;ACK6U}7*}U|=w3U|?`yU|{fOU|@)3U|`5#U|=X`U|?uvU|^WQz`!sQq>{<o
z+uQp;Ba64U_akrb{|sy(`pIJulhfP#iMKb14N}4A?d{FN>h1mbF-VdT&VBL(s`in$
Y_v0sE(?Eti@qPr702>TqFhMK=0HFLZ=>Px#

literal 156
zcmd;L;9y{2U}P|0U|=w3U|?`yU|{fKU|<MmU|>jNU|=X^U|?usU|{HBU|^UEQpx1)
z?d|=afyLX~`w@u2`sk7OlgA(y$CD@CU?zye=<V&z%<Ap^_%T=x&IPIY&%p8Mk+=8b
XClI4ppFHt?^aP{{WGINi2(bhJdMz>i

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0401.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0401.lmp
index 98f428501b1490fff0bde868dd7a46ab82c576b6..624aa66b791b975e9c7af4b660716c5737fd724f 100644
GIT binary patch
literal 154
zcmd;N;ACK6U}Df=U|=v~U|?`!U|<MfU|@)2U|`5*U|^_ZU|?uxU|^U8QpM^G0sk4<
zy}i93J$~%%?fsvD)7$%z_v0rB-V^V~AilTve?|^(ZxF}(F+!pDWA7(W9!TL6kdglx
S*}T0$!rtEhnV3N$-v0p$`7<~G

literal 150
zcmd;N;9y{2U}Vr?U|=v~U|?`!U|{fPU|@)0U|`5(U|=X?U|?uwU|{G2sbckpfd35a
z-rnAi9zXW>_WsYn@#vBF<0mlAlPBJfL0qtmw>OC6{TR#vDf52p{RGSbD|-Sm?mq*Y
Rw>L=C+xtHwGf2eyKLFi_G*JKm

diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0419.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0419.lmp
index 5ddbda41d64c35eab82c23f48faf22af86be63d5..3c5bf84fe3068b135d40444d60f3d9dba6e8080b 100644
GIT binary patch
literal 196
zcmd;L;9_84U}7*}U|_IeU|{fNU|@)5U|`5(U|^_XU|?uxU|^WWz`(GSfq`K=NF}>B
z4E$$c^!D~<V)yob^!V}P$KKxm88{z3^7el6<O!7b`0*o<;>S-wa?IY|kG;KFSiQYL
yeDD7Z9AE(`hwJg<C*B}!APxT+xSl-m_6C^>5`tR90XF&xNajBi2S^<R{|5j?Hb|-f

literal 175
zcmd;L;ACK6U}P|0U|_IeU|{fIU|<MgU|>jOU|`5&U|^_XU|{HAU|^Waz`(Ewq>|km
z2L3a$dwV~6{P^)>Z*MUB$&)8wHUkGl$>S&9-v2?I$KKu`w)cMqc5m+|FgB;Rw>L;V
ZNb!G04iE=s7>Bp_6EFao3^fg`3;<>+J>>uZ


From 5c86a1e6b5be9c1106756056ad0870c4bcc17d2e Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Thu, 4 Apr 2019 13:23:08 +0300
Subject: [PATCH 5/8] - fixed crash with push/insert to null dynarray when JIT
 is on

https://forum.zdoom.org/viewtopic.php?t=64148
---
 src/scripting/backend/dynarrays.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/scripting/backend/dynarrays.cpp b/src/scripting/backend/dynarrays.cpp
index b95e02f4d..d01a4557b 100644
--- a/src/scripting/backend/dynarrays.cpp
+++ b/src/scripting/backend/dynarrays.cpp
@@ -783,6 +783,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Find, ArrayFind<FDynArray_Obj COMMA
 
 int ObjArrayPush(FDynArray_Obj *self, DObject *obj)
 {
+    if (self == nullptr) NullParam("\"self\"");
 	GC::WriteBarrier(obj);
 	return self->Push(obj);
 }
@@ -811,6 +812,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Delete, ArrayDelete<FDynArray_Obj>)
 
 void ObjArrayInsert(FDynArray_Obj *self,int index, DObject *obj)
 {
+    if (self == nullptr) NullParam("\"self\"");
 	GC::WriteBarrier(obj);
 	self->Insert(index, obj);
 }

From a3541f853c2f59901be1b5c7c7a0341521b9684e Mon Sep 17 00:00:00 2001
From: pkubaj <pkubaj@users.noreply.github.com>
Date: Thu, 4 Apr 2019 08:05:31 +0200
Subject: [PATCH 6/8] Fix build on big-endian platforms

GCC 8 complains that it can't find relevant functions:
/wrkdirs/usr/ports/games/gzdoom/work/gzdoom-g3.7.2/src/m_png.cpp:669:42: error: call of overloaded 'BigLong(uint32_t)' is ambiguous
     chunklen = BigLong((unsigned int)x[1]);
                                          ^
In file included from /wrkdirs/usr/ports/games/gzdoom/work/gzdoom-g3.7.2/src/m_png.cpp:44:
/wrkdirs/usr/ports/games/gzdoom/work/gzdoom-g3.7.2/src/m_swap.h:212:15: note: candidate: 'long unsigned int BigLong(long unsigned int)' <deleted>
 unsigned long BigLong(unsigned long) = delete;
               ^~~~~~~
/wrkdirs/usr/ports/games/gzdoom/work/gzdoom-g3.7.2/src/m_swap.h:213:6: note: candidate: 'long int BigLong(long int)' <deleted>
 long BigLong(long) = delete;

This is on FreeBSD/powerpc64.
---
 src/utility/m_swap.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/utility/m_swap.h b/src/utility/m_swap.h
index a3e03bea2..f5b90770f 100644
--- a/src/utility/m_swap.h
+++ b/src/utility/m_swap.h
@@ -129,6 +129,16 @@ inline int BigLong(int &x)
 	return x;
 }
 
+inline unsigned int BigLong(unsigned int x)
+{
+	return x;
+}
+
+inline int BigLong(int x)
+{
+	return x;
+}
+
 #else
 
 inline short LittleShort(short x)

From 2886f22b8fd43e0b6da3b6c72537b7a390575cef Mon Sep 17 00:00:00 2001
From: pkubaj <pkubaj@users.noreply.github.com>
Date: Thu, 4 Apr 2019 13:20:24 +0200
Subject: [PATCH 7/8] Remove bad BigLong variants

---
 src/utility/m_swap.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/utility/m_swap.h b/src/utility/m_swap.h
index f5b90770f..de9b7780a 100644
--- a/src/utility/m_swap.h
+++ b/src/utility/m_swap.h
@@ -119,16 +119,6 @@ inline unsigned short BigShort(unsigned short x)
 	return x;
 }
 
-inline unsigned int BigLong(unsigned int &x)
-{
-	return x;
-}
-
-inline int BigLong(int &x)
-{
-	return x;
-}
-
 inline unsigned int BigLong(unsigned int x)
 {
 	return x;

From 025e50219f9aabf3e2c9be11960f7d9bb95f86f2 Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Thu, 4 Apr 2019 16:37:51 +0300
Subject: [PATCH 8/8] - fixed missing command line in crash reports

https://forum.zdoom.org/viewtopic.php?t=64149
---
 src/win32/i_main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp
index ee43eab0c..9af8bc4cf 100644
--- a/src/win32/i_main.cpp
+++ b/src/win32/i_main.cpp
@@ -1111,7 +1111,7 @@ void DoomSpecificInfo (char *buffer, size_t bufflen)
 	int i;
 
 	buffer += mysnprintf (buffer, buffend - buffer, GAMENAME " version %s (%s)", GetVersionString(), GetGitHash());
-	buffer += mysnprintf (buffer, buffend - buffer, "\r\nCommand line: %s\r\n", GetCommandLine());
+	buffer += mysnprintf (buffer, buffend - buffer, "\r\nCommand line: %s\r\n", GetCommandLineA());
 
 	for (i = 0; (arg = Wads.GetWadName (i)) != NULL; ++i)
 	{