Heretic: small tweaks

JNechaevsky · Jun 8, 2023 · c38d01f · c38d01f
1 parent 74a8ebc
commit c38d01f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/heretic/r_bsp.c b/src/heretic/r_bsp.c
@@ -456,7 +456,6 @@ void R_Subsector(int num)
         I_Error("R_Subsector: ss %i with numss = %i", num, numsubsectors);
 #endif
 
-    sscount++;
     sub = &subsectors[num];
     frontsector = sub->sector;
     count = sub->numlines;

diff --git a/src/heretic/r_local.h b/src/heretic/r_local.h
@@ -311,7 +311,6 @@ extern fixed_t projection;
 
 extern int validcount;
 
-extern int sscount, linecount, loopcount;
 extern lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
 extern lighttable_t *scalelightfixed[MAXLIGHTSCALE];
 extern lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];

diff --git a/src/heretic/r_main.c b/src/heretic/r_main.c
@@ -44,8 +44,6 @@ fixed_t projection;
 
 int framecount;                 // just for profiling purposes
 
-int sscount, linecount, loopcount;
-
 fixed_t viewx, viewy, viewz;
 angle_t viewangle;
 fixed_t viewcos, viewsin;
@@ -840,7 +838,6 @@ void R_SetupFrame(player_t * player)
     }
     viewsin = finesine[tableAngle];
     viewcos = finecosine[tableAngle];
-    sscount = 0;
     if (player->fixedcolormap)
     {
         fixedcolormap = colormaps + player->fixedcolormap

diff --git a/src/heretic/sb_bar.c b/src/heretic/sb_bar.c
@@ -841,6 +841,7 @@ void SB_PaletteFlash(void)
 void DrawCommonBar(void)
 {
     int chainY;
+    int chainYY;
     int healthPos;
 
     V_DrawPatch(0, 148, PatchLTFCTOP, "LTFCTOP");
@@ -861,9 +862,12 @@ void DrawCommonBar(void)
         healthPos = (healthPos * 256) / 100;
         chainY =
             (HealthMarker == CPlayer->mo->health) ? 191 : 191 + ChainWiggle;
+        // [JN] TODO - something wrong with chain wiggling.
+        chainYY = 
+            (HealthMarker == CPlayer->mo->health) ? chainY : 191;
         V_DrawPatch(0, 190, PatchCHAINBACK, "CHAINBACK");
-        V_DrawPatch(2 + (healthPos % 17), chainY, PatchCHAIN, "CHAIN");
-        V_DrawPatch(17 + healthPos, chainY, PatchLIFEGEM, "LIFEGEM2");
+        V_DrawPatch(2 + (healthPos % 17), chainYY, PatchCHAIN, "CHAIN");
+        V_DrawPatch(17 + healthPos, chainYY, PatchLIFEGEM, "LIFEGEM2");
         V_DrawPatch(0, 190, PatchLTFACE, "LTFACE");
         V_DrawPatch(276, 190, PatchRTFACE, "RTFACE");
         ShadeChain();