diff --git a/src/k_kart.c b/src/k_kart.c index b80293ff4..1390f361d 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -8256,6 +8256,25 @@ void K_getMinimapDrawinfo(drawinfo_t *out) out->flags = fflags; } +INT32 K_getMinimapTrans(void) +{ + INT32 minimaptrans = cv_kartminimap.value; + + if (!minimaptrans) + return 0; + + if (forceshowhud) + return (10-minimaptrans)<width)/2); y = info.y - (SHORT(minimapinfo.minimap_pic->height)/2); splitflags = info.flags; - if (forceshowhud) - minimaptrans = cv_kartminimap.value; - else if (timeinmap > 105) - { - minimaptrans = cv_kartminimap.value; - if (timeinmap <= 113) - minimaptrans = ((((INT32)timeinmap) - 105)*minimaptrans)/(113-105); - if (!minimaptrans) - return; - } - else - return; - - minimaptrans = ((10-minimaptrans)< 1) // 3P : bottom right - { - MM_X = (3*BASEVIDWIDTH/4) + cv_mini_xoffset.value; - MM_Y = (3*BASEVIDHEIGHT/4) + cv_mini_yoffset.value; - - if (splitscreen > 2) // 4P: centered - { - MM_X = (BASEVIDWIDTH/2) + cv_mini_xoffset.value; - MM_Y = (BASEVIDHEIGHT/2) + cv_mini_yoffset.value; - } - } - } - - // splitscreen flags - splitflags = (splitscreen == 3 ? 0 : V_SNAPTORIGHT); // flags should only be 0 when it's centered (4p split) - - // translucency: - if (timeinmap > 105) - { - minimaptrans = cv_kartminimap.value; - if (timeinmap <= 113) - minimaptrans = ((((INT32)timeinmap) - 105)*minimaptrans)/(113-105); - if (!minimaptrans) - return 0; - } - else - return 0; - - minimaptrans = ((10-minimaptrans)<width)/2); - mm_y = MM_Y - (SHORT(AutomapPic->height)/2); + mm_x = info.x - (SHORT(AutomapPic->width)/2); + mm_y = info.y - (SHORT(AutomapPic->height)/2); // let offsets transfer to the heads, too! if (encoremode) @@ -696,13 +669,12 @@ static int libd_drawOnMinimap(lua_State *L) mm_y -= SHORT(AutomapPic->topoffset); - // scale patch coords - patchw = (SHORT(patch->width) * scale / 2); - patchh = (SHORT(patch->height) * scale / 2); - - if (centered) + // patch is supposedly already centered, don't butt in. + if (!centered) { - patchw = patchh = 0; // patch is supposedly already centered, don't butt in. + // scale patch coords + patchw = (SHORT(patch->width) * scale / 2); + patchh = (SHORT(patch->height) * scale / 2); } amnumxpos = (FixedMul(x, minimapinfo.zoom) - minimapinfo.offs_x); @@ -716,11 +688,6 @@ static int libd_drawOnMinimap(lua_State *L) amxpos = amnumxpos + ((mm_x + SHORT(AutomapPic->width) / 2)<height) / 2)<