[CLIENT] Teeworlds Gamer (Page 10 of 38)

Index: datasrc/content.py
===================================================================
--- datasrc/content.py    (revision 2368)
+++ datasrc/content.py    (working copy)
@@ -225,6 +225,7 @@
 image_game = Image("game", "game.png")
 image_browseicons = Image("browseicons", "browse_icons.png")
 image_emoticons = Image("emoticons", "emoticons.png")
+image_muteicons = Image("muteicons", "mute.png")
 
 container.images.Add(image_null)
 container.images.Add(image_game)
@@ -235,6 +236,7 @@
 container.images.Add(image_browseicons)
 container.images.Add(Image("console_bg", "console.png"))
 container.images.Add(Image("console_bar", "console_bar.png"))
+container.images.Add(image_muteicons)
 
 container.pickups.Add(Pickup("health"))
 container.pickups.Add(Pickup("armor"))
@@ -243,12 +245,14 @@
 
 set_particles = SpriteSet("particles", image_particles, 8, 8)
 set_game = SpriteSet("game", image_game, 32, 16)
+set_muteicons = SpriteSet("muteicons", image_muteicons, 2, 1)
 set_tee = SpriteSet("tee", image_null, 8, 4)
 set_browseicons = SpriteSet("browseicons", image_browseicons, 4, 1)
 set_emoticons = SpriteSet("emoticons", image_emoticons, 4, 4)
 
 container.spritesets.Add(set_particles)
 container.spritesets.Add(set_game)
+container.spritesets.Add(set_muteicons)
 container.spritesets.Add(set_tee)
 container.spritesets.Add(set_browseicons)
 container.spritesets.Add(set_emoticons)
@@ -363,6 +367,9 @@
 container.sprites.Add(Sprite("browse_heart", set_browseicons, 1,0,1,1))
 container.sprites.Add(Sprite("browse_unpure", set_browseicons, 3,0,1,1))
 
+container.sprites.Add(Sprite("unmute", set_muteicons, 0,0,1,1))
+container.sprites.Add(Sprite("mute", set_muteicons, 1,0,1,1))
+
 anim = Animation("base")
 anim.body.frames.Add(AnimKeyframe(0, 0, -4, 0))
 anim.back_foot.frames.Add(AnimKeyframe(0, 0, 10, 0))
Index: src/game/client/components/menus_ingame.cpp
===================================================================
--- src/game/client/components/menus_ingame.cpp    (revision 2368)
+++ src/game/client/components/menus_ingame.cpp    (working copy)
@@ -321,6 +321,25 @@
         info.size = button.h;
         render_tee(ANIMSTATE::get_idle(), &info, EMOTE_NORMAL, vec2(1,0), vec2(button.x+button.h/2, button.y+button.h/2));
 
+        if(show_muted && gameclient.clients[i].muted)
+        {
+            // draw a "mute" icon
+            gfx_texture_set(data->images[IMAGE_MUTEICONS].id);
+            gfx_quads_begin();
+            select_sprite(SPRITE_MUTE);
+            gfx_quads_draw(button.x+button.h/2 + 10, button.y+button.h/2 + 3, 16,16);
+            gfx_quads_end();
+        }
+        else
+        {
+            // draw a "unmute" icon
+            gfx_texture_set(data->images[IMAGE_MUTEICONS].id);
+            gfx_quads_begin();
+            select_sprite(SPRITE_UNMUTE);
+            gfx_quads_draw(button.x+button.h/2 + 10, button.y+button.h/2 + 3, 16,16);
+            gfx_quads_end();
+        }
+
         button.x += button.h;
         ui_do_label(&button, gameclient.clients[i].name, 18.0f, -1);
     }
Index: src/game/client/components/scoreboard.cpp
===================================================================
--- src/game/client/components/scoreboard.cpp    (revision 2368)
+++ src/game/client/components/scoreboard.cpp    (working copy)
@@ -246,6 +246,16 @@
         teeinfo.size *= tee_sizemod;
         render_tee(ANIMSTATE::get_idle(), &teeinfo, EMOTE_NORMAL, vec2(1,0), vec2(x+90, y+28+tee_offset));
 
+        if(gameclient.clients[info->cid].muted)
+        {
+            // draw a "mute" icon
+            gfx_texture_set(data->images[IMAGE_MUTEICONS].id);
+            gfx_quads_begin();
+            select_sprite(SPRITE_MUTE);
+            gfx_quads_drawTL(x+100, y+28, 28, 28);
+            gfx_quads_end();
+        }
+
         
         y += line_height;
     }