added new friend/mute buttons by Crises and reworked the player options like Landil suggested. Closes #579

1 files changed, 10 insertions, 5 deletions

diff --git a/datasrc/content.py b/datasrc/content.py
index 712bba70..31f5092f 100644
--- a/datasrc/content.py
+++ b/datasrc/content.py
@@ -229,6 +229,7 @@ image_emoticons = Image("emoticons", "emoticons.png")
 image_demobuttons = Image("demobuttons", "demo_buttons.png")
 image_fileicons = Image("fileicons", "file_icons.png")
 image_guibuttons = Image("guibuttons", "gui_buttons.png")
+image_guiicons = Image("guiicons", "gui_icons.png")
 
 container.images.Add(image_null)
 container.images.Add(image_game)
@@ -242,6 +243,7 @@ container.images.Add(Image("console_bar", "console_bar.png"))
 container.images.Add(image_demobuttons)
 container.images.Add(image_fileicons)
 container.images.Add(image_guibuttons)
+container.images.Add(image_guiicons)
 
 container.pickups.Add(Pickup("health"))
 container.pickups.Add(Pickup("armor"))
@@ -255,7 +257,8 @@ set_browseicons = SpriteSet("browseicons", image_browseicons, 4, 1)
 set_emoticons = SpriteSet("emoticons", image_emoticons, 4, 4)
 set_demobuttons = SpriteSet("demobuttons", image_demobuttons, 5, 1)
 set_fileicons = SpriteSet("fileicons", image_fileicons, 8, 1)
-set_guibuttons = SpriteSet("guibuttons", image_guibuttons, 16, 2)
+set_guibuttons = SpriteSet("guibuttons", image_guibuttons, 6, 2)
+set_guiicons = SpriteSet("guiicons", image_guiicons, 8, 2)
 
 container.spritesets.Add(set_particles)
 container.spritesets.Add(set_game)
@@ -265,6 +268,7 @@ container.spritesets.Add(set_emoticons)
 container.spritesets.Add(set_demobuttons)
 container.spritesets.Add(set_fileicons)
 container.spritesets.Add(set_guibuttons)
+container.spritesets.Add(set_guiicons)
 
 container.sprites.Add(Sprite("part_slice", set_particles, 0,0,1,1))
 container.sprites.Add(Sprite("part_ball", set_particles, 1,0,1,1))
@@ -387,11 +391,12 @@ container.sprites.Add(Sprite("file_folder", set_fileicons, 2,0,1,1))
 container.sprites.Add(Sprite("file_map1", set_fileicons, 5,0,1,1))
 container.sprites.Add(Sprite("file_map2", set_fileicons, 6,0,1,1))
 
-container.sprites.Add(Sprite("guibutton_chatoff", set_guibuttons, 0,0,4,2))
-container.sprites.Add(Sprite("guibutton_chaton", set_guibuttons, 4,0,4,2))
-container.sprites.Add(Sprite("guibutton_friendadd", set_guibuttons, 8,0,4,2))
-container.sprites.Add(Sprite("guibutton_friendrem", set_guibuttons, 12,0,4,2))
+container.sprites.Add(Sprite("guibutton_off", set_guibuttons, 0,0,2,2))
+container.sprites.Add(Sprite("guibutton_on", set_guibuttons, 2,0,2,2))
+container.sprites.Add(Sprite("guibutton_hover", set_guibuttons, 4,0,2,2))
 
+container.sprites.Add(Sprite("guiicon_mute", set_guiicons, 0,0,4,2))
+container.sprites.Add(Sprite("guiicon_friend", set_guiicons, 4,0,4,2))
 
 anim = Animation("base")
 anim.body.frames.Add(AnimKeyframe(0, 0, -4, 0))