Merge addendum

MrAlaux · May 1, 2024 · b6042c9 · b6042c9
1 parent 41d8445
commit b6042c9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/autoload/all-all/woofhud.lmp b/autoload/all-all/woofhud.lmp
@@ -2,6 +2,7 @@ hud 0
 rate topleft
 monsec topleft
 sttime topleft
+powers topright
 coord topright
 fps topright
 
@@ -14,6 +15,7 @@ weapon bottomleft
 keys bottomleft
 monsec bottomleft
 sttime bottomleft
+powers topright
 coord topright
 fps topright
 
@@ -26,5 +28,6 @@ weapon bottomright
 keys bottomleft
 monsec bottomleft
 sttime bottomleft
+powers topright
 coord  topright
 fps topright
diff --git a/docs/nughud.lmp b/docs/nughud.lmp
@@ -206,7 +206,7 @@ nughud_message_align -1
 
 ; Secret Message/Milestone Completion display
 nughud_secret_x     160
-nughud_secret_y     84
+nughud_secret_y     42
 nughud_secret_wide  0
 nughud_secret_align 0
 

diff --git a/src/m_nughud.c b/src/m_nughud.c
@@ -108,7 +108,7 @@ default_t nughud_defaults[] = {
   {          "nughud_message_y",     (config_t *)&nughud.message.y,     NULL, {  0 }, {  0, 200 }, number },
   {          "nughud_message_wide",  (config_t *)&nughud.message.wide,  NULL, { -1 }, { -2, 2 },   number },
   {          "nughud_message_align", (config_t *)&nughud.message.align, NULL, { -1 }, { -1, 1 },   number },
-  TEXTLINE(  "nughud_secret",      nughud.secret,       160,          84,            0,  0     ),
+  TEXTLINE(  "nughud_secret",      nughud.secret, 160, (SCREENHEIGHT - ST_HEIGHT) / 4, 0, 0    ),
   PATCH(     "nughud_patch1",      0                                                           ),
   PATCH(     "nughud_patch2",      1                                                           ),
   PATCH(     "nughud_patch3",      2                                                           ),

diff --git a/src/mn_menu.h b/src/mn_menu.h
@@ -94,6 +94,8 @@ void MN_DrawString(int cx, int cy, int color, const char *ch);
 
 void M_StartSound(int sound_id);
 
+void M_StartSoundOptional(const int opt_sound_id, const int sound_id); // [Nugget]
+
 #endif
 
 //----------------------------------------------------------------------------

diff --git a/src/s_sound.h b/src/s_sound.h
@@ -93,7 +93,10 @@ extern int idmusnum;
 // [Nugget] ------------------------------------------------------------------
 
 // [NS] Try to play an optional sound.
-void S_StartSoundOptional(const struct mobj_s *const origin, const int sfx_id, const int old_sfx_id);
+#define S_StartSoundOptional(o, p, i) S_StartSoundPitchOptional((o), (p), (i), PITCH_FULL)
+void S_StartSoundPitchOptional(const struct mobj_s *const origin,
+                               const int opt_sound_id, const int sound_id,
+                               const pitchrange_t pitch_range);
 
 void S_PlayerPainSound(const struct mobj_s *const origin);