Minor bits

JonnyPtn · Oct 18, 2024 · e70f842 · e70f842
1 parent 99a3468
commit e70f842
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/linuxdoom-1.10/r_bsp.cpp b/linuxdoom-1.10/r_bsp.cpp
@@ -425,10 +425,8 @@ void R_Subsector(int num) {
   seg_t *line;
   subsector_t *sub;
 
-#ifdef RANGECHECK
-  if (num >= numsubsectors)
-    I_Error("R_Subsector: ss {} with numss = {}", num, numsubsectors);
-#endif
+  if (num >= subsectors.size())
+    I_Error("R_Subsector: ss {} with numss = {}", num, subsectors.size());
 
   sscount++;
   sub = &subsectors[num];

diff --git a/linuxdoom-1.10/r_things.cpp b/linuxdoom-1.10/r_things.cpp
@@ -43,8 +43,8 @@ import wad;
 import doomstat;
 import tables;
 
-#define MINZ (FRACUNIT * 4)
-#define BASEYCENTER 100
+constexpr auto MINZ = (FRACUNIT * 4);
+constexpr auto BASEYCENTER = 100;
 
 // void R_DrawColumn (void);
 // void R_DrawFuzzColumn (void);

diff --git a/src/status_bar.ixx b/src/status_bar.ixx
@@ -119,7 +119,7 @@ typedef struct {
 } st_percent_t;
 
 // Multiple Icon widget
-typedef struct {
+struct st_multicon_t{
   // center-justified location of icons
   int x;
   int y;
@@ -140,7 +140,7 @@ typedef struct {
   // user data
   int data;
 
-} st_multicon_t;
+};
 
 // Binary Icon widget
 
@@ -1156,17 +1156,13 @@ void STlib_updateBinIcon(st_binicon_t *bi, bool refresh) {
 }
 
 void STlib_updateMultIcon(st_multicon_t *mi, bool refresh) {
-  int w;
-  int h;
-  int x;
-  int y;
 
   if (*mi->on && (mi->oldinum != *mi->inum || refresh) && (*mi->inum != -1)) {
     if (mi->oldinum != -1) {
-      x = mi->x - SHORT(mi->p[mi->oldinum]->leftoffset);
-      y = mi->y - SHORT(mi->p[mi->oldinum]->topoffset);
-      w = SHORT(mi->p[mi->oldinum]->width);
-      h = SHORT(mi->p[mi->oldinum]->height);
+      auto x = mi->x - SHORT(mi->p[mi->oldinum]->leftoffset);
+      auto y = mi->y - SHORT(mi->p[mi->oldinum]->topoffset);
+      auto w = SHORT(mi->p[mi->oldinum]->width);
+      auto h = SHORT(mi->p[mi->oldinum]->height);
 
       if (y - ST_Y < 0)
         I_Error("updateMultIcon: y - ST_Y < 0");