[Scummvm-cvs-logs] SF.net SVN: scummvm:[55140] scummex/trunk

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Fri Jan 7 06:30:58 CET 2011


Revision: 55140
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55140&view=rev
Author:   Kirben
Date:     2011-01-07 05:30:57 +0000 (Fri, 07 Jan 2011)

Log Message:
-----------
Add patch #3138012 - ScummEX: Code cleanup.

Modified Paths:
--------------
    scummex/trunk/Makefile
    scummex/trunk/descumm.cpp
    scummex/trunk/file.h
    scummex/trunk/icons/cancel_icon.xpm
    scummex/trunk/icons/close_icon.xpm
    scummex/trunk/icons/exit_icon.xpm
    scummex/trunk/icons/file_icon.xpm
    scummex/trunk/icons/help_icon.xpm
    scummex/trunk/icons/hex_icon.xpm
    scummex/trunk/icons/open_icon.xpm
    scummex/trunk/icons/options_icon.xpm
    scummex/trunk/icons/save_icon.xpm
    scummex/trunk/icons/xpm_0.xpm
    scummex/trunk/icons/xpm_0_big.xpm
    scummex/trunk/icons/xpm_1.xpm
    scummex/trunk/icons/xpm_10.xpm
    scummex/trunk/icons/xpm_10_big.xpm
    scummex/trunk/icons/xpm_11.xpm
    scummex/trunk/icons/xpm_11_big.xpm
    scummex/trunk/icons/xpm_12.xpm
    scummex/trunk/icons/xpm_12_big.xpm
    scummex/trunk/icons/xpm_13.xpm
    scummex/trunk/icons/xpm_13_big.xpm
    scummex/trunk/icons/xpm_14.xpm
    scummex/trunk/icons/xpm_14_big.xpm
    scummex/trunk/icons/xpm_15.xpm
    scummex/trunk/icons/xpm_15_big.xpm
    scummex/trunk/icons/xpm_16.xpm
    scummex/trunk/icons/xpm_16_big.xpm
    scummex/trunk/icons/xpm_17.xpm
    scummex/trunk/icons/xpm_17_big.xpm
    scummex/trunk/icons/xpm_18.xpm
    scummex/trunk/icons/xpm_18_big.xpm
    scummex/trunk/icons/xpm_19.xpm
    scummex/trunk/icons/xpm_19_big.xpm
    scummex/trunk/icons/xpm_1_big.xpm
    scummex/trunk/icons/xpm_2.xpm
    scummex/trunk/icons/xpm_20.xpm
    scummex/trunk/icons/xpm_20_big.xpm
    scummex/trunk/icons/xpm_21.xpm
    scummex/trunk/icons/xpm_21_big.xpm
    scummex/trunk/icons/xpm_22.xpm
    scummex/trunk/icons/xpm_22_big.xpm
    scummex/trunk/icons/xpm_23.xpm
    scummex/trunk/icons/xpm_23_big.xpm
    scummex/trunk/icons/xpm_24.xpm
    scummex/trunk/icons/xpm_24_big.xpm
    scummex/trunk/icons/xpm_25.xpm
    scummex/trunk/icons/xpm_25_big.xpm
    scummex/trunk/icons/xpm_26.xpm
    scummex/trunk/icons/xpm_26_big.xpm
    scummex/trunk/icons/xpm_27.xpm
    scummex/trunk/icons/xpm_27_big.xpm
    scummex/trunk/icons/xpm_28.xpm
    scummex/trunk/icons/xpm_28_big.xpm
    scummex/trunk/icons/xpm_29.xpm
    scummex/trunk/icons/xpm_29_big.xpm
    scummex/trunk/icons/xpm_2_big.xpm
    scummex/trunk/icons/xpm_3.xpm
    scummex/trunk/icons/xpm_30.xpm
    scummex/trunk/icons/xpm_30_big.xpm
    scummex/trunk/icons/xpm_31.xpm
    scummex/trunk/icons/xpm_31_big.xpm
    scummex/trunk/icons/xpm_32.xpm
    scummex/trunk/icons/xpm_32_big.xpm
    scummex/trunk/icons/xpm_33.xpm
    scummex/trunk/icons/xpm_33_big.xpm
    scummex/trunk/icons/xpm_34.xpm
    scummex/trunk/icons/xpm_34_big.xpm
    scummex/trunk/icons/xpm_35.xpm
    scummex/trunk/icons/xpm_35_big.xpm
    scummex/trunk/icons/xpm_36.xpm
    scummex/trunk/icons/xpm_36_big.xpm
    scummex/trunk/icons/xpm_37.xpm
    scummex/trunk/icons/xpm_37_big.xpm
    scummex/trunk/icons/xpm_38.xpm
    scummex/trunk/icons/xpm_38_big.xpm
    scummex/trunk/icons/xpm_39.xpm
    scummex/trunk/icons/xpm_39_big.xpm
    scummex/trunk/icons/xpm_3_big.xpm
    scummex/trunk/icons/xpm_4.xpm
    scummex/trunk/icons/xpm_40.xpm
    scummex/trunk/icons/xpm_40_big.xpm
    scummex/trunk/icons/xpm_41.xpm
    scummex/trunk/icons/xpm_41_big.xpm
    scummex/trunk/icons/xpm_42.xpm
    scummex/trunk/icons/xpm_42_big.xpm
    scummex/trunk/icons/xpm_43.xpm
    scummex/trunk/icons/xpm_43_big.xpm
    scummex/trunk/icons/xpm_44.xpm
    scummex/trunk/icons/xpm_44_big.xpm
    scummex/trunk/icons/xpm_45.xpm
    scummex/trunk/icons/xpm_45_big.xpm
    scummex/trunk/icons/xpm_46.xpm
    scummex/trunk/icons/xpm_46_big.xpm
    scummex/trunk/icons/xpm_47.xpm
    scummex/trunk/icons/xpm_47_big.xpm
    scummex/trunk/icons/xpm_48.xpm
    scummex/trunk/icons/xpm_48_big.xpm
    scummex/trunk/icons/xpm_49.xpm
    scummex/trunk/icons/xpm_49_big.xpm
    scummex/trunk/icons/xpm_4_big.xpm
    scummex/trunk/icons/xpm_5.xpm
    scummex/trunk/icons/xpm_50.xpm
    scummex/trunk/icons/xpm_50_big.xpm
    scummex/trunk/icons/xpm_51.xpm
    scummex/trunk/icons/xpm_51_big.xpm
    scummex/trunk/icons/xpm_52.xpm
    scummex/trunk/icons/xpm_52_big.xpm
    scummex/trunk/icons/xpm_53.xpm
    scummex/trunk/icons/xpm_53_big.xpm
    scummex/trunk/icons/xpm_54.xpm
    scummex/trunk/icons/xpm_54_big.xpm
    scummex/trunk/icons/xpm_55.xpm
    scummex/trunk/icons/xpm_55_big.xpm
    scummex/trunk/icons/xpm_56.xpm
    scummex/trunk/icons/xpm_56_big.xpm
    scummex/trunk/icons/xpm_57.xpm
    scummex/trunk/icons/xpm_57_big.xpm
    scummex/trunk/icons/xpm_58.xpm
    scummex/trunk/icons/xpm_58_big.xpm
    scummex/trunk/icons/xpm_59.xpm
    scummex/trunk/icons/xpm_59_big.xpm
    scummex/trunk/icons/xpm_5_big.xpm
    scummex/trunk/icons/xpm_6.xpm
    scummex/trunk/icons/xpm_60.xpm
    scummex/trunk/icons/xpm_60_big.xpm
    scummex/trunk/icons/xpm_6_big.xpm
    scummex/trunk/icons/xpm_7.xpm
    scummex/trunk/icons/xpm_7_big.xpm
    scummex/trunk/icons/xpm_8.xpm
    scummex/trunk/icons/xpm_8_big.xpm
    scummex/trunk/icons/xpm_9.xpm
    scummex/trunk/icons/xpm_9_big.xpm
    scummex/trunk/image.rc
    scummex/trunk/resource.cpp
    scummex/trunk/wxwindows.cpp

Modified: scummex/trunk/Makefile
===================================================================
--- scummex/trunk/Makefile	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/Makefile	2011-01-07 05:30:57 UTC (rev 55140)
@@ -10,7 +10,7 @@
 CP      := cp
 
 BUILD_MAC  :=
-WX_VERSION := 2.5
+WX_VERSION := 2.8
 
 RESSW    := --define __WIN32__ --define __WIN95__ --define __GNUWIN32__
 REZ_CMD  := `wx-config --version=$(WX_VERSION) --rezflags`

Modified: scummex/trunk/descumm.cpp
===================================================================
--- scummex/trunk/descumm.cpp	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/descumm.cpp	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1242,7 +1242,7 @@
 					if (i == 255) {
 						i = get_byte();
 						buf = putascii(buf, i);
-						if (i == 0 || i != 2 && i != 3 && i != 8) {
+						if ( (i == 0) || (i != 2 && i != 3 && i != 8)) {
 							buf = putascii(buf, get_byte());
 							buf = putascii(buf, get_byte());
 						}
@@ -1647,7 +1647,7 @@
 	case 0xD9:
 	case 0xF9:{
 			buf = strecpy(buf, "doSentence(");
-			if (!(opcode & 0x80) && (*cur_pos == 0xFB) || *cur_pos == 0xFC) {
+			if ((!(opcode & 0x80) && (*cur_pos == 0xFB)) || *cur_pos == 0xFC) {
 				strcpy(buf, "STOP)");
 				cur_pos++;
 			} else {

Modified: scummex/trunk/file.h
===================================================================
--- scummex/trunk/file.h	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/file.h	2011-01-07 05:30:57 UTC (rev 55140)
@@ -66,7 +66,7 @@
 	void writeUint32LE(uint32 value);
 	void writeUint16BE(uint16 value);
 	void writeUint32BE(uint32 value);
-	byte File::getbit(byte s);
+	byte getbit(byte s);
 };
 
 #endif

Modified: scummex/trunk/icons/cancel_icon.xpm
===================================================================
--- scummex/trunk/icons/cancel_icon.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/cancel_icon.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *cancel_icon[] = {
+static const char *cancel_icon[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 111 2",
 "   c black",

Modified: scummex/trunk/icons/close_icon.xpm
===================================================================
--- scummex/trunk/icons/close_icon.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/close_icon.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *close_icon[] = {
+static const char *close_icon[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 61 1",
 "  c black",

Modified: scummex/trunk/icons/exit_icon.xpm
===================================================================
--- scummex/trunk/icons/exit_icon.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/exit_icon.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *exit_icon[] = {
+static const char *exit_icon[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 66 1",
 "  c black",

Modified: scummex/trunk/icons/file_icon.xpm
===================================================================
--- scummex/trunk/icons/file_icon.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/file_icon.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *file_icon[] = {
+static const char *file_icon[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 109 2",
 "   c #000000",

Modified: scummex/trunk/icons/help_icon.xpm
===================================================================
--- scummex/trunk/icons/help_icon.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/help_icon.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *help_icon[] = {
+static const char *help_icon[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 123 2",
 "   c black",

Modified: scummex/trunk/icons/hex_icon.xpm
===================================================================
--- scummex/trunk/icons/hex_icon.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/hex_icon.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *hex_icon[] = {
+static const char *hex_icon[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 65 1",
 "  c black",

Modified: scummex/trunk/icons/open_icon.xpm
===================================================================
--- scummex/trunk/icons/open_icon.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/open_icon.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *open_icon[] = {
+static const char *open_icon[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 64 1",
 "  c black",

Modified: scummex/trunk/icons/options_icon.xpm
===================================================================
--- scummex/trunk/icons/options_icon.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/options_icon.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *options_icon[] = {
+static const char *options_icon[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 47 1",
 "  c black",

Modified: scummex/trunk/icons/save_icon.xpm
===================================================================
--- scummex/trunk/icons/save_icon.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/save_icon.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *save_icon[] = {
+static const char *save_icon[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 83 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_0.xpm
===================================================================
--- scummex/trunk/icons/xpm_0.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_0.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_0[] = {
+static const char *xpm_0[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 3 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_0_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_0_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_0_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_0_big[] = {
+static const char *xpm_0_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 3 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_1.xpm
===================================================================
--- scummex/trunk/icons/xpm_1.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_1.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_1[] = {
+static const char *xpm_1[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 42 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_10.xpm
===================================================================
--- scummex/trunk/icons/xpm_10.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_10.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_10[] = {
+static const char *xpm_10[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 105 2",
 "   c #10184A",

Modified: scummex/trunk/icons/xpm_10_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_10_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_10_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_10_big[] = {
+static const char *xpm_10_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 185 2",
 "   c black",

Modified: scummex/trunk/icons/xpm_11.xpm
===================================================================
--- scummex/trunk/icons/xpm_11.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_11.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_11[] = {
+static const char *xpm_11[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 118 2",
 "   c #101042",

Modified: scummex/trunk/icons/xpm_11_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_11_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_11_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_11_big[] = {
+static const char *xpm_11_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 203 2",
 "   c #080000",

Modified: scummex/trunk/icons/xpm_12.xpm
===================================================================
--- scummex/trunk/icons/xpm_12.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_12.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_12[] = {
+static const char *xpm_12[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 98 2",
 "   c black",

Modified: scummex/trunk/icons/xpm_12_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_12_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_12_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_12_big[] = {
+static const char *xpm_12_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 166 2",
 "   c black",

Modified: scummex/trunk/icons/xpm_13.xpm
===================================================================
--- scummex/trunk/icons/xpm_13.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_13.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_13[] = {
+static const char *xpm_13[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 25 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_13_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_13_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_13_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_13_big[] = {
+static const char *xpm_13_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 34 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_14.xpm
===================================================================
--- scummex/trunk/icons/xpm_14.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_14.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_14[] = {
+static const char *xpm_14[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 59 1",
 "  c #291000",

Modified: scummex/trunk/icons/xpm_14_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_14_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_14_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_14_big[] = {
+static const char *xpm_14_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 211 2",
 "   c #291000",

Modified: scummex/trunk/icons/xpm_15.xpm
===================================================================
--- scummex/trunk/icons/xpm_15.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_15.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_15[] = {
+static const char *xpm_15[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 52 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_15_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_15_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_15_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_15_big[] = {
+static const char *xpm_15_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 50 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_16.xpm
===================================================================
--- scummex/trunk/icons/xpm_16.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_16.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_16[] = {
+static const char *xpm_16[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 26 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_16_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_16_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_16_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_16_big[] = {
+static const char *xpm_16_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 41 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_17.xpm
===================================================================
--- scummex/trunk/icons/xpm_17.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_17.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_17[] = {
+static const char *xpm_17[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 45 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_17_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_17_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_17_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_17_big[] = {
+static const char *xpm_17_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 74 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_18.xpm
===================================================================
--- scummex/trunk/icons/xpm_18.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_18.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_18[] = {
+static const char *xpm_18[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 53 1",
 "  c #291000",

Modified: scummex/trunk/icons/xpm_18_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_18_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_18_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_18_big[] = {
+static const char *xpm_18_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 138 2",
 "   c #291000",

Modified: scummex/trunk/icons/xpm_19.xpm
===================================================================
--- scummex/trunk/icons/xpm_19.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_19.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_19[] = {
+static const char *xpm_19[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 45 1",
 "  c #291000",

Modified: scummex/trunk/icons/xpm_19_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_19_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_19_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_19_big[] = {
+static const char *xpm_19_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 110 2",
 "   c #291000",

Modified: scummex/trunk/icons/xpm_1_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_1_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_1_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_1_big[] = {
+static const char *xpm_1_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 39 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_2.xpm
===================================================================
--- scummex/trunk/icons/xpm_2.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_2.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_2[] = {
+static const char *xpm_2[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 42 1",
 "  c #7B6B6B",

Modified: scummex/trunk/icons/xpm_20.xpm
===================================================================
--- scummex/trunk/icons/xpm_20.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_20.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_20[] = {
+static const char *xpm_20[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 47 1",
 "  c #291000",

Modified: scummex/trunk/icons/xpm_20_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_20_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_20_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_20_big[] = {
+static const char *xpm_20_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 98 2",
 "   c black",

Modified: scummex/trunk/icons/xpm_21.xpm
===================================================================
--- scummex/trunk/icons/xpm_21.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_21.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_21[] = {
+static const char *xpm_21[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 78 1",
 "  c #633129",

Modified: scummex/trunk/icons/xpm_21_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_21_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_21_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_21_big[] = {
+static const char *xpm_21_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 119 2",
 "   c #6B3121",

Modified: scummex/trunk/icons/xpm_22.xpm
===================================================================
--- scummex/trunk/icons/xpm_22.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_22.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_22[] = {
+static const char *xpm_22[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 80 1",
 "  c #633129",

Modified: scummex/trunk/icons/xpm_22_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_22_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_22_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_22_big[] = {
+static const char *xpm_22_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 119 2",
 "   c #6B3121",

Modified: scummex/trunk/icons/xpm_23.xpm
===================================================================
--- scummex/trunk/icons/xpm_23.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_23.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_23[] = {
+static const char *xpm_23[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 65 1",
 "  c #001800",

Modified: scummex/trunk/icons/xpm_23_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_23_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_23_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_23_big[] = {
+static const char *xpm_23_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 116 2",
 "   c #000800",

Modified: scummex/trunk/icons/xpm_24.xpm
===================================================================
--- scummex/trunk/icons/xpm_24.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_24.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_24[] = {
+static const char *xpm_24[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 23 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_24_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_24_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_24_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_24_big[] = {
+static const char *xpm_24_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 25 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_25.xpm
===================================================================
--- scummex/trunk/icons/xpm_25.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_25.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_25[] = {
+static const char *xpm_25[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 32 1",
 "  c #3139BD",

Modified: scummex/trunk/icons/xpm_25_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_25_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_25_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_25_big[] = {
+static const char *xpm_25_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 33 1",
 "  c #2929CE",

Modified: scummex/trunk/icons/xpm_26.xpm
===================================================================
--- scummex/trunk/icons/xpm_26.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_26.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_26[] = {
+static const char *xpm_26[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 50 1",
 "  c #00187B",

Modified: scummex/trunk/icons/xpm_26_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_26_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_26_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_26_big[] = {
+static const char *xpm_26_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 55 1",
 "  c #002973",

Modified: scummex/trunk/icons/xpm_27.xpm
===================================================================
--- scummex/trunk/icons/xpm_27.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_27.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_27[] = {
+static const char *xpm_27[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 32 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_27_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_27_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_27_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_27_big[] = {
+static const char *xpm_27_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 34 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_28.xpm
===================================================================
--- scummex/trunk/icons/xpm_28.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_28.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_28[] = {
+static const char *xpm_28[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 64 1",
 "  c #4A424A",

Modified: scummex/trunk/icons/xpm_28_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_28_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_28_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_28_big[] = {
+static const char *xpm_28_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 9 1",
 "  c #100010",

Modified: scummex/trunk/icons/xpm_29.xpm
===================================================================
--- scummex/trunk/icons/xpm_29.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_29.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_29[] = {
+static const char *xpm_29[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 102 2",
 "   c #296B4A",

Modified: scummex/trunk/icons/xpm_29_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_29_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_29_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_29_big[] = {
+static const char *xpm_29_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 256 2",
 "   c #391010",

Modified: scummex/trunk/icons/xpm_2_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_2_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_2_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_2_big[] = {
+static const char *xpm_2_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 11 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_3.xpm
===================================================================
--- scummex/trunk/icons/xpm_3.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_3.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_3[] = {
+static const char *xpm_3[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 156 2",
 "   c #310000",

Modified: scummex/trunk/icons/xpm_30.xpm
===================================================================
--- scummex/trunk/icons/xpm_30.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_30.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_30[] = {
+static const char *xpm_30[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 132 2",
 "   c #393100",

Modified: scummex/trunk/icons/xpm_30_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_30_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_30_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_30_big[] = {
+static const char *xpm_30_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 257 2",
 "   c #313100",

Modified: scummex/trunk/icons/xpm_31.xpm
===================================================================
--- scummex/trunk/icons/xpm_31.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_31.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_31[] = {
+static const char *xpm_31[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 22 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_31_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_31_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_31_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_31_big[] = {
+static const char *xpm_31_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 41 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_32.xpm
===================================================================
--- scummex/trunk/icons/xpm_32.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_32.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_32[] = {
+static const char *xpm_32[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 17 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_32_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_32_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_32_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_32_big[] = {
+static const char *xpm_32_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 23 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_33.xpm
===================================================================
--- scummex/trunk/icons/xpm_33.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_33.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_33[] = {
+static const char *xpm_33[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 87 1",
 "  c #003918",

Modified: scummex/trunk/icons/xpm_33_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_33_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_33_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_33_big[] = {
+static const char *xpm_33_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 138 2",
 "   c black",

Modified: scummex/trunk/icons/xpm_34.xpm
===================================================================
--- scummex/trunk/icons/xpm_34.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_34.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_34[] = {
+static const char *xpm_34[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 58 1",
 "  c #003131",

Modified: scummex/trunk/icons/xpm_34_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_34_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_34_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_34_big[] = {
+static const char *xpm_34_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 150 2",
 "   c #102118",

Modified: scummex/trunk/icons/xpm_35.xpm
===================================================================
--- scummex/trunk/icons/xpm_35.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_35.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_35[] = {
+static const char *xpm_35[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 76 1",
 "  c #00107B",

Modified: scummex/trunk/icons/xpm_35_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_35_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_35_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_35_big[] = {
+static const char *xpm_35_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 129 2",
 "   c #00187B",

Modified: scummex/trunk/icons/xpm_36.xpm
===================================================================
--- scummex/trunk/icons/xpm_36.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_36.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_36[] = {
+static const char *xpm_36[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 39 1",
 "  c #00187B",

Modified: scummex/trunk/icons/xpm_36_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_36_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_36_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_36_big[] = {
+static const char *xpm_36_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 37 1",
 "  c #002973",

Modified: scummex/trunk/icons/xpm_37.xpm
===================================================================
--- scummex/trunk/icons/xpm_37.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_37.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_37[] = {
+static const char *xpm_37[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 65 1",
 "  c #7B4A39",

Modified: scummex/trunk/icons/xpm_37_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_37_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_37_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_37_big[] = {
+static const char *xpm_37_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 111 2",
 "   c #633939",

Modified: scummex/trunk/icons/xpm_38.xpm
===================================================================
--- scummex/trunk/icons/xpm_38.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_38.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_38[] = {
+static const char *xpm_38[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 70 1",
 "  c #633129",

Modified: scummex/trunk/icons/xpm_38_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_38_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_38_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_38_big[] = {
+static const char *xpm_38_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 112 2",
 "   c #6B3121",

Modified: scummex/trunk/icons/xpm_39.xpm
===================================================================
--- scummex/trunk/icons/xpm_39.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_39.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_39[] = {
+static const char *xpm_39[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 37 1",
 "  c #101018",

Modified: scummex/trunk/icons/xpm_39_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_39_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_39_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_39_big[] = {
+static const char *xpm_39_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 71 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_3_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_3_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_3_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_3_big[] = {
+static const char *xpm_3_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 257 2",
 "   c #310000",

Modified: scummex/trunk/icons/xpm_4.xpm
===================================================================
--- scummex/trunk/icons/xpm_4.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_4.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_4[] = {
+static const char *xpm_4[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 24 1",
 "  c #181821",

Modified: scummex/trunk/icons/xpm_40.xpm
===================================================================
--- scummex/trunk/icons/xpm_40.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_40.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_40[] = {
+static const char *xpm_40[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 90 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_40_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_40_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_40_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_40_big[] = {
+static const char *xpm_40_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 257 2",
 "   c black",

Modified: scummex/trunk/icons/xpm_41.xpm
===================================================================
--- scummex/trunk/icons/xpm_41.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_41.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_41[] = {
+static const char *xpm_41[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 43 1",
 "  c #392118",

Modified: scummex/trunk/icons/xpm_41_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_41_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_41_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_41_big[] = {
+static const char *xpm_41_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 78 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_42.xpm
===================================================================
--- scummex/trunk/icons/xpm_42.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_42.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_42[] = {
+static const char *xpm_42[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 53 1",
 "  c #002973",

Modified: scummex/trunk/icons/xpm_42_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_42_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_42_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_42_big[] = {
+static const char *xpm_42_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 58 1",
 "  c #002173",

Modified: scummex/trunk/icons/xpm_43.xpm
===================================================================
--- scummex/trunk/icons/xpm_43.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_43.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_43[] = {
+static const char *xpm_43[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 42 1",
 "  c #6B0000",

Modified: scummex/trunk/icons/xpm_43_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_43_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_43_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_43_big[] = {
+static const char *xpm_43_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 72 1",
 "  c #6B0000",

Modified: scummex/trunk/icons/xpm_44.xpm
===================================================================
--- scummex/trunk/icons/xpm_44.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_44.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_44[] = {
+static const char *xpm_44[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 16 1",
 "  c #211000",

Modified: scummex/trunk/icons/xpm_44_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_44_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_44_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_44_big[] = {
+static const char *xpm_44_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 25 1",
 "  c #211000",

Modified: scummex/trunk/icons/xpm_45.xpm
===================================================================
--- scummex/trunk/icons/xpm_45.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_45.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_45[] = {
+static const char *xpm_45[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 8 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_45_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_45_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_45_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_45_big[] = {
+static const char *xpm_45_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 33 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_46.xpm
===================================================================
--- scummex/trunk/icons/xpm_46.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_46.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_46[] = {
+static const char *xpm_46[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 3 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_46_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_46_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_46_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_46_big[] = {
+static const char *xpm_46_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 3 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_47.xpm
===================================================================
--- scummex/trunk/icons/xpm_47.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_47.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_47[] = {
+static const char *xpm_47[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 11 1",
 "  c #8C0000",

Modified: scummex/trunk/icons/xpm_47_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_47_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_47_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_47_big[] = {
+static const char *xpm_47_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 11 1",
 "  c #8C0000",

Modified: scummex/trunk/icons/xpm_48.xpm
===================================================================
--- scummex/trunk/icons/xpm_48.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_48.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_48[] = {
+static const char *xpm_48[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 43 1",
 "  c #8C3910",

Modified: scummex/trunk/icons/xpm_48_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_48_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_48_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_48_big[] = {
+static const char *xpm_48_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 55 1",
 "  c #8C3910",

Modified: scummex/trunk/icons/xpm_49.xpm
===================================================================
--- scummex/trunk/icons/xpm_49.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_49.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_49[] = {
+static const char *xpm_49[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 16 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_49_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_49_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_49_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_49_big[] = {
+static const char *xpm_49_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 21 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_4_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_4_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_4_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_4_big[] = {
+static const char *xpm_4_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 20 1",
 "  c gray45",

Modified: scummex/trunk/icons/xpm_5.xpm
===================================================================
--- scummex/trunk/icons/xpm_5.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_5.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_5[] = {
+static const char *xpm_5[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 62 1",
 "  c #73737B",

Modified: scummex/trunk/icons/xpm_50.xpm
===================================================================
--- scummex/trunk/icons/xpm_50.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_50.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_50[] = {
+static const char *xpm_50[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 85 1",
 "  c #187308",

Modified: scummex/trunk/icons/xpm_50_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_50_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_50_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_50_big[] = {
+static const char *xpm_50_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 156 2",
 "   c #087300",

Modified: scummex/trunk/icons/xpm_51.xpm
===================================================================
--- scummex/trunk/icons/xpm_51.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_51.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_51[] = {
+static const char *xpm_51[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 55 1",
 "  c #21737B",

Modified: scummex/trunk/icons/xpm_51_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_51_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_51_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_51_big[] = {
+static const char *xpm_51_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 31 1",
 "  c #085A5A",

Modified: scummex/trunk/icons/xpm_52.xpm
===================================================================
--- scummex/trunk/icons/xpm_52.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_52.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_52[] = {
+static const char *xpm_52[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 48 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_52_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_52_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_52_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_52_big[] = {
+static const char *xpm_52_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 64 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_53.xpm
===================================================================
--- scummex/trunk/icons/xpm_53.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_53.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_53[] = {
+static const char *xpm_53[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 68 1",
 "  c #101010",

Modified: scummex/trunk/icons/xpm_53_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_53_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_53_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_53_big[] = {
+static const char *xpm_53_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 141 2",
 "   c black",

Modified: scummex/trunk/icons/xpm_54.xpm
===================================================================
--- scummex/trunk/icons/xpm_54.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_54.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_54[] = {
+static const char *xpm_54[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 75 1",
 "  c #101010",

Modified: scummex/trunk/icons/xpm_54_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_54_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_54_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_54_big[] = {
+static const char *xpm_54_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 150 2",
 "   c black",

Modified: scummex/trunk/icons/xpm_55.xpm
===================================================================
--- scummex/trunk/icons/xpm_55.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_55.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_55[] = {
+static const char *xpm_55[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 45 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_55_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_55_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_55_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_55_big[] = {
+static const char *xpm_55_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 63 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_56.xpm
===================================================================
--- scummex/trunk/icons/xpm_56.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_56.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_56[] = {
+static const char *xpm_56[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 67 1",
 "  c gray3",

Modified: scummex/trunk/icons/xpm_56_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_56_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_56_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_56_big[] = {
+static const char *xpm_56_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 144 2",
 "   c black",

Modified: scummex/trunk/icons/xpm_57.xpm
===================================================================
--- scummex/trunk/icons/xpm_57.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_57.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_57[] = {
+static const char *xpm_57[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 58 1",
 "  c #292900",

Modified: scummex/trunk/icons/xpm_57_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_57_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_57_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_57_big[] = {
+static const char *xpm_57_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 99 2",
 "   c black",

Modified: scummex/trunk/icons/xpm_58.xpm
===================================================================
--- scummex/trunk/icons/xpm_58.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_58.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_58[] = {
+static const char *xpm_58[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 55 1",
 "  c #292900",

Modified: scummex/trunk/icons/xpm_58_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_58_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_58_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_58_big[] = {
+static const char *xpm_58_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 38 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_59.xpm
===================================================================
--- scummex/trunk/icons/xpm_59.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_59.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_59[] = {
+static const char *xpm_59[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 33 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_59_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_59_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_59_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_59_big[] = {
+static const char *xpm_59_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 58 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_5_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_5_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_5_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_5_big[] = {
+static const char *xpm_5_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 89 1",
 "  c gray29",

Modified: scummex/trunk/icons/xpm_6.xpm
===================================================================
--- scummex/trunk/icons/xpm_6.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_6.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_6[] = {
+static const char *xpm_6[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 77 1",
 "  c #181010",

Modified: scummex/trunk/icons/xpm_60.xpm
===================================================================
--- scummex/trunk/icons/xpm_60.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_60.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_60[] = {
+static const char *xpm_60[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 21 1",
 "  c gray3",

Modified: scummex/trunk/icons/xpm_60_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_60_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_60_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_60_big[] = {
+static const char *xpm_60_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 22 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_6_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_6_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_6_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_6_big[] = {
+static const char *xpm_6_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 218 2",
 "   c #181010",

Modified: scummex/trunk/icons/xpm_7.xpm
===================================================================
--- scummex/trunk/icons/xpm_7.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_7.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_7[] = {
+static const char *xpm_7[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 65 1",
 "  c #392118",

Modified: scummex/trunk/icons/xpm_7_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_7_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_7_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_7_big[] = {
+static const char *xpm_7_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 120 2",
 "   c black",

Modified: scummex/trunk/icons/xpm_8.xpm
===================================================================
--- scummex/trunk/icons/xpm_8.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_8.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_8[] = {
+static const char *xpm_8[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 14 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_8_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_8_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_8_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_8_big[] = {
+static const char *xpm_8_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 14 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_9.xpm
===================================================================
--- scummex/trunk/icons/xpm_9.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_9.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_9[] = {
+static const char *xpm_9[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 25 1",
 "  c black",

Modified: scummex/trunk/icons/xpm_9_big.xpm
===================================================================
--- scummex/trunk/icons/xpm_9_big.xpm	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/icons/xpm_9_big.xpm	2011-01-07 05:30:57 UTC (rev 55140)
@@ -1,5 +1,5 @@
 /* XPM */
-static char *xpm_9_big[] = {
+static const char *xpm_9_big[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 88 1",
 "  c #291000",

Modified: scummex/trunk/resource.cpp
===================================================================
--- scummex/trunk/resource.cpp	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/resource.cpp	2011-01-07 05:30:57 UTC (rev 55140)
@@ -192,7 +192,7 @@
 	{"SMRK", "SMUSH Audio Marker", 0, "", 24},
 	{"SHDR", "SMUSH Audio Header/SMUSH v2 Header", 0, "", 24},
 	{"ETRS", "SMUSH External Text Resource", 0, "", 24},
-	{0, 0, 0, 0, 0}
+	{"0", "0", 0, "0", 0}
 };
 
 const struct blockInfo oldBlocksInfo[] = {
@@ -226,7 +226,7 @@
 	{"RN", "Room Names", 0, "", 47},
 	{"WA", "", 0, "", 31},
 	{"AD", "", 0, "", 31},
-	{0, 0, 0, 0, 0}
+	{"0", "0", 0, "0", 0}
 };
 
 
@@ -747,7 +747,7 @@
 						_blockTable[i].blockTypeID = getBlockType(tempname);
 					}
 				}
-				if (_blockTable[i].blockType == "") {
+				if (strcmp(_blockTable[i].blockType, "")) {
 					sprintf(_blockTable[i].blockType, "Unknown");
 				}
 			}

Modified: scummex/trunk/wxwindows.cpp
===================================================================
--- scummex/trunk/wxwindows.cpp	2011-01-07 00:19:54 UTC (rev 55139)
+++ scummex/trunk/wxwindows.cpp	2011-01-07 05:30:57 UTC (rev 55140)
@@ -160,7 +160,7 @@
 void ImageScrolledWindow::OnPaint(wxPaintEvent &event) {
 	wxPaintDC dc(this);
 	PrepareDC(dc);
-	dc.DrawBitmap(wxBitmap(_imageWindow->_image), 0, 0);
+	dc.DrawBitmap(wxBitmap(* _imageWindow->_image), 0, 0);
 }
 
 BEGIN_EVENT_TABLE(ImageWindow, wxFrame)
@@ -245,7 +245,7 @@
 
 void ImageWindow::DrawImage() {
 	wxClientDC dc(this);
-	dc.DrawBitmap(wxBitmap(_image), 0, 0);
+	dc.DrawBitmap(wxBitmap(* _image), 0, 0);
 	Show(TRUE);
 	Refresh();
 }
@@ -791,10 +791,9 @@
 	BlocksSizer->Add(InfosSizer, 1, wxALL|wxEXPAND,	5);
 
 	notebook = new wxNotebook(panel, -1, wxPoint(-1, -1), wxSize(-1, -1), 0, wxT("notebook"));
+
+	InfosSizer->Add(notebook, 1,	wxALL|wxEXPAND,	0);
 	
-	wxNotebookSizer *nbs = new wxNotebookSizer( notebook );
-	InfosSizer->Add(nbs, 1,	wxALL|wxEXPAND,	0);
-	
 	//
 	// Explorer panel
 	//	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list