Merge branch 'terencehill/itemstime_checkmark2' into 'master'

Itemstime: draw a checkmark for available items

Itemstime: draw a checkmark instead of centering the item icon when an item is a vailable again (only when the client has the checkmark image)

See merge request !213

diff --combined qcsrc/common/mutators/mutator/itemstime.qc
index d7ca5a3351585f82148d90d6457d184ff13f3b8c,8ad72079a382c69ab5ba75e22ce3331cfcaab628..4d859b1fcab1438db82826be497093395af67a11
--- 1/qcsrc/common/mutators/mutator/itemstime.qc
--- 2/qcsrc/common/mutators/mutator/itemstime.qc
+++ b/qcsrc/common/mutators/mutator/itemstime.qc
@@@ -149,28 -149,24 +149,28 @@@ float Item_ItemsTime_UpdateTime(entity 
      return t;
  }
  
 -MUTATOR_HOOKFUNCTION(itemstime, reset_map_global) {
 +MUTATOR_HOOKFUNCTION(itemstime, reset_map_global)
 +{SELFPARAM();
      Item_ItemsTime_ResetTimes();
      // ALL the times need to be reset before .reset()ing each item
      // since Item_Reset schedules respawn of superweapons and powerups
 -    for (self = world; (self = nextent(self)); )
 -    if (IS_NOT_A_CLIENT(self))
 +    for (entity e = NULL; (e = nextent(e)); )
 +    if (IS_NOT_A_CLIENT(e))
      {
 +        setself(e);
          if (self.reset)
              Item_ItemsTime_SetTime(self, 0);
      }
      Item_ItemsTime_SetTimesForAllPlayers();
  }
  
 -MUTATOR_HOOKFUNCTION(itemstime, MakePlayerObserver) {
 +MUTATOR_HOOKFUNCTION(itemstime, MakePlayerObserver)
 +{SELFPARAM();
      Item_ItemsTime_SetTimesForPlayer(self);
  }
  
 -MUTATOR_HOOKFUNCTION(itemstime, PlayerSpawn) {
 +MUTATOR_HOOKFUNCTION(itemstime, PlayerSpawn)
 +{SELFPARAM();
      if (warmup_stage) return;
      Item_ItemsTime_ResetTimesForPlayer(self);
  }
@@@ -232,10 -228,15 +232,15 @@@ void DrawItemsTimeItem(vector myPos, ve
          HUD_Panel_DrawProgressBar(p_pos, p_size, autocvar_hud_panel_itemstime_progressbar_name, t/autocvar_hud_panel_itemstime_progressbar_maxtime, 0, autocvar_hud_panel_itemstime_iconalign, color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
      }
  
-     if (t > 0 && autocvar_hud_panel_itemstime_text)
-         drawstring_aspect(numpos, ftos(t), eX * ((ar - 1)/ar) * mySize_x + eY * mySize_y, color, panel_fg_alpha, DRAWFLAG_NORMAL);
-     else
-         picpos.x = myPos.x + mySize.x / 2 - mySize.y / 2;
+     if(autocvar_hud_panel_itemstime_text)
+     {
+         if(t > 0)
+             drawstring_aspect(numpos, ftos(t), eX * ((ar - 1)/ar) * mySize_x + eY * mySize_y, color, panel_fg_alpha, DRAWFLAG_NORMAL);
+         else if(precache_pic("gfx/hud/default/checkmark")) // COMPAT: check if this image exists, as 0.8.1 clients lack it
+             drawpic_aspect_skin(numpos, "checkmark", eX * (ar - 1) * mySize_y + eY * mySize_y, '1 1 1', panel_fg_alpha * picalpha, DRAWFLAG_NORMAL);
+         else // legacy code, if the image is missing just center the icon
+             picpos.x = myPos.x + mySize.x / 2 - mySize.y / 2;
+     }
      if (item_availableTime)
          drawpic_aspect_skin_expanding(picpos, item.m_icon, '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha * picalpha, DRAWFLAG_NORMAL, item_availableTime);
      drawpic_aspect_skin(picpos, item.m_icon, '1 1 0' * mySize_y, '1 1 1', panel_fg_alpha * picalpha, DRAWFLAG_NORMAL);