From aec56d2253bc77e45cc98c8fb783f13bbf7355c3 Mon Sep 17 00:00:00 2001 From: Brad Harding Date: Thu, 24 Feb 2022 15:58:01 +1100 Subject: [PATCH] Minor tweaks --- res/DEHACKED | 34 ++++----- res/doomretro.wad | Bin 4783887 -> 4783955 bytes src/am_map.c | 179 ++++++++++++++++++++-------------------------- src/f_finale.c | 12 +--- src/p_mobj.c | 5 +- src/s_sound.c | 5 +- 6 files changed, 101 insertions(+), 134 deletions(-) diff --git a/res/DEHACKED b/res/DEHACKED index 9232830874..94530d28a1 100644 --- a/res/DEHACKED +++ b/res/DEHACKED @@ -303,23 +303,23 @@ STSTR_RHOFF = Regenerating health OFF. STSTR_VON = Vanilla mode ON. STSTR_VOFF = Vanilla mode OFF. STSTR_FPS = %s FPS -CC_ZOMBIE = zombieman -CC_SHOTGUN = shotgun guy -CC_HEAVY = chaingunner -CC_IMP = imp -CC_DEMON = pinky demon -CC_SPECTRE = spectre -CC_LOST = lost soul -CC_CACO = cacodemon -CC_HELL = hell knight -CC_BARON = baron of hell -CC_ARACH = arachnotron -CC_PAIN = pain elemental -CC_REVEN = revenant -CC_MANCU = mancubus -CC_ARCH = arch-vile -CC_SPIDER = spider mastermind -CC_CYBER = cyberdemon +CC_ZOMBIE = the zombieman +CC_SHOTGUN = the shotgun guy +CC_HEAVY = the chaingunner +CC_IMP = the imp +CC_DEMON = the pinky demon +CC_SPECTRE = the spectre +CC_LOST = the lost soul +CC_CACO = the cacodemon +CC_HELL = the hell knight +CC_BARON = the baron of hell +CC_ARACH = the arachnotron +CC_PAIN = the pain elemental +CC_REVEN = the revenant +CC_MANCU = the mancubus +CC_ARCH = the arch-vile +CC_SPIDER = the spider mastermind +CC_CYBER = the cyberdemon CC_HERO = our hero E1TEXT = Once you beat the big badasses and\nclean out the moon base, you're supposed\nto win, aren't you? Aren't you? Where's\nyour fat reward and ticket home? What\nthe Hell is this? It's not supposed to\nend this way!\n\nIt stinks like rotten meat, but looks\nlike the lost Deimos base. It looks like\nyou're stuck on The Shores of Hell.\nThe only way out is through.\n\nTo continue the DOOM experience, play\nThe Shores of Hell and its amazing\nsequel, Inferno! E2TEXT = You've done it! The hideous Cyber-\ndemon lord that ruled the lost Deimos\nmoon base has been slain and you\nare triumphant! But... where are\nyou? You clamber to the edge of the\nmoon and look down to see the awful\ntruth.\n\nDeimos floats above Hell itself!\nYou've never heard of anyone escaping\nfrom Hell, but you'll make the bastards\nsorry they ever heard of you! Quickly,\nyou rappel down to the surface of\nHell.\n\nNow, it's onto the final chapter of\nDOOM - Inferno! diff --git a/res/doomretro.wad b/res/doomretro.wad index c7f7a5e571f7434685ce8c50874bc98a970dd156..fbb07b2821066051ca078ede6ea224a695827092 100644 GIT binary patch delta 5887 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 kit>i*)`oHEB4-3NB*>v6(!rvF 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 == ev_keydown && ev->data1 == AM_STARTKEY && keydown != AM_STARTKEY && !(modstate & KMOD_ALT)) + if ((ev->type == ev_keydown && ev->data1 == keyboardautomap && keydown != keyboardautomap && !(modstate & KMOD_ALT)) || (ev->type == ev_controller && (gamecontrollerbuttons & gamecontrollerautomap) && !backbuttondown)) { - keydown = AM_STARTKEY; + keydown = keyboardautomap; backbuttondown = true; AM_Start(true); viewactive = false; @@ -717,7 +696,7 @@ dboolean AM_Responder(const event_t *ev) key = ev->data1; // pan right - if (key == AM_PANRIGHTKEY || key == AM_PANRIGHTKEY2 || key == AM_PANRIGHTKEY3) + if (key == keyboardright || key == keyboardstraferight || key == keyboardstraferight2) { keydown = key; @@ -734,7 +713,7 @@ dboolean AM_Responder(const event_t *ev) } // pan left - else if (key == AM_PANLEFTKEY || key == AM_PANLEFTKEY2 || key == AM_PANLEFTKEY3) + else if (key == keyboardleft || key == keyboardstrafeleft || key == keyboardstrafeleft2) { keydown = key; @@ -751,7 +730,7 @@ dboolean AM_Responder(const event_t *ev) } // pan up - else if (key == AM_PANUPKEY || key == AM_PANUPKEY2) + else if (key == keyboardforward || key == keyboardforward2) { keydown = key; @@ -768,7 +747,7 @@ dboolean AM_Responder(const event_t *ev) } // pan down - else if (key == AM_PANDOWNKEY || key == AM_PANDOWNKEY2) + else if (key == keyboardback || key == keyboardback2) { keydown = key; @@ -785,21 +764,21 @@ dboolean AM_Responder(const event_t *ev) } // zoom out - else if (key == AM_ZOOMOUTKEY && !movement) + else if (key == keyboardzoomout && !movement) { keydown = key; AM_ToggleZoomOut(); } // zoom in - else if (key == AM_ZOOMINKEY && !movement) + else if (key == keyboardzoomin && !movement) { keydown = key; AM_ToggleZoomIn(); } // leave automap - else if (key == AM_ENDKEY && !(modstate & KMOD_ALT) && keydown != AM_ENDKEY && !mapwindow) + else if (key == keyboardautomap && !(modstate & KMOD_ALT) && keydown != keyboardautomap && !mapwindow) { keydown = key; viewactive = true; @@ -808,9 +787,9 @@ dboolean AM_Responder(const event_t *ev) } // toggle maximum zoom - else if (key == AM_GOBIGKEY && !idclev && !idmus) + else if (key == keyboardmaxzoom && !idclev && !idmus) { - if (keydown != AM_GOBIGKEY) + if (keydown != keyboardmaxzoom) { keydown = key; AM_ToggleMaxZoom(); @@ -818,9 +797,9 @@ dboolean AM_Responder(const event_t *ev) } // toggle follow mode - else if (key == AM_FOLLOWKEY) + else if (key == keyboardfollowmode) { - if (keydown != AM_FOLLOWKEY) + if (keydown != keyboardfollowmode) { keydown = key; AM_ToggleFollowMode(!am_followmode); @@ -828,9 +807,9 @@ dboolean AM_Responder(const event_t *ev) } // toggle grid - else if (key == AM_GRIDKEY) + else if (key == keyboardgrid) { - if (keydown != AM_GRIDKEY) + if (keydown != keyboardgrid) { keydown = key; AM_ToggleGrid(); @@ -838,9 +817,9 @@ dboolean AM_Responder(const event_t *ev) } // mark spot - else if (key == AM_MARKKEY) + else if (key == keyboardmark) { - if (keydown != AM_MARKKEY) + if (keydown != keyboardmark) { keydown = key; AM_AddMark(); @@ -848,13 +827,13 @@ dboolean AM_Responder(const event_t *ev) } // clear mark(s) - else if (key == AM_CLEARMARKKEY) + else if (key == keyboardclearmark) AM_ClearMarks(); // toggle rotate mode - else if (key == AM_ROTATEKEY) + else if (key == keyboardrotatemode) { - if (keydown != AM_ROTATEKEY) + if (keydown != keyboardrotatemode) { keydown = key; AM_ToggleRotateMode(!am_rotatemode); @@ -867,40 +846,40 @@ dboolean AM_Responder(const event_t *ev) { key = ev->data1; - if (key == AM_CLEARMARKKEY) + if (key == keyboardclearmark) markpress = 0; keydown = 0; - if ((key == AM_ZOOMOUTKEY || key == AM_ZOOMINKEY) && !movement) + if ((key == keyboardzoomout || key == keyboardzoomin) && !movement) { mtof_zoommul = FRACUNIT; ftom_zoommul = FRACUNIT; } - else if (key == AM_FOLLOWKEY) + else if (key == keyboardfollowmode) { int key2 = 0; - if (keystate(AM_PANLEFTKEY)) - key2 = AM_PANLEFTKEY; - else if (keystate(AM_PANLEFTKEY2)) - key2 = AM_PANLEFTKEY2; - else if (keystate(AM_PANLEFTKEY3)) - key2 = AM_PANLEFTKEY3; - else if (keystate(AM_PANRIGHTKEY)) - key2 = AM_PANRIGHTKEY; - else if (keystate(AM_PANRIGHTKEY2)) - key2 = AM_PANRIGHTKEY2; - else if (keystate(AM_PANRIGHTKEY3)) - key2 = AM_PANRIGHTKEY3; - else if (keystate(AM_PANUPKEY)) - key2 = AM_PANUPKEY; - else if (keystate(AM_PANUPKEY2)) - key2 = AM_PANUPKEY2; - else if (keystate(AM_PANDOWNKEY)) - key2 = AM_PANDOWNKEY; - else if (keystate(AM_PANDOWNKEY2)) - key2 = AM_PANDOWNKEY2; + if (keystate(keyboardleft)) + key2 = keyboardleft; + else if (keystate(keyboardstrafeleft)) + key2 = keyboardstrafeleft; + else if (keystate(keyboardstrafeleft2)) + key2 = keyboardstrafeleft2; + else if (keystate(keyboardright)) + key2 = keyboardright; + else if (keystate(keyboardstraferight)) + key2 = keyboardstraferight; + else if (keystate(keyboardstraferight2)) + key2 = keyboardstraferight2; + else if (keystate(keyboardforward)) + key2 = keyboardforward; + else if (keystate(keyboardforward2)) + key2 = keyboardforward2; + else if (keystate(keyboardback)) + key2 = keyboardback; + else if (keystate(keyboardback2)) + key2 = keyboardback2; if (key2) { @@ -914,38 +893,38 @@ dboolean AM_Responder(const event_t *ev) } else if (!am_followmode) { - if (key == AM_PANLEFTKEY || key == AM_PANLEFTKEY2 || key == AM_PANLEFTKEY3) + if (key == keyboardleft || key == keyboardstrafeleft || key == keyboardstrafeleft2) { speedtoggle = AM_GetSpeedToggle(); - if (keystate(AM_PANRIGHTKEY) || keystate(AM_PANRIGHTKEY2) || keystate(AM_PANRIGHTKEY3)) + if (keystate(keyboardright) || keystate(keyboardstraferight) || keystate(keyboardstraferight2)) m_paninc.x = FTOM(F_PANINC); else m_paninc.x = 0; } - else if (key == AM_PANRIGHTKEY || key == AM_PANRIGHTKEY2 || key == AM_PANRIGHTKEY3) + else if (key == keyboardright || key == keyboardstraferight || key == keyboardstraferight2) { speedtoggle = AM_GetSpeedToggle(); - if (keystate(AM_PANLEFTKEY) || keystate(AM_PANLEFTKEY2) || keystate(AM_PANLEFTKEY3)) + if (keystate(keyboardleft) || keystate(keyboardstrafeleft) || keystate(keyboardstrafeleft2)) m_paninc.x = -FTOM(F_PANINC); else m_paninc.x = 0; } - else if (key == AM_PANUPKEY || key == AM_PANUPKEY2) + else if (key == keyboardforward || key == keyboardforward2) { speedtoggle = AM_GetSpeedToggle(); - if (keystate(AM_PANDOWNKEY) || keystate(AM_PANDOWNKEY2)) + if (keystate(keyboardback) || keystate(keyboardback2)) m_paninc.y = FTOM(F_PANINC); else m_paninc.y = 0; } - else if (key == AM_PANDOWNKEY || key == AM_PANDOWNKEY2) + else if (key == keyboardback || key == keyboardback2) { speedtoggle = AM_GetSpeedToggle(); - if (keystate(AM_PANUPKEY) || keystate(AM_PANUPKEY2)) + if (keystate(keyboardforward) || keystate(keyboardforward2)) m_paninc.y = -FTOM(F_PANINC); else m_paninc.y = 0; diff --git a/src/f_finale.c b/src/f_finale.c index 85b700ccbe..40ecf00d73 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -855,17 +855,7 @@ static void F_CastDrawer(void) V_DrawWidePatch((SCREENWIDTH / SCREENSCALE - SHORT(patch->width)) / 2, 0, 0, patch); if (M_StringCompare(castorder[castnum].name, *castorder[castnum].dehackedname)) - { - if (type == MT_PLAYER) - F_CastPrint(playername); - else - { - char *name = M_StringJoin("The ", mobjinfo[type].name1, NULL); - - F_CastPrint(name); - free(name); - } - } + F_CastPrint(type == MT_PLAYER ? playername : mobjinfo[type].name1); else F_CastPrint(*castorder[castnum].dehackedname); diff --git a/src/p_mobj.c b/src/p_mobj.c index 60003ea92c..105385b1ce 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -1166,13 +1166,14 @@ mobj_t *P_SpawnMapThing(mapthing_t *mthing, dboolean spawnmonsters) if ((type >= Player2Start && type <= Player4Start) || type == PlayerDeathmatchStart) return NULL; + if (type == VisualModeCamera) + return NULL; + if (type >= MusicSourceMin && type <= MusicSourceMax) { musicid = type - MusicSourceMin; type = MusicSourceMax; } - else if (type == VisualModeCamera) - return NULL; if (options & MTF_NOTSINGLE) return NULL; diff --git a/src/s_sound.c b/src/s_sound.c index 8d319b9d77..0b525d7c40 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -716,10 +716,7 @@ void S_ChangeMusInfoMusic(int lumpnum, int looping) musicinfo_t *music; void *handle; - if (nomusic) - return; - - if (mus_playing && mus_playing->lumpnum == lumpnum) + if (nomusic || (mus_playing && mus_playing->lumpnum == lumpnum)) return; music = &S_music[mus_musinfo];