diff --git a/src/core/json.cpp b/src/core/json.cpp index 4918c2de4..d686a00d0 100644 --- a/src/core/json.cpp +++ b/src/core/json.cpp @@ -1513,9 +1513,6 @@ static JsonValue parse_string(const Token& token) hex[3] = *++itr; if (hex[0] == -1 || hex[1] == -1 || hex[2] == -1 || hex[3] == -1) throw JsonParseError("invalid unicode escape"); - char byte[2]; - byte[0] = (hexconv(hex[0]) << 4) | hexconv(hex[1]); - byte[1] = (hexconv(hex[2]) << 4) | hexconv(hex[3]); uint16_t utf16 = hexconv(hex[0]) << 12 | hexconv(hex[1]) << 8 | hexconv(hex[2]) << 4 | hexconv(hex[3]); bool valid_codepoint = false; uint32_t codepoint = 0; diff --git a/src/hwr2/upscale_backbuffer.cpp b/src/hwr2/upscale_backbuffer.cpp index 3a14c5254..4984198c3 100644 --- a/src/hwr2/upscale_backbuffer.cpp +++ b/src/hwr2/upscale_backbuffer.cpp @@ -53,10 +53,6 @@ void UpscaleBackbuffer::begin_pass(Rhi& rhi) color_tex.u_wrap = TextureWrapMode::kClamp; color_tex.v_wrap = TextureWrapMode::kClamp; color_ = rhi.create_texture(color_tex); - - RenderbufferDesc depth_tex {}; - depth_tex.width = vid_width; - depth_tex.height = vid_height; } RenderPassBeginInfo begin_info {}; diff --git a/src/k_hud.cpp b/src/k_hud.cpp index 59bfc3c8e..09149d92a 100644 --- a/src/k_hud.cpp +++ b/src/k_hud.cpp @@ -2026,13 +2026,11 @@ static void K_drawBackupItem(void) { bool tiny = r_splitscreen > 1; patch_t *localpatch[3] = { kp_nodraw, kp_nodraw, kp_nodraw }; - patch_t *localbg = (kp_itembg[2]); patch_t *localinv = kp_invincibility[((leveltime % (6*3)) / 3) + 7 + tiny]; INT32 fx = 0, fy = 0, fflags = 0, tx = 0, ty = 0; // final coords for hud and flags... const INT32 numberdisplaymin = 2; skincolornum_t localcolor[3] = { static_cast(stplyr->skincolor) }; SINT8 colormode[3] = { TC_RAINBOW }; - boolean flipamount = false; // Used for 3P/4P splitscreen to flip item amount stuff if (stplyr->backupitemamount <= 0) return; @@ -2041,20 +2039,12 @@ static void K_drawBackupItem(void) { case KITEM_INVINCIBILITY: localpatch[1] = localinv; - localbg = kp_itembg[2]; break; case KITEM_ORBINAUT: localpatch[1] = kp_orbinaut[tiny+4]; break; - case KITEM_SPB: - case KITEM_LIGHTNINGSHIELD: - case KITEM_BUBBLESHIELD: - case KITEM_FLAMESHIELD: - localbg = kp_itembg[2]; - /*FALLTHRU*/ - default: localpatch[1] = K_GetCachedItemPatch(stplyr->backupitemtype, 1 + tiny); @@ -2075,7 +2065,7 @@ static void K_drawBackupItem(void) fx = ITEM2_X; fy = ITEM2_Y; fflags = V_SNAPTORIGHT|V_SNAPTOTOP|V_SPLITSCREEN; - flipamount = true; + //flipamount = true; } if (r_splitscreen == 1)