Merge branch 'fabiangreffrath:master' into master

JROB774 · Feb 24, 2024 · f84a3ad · f84a3ad
2 parents a639629 + d80f4a1
commit f84a3ad
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/doom/m_menu.c b/src/doom/m_menu.c
@@ -1580,7 +1580,7 @@ static void M_DrawCrispness1(void)
 
     M_DrawCrispnessSeparator(crispness_sep_rendering, "Rendering");
     M_DrawCrispnessItem(crispness_hires, "High Resolution Rendering", crispy->hires, true);
-    M_DrawCrispnessMultiItem(crispness_widescreen, "Widescreen Aspect Ratio", multiitem_widescreen, crispy->widescreen, aspect_ratio_correct == 1);
+    M_DrawCrispnessMultiItem(crispness_widescreen, "Aspect Ratio", multiitem_widescreen, crispy->widescreen, aspect_ratio_correct == 1);
     M_DrawCrispnessItem(crispness_uncapped, "Uncapped Framerate", crispy->uncapped, true);
     M_DrawCrispnessNumericItem(crispness_fpslimit, "Framerate Limit", crispy->fpslimit, "None", crispy->uncapped, "35");
     M_DrawCrispnessItem(crispness_vsync, "Enable VSync", crispy->vsync, !force_software_renderer);

diff --git a/src/heretic/mn_menu.c b/src/heretic/mn_menu.c
@@ -2222,7 +2222,7 @@ boolean MN_Responder(event_t * event)
     if (!MenuActive)
     {
         // [crispy] don't pop up the menu on other keys during a demo
-        if (key == key_menu_activate) //|| gamestate == GS_DEMOSCREEN || demoplayback)
+        if (key == key_menu_activate || gamestate == GS_DEMOSCREEN || (demoplayback && !singledemo))
         {
             MN_ActivateMenu();
             return (true);

diff --git a/src/heretic/p_mobj.c b/src/heretic/p_mobj.c
@@ -1280,7 +1280,7 @@ void P_SpawnPuffSafe(fixed_t x, fixed_t y, fixed_t z, boolean safe)
     mobj_t *puff;
 
     z += safe ? (Crispy_SubRandom() << 10) : (P_SubRandom() << 10);
-    puff = P_SpawnMobj(x, y, z, PuffType);
+    puff = P_SpawnMobjSafe(x, y, z, PuffType, safe);
     if (puff->info->attacksound)
     {
         S_StartSound(puff, puff->info->attacksound);

diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c
@@ -2225,7 +2225,7 @@ boolean MN_Responder(event_t * event)
     if (!MenuActive)
     {
         // [crispy] don't pop up the menu on other keys during a demo
-        if (key == key_menu_activate) //|| gamestate == GS_DEMOSCREEN || demoplayback)
+        if (key == key_menu_activate || gamestate == GS_DEMOSCREEN || (demoplayback && !singledemo))
         {
             MN_ActivateMenu();
             return (true);