renamed icons from 'detailed' to simple. removed unused h2mp_32x32x4.…

…png.

git-svn-id: file:///svn/uhexen2/code/trunk@5123 eaf649e6-6c13-0410-b194-84221022858e

engine/h2shared/resource.h

@@ -15,8 +15,8 @@
 //
 #if defined(H2W)
 #define RES_ICONFILE	"../../resource/hexenworld.ico"
-//#elif defined(H2MP)
-//#define RES_ICONFILE	"../resource/h2mp.ico"
+#elif defined(H2MP)
+#define RES_ICONFILE	"../resource/h2mp.ico"
 #else
 #define RES_ICONFILE	"../resource/hexen2.ico"
 #endif

engine/h2shared/xbm_icon.h

@@ -21,13 +21,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#if defined(H2W)	/* hexenworld */
-#include "../../resource/h2w_ico.xbm"
-
-#elif defined(H2MP)	/* hexen2 with mission pack */
-#include "../resource/h2mp_ico.xbm"
-
-#else			/* plain hexen2 */
-#include "../resource/h2_ico.xbm"
+#if defined(H2W)
+#include "../../resource/hexenworld.xbm"
+#elif defined(H2MP)
+#include "../resource/h2mp.xbm"
+#else
+#include "../resource/hexen2.xbm"
 #endif
 

rpm/hexen2.spec

@@ -240,7 +240,7 @@ utils/hcc/hcc -src gamecode-%{gamecode_ver}/hc/hw -oi -on
 
 # Install the menu icon
 %{__mkdir_p} %{buildroot}/%{_datadir}/pixmaps
-%{__install} -D -m644 engine/resource/h2_32x32x4.png %{buildroot}/%{_datadir}/pixmaps/hexen2.png
+%{__install} -D -m644 engine/resource/hexen2.png %{buildroot}/%{_datadir}/pixmaps/hexen2.png
 
 # Install menu entry
 %{__cat} > %{name}.desktop << EOF
@@ -348,7 +348,7 @@ desktop-file-install \
 %{_prefix}/games/%{name}/docs/README.hwmaster
 
 %changelog
-* Thu Feb 14 2013 O.Sezer <[email protected]> 1.5.6-1
+* Fri Feb 15 2013 O.Sezer <[email protected]> 1.5.6-1
 - Bump version to 1.5.6.
 
 * Tue Sep 11 2012 O.Sezer <[email protected]> 1.5.5-1