Added some more const keywords

svn-id: r24330

7 files changed, 118 insertions, 118 deletions

diff --git a/engines/agi/patches.cpp b/engines/agi/patches.cpp
index a666c84686..b41dc24b0d 100644
--- a/engines/agi/patches.cpp
+++ b/engines/agi/patches.cpp
@@ -39,14 +39,14 @@ namespace Agi {
  * Patches
  */
 
-static uint8 kq4data_find[] = {
+static const uint8 kq4data_find[] = {
 	0x0C, 0x04, 0xFF, 0x07, 0x05, 0xFF, 0x15, 0x00,
 	0x03, 0x0A, 0x00, 0x77, 0x83, 0x71, 0x0D, 0x97,
 	0x03, 0x98, 0xCE, 0x18, 0x98, 0x19, 0x98, 0x1B,
 	0x98, 0x0C, 0x5A, 0x1A, 0x00
 };
 
-static uint8 kq4data_fix[] = {
+static const uint8 kq4data_fix[] = {
 	/* v19 = 0
 	 * new.room(96)
 	 * return
@@ -54,14 +54,14 @@ static uint8 kq4data_fix[] = {
 	0x03, 0x13, 0x0, 0x12, 0x60, 0x00
 };
 
-static uint8 grdata_find[] = {
+static const uint8 grdata_find[] = {
 	0x0C, 0x04, 0xFF, 0x07, 0x05, 0xFF, 0x16, 0x00,
 	0x0C, 0x96, 0x03, 0x0A, 0x00, 0x77, 0x83, 0x71,
 	0x0D, 0xD9, 0x03, 0xDC, 0xBF, 0x18, 0xDC, 0x19,
 	0xDC, 0x1B, 0xDC, 0x0C, 0x95, 0x1A
 };
 
-static uint8 grdata_fix[] = {
+static const uint8 grdata_fix[] = {
 	/* reset(227)
 	 * v19 = 0
 	 * v246 = 1
@@ -73,14 +73,14 @@ static uint8 grdata_fix[] = {
 };
 
 #if 0
-static uint8 lsl1data_find[] = {
+static const uint8 lsl1data_find[] = {
 	0xFF, 0xFD, 0x07, 0x1E, 0xFC, 0x07, 0x6D, 0x01,
 	0x5F, 0x03, 0xFC, 0xFF, 0x12, 0x00, 0x0C, 0x6D,
 	0x78, 0x8A, 0x77, 0x69, 0x16, 0x18, 0x00, 0x0D,
 	0x30, 0x0D, 0x55, 0x78, 0x65, 0x0A
 };
 
-static uint8 lsl1data_fix[] = {
+static const uint8 lsl1data_fix[] = {
 	/* set(109)
 	 * reset(48)
 	 * reset(85)
@@ -92,7 +92,7 @@ static uint8 lsl1data_fix[] = {
 };
 #endif
 
-static uint8 mh1data_find[] = {
+static const uint8 mh1data_find[] = {
 	0xFF, 0x07, 0x05, 0xFF, 0xE6, 0x00,
 	0x03, 0x0A, 0x02, 0x77, 0x83, 0x71,
 	0x6F, 0x01, 0x17, 0x00, 0x03, 0x00,
@@ -100,7 +100,7 @@ static uint8 mh1data_find[] = {
 	0x03, 0x03, 0x3B, 0x00, 0x6C, 0x03
 };
 
-static uint8 mh1data_fix[] = {
+static const uint8 mh1data_fix[] = {
 	0x0C, 0x05, 0x16, 0x5A, 0x12, 0x99
 };
 
diff --git a/engines/agi/picture.cpp b/engines/agi/picture.cpp
index 900bf10a91..00bde8ac87 100644
--- a/engines/agi/picture.cpp
+++ b/engines/agi/picture.cpp
@@ -43,7 +43,7 @@ static uint8 scr_on;
 static uint8 scr_colour;
 static uint8 pri_colour;
 
-static uint8 circles[][15] = {	/* agi circle bitmaps */
+static const uint8 circles[][15] = {	/* agi circle bitmaps */
 	{0x80},
 	{0xfc},
 	{0x5f, 0xf4},
@@ -54,14 +54,14 @@ static uint8 circles[][15] = {	/* agi circle bitmaps */
 	{0x18, 0x3c, 0x7e, 0x7e, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x7e, 0x7e, 0x3c, 0x18}
 };
 
-static uint8 splatter_map[32] = {	/* splatter brush bitmaps */
+static const uint8 splatter_map[32] = {	/* splatter brush bitmaps */
 	0x20, 0x94, 0x02, 0x24, 0x90, 0x82, 0xa4, 0xa2,
 	0x82, 0x09, 0x0a, 0x22, 0x12, 0x10, 0x42, 0x14,
 	0x91, 0x4a, 0x91, 0x11, 0x08, 0x12, 0x25, 0x10,
 	0x22, 0xa8, 0x14, 0x24, 0x00, 0x50, 0x24, 0x04
 };
 
-static uint8 splatter_start[128] = {	/* starting bit position */
+static const uint8 splatter_start[128] = {	/* starting bit position */
 	0x00, 0x18, 0x30, 0xc4, 0xdc, 0x65, 0xeb, 0x48,
 	0x60, 0xbd, 0x89, 0x05, 0x0a, 0xf4, 0x7d, 0x7d,
 	0x85, 0xb0, 0x8e, 0x95, 0x1f, 0x22, 0x0d, 0xdf,
diff --git a/engines/kyra/kyra.h b/engines/kyra/kyra.h
index 7e55108ba7..2e7a8c656e 100644
--- a/engines/kyra/kyra.h
+++ b/engines/kyra/kyra.h
@@ -602,7 +602,7 @@ protected:
 	void updateKyragemFading();
 	
 	void setupOpcodeTable();
-	OpcodeProc *_opcodeTable;
+	const OpcodeProc *_opcodeTable;
 	int _opcodeTableSize;
 	
 	void waitForEvent();
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index bd24a9bb40..ad9c32fcc6 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -94,7 +94,7 @@ struct LanguageTypes {
 	const char *ext;
 };
 
-static LanguageTypes languages[] = {
+static const LanguageTypes languages[] = {
 	{ GF_ENGLISH, "ENG" },	// this is the default language
 	{ GF_FRENCH, "FRE" },
 	{ GF_GERMAN, "GER" },
@@ -858,7 +858,7 @@ const int Screen::_screenDimTableCountK3 = ARRAYSIZE(_screenDimTableK3);
 
 #define Opcode(x) &KyraEngine::x
 void KyraEngine::setupOpcodeTable() {
-	static OpcodeProc opcodeTable[] = {
+	static const OpcodeProc opcodeTable[] = {
 		// 0x00
 		Opcode(o1_magicInMouseItem),
 		Opcode(o1_characterSays),
diff --git a/engines/scumm/charset.h b/engines/scumm/charset.h
index 25fc1c7788..54091eeee7 100644
--- a/engines/scumm/charset.h
+++ b/engines/scumm/charset.h
@@ -99,7 +99,7 @@ public:
 
 class CharsetRendererCommon : public CharsetRenderer {
 protected:
-	byte *_fontPtr;
+	const byte *_fontPtr;
 	int _bitDepth;
 	int _fontHeight;
 	int _numChars;
@@ -155,7 +155,7 @@ public:
 
 class CharsetRendererV3 : public CharsetRendererCommon {
 protected:
-	byte *_widthTable;
+	const byte *_widthTable;
 
 public:
 	CharsetRendererV3(ScummEngine *vm) : CharsetRendererCommon(vm) {}
diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp
index d13f901511..b2263482dd 100644
--- a/engines/sky/sound.cpp
+++ b/engines/sky/sound.cpp
@@ -65,7 +65,7 @@ uint16 Sound::_speechConvertTable[8] = {
 };
 
 
-static Sfx fx_null = {
+static const Sfx fx_null = {
 	0,
 	0,
 	{
@@ -74,7 +74,7 @@ static Sfx fx_null = {
 	}
 };
 
-static Sfx fx_level_3_ping = {
+static const Sfx fx_level_3_ping = {
 	1,
 	0,
 	{
@@ -85,7 +85,7 @@ static Sfx fx_level_3_ping = {
 	}
 };
 
-static Sfx fx_factory_sound = {
+static const Sfx fx_factory_sound = {
 	1,
 	SFXF_SAVE,
 	{
@@ -93,7 +93,7 @@ static Sfx fx_factory_sound = {
 	}
 };
 
-static Sfx fx_crowbar_plaster = {
+static const Sfx fx_crowbar_plaster = {
 	1,
 	0,
 	{
@@ -101,7 +101,7 @@ static Sfx fx_crowbar_plaster = {
 	}
 };
 
-static Sfx fx_masonry_fall = {
+static const Sfx fx_masonry_fall = {
 	1,
 	0,
 	{
@@ -109,7 +109,7 @@ static Sfx fx_masonry_fall = {
 	}
 };
 
-static Sfx fx_prise_brick = {
+static const Sfx fx_prise_brick = {
 	2,
 	0,
 	{
@@ -117,7 +117,7 @@ static Sfx fx_prise_brick = {
 	}
 };
 
-static Sfx fx_rope_creak = {
+static const Sfx fx_rope_creak = {
 	2,
 	0,
 	{
@@ -125,7 +125,7 @@ static Sfx fx_rope_creak = {
 	}
 };
 
-static Sfx fx_ping = {
+static const Sfx fx_ping = {
 	3,
 	0,
 	{
@@ -133,7 +133,7 @@ static Sfx fx_ping = {
 	}
 };
 
-static Sfx fx_force_fire_door = {
+static const Sfx fx_force_fire_door = {
 	3,
 	0,
 	{
@@ -141,7 +141,7 @@ static Sfx fx_force_fire_door = {
 	}
 };
 
-static Sfx fx_brick_hit_foster = {
+static const Sfx fx_brick_hit_foster = {
 	3,
 	10+SFXF_START_DELAY,
 	{
@@ -149,7 +149,7 @@ static Sfx fx_brick_hit_foster = {
 	}
 };
 
-static Sfx fx_brick_hit_plank = {
+static const Sfx fx_brick_hit_plank = {
 	3,
 	8+SFXF_START_DELAY,
 	{
@@ -157,7 +157,7 @@ static Sfx fx_brick_hit_plank = {
 	}
 };
 
-static Sfx fx_rm3_lift_moving = {
+static const Sfx fx_rm3_lift_moving = {
 	4,
 	SFXF_SAVE,
 	{
@@ -167,7 +167,7 @@ static Sfx fx_rm3_lift_moving = {
 	}
 };
 
-static Sfx fx_weld = {
+static const Sfx fx_weld = {
 	4,
 	0,
 	{
@@ -180,7 +180,7 @@ static Sfx fx_weld = {
 	}
 };
 
-static Sfx fx_weld12 = {
+static const Sfx fx_weld12 = {
 	4,
 	0,
 	{
@@ -189,7 +189,7 @@ static Sfx fx_weld12 = {
 	}
 };
 
-static Sfx fx_spray_on_skin = {
+static const Sfx fx_spray_on_skin = {
 	4,
 	0,
 	{
@@ -197,7 +197,7 @@ static Sfx fx_spray_on_skin = {
 	}
 };
 
-static Sfx fx_plank_vibrating = {
+static const Sfx fx_plank_vibrating = {
 	4,
 	6+SFXF_START_DELAY,
 	{
@@ -205,7 +205,7 @@ static Sfx fx_plank_vibrating = {
 	}
 };
 
-static Sfx fx_press_bang = {
+static const Sfx fx_press_bang = {
 	5,
 	0,
 	{
@@ -214,7 +214,7 @@ static Sfx fx_press_bang = {
 	}
 };
 
-static Sfx fx_spanner_clunk = {
+static const Sfx fx_spanner_clunk = {
 	5,
 	0,
 	{
@@ -222,7 +222,7 @@ static Sfx fx_spanner_clunk = {
 	}
 };
 
-static Sfx fx_break_crystals = {
+static const Sfx fx_break_crystals = {
 	5,
 	0,
 	{
@@ -231,7 +231,7 @@ static Sfx fx_break_crystals = {
 	}
 };
 
-static Sfx fx_press_hiss = {
+static const Sfx fx_press_hiss = {
 	6,
 	0,
 	{
@@ -240,7 +240,7 @@ static Sfx fx_press_hiss = {
 	}
 };
 
-static Sfx fx_open_door = {
+static const Sfx fx_open_door = {
 	6,
 	0,
 	{
@@ -248,7 +248,7 @@ static Sfx fx_open_door = {
 	}
 };
 
-static Sfx fx_open_lamb_door = {
+static const Sfx fx_open_lamb_door = {
 	6,
 	0,
 	{
@@ -258,7 +258,7 @@ static Sfx fx_open_lamb_door = {
 	}
 };
 
-static Sfx fx_splash = {
+static const Sfx fx_splash = {
 	6,
 	22+SFXF_START_DELAY,
 	{
@@ -266,7 +266,7 @@ static Sfx fx_splash = {
 	}
 };
 
-static Sfx fx_disintegrate = {
+static const Sfx fx_disintegrate = {
 	7,
 	0,
 	{
@@ -274,7 +274,7 @@ static Sfx fx_disintegrate = {
 	}
 };
 
-static Sfx fx_buzzer = {
+static const Sfx fx_buzzer = {
 	7,
 	4+SFXF_START_DELAY,
 	{
@@ -282,7 +282,7 @@ static Sfx fx_buzzer = {
 	}
 };
 
-static Sfx fx_lathe = {
+static const Sfx fx_lathe = {
 	7,
 	SFXF_SAVE,
 	{
@@ -292,7 +292,7 @@ static Sfx fx_lathe = {
 	}
 };
 
-static Sfx fx_hit_crowbar_brick = {
+static const Sfx fx_hit_crowbar_brick = {
 	7,
 	9+SFXF_START_DELAY,
 	{
@@ -300,7 +300,7 @@ static Sfx fx_hit_crowbar_brick = {
 	}
 };
 
-static Sfx fx_hello_helga = {
+static const Sfx fx_hello_helga = {
 	8,
 	0,
 	{
@@ -308,7 +308,7 @@ static Sfx fx_hello_helga = {
 	}
 };
 
-static Sfx fx_statue_on_armour = {
+static const Sfx fx_statue_on_armour = {
 	8,
 	0,
 	{
@@ -316,7 +316,7 @@ static Sfx fx_statue_on_armour = {
 	}
 };
 
-static Sfx fx_lift_alarm = {
+static const Sfx fx_lift_alarm = {
 	8,
 	SFXF_SAVE,
 	{
@@ -325,7 +325,7 @@ static Sfx fx_lift_alarm = {
 	}
 };
 
-static Sfx fx_drop_crowbar = {
+static const Sfx fx_drop_crowbar = {
 	8,
 	5+SFXF_START_DELAY,
 	{
@@ -333,7 +333,7 @@ static Sfx fx_drop_crowbar = {
 	}
 };
 
-static Sfx fx_byee_helga = {
+static const Sfx fx_byee_helga = {
 	9,
 	3+SFXF_START_DELAY,
 	{
@@ -341,7 +341,7 @@ static Sfx fx_byee_helga = {
 	}
 };
 
-static Sfx fx_shed_door_creak = {
+static const Sfx fx_shed_door_creak = {
 	10,
 	0,
 	{
@@ -349,7 +349,7 @@ static Sfx fx_shed_door_creak = {
 	}
 };
 
-static Sfx fx_explosion = {
+static const Sfx fx_explosion = {
 	10,
 	0,
 	{
@@ -357,7 +357,7 @@ static Sfx fx_explosion = {
 	}
 };
 
-static Sfx fx_fire_crackle_in_pit = {
+static const Sfx fx_fire_crackle_in_pit = {
 	 9,
 	SFXF_SAVE,
 	{
@@ -365,7 +365,7 @@ static Sfx fx_fire_crackle_in_pit = {
 	}
 };
 
-static Sfx fx_remove_bar_grill = {
+static const Sfx fx_remove_bar_grill = {
 	10,
 	7+SFXF_START_DELAY,
 	{
@@ -373,7 +373,7 @@ static Sfx fx_remove_bar_grill = {
 	}
 };
 
-static Sfx fx_grill_creak = {
+static const Sfx fx_grill_creak = {
 	10,
 	43+SFXF_START_DELAY,
 	{
@@ -381,7 +381,7 @@ static Sfx fx_grill_creak = {
 	}
 };
 
-static Sfx fx_steam1 = {
+static const Sfx fx_steam1 = {
 	11,
 	SFXF_SAVE,
 	{
@@ -390,7 +390,7 @@ static Sfx fx_steam1 = {
 	}
 };
 
-static Sfx fx_steam2 = {
+static const Sfx fx_steam2 = {
 	11,
 	SFXF_SAVE,
 	{
@@ -399,7 +399,7 @@ static Sfx fx_steam2 = {
 	}
 };
 
-static Sfx fx_steam3 = {
+static const Sfx fx_steam3 = {
 	11,
 	SFXF_SAVE,
 	{
@@ -408,7 +408,7 @@ static Sfx fx_steam3 = {
 	}
 };
 
-static Sfx fx_crowbar_wooden = {
+static const Sfx fx_crowbar_wooden = {
 	11,
 	0,
 	{
@@ -416,7 +416,7 @@ static Sfx fx_crowbar_wooden = {
 	}
 };
 
-static Sfx fx_helmet_down_3 = {
+static const Sfx fx_helmet_down_3 = {
 	11,
 	0,
 	{
@@ -424,7 +424,7 @@ static Sfx fx_helmet_down_3 = {
 	}
 };
 
-static Sfx fx_guard_fall = {
+static const Sfx fx_guard_fall = {
 	11,
 	4,
 	{
@@ -433,7 +433,7 @@ static Sfx fx_guard_fall = {
 };
 
 #if 0
-static Sfx fx_furnace = {
+static const Sfx fx_furnace = {
 	11,
 	0,
 	{
@@ -443,7 +443,7 @@ static Sfx fx_furnace = {
 };
 #endif
 
-static Sfx fx_fall_thru_box = {
+static const Sfx fx_fall_thru_box = {
 	12,
 	0,
 	{
@@ -451,7 +451,7 @@ static Sfx fx_fall_thru_box = {
 	}
 };
 
-static Sfx fx_lazer = {
+static const Sfx fx_lazer = {
 	12,
 	0,
 	{
@@ -459,7 +459,7 @@ static Sfx fx_lazer = {
 	}
 };
 
-static Sfx fx_scanner = {
+static const Sfx fx_scanner = {
 	12,
 	0,
 	{
@@ -467,7 +467,7 @@ static Sfx fx_scanner = {
 	}
 };
 
-static Sfx fx_helmet_up_3 = {
+static const Sfx fx_helmet_up_3 = {
 	12,
 	0,
 	{
@@ -475,7 +475,7 @@ static Sfx fx_helmet_up_3 = {
 	}
 };
 
-static Sfx fx_liquid_bubble = {
+static const Sfx fx_liquid_bubble = {
 	12,
 	SFXF_SAVE,
 	{
@@ -485,7 +485,7 @@ static Sfx fx_liquid_bubble = {
 	}
 };
 
-static Sfx fx_liquid_drip = {
+static const Sfx fx_liquid_drip = {
 	13,
 	6+SFXF_START_DELAY,
 	{
@@ -493,7 +493,7 @@ static Sfx fx_liquid_drip = {
 	}
 };
 
-static Sfx fx_goo_drip = {
+static const Sfx fx_goo_drip = {
 	13,
 	5+SFXF_START_DELAY,
 	{
@@ -501,7 +501,7 @@ static Sfx fx_goo_drip = {
 	}
 };
 
-static Sfx fx_comp_bleeps = {
+static const Sfx fx_comp_bleeps = {
 	13,
 	0,
 	{
@@ -509,7 +509,7 @@ static Sfx fx_comp_bleeps = {
 	}
 };
 
-static Sfx fx_use_crowbar_grill = {
+static const Sfx fx_use_crowbar_grill = {
 	13,
 	34+SFXF_START_DELAY,
 	{
@@ -517,7 +517,7 @@ static Sfx fx_use_crowbar_grill = {
 	}
 };
 
-static Sfx fx_helmet_grind = {
+static const Sfx fx_helmet_grind = {
 	14,
 	0,
 	{
@@ -525,7 +525,7 @@ static Sfx fx_helmet_grind = {
 	}
 };
 
-static Sfx fx_lift_moving = {
+static const Sfx fx_lift_moving = {
 	14,
 	SFXF_SAVE,
 	{
@@ -535,7 +535,7 @@ static Sfx fx_lift_moving = {
 	}
 };
 
-static Sfx fx_use_secateurs = {
+static const Sfx fx_use_secateurs = {
 	14,
 	18+SFXF_START_DELAY,
 	{
@@ -543,7 +543,7 @@ static Sfx fx_use_secateurs = {
 	}
 };
 
-static Sfx fx_hit_joey1 = {
+static const Sfx fx_hit_joey1 = {
 	14,
 	7+SFXF_START_DELAY,
 	{
@@ -551,7 +551,7 @@ static Sfx fx_hit_joey1 = {
 	}
 };
 
-static Sfx fx_hit_joey2 = {
+static const Sfx fx_hit_joey2 = {
 	14,
 	13+SFXF_START_DELAY,
 	{
@@ -559,7 +559,7 @@ static Sfx fx_hit_joey2 = {
 	}
 };
 
-static Sfx fx_dani_phone_ring = {
+static const Sfx fx_dani_phone_ring = {
 	15,
 	0,
 	{
@@ -567,7 +567,7 @@ static Sfx fx_dani_phone_ring = {
 	}
 };
 
-static Sfx fx_sc74_pod_down = {
+static const Sfx fx_sc74_pod_down = {
 	15,
 	0,
 	{
@@ -575,7 +575,7 @@ static Sfx fx_sc74_pod_down = {
 	}
 };
 
-static Sfx fx_phone = {
+static const Sfx fx_phone = {
 	15,
 	0,
 	{
@@ -583,7 +583,7 @@ static Sfx fx_phone = {
 	}
 };
 
-static Sfx fx_25_weld = {
+static const Sfx fx_25_weld = {
 	15,
 	0,
 	{
@@ -591,7 +591,7 @@ static Sfx fx_25_weld = {
 	}
 };
 
-static Sfx fx_lift_open_7 = {
+static const Sfx fx_lift_open_7 = {
 	15,
 	0,
 	{
@@ -600,7 +600,7 @@ static Sfx fx_lift_open_7 = {
 	}
 };
 
-static Sfx fx_lift_close_7 = {
+static const Sfx fx_lift_close_7 = {
 	16,
 	0,
 	{
@@ -609,7 +609,7 @@ static Sfx fx_lift_close_7 = {
 	}
 };
 
-static Sfx fx_s2_helmet = {
+static const Sfx fx_s2_helmet = {
 	16,
 	0,
 	{
@@ -617,7 +617,7 @@ static Sfx fx_s2_helmet = {
 	}
 };
 
-static Sfx fx_hiss_in_nitrogen = {
+static const Sfx fx_hiss_in_nitrogen = {
 	16,
 	0,
 	{
@@ -625,7 +625,7 @@ static Sfx fx_hiss_in_nitrogen = {
 	}
 };
 
-static Sfx fx_dog_yap_indoors = {
+static const Sfx fx_dog_yap_indoors = {
 	16,
 	0,
 	{
@@ -634,7 +634,7 @@ static Sfx fx_dog_yap_indoors = {
 	}
 };
 
-static Sfx fx_dog_yap_outdoors = {
+static const Sfx fx_dog_yap_outdoors = {
 	16,
 	0,
 	{
@@ -646,7 +646,7 @@ static Sfx fx_dog_yap_outdoors = {
 	}
 };
 
-static Sfx fx_locker_creak_open = {
+static const Sfx fx_locker_creak_open = {
 	17,
 	0,
 	{
@@ -654,7 +654,7 @@ static Sfx fx_locker_creak_open = {
 	}
 };
 
-static Sfx fx_big_tent_gurgle = {
+static const Sfx fx_big_tent_gurgle = {
 	17,
 	0,
 	{
@@ -662,7 +662,7 @@ static Sfx fx_big_tent_gurgle = {
 	}
 };
 
-static Sfx fx_wind_howl = {
+static const Sfx fx_wind_howl = {
 	17,
 	SFXF_SAVE,
 	{
@@ -671,7 +671,7 @@ static Sfx fx_wind_howl = {
 	}
 };
 
-static Sfx fx_lift_open_29 = {
+static const Sfx fx_lift_open_29 = {
 	17,
 	0,
 	{
@@ -680,7 +680,7 @@ static Sfx fx_lift_open_29 = {
 	}
 };
 
-static Sfx fx_lift_arrive_7 = {
+static const Sfx fx_lift_arrive_7 = {
 	17,
 	0,
 	{
@@ -689,7 +689,7 @@ static Sfx fx_lift_arrive_7 = {
 	}
 };
 
-static Sfx fx_lift_close_29 = {
+static const Sfx fx_lift_close_29 = {
 	18,
 	0,
 	{
@@ -699,7 +699,7 @@ static Sfx fx_lift_close_29 = {
 	}
 };
 
-static Sfx fx_shaft_industrial_noise = {
+static const Sfx fx_shaft_industrial_noise = {
 	18,
 	SFXF_SAVE,
 	{
@@ -707,7 +707,7 @@ static Sfx fx_shaft_industrial_noise = {
 	}
 };
 
-static Sfx fx_gall_drop = {
+static const Sfx fx_gall_drop = {
 	18,
 	29+SFXF_START_DELAY,
 	{
@@ -715,7 +715,7 @@ static Sfx fx_gall_drop = {
 	}
 };
 
-static Sfx fx_door_slam_under = {
+static const Sfx fx_door_slam_under = {
 	19,
 	0,
 	{
@@ -723,7 +723,7 @@ static Sfx fx_door_slam_under = {
 	}
 };
 
-static Sfx fx_reichs_fish = {
+static const Sfx fx_reichs_fish = {
 	19,
 	SFXF_SAVE,
 	{
@@ -731,7 +731,7 @@ static Sfx fx_reichs_fish = {
 	}
 };
 
-static Sfx fx_judges_gavel1 = {
+static const Sfx fx_judges_gavel1 = {
 	19,
 	13+SFXF_START_DELAY,
 	{
@@ -739,7 +739,7 @@ static Sfx fx_judges_gavel1 = {
 	}
 };
 
-static Sfx fx_judges_gavel2 = {
+static const Sfx fx_judges_gavel2 = {
 	19,
 	16+SFXF_START_DELAY,
 	{
@@ -747,7 +747,7 @@ static Sfx fx_judges_gavel2 = {
 	}
 };
 
-static Sfx fx_judges_gavel3 = {
+static const Sfx fx_judges_gavel3 = {
 	19,
 	19+SFXF_START_DELAY,
 	{
@@ -755,7 +755,7 @@ static Sfx fx_judges_gavel3 = {
 	}
 };
 
-static Sfx fx_wind_3 = {
+static const Sfx fx_wind_3 = {
 	20,
 	SFXF_SAVE,
 	{
@@ -763,7 +763,7 @@ static Sfx fx_wind_3 = {
 	}
 };
 
-static Sfx fx_fact_sensor = {
+static const Sfx fx_fact_sensor = {
 	20,
 	SFXF_SAVE,
 	{
@@ -771,7 +771,7 @@ static Sfx fx_fact_sensor = {
 	}
 };
 
-static Sfx fx_medi_stab_gall = {
+static const Sfx fx_medi_stab_gall = {
 	20,
 	17+SFXF_START_DELAY,
 	{
@@ -779,7 +779,7 @@ static Sfx fx_medi_stab_gall = {
 	}
 };
 
-static Sfx fx_computer_3 = {
+static const Sfx fx_computer_3 = {
 	21,
 	SFXF_SAVE,
 	{
@@ -787,7 +787,7 @@ static Sfx fx_computer_3 = {
 	}
 };
 
-static Sfx fx_timber_cracking = {
+static const Sfx fx_timber_cracking = {
 	21,
 	0,
 	{
@@ -795,7 +795,7 @@ static Sfx fx_timber_cracking = {
 	}
 };
 
-static Sfx fx_anchor_fall = {
+static const Sfx fx_anchor_fall = {
 	22,
 	0,
 	{
@@ -803,7 +803,7 @@ static Sfx fx_anchor_fall = {
 	}
 };
 
-static Sfx fx_elevator_4 = {
+static const Sfx fx_elevator_4 = {
 	22,
 	0,
 	{
@@ -811,7 +811,7 @@ static Sfx fx_elevator_4 = {
 	}
 };
 
-static Sfx fx_star_trek_2 = {
+static const Sfx fx_star_trek_2 = {
 	22,
 	SFXF_SAVE,
 	{
@@ -819,7 +819,7 @@ static Sfx fx_star_trek_2 = {
 	}
 };
 
-static Sfx fx_lift_closing = {
+static const Sfx fx_lift_closing = {
 	23,
 	0,
 	{
@@ -827,7 +827,7 @@ static Sfx fx_lift_closing = {
 	}
 };
 
-static Sfx fx_heartbeat = {
+static const Sfx fx_heartbeat = {
 	23,
 	11+SFXF_START_DELAY,
 	{
@@ -843,7 +843,7 @@ static Sfx fx_heartbeat = {
 	}
 };
 
-static Sfx fx_pos_key = {
+static const Sfx fx_pos_key = {
 	25,
 	2+SFXF_START_DELAY,
 	{
@@ -851,7 +851,7 @@ static Sfx fx_pos_key = {
 	}
 };
 
-static Sfx fx_neg_key = {
+static const Sfx fx_neg_key = {
 	26,
 	2+SFXF_START_DELAY,
 	{
@@ -859,7 +859,7 @@ static Sfx fx_neg_key = {
 	}
 };
 
-static Sfx fx_orifice_swallow_drip = {
+static const Sfx fx_orifice_swallow_drip = {
 	28,
 	0,
 	{
@@ -867,7 +867,7 @@ static Sfx fx_orifice_swallow_drip = {
 	}
 };
 
-static Sfx *musicList[] = {
+static const Sfx *musicList[] = {
 	&fx_press_bang, // 256 banging of the press
 	&fx_press_hiss, // 257 hissing press
 	&fx_wind_howl, // 258 howling wind
@@ -1135,8 +1135,8 @@ void Sound::fnStartFx(uint32 sound, uint8 channel) {
 
 	sound &= ~(1 << 8);
 
-	Sfx *sfx = musicList[sound];
-	RoomList *roomList = sfx->roomList;
+	const Sfx *sfx = musicList[sound];
+	const RoomList *roomList = sfx->roomList;
 
 	int i = 0;
 	if (roomList[i].room != 0xff) // if room list empty then do all rooms
diff --git a/engines/sword2/function.cpp b/engines/sword2/function.cpp
index ec74d5c684..a8748544c0 100644
--- a/engines/sword2/function.cpp
+++ b/engines/sword2/function.cpp
@@ -1881,11 +1881,11 @@ int32 Logic::fnColour(int32 *params) {
 #define GREEN	3
 #define BLUE	4
 
-static uint8 black[4]	= {  0,    0,   0,   0 };
-static uint8 white[4]	= { 255, 255, 255,   0 };
-static uint8 red[4]	= { 255,   0,   0,   0 };
-static uint8 green[4]	= {   0, 255,   0,   0 };
-static uint8 blue[4]	= {   0,   0, 255,   0 };
+static const uint8 black[4]	= {  0,    0,   0,   0 };
+static const uint8 white[4]	= { 255, 255, 255,   0 };
+static const uint8 red[4]	= { 255,   0,   0,   0 };
+static const uint8 green[4]	= {   0, 255,   0,   0 };
+static const uint8 blue[4]	= {   0,   0, 255,   0 };
 #endif
 
 int32 Logic::fnFlash(int32 *params) {