From 92045bea0e73774488080945bc5b5367fb6ef3b1 Mon Sep 17 00:00:00 2001 From: Nemrtvi <26684396+Nemrtvi@users.noreply.github.com> Date: Thu, 24 Jan 2019 08:35:30 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Improved=20Strife=E2=80=99s=20BIGFONT=20fil?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wadsrc_extra/static/sbigfont.lmp | Bin 7546 -> 7452 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/wadsrc_extra/static/sbigfont.lmp b/wadsrc_extra/static/sbigfont.lmp index 9c2a9d367cbbdb7d348219cbdc4740b0b0339a21..937a92b357d6495d88cbcb972118bd64f025fff3 100644 GIT binary patch literal 7452 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 Date: Mon, 21 Jan 2019 13:33:53 +0800 Subject: [PATCH 2/3] Punctuated the input strings in UpperCamelCase format. --- src/c_bind.cpp | 158 ++++++++++++++++++++++++------------------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/src/c_bind.cpp b/src/c_bind.cpp index 1ed96dafb..37f69ba13 100644 --- a/src/c_bind.cpp +++ b/src/c_bind.cpp @@ -55,100 +55,100 @@ const char *KeyNames[NUM_KEYS] = // DirectInput codes and assume a qwerty keyboard layout. // See for the DIK_* codes - NULL, "escape", "1", "2", "3", "4", "5", "6", //00 - "7", "8", "9", "0", "-", "=", "backspace","tab", //08 - "q", "w", "e", "r", "t", "y", "u", "i", //10 - "o", "p", "[", "]", "enter", "ctrl", "a", "s", //18 - "d", "f", "g", "h", "j", "k", "l", ";", //20 - "'", "`", "shift", "\\", "z", "x", "c", "v", //28 - "b", "n", "m", ",", ".", "/", "rshift", "kp*", //30 - "alt", "space", "capslock", "f1", "f2", "f3", "f4", "f5", //38 - "f6", "f7", "f8", "f9", "f10", "numlock", "scroll", "kp7", //40 - "kp8", "kp9", "kp-", "kp4", "kp5", "kp6", "kp+", "kp1", //48 - "kp2", "kp3", "kp0", "kp.", NULL, NULL, "oem102", "f11", //50 - "f12", NULL, NULL, NULL, NULL, NULL, NULL, NULL, //58 - NULL, NULL, NULL, NULL, "f13", "f14", "f15", "f16", //60 + NULL, "Escape", "1", "2", "3", "4", "5", "6", //00 + "7", "8", "9", "0", "-", "=", "Backspace","Tab", //08 + "Q", "W", "E", "R", "T", "Y", "U", "I", //10 + "O", "P", "[", "]", "Enter", "Ctrl", "A", "S", //18 + "D", "F", "G", "H", "J", "K", "L", ";", //20 + "'", "`", "Shift", "\\", "Z", "X", "C", "V", //28 + "B", "N", "M", ",", ".", "/", "RShift", "KP*", //30 + "Alt", "Space", "CapsLock", "F1", "F2", "F3", "F4", "F5", //38 + "F6", "F7", "F8", "F9", "F10", "NumLock", "Scroll", "KP7", //40 + "KP8", "KP9", "KP-", "KP4", "KP5", "KP6", "KP+", "KP1", //48 + "KP2", "KP3", "KP0", "KP.", NULL, NULL, "OEM102", "F11", //50 + "F12", NULL, NULL, NULL, NULL, NULL, NULL, NULL, //58 + NULL, NULL, NULL, NULL, "F13", "F14", "F15", "F16", //60 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, //68 - "kana", NULL, NULL, "abnt_c1", NULL, NULL, NULL, NULL, //70 - NULL, "convert", NULL, "noconvert",NULL, "yen", "abnt_c2", NULL, //78 + "Kana", NULL, NULL, "Abnt_C1", NULL, NULL, NULL, NULL, //70 + NULL, "Convert", NULL, "NoConvert",NULL, "Yen", "abnt_c2", NULL, //78 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, //80 - NULL, NULL, NULL, NULL, NULL, "kp=", NULL, NULL, //88 - "circumflex","@", ":", "_", "kanji", "stop", "ax", "unlabeled",//90 - NULL, "prevtrack",NULL, NULL, "kp-enter", "rctrl", NULL, NULL, //98 - "mute", "calculator","play", NULL, "stop", NULL, NULL, NULL, //A0 - NULL, NULL, NULL, NULL, NULL, NULL, "voldown", NULL, //A8 - "volup", NULL, "webhome", "kp,", NULL, "kp/", NULL, "sysrq", //B0 - "ralt", NULL, NULL, NULL, NULL, NULL, NULL, NULL, //B8 - NULL, NULL, NULL, NULL, NULL, "pause", NULL, "home", //C0 - "uparrow", "pgup", NULL, "leftarrow",NULL, "rightarrow",NULL, "end", //C8 - "downarrow","pgdn", "ins", "del", NULL, NULL, NULL, NULL, //D0 + NULL, NULL, NULL, NULL, NULL, "KP=", NULL, NULL, //88 + "Circumflex","@", ":", "_", "Kanji", "Stop", "Ax", "Unlabeled",//90 + NULL, "PrevTrack",NULL, NULL, "KP-Enter", "RCtrl", NULL, NULL, //98 + "Mute", "Calculator","Play", NULL, "Stop", NULL, NULL, NULL, //A0 + NULL, NULL, NULL, NULL, NULL, NULL, "VolDown", NULL, //A8 + "VolUp", NULL, "WebHome", "KP,", NULL, "KP/", NULL, "SysRq", //B0 + "RAlt", NULL, NULL, NULL, NULL, NULL, NULL, NULL, //B8 + NULL, NULL, NULL, NULL, NULL, "Pause", NULL, "Home", //C0 + "UpArrow", "PgUp", NULL, "LeftArrow",NULL, "RightArrow",NULL, "End", //C8 + "DownArrow","PgDn", "Ins", "Del", NULL, NULL, NULL, NULL, //D0 #ifdef __APPLE__ - NULL, NULL, NULL, "command", NULL, "apps", "power", "sleep", //D8 + NULL, NULL, NULL, "Command", NULL, "Apps", "Power", "Sleep", //D8 #else // !__APPLE__ - NULL, NULL, NULL, "lwin", "rwin", "apps", "power", "sleep", //D8 + NULL, NULL, NULL, "LWin", "RWin", "Apps", "Power", "Sleep", //D8 #endif // __APPLE__ - NULL, NULL, NULL, "wake", NULL, "search", "favorites","refresh", //E0 - "webstop", "webforward","webback", "mycomputer","mail", "mediaselect",NULL, NULL, //E8 + NULL, NULL, NULL, "Wake", NULL, "Search", "Favorites","Refresh", //E0 + "WebStop", "WebForward","WebBack", "MyComputer","Mail", "MediaSelect",NULL, NULL, //E8 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, //F0 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, //F8 // non-keyboard buttons that can be bound - "mouse1", "mouse2", "mouse3", "mouse4", // 8 mouse buttons - "mouse5", "mouse6", "mouse7", "mouse8", + "Mouse1", "Mouse2", "Mouse3", "Mouse4", // 8 mouse buttons + "Mouse5", "Mouse6", "Mouse7", "Mouse8", - "joy1", "joy2", "joy3", "joy4", // 128 joystick buttons! - "joy5", "joy6", "joy7", "joy8", - "joy9", "joy10", "joy11", "joy12", - "joy13", "joy14", "joy15", "joy16", - "joy17", "joy18", "joy19", "joy20", - "joy21", "joy22", "joy23", "joy24", - "joy25", "joy26", "joy27", "joy28", - "joy29", "joy30", "joy31", "joy32", - "joy33", "joy34", "joy35", "joy36", - "joy37", "joy38", "joy39", "joy40", - "joy41", "joy42", "joy43", "joy44", - "joy45", "joy46", "joy47", "joy48", - "joy49", "joy50", "joy51", "joy52", - "joy53", "joy54", "joy55", "joy56", - "joy57", "joy58", "joy59", "joy60", - "joy61", "joy62", "joy63", "joy64", - "joy65", "joy66", "joy67", "joy68", - "joy69", "joy70", "joy71", "joy72", - "joy73", "joy74", "joy75", "joy76", - "joy77", "joy78", "joy79", "joy80", - "joy81", "joy82", "joy83", "joy84", - "joy85", "joy86", "joy87", "joy88", - "joy89", "joy90", "joy91", "joy92", - "joy93", "joy94", "joy95", "joy96", - "joy97", "joy98", "joy99", "joy100", - "joy101", "joy102", "joy103", "joy104", - "joy105", "joy106", "joy107", "joy108", - "joy109", "joy110", "joy111", "joy112", - "joy113", "joy114", "joy115", "joy116", - "joy117", "joy118", "joy119", "joy120", - "joy121", "joy122", "joy123", "joy124", - "joy125", "joy126", "joy127", "joy128", + "Joy1", "Joy2", "Joy3", "Joy4", // 128 joystick buttons! + "Joy5", "Joy6", "Joy7", "Joy8", + "Joy9", "Joy10", "Joy11", "Joy12", + "Joy13", "Joy14", "Joy15", "Joy16", + "Joy17", "Joy18", "Joy19", "Joy20", + "Joy21", "Joy22", "Joy23", "Joy24", + "Joy25", "Joy26", "Joy27", "Joy28", + "Joy29", "Joy30", "Joy31", "Joy32", + "Joy33", "Joy34", "Joy35", "Joy36", + "Joy37", "Joy38", "Joy39", "Joy40", + "Joy41", "Joy42", "Joy43", "Joy44", + "Joy45", "Joy46", "Joy47", "Joy48", + "Joy49", "Joy50", "Joy51", "Joy52", + "Joy53", "Joy54", "Joy55", "Joy56", + "Joy57", "Joy58", "Joy59", "Joy60", + "Joy61", "Joy62", "Joy63", "Joy64", + "Joy65", "Joy66", "Joy67", "Joy68", + "Joy69", "Joy70", "Joy71", "Joy72", + "Joy73", "Joy74", "Joy75", "Joy76", + "Joy77", "Joy78", "Joy79", "Joy80", + "Joy81", "Joy82", "Joy83", "Joy84", + "Joy85", "Joy86", "Joy87", "Joy88", + "Joy89", "Joy90", "Joy91", "Joy92", + "Joy93", "Joy94", "Joy95", "Joy96", + "Joy97", "Joy98", "Joy99", "Joy100", + "Joy101", "Joy102", "Joy103", "Joy104", + "Joy105", "Joy106", "Joy107", "Joy108", + "Joy109", "Joy110", "Joy111", "Joy112", + "Joy113", "Joy114", "Joy115", "Joy116", + "Joy117", "Joy118", "Joy119", "Joy120", + "Joy121", "Joy122", "Joy123", "Joy124", + "Joy125", "Joy126", "Joy127", "Joy128", - "pov1up", "pov1right","pov1down", "pov1left", // First POV hat - "pov2up", "pov2right","pov2down", "pov2left", // Second POV hat - "pov3up", "pov3right","pov3down", "pov3left", // Third POV hat - "pov4up", "pov4right","pov4down", "pov4left", // Fourth POV hat + "POV1Up", "POV1Right","POV1Down", "POV1Left", // First POV hat + "POV2Up", "POV2Right","POV2Down", "POV2Left", // Second POV hat + "POV3Up", "POV3Right","POV3Down", "POV3Left", // Third POV hat + "POV4Up", "POV4Right","POV4Down", "POV4Left", // Fourth POV hat - "mwheelup", "mwheeldown", // the mouse wheel - "mwheelright", "mwheelleft", + "MWheelUp", "MWheelDown", // the mouse wheel + "MWheelRight", "MWheelLeft", - "axis1plus","axis1minus","axis2plus","axis2minus", // joystick axes as buttons - "axis3plus","axis3minus","axis4plus","axis4minus", - "axis5plus","axis5minus","axis6plus","axis6minus", - "axis7plus","axis7minus","axis8plus","axis8minus", + "Axis1Plus","Axis1Minus","Axis2Plus","Axis2Minus", // joystick axes as buttons + "Axis3Plus","Axis3Minus","Axis4Plus","Axis4Minus", + "Axis5Plus","Axis5Minus","Axis6Plus","Axis6Minus", + "Axis7Plus","Axis7Minus","Axis8Plus","Axis8Minus", - "lstickright","lstickleft","lstickdown","lstickup", // Gamepad axis-based buttons - "rstickright","rstickleft","rstickdown","rstickup", + "LStickRight","LStickLeft","LStickDown","LStickUp", // Gamepad axis-based buttons + "RStickRight","RStickLeft","RStickDown","RStickUp", - "dpadup","dpaddown","dpadleft","dpadright", // Gamepad buttons - "pad_start","pad_back","lthumb","rthumb", - "lshoulder","rshoulder","ltrigger","rtrigger", - "pad_a", "pad_b", "pad_x", "pad_y" + "DPadUp","DPadDown","DPadLeft","DPadRight", // Gamepad buttons + "Pad_Start","Pad_Back","LThumb","RThumb", + "LShoulder","RShoulder","LTrigger","RTrigger", + "Pad_A", "Pad_B", "Pad_X", "Pad_Y" }; FKeyBindings Bindings; From b2ee99c7ccb561a9e91c3e10ddf339126e6d506d Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 25 Jan 2019 00:55:28 +0100 Subject: [PATCH 3/3] - call level compatibility handlers for all levels and pass the map name as a second parameter. This is for user-made handlers for which the checksum is rather useless both for deciding whether to call the handler and for identifying the map. --- src/maploader/compatibility.cpp | 21 ++++++++----------- wadsrc/static/zscript/level_compatibility.txt | 5 ++++- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/maploader/compatibility.cpp b/src/maploader/compatibility.cpp index e59357731..461f8cab4 100644 --- a/src/maploader/compatibility.cpp +++ b/src/maploader/compatibility.cpp @@ -353,21 +353,18 @@ IMPLEMENT_CLASS(DLevelCompatibility, true, false); void MapLoader::SetCompatibilityParams(FName checksum) { - if (checksum != NAME_None) + auto lc = Create(); + lc->loader = this; + lc->Level = Level; + for(auto cls : PClass::AllClasses) { - auto lc = Create(); - lc->loader = this; - lc->Level = Level; - for(auto cls : PClass::AllClasses) + if (cls->IsDescendantOf(RUNTIME_CLASS(DLevelCompatibility))) { - if (cls->IsDescendantOf(RUNTIME_CLASS(DLevelCompatibility))) + PFunction *const func = dyn_cast(cls->FindSymbol("Apply", false)); + if (func != nullptr) { - PFunction *const func = dyn_cast(cls->FindSymbol("Apply", false)); - if (func != nullptr) - { - VMValue param[] = { lc, (int)checksum }; - VMCall(func->Variants[0].Implementation, param, 2, nullptr, 0); - } + VMValue param[] = { lc, checksum.GetIndex(), &Level->MapName }; + VMCall(func->Variants[0].Implementation, param, 3, nullptr, 0); } } } diff --git a/wadsrc/static/zscript/level_compatibility.txt b/wadsrc/static/zscript/level_compatibility.txt index 29378b01e..25eacb9da 100644 --- a/wadsrc/static/zscript/level_compatibility.txt +++ b/wadsrc/static/zscript/level_compatibility.txt @@ -3,10 +3,13 @@ class LevelCompatibility native play { native LevelLocals level; - protected void Apply(Name checksum) + protected void Apply(Name checksum, String mapname) { switch (checksum) { + case 'none': + return; + case '9BC9E12781903D7C2D5697A5E0AEFD6F': // HACX.WAD map05 from 21.10.2010 case '9527DD0809FDA39CCFC316A21D135783': // HACX.WAD map05 from 20.10.2010 {