Merge branch 'master' into stripped

Conflicts:
	src/guichan/gui.cpp
	src/guichan/include/guichan/sdl/sdlpixel.hpp

12 files changed, 172 insertions, 36 deletions

diff --git a/data/evol/evol.desktop b/data/evol/evol.desktop
new file mode 100644
index 000000000..7ccfc4001
--- /dev/null
+++ b/data/evol/evol.desktop
@@ -0,0 +1,47 @@
+
+[Desktop Entry]
+Version=1.0
+Name=EvolOnline
+Comment=A 2D MMORPG client
+Exec=manaplus /usr/share/games/manaplus/data/evol/evol.manaplus
+StartupNotify=false
+Terminal=false
+Type=Application
+Icon=evol-client
+Categories=Game;AdventureGame;
+
+
+# Translations
+Comment[vls]=Nen 2D MMORPG client
+Name[vls]=ManaPlus
+Icon[vls]=manaplus
+Comment[ru]=Клиент к 2D MMORPG игре
+Name[ru]=ManaPlus
+Icon[ru]=manaplus
+Comment[it]=Un gioco fantasy online
+Name[it]=ManaPlus
+Icon[it]=manaplus
+Comment[ja]=2DのMMORPGクライアント
+Name[ja]=ManaPlus
+Icon[ja]=manaplus
+Comment[cs]=2D MMORPG klient
+Name[cs]=ManaPlus
+Icon[cs]=manaplus
+Comment[nl_BE]=Een 2D MMORPG client
+Name[nl_BE]=ManaPlus
+Icon[nl_BE]=manaplus
+Comment[de]=ein 2D MMORG Client
+Name[de]=ManaPlus
+Icon[de]=manaplus
+Comment[sv_SE]=Ett fantasyrollspel online
+Name[sv_SE]=ManaPlus
+Icon[sv_SE]=manaplus
+Comment[es]=Un cliente MMORPG 2D
+Name[es]=ManaPlus
+Icon[es]=manaplus
+Comment[fr]=Un jeu en ligne dans un univers fantastique
+Name[fr]=ManaPlus
+Icon[fr]=manaplus
+Comment[nl]=Een online role playing game
+Name[nl]=ManaPlus
+Icon[nl]=manaplus
diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus
new file mode 100644
index 000000000..63a963495
--- /dev/null
+++ b/data/evol/evol.manaplus
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<configuration>
+ <option name="appName" value="Evol Online"/>
+ <option name="appShort" value="mana"/>
+ <option name="appIcon" value="evol/icons/evol-client"/>
+ <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/>
+ <option name="onlineServerList" value="http://www.evolonline.org/serverlist.xml"/>
+ <option name="defaultServer" value="world.evolonline.org"/>
+ <option name="defaultPort" value="6901"/>
+ <option name="defaultServerType" value="evol"/>
+ <option name="font" value="fonts/dejavusans.ttf" />
+ <option name="boldFont" value="fonts/dejavusans-bold.ttf" />
+ <option name="theme" value="wood" />
+ <option name="wallpapersPath" value="evol/images/" />
+ <option name="wallpaperFile" value="loginwallpaper_800x600.png" />
+</configuration>
diff --git a/data/evol/icons/evol-client.ico b/data/evol/icons/evol-client.ico
new file mode 100644
index 000000000..17309a1ba
--- /dev/null
+++ b/data/evol/icons/evol-client.ico
diff --git a/data/evol/icons/evol-client.png b/data/evol/icons/evol-client.png
new file mode 100644
index 000000000..2fb9eaab0
--- /dev/null
+++ b/data/evol/icons/evol-client.png
diff --git a/data/evol/icons/evol-client.xpm b/data/evol/icons/evol-client.xpm
new file mode 100644
index 000000000..7fb1f2cda
--- /dev/null
+++ b/data/evol/icons/evol-client.xpm
@@ -0,0 +1,45 @@
+/* XPM */
+static char * manaplus_xpm[] = {
+"32 32 10 1",
+" 	c None",
+".	c #663300",
+"X	c #673200",
+"o	c #663400",
+"O	c #653400",
+"+	c #653200",
+"@	c #653300",
+"#	c #673300",
+"$	c #663200",
+"%	c #673400",
+"         ..       .             ",
+"           ..    X     .        ",
+"       .X   ..   o   O.         ",
+"        +@o  .o O# o.           ",
+"          Xo. $.@ .  o%.        ",
+"             $.#$.#$+           ",
+"          .   $$$##             ",
+"           ....$@+   %.         ",
+"             ....o#$X           ",
+"              .$o..             ",
+"              .@@.              ",
+"              Oo#.              ",
+"               o                ",
+"              #@ .              ",
+"              O...              ",
+"               $.o              ",
+"              #.$.              ",
+"               ..%              ",
+"              #$@.              ",
+"              ....              ",
+"       # O%.@..$.#.o    .       ",
+"       +# oO X+$..@ .#$$        ",
+"          %  +...o #   %        ",
+"         O   %o..$oO O.%        ",
+"        o   #O$@ X#  +          ",
+"           #  $    $  %         ",
+"         O.  . $    #@          ",
+"         o           XO         ",
+"        .  X          $X        ",
+"        #   +         +         ",
+"        .   @         .         ",
+"         .$#        $@          "};
diff --git a/data/evol/images/loginwallpaper_800x600.png b/data/evol/images/loginwallpaper_800x600.png
new file mode 100644
index 000000000..a1fe4f83b
--- /dev/null
+++ b/data/evol/images/loginwallpaper_800x600.png
diff --git a/data/graphics/sprites/manaplus_emote.xml b/data/graphics/sprites/manaplus_emote.xml
index 8f27c4f83..1ec57dff2 100644
--- a/data/graphics/sprites/manaplus_emote.xml
+++ b/data/graphics/sprites/manaplus_emote.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<sprite variants="25" variant_offset="1">
+<!-- Author : Reid, 4144
+Copyright (C) 2011-2012  Manaplus -->
+<sprite variants="28" variant_offset="1">
     <imageset name="base" src="graphics/sprites/manaplus_emotions.png" width="30" height="32" />
 
     <action name="stand" imageset="base">
diff --git a/data/graphics/sprites/manaplus_emotes.xml b/data/graphics/sprites/manaplus_emotes.xml
index 38628dc30..240b2d4b8 100644
--- a/data/graphics/sprites/manaplus_emotes.xml
+++ b/data/graphics/sprites/manaplus_emotes.xml
@@ -1,4 +1,9 @@
 <emotes>
+    <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+        <its:translateRule selector="//emote/sprite/@name" translate="yes"/>
+        <its:translateRule selector="//*" translate="no"/>
+    </its:rules>
+
     <emote id="100"><sprite name="Kitty" variant="0">manaplus_emote.xml</sprite></emote>
     <emote id="101"><sprite name="xD" variant="1">manaplus_emote.xml</sprite></emote>
     <emote id="102"><sprite name="^.^" variant="2">manaplus_emote.xml</sprite></emote>
@@ -24,4 +29,7 @@
     <emote id="122"><sprite name="Bad geek" variant="22">manaplus_emote.xml</sprite></emote>
     <emote id="123"><sprite name="Mimi" variant="23">manaplus_emote.xml</sprite></emote>
     <emote id="124"><sprite name="Alien" variant="24">manaplus_emote.xml</sprite></emote>
+    <emote id="125"><sprite name="Troll" variant="25">manaplus_emote.xml</sprite></emote>
+    <emote id="126"><sprite name="Metal" variant="26">manaplus_emote.xml</sprite></emote>
+    <emote id="127"><sprite name="Crying" variant="27">manaplus_emote.xml</sprite></emote>
 </emotes>
diff --git a/data/graphics/sprites/manaplus_emotions.png b/data/graphics/sprites/manaplus_emotions.png
index c6f49ff29..1b2815b87 100644
--- a/data/graphics/sprites/manaplus_emotions.png
+++ b/data/graphics/sprites/manaplus_emotions.png
diff --git a/data/icons/manaplus.xpm b/data/icons/manaplus.xpm
index 33de9197a..df48f3ad3 100644
--- a/data/icons/manaplus.xpm
+++ b/data/icons/manaplus.xpm
@@ -3,39 +3,39 @@ static char * manaplus_xpm[] = {
 "32 32 6 1",
 " 	c None",
 ".	c #FF6600",
-"+	c #FF6500",
-"@	c #FF6400",
-"#	c #FF6700",
-"$	c #FF6300",
-"              .+.++..           ",
-"           ..+...@  .+.#        ",
-"         ++..@              @   ",
-"        ..+.               +@   ",
-"      +.+.              $  ++   ",
-"     ..+.               @@$@+$$ ",
-"    ....                  $++++@",
-"   +..+                    @@   ",
-"   ..+                    +@    ",
-"  +..        ...     ...        ",
-"  ..+   ...+.+.....+....++      ",
-" ...   #....  ....+.  .....     ",
-" ...   ....+   .....   ....     ",
-"@..+   +...    ....    ...+     ",
-"+..    ....    ....    ....     ",
+"X	c #FF6500",
+"o	c #FF6400",
+"O	c #FF6700",
+"+	c #FF6300",
+"              .X.XX..           ",
+"           ..X...o  .X.O        ",
+"         XX..o               .  ",
+"        ..X.                o   ",
+"      X.X.              +  XX   ",
+"     ..X.                o+oX+  ",
+"    ....                  +XXXX ",
+"   X..X                    oo  .",
+"   ..X                     o    ",
+"  X..        ...     ...  .     ",
+"  ..X   ...X.X.....X....XX      ",
+" ...   O....  ....X.  .....     ",
+" ...   ....X   .....   ....     ",
+"o..X   X...    ....    ...X     ",
+"X..    ....    ....    ....     ",
 "...    ....    ....    ....     ",
-"...    ....    ....    ...+     ",
-"...    ....    ....    ...+     ",
-"...   +...+   .....    ...+     ",
-"...   +...    +...    +...      ",
-" ..   ....    ....    +..+      ",
-" ..   ...+    ....    ....+++.+.",
-" +.   ...     ...     ..+..    +",
-"  .+                     +     .",
-"  +.                    ..    .+",
-"   +.                  ..    ++ ",
-"    ..                 +.+  ++  ",
-"     ++               +...+..   ",
-"      .+             +.....+    ",
-"        ++         ....+..      ",
-"          +++.#.++.+.+..        ",
-"             ..+..+..           "};
+"...    ....    ....    ...X     ",
+"...    ....    ....    ...X     ",
+"...   X...X   .....    ...X     ",
+"...   X...    X...    X...      ",
+" ..   ....    ....    X..X      ",
+" ..   ...X    ....    ....XXX.X.",
+" X.   ...     ...     ..X..    X",
+"  .X                     X     .",
+"  X.                    ..    .X",
+"   X.                  ..    XX ",
+"    ..                 X.X  XX  ",
+"     XX               X...X..   ",
+"      .X             X.....X    ",
+"        XX         ....X..      ",
+"          XXX.O.XX.X.X..        ",
+"             ..X..X..           "};
diff --git a/data/tmw/images/loginwallpaper_800x600.png b/data/tmw/images/loginwallpaper_800x600.png
new file mode 100644
index 000000000..e3a6e492d
--- /dev/null
+++ b/data/tmw/images/loginwallpaper_800x600.png
diff --git a/data/tmw/tmw.manaplus b/data/tmw/tmw.manaplus
new file mode 100644
index 000000000..47688e1d0
--- /dev/null
+++ b/data/tmw/tmw.manaplus
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<configuration>
+ <option name="appName" value="The Mana World"/>
+ <option name="appShort" value="mana"/>
+ <option name="appIcon" value="icons/manaplus.png"/>
+ <option name="loginMusic" value="Magick - Real.ogg"/>
+ <option name="onlineServerList" value="http://manasource.org/serverlist.xml"/>
+ <option name="defaultServer" value="server.themanaworld.org"/>
+ <option name="defaultPort" value="6901"/>
+ <option name="defaultServerType" value="evol"/>
+ <option name="font" value="fonts/dejavusans.ttf" />
+ <option name="boldFont" value="fonts/dejavusans-bold.ttf" />
+ <option name="theme" value="wood" />
+ <option name="wallpapersPath" value="tmw/images/" />
+ <option name="wallpaperFile" value="loginwallpaper_800x600.png" />
+</configuration>