From 5310ecc2c31df58150c696462113142dd256b2d8 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" 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(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 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 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 zcmXAg0TF{h3E6vMMb~NrM!`w`c-<~}>s`}!vt$tovhc33!43zU zaKQ}^ybwlp#a^n%ug9WVLsF#{_mY__$UG!^#k!x&Jhir}HQRUTw_U%ZhL{s@=@D1(S3nRsVdV1*5K zIN*c}Zb-F8wO`9&pU;|VPMs>^{%}OA=^~)= E0_Sf$h5!Hn 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 zcmXwyZ54nZ3`GZeL`-7?1MtHHCa{13EMNi?ScMM! z2ROk6Ztwu#CC1RM;(ADKt|=9XRAkyLXGN-Ntc`qBYZ9uk^)E2z1~W~@p>H2%4FPk3 Hf7d84`3gl= literal 176 zcmXwy(G7qg3`9$eXq?6k9Du|HT)+YRcK{b~0T+Yrq3=YGJh*Eq4Az@ju#tU&85US! zgB=by;eya4sjbJYm}@L4-PRK^rG}h~NN6CKL4jK4b&Gz3^XkO literal 148 zcmXwxyA6Oa3`A{-PuPW;p4t)%umB4%05w};?-8CAi1nPivy(}Rh^Wl;1yZOouXs 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 zcmXAh%ME}q3`5f(KHY^gcg_|IFaZ-V0UNL($sWZ?BR$72m0G2Wh|0>`$W9J&l8fBr uAurJpeVR_dXGUu}1LnP#g%=CugVgNdX=a|?)11q|2rJC^ysHjzMf(A1t27Y+ literal 147 zcmYj}u@QhU3^%OpvXh(uZFD{QdC0ViB= u!vk^D{z{k;*^FK!A=UhMIh#_>kXcQeZ_Y_;`M2j?EAA0d@0bciF1vWqhR^Z(dUHZV;U=%Vh^WY^(A`)dL7g%9~9Woqn r!UeI{c4`=r+l;J|P_^>6qUN2yFtMO;zad`U=0n_v1KBio{-X5(3;8oR literal 150 zcmXwv!4ZHU3r0{rG-12$j-G~nMNN&3JA1~PkdOR`B6ksv#HzzG-J@IZnW pJ_xh+S7fDRGqOm`S;c3KjNabf{~6dHKL*ku@SlO>$&<&A9s>cGq9$>L?ClK_gqQ^Y{#hug literal 118 zcmX|(!3}^=2t!Le$S9sXI)K+6T)+W5Iy10`mTzK{2cZ-k4#2Reu3{6rIK(L~aSJn& d4<<6Y&k-qOc%I2fsTVy|Yox0FlrG!*{=9YwCuslx 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}De!l6pXF2E@)l900_zK%51{ML^8R=<7eAK%54|c|gp_=9#p5K{ngts)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 zcmX|(fepey3=Cx>UHr^lto(_qNd3|T4zHQ 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 zcmYj~yA6Oa3eC%&@=; z8|-kv36+oKWY=Awob_i!)!M=)@Az!f)M7T-mRKT{ GZ}AHzx;nW4 literal 170 zcmX|)yA6Oa3`A|d5!2Ap)6p;hBQOFBumC-)Veb*1QzX)}&pGQnNfHs2nYzFVI~;Jr z1vfnKLep*KWgY0BQL>IG_o@*wWMS73eM>L1Sr~Or?qQgRnTT>0N@9d#@?Q`Bj{rE% 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);l9oX13dF%coCw54K->((6M=X>5U&PeW)^QS_|M1=q8~j568{-E zfh_MwPo6+|kAT8JCW!l=f%P$v0wOkMFoi{c6QmKO=n2%UCqS(rjyKenCtx<*Y5=Kb BKZpPT literal 172 zcmZXNu?>JQ3wd!|G@KIg6K_vH=uT|E8( 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);l9oX13dF%coCw5)K->t#{Xjeyh*ttJGmAGE{AXkb(T^SjiT@0o zK$iETCr{wKC*D9Ni2I)rqyflaV+KzzB@M0xZA)EarHR@N6L(B0c*q&N-tDB2vjjone6$ zHrU~S6E3)+Zd05hy?4!&B7mo3^aMP<&tJ)Nl`QJ0xN8=!vQB; sa6?SiR24{ZGJshrbP6%o64`Ol`$W-{`q7_jS|2bi+$Gc9NqRR~G_znc?*c1qu)_ff pPPiZp`scAoyK~M2LKX%?T1rhisYpFhHH_cB_jO-Y%Uh$_vP3s}Jhc5r|b vT;K+^Ntf4ABlgZ#l85Wt<@!Omw6x2%_{aio45S%PKc; literal 157 zcmd;N;9y{2U}Vq%lIB3{48;CG91X--KwJ*QEkHaGh#A?uq2NCwySMkF$B!Qa`C#@F rAOLc}Y>*ldn}HcjvqGr<3>=RiKY`0}Jb3~(0IZM$D2#3bQ0PAZcvv;x 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 zcmXwx!4ZHU3UZu&nttRB;?p82PQ*&}*uABpxlb^rhX literal 157 zcmXwx!3}^Q5Cjj6diLVq0({=b2CTpaY`_9+5$FTw2y8OshHQ2f6_Fqt?+yo?aKQ}^ syzoJot)+y;ET)w3BFdc!hQ#Q0*|B!F#^e2mEd+KQwVTK>z>% 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 zcmX|((G7qg3`7eiD7*OY0{->S30%MloWKPf5ZD7>8@0(Rcj<9ivWP^P*$b?&!43zU vaKQ~R={r44s8Va?>5|df7_7VIIddT()1dmD%73zN%}YFJjbBF`J!PvuLV-3% literal 158 zcmX|(!4ZHk2n1mqHTL4)2K@1|0UNLZ8?XUOOwvc(5cOsjIJjYwAR;O=b%7N&*x`T^ tF1SGldsQSb#gq~a6QgB>!{qEKH_F&|X6-_(>W|e2&9MC*=;)zZ$^#q9H(vk% 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 zcmXYqyAgyi3`B(t%y89QNJ^{{Xn_`JfetRc!jStgZvo9bd9~K(W0RS=eaSN{5U|1q zI~?$XKX?g6^FHFd#Sl?bs_V#Qe9LG?D<3@#nFx%``Wh9{%=KtQz6`B!22R!Ykw>sf F#swGRG_n8y literal 154 zcmXYqxeTDe)CR12jMbt<8 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 zcmX|)(G7qg5JL}80#4(v|Nh;V6S#saIDr$mfMdz+fh~zZUb*&~Fi92>FEexjE7-se z4se1C+~5IW&~~bic;5o4E^#z#MzU(bRoW_JDMl9qV+Lkz>cQVf59`dnQRouO+N6rZ H*uVb(Mt(pS literal 177 zcmX|)%ME}a5Cs>15UcU(-5VDhumnr60UNLYJ9D=WoFzt*S?0kDjFLno$i$psffY8` z;eZn^xS{ECT_p_ck1|S#m|1m6IV%MpMe3Q4N4F3JQ3^JQ3fUC5j2%|Fq>i>1=vixLa>)0|3wkXv{Qv*} 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 zcmYL<%ME}a5Cs>EAA0d@0bciF1vWqhR^Z(dUHZV;U=%Vh^WY^(A`)dL7g%9~9Woqn r!UeI{c4`=r+l;J|P_^>6qUN2yFtMO;zad`U=0n_v1KBio{-X5(3;8oR literal 150 zcmXwv!4ZHU3r0{rG-12$j-G~nMNN&3JA1~PkdOR`B6ksv#HzzG-J@IZnW pJ_xh+S7fDRGqOm`S)OZyTAjU zu)+)8@PRMsT+d!E?b0l?}TazN<@7%GHNA^Yv=`tOj;I;?Z#8juqwG=jp^XhSF O|A=``BL)iQRNnwaHb|-f literal 175 zcmXwxOA&xD3`CO?6g3Dy05iQ}00Rg>0S0OSX*52{OFujFI=ks6iv$r-S$Q|u;eZn^ wxZ!~WFX$A9iu*647^^q4>Sb<~Y 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, ArrayFindPush(obj); } @@ -811,6 +812,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Delete, ArrayDelete) 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 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)' 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)' 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 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" 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) {