From 44068338e57a70a3ea8953c269b523006a0dba28 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 8 Sep 2011 20:03:30 +0200
Subject: GOB: Made some static data const.

---
 engines/gob/init.cpp         | 2 +-
 engines/gob/init.h           | 2 +-
 engines/gob/inter_bargon.cpp | 6 +++---
 engines/gob/sound/sound.cpp  | 8 ++++----
 engines/gob/videoplayer.cpp  | 2 +-
 engines/gob/videoplayer.h    | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/init.cpp b/engines/gob/init.cpp
index 90c2a1602a..a61261f355 100644
--- a/engines/gob/init.cpp
+++ b/engines/gob/init.cpp
@@ -40,7 +40,7 @@
 
 namespace Gob {
 
-const char *Init::_fontNames[] = { "jeulet1.let", "jeulet2.let", "jeucar1.let", "jeumath.let" };
+const char *const Init::_fontNames[] = { "jeulet1.let", "jeulet2.let", "jeucar1.let", "jeumath.let" };
 
 Init::Init(GobEngine *vm) : _vm(vm) {
 	_palDesc = 0;
diff --git a/engines/gob/init.h b/engines/gob/init.h
index e8c948c72e..ac460fd654 100644
--- a/engines/gob/init.h
+++ b/engines/gob/init.h
@@ -41,7 +41,7 @@ public:
 
 protected:
 	Video::PalDesc *_palDesc;
-	static const char *_fontNames[4];
+	static const char *const _fontNames[4];
 	GobEngine *_vm;
 
 	void cleanup();
diff --git a/engines/gob/inter_bargon.cpp b/engines/gob/inter_bargon.cpp
index c2e6a2e912..134203fa9d 100644
--- a/engines/gob/inter_bargon.cpp
+++ b/engines/gob/inter_bargon.cpp
@@ -120,7 +120,7 @@ void Inter_Bargon::oBargon_intro2(OpGobParams &params) {
 	SurfacePtr surface;
 	SoundDesc samples[4];
 	int16 comp[5] = { 0, 1, 2, 3, -1 };
-	static const char *sndFiles[] = {"1INTROII.snd", "2INTROII.snd", "1INTRO3.snd", "2INTRO3.snd"};
+	static const char *const sndFiles[] = {"1INTROII.snd", "2INTROII.snd", "1INTRO3.snd", "2INTRO3.snd"};
 
 	surface = _vm->_video->initSurfDesc(320, 200);
 	_vm->_video->drawPackedSprite("2ille.ims", *surface);
@@ -169,8 +169,8 @@ void Inter_Bargon::oBargon_intro3(OpGobParams &params) {
 	SoundDesc samples[2];
 	int16 comp[3] = { 0, 1, -1 };
 	byte *palettes[4];
-	static const char *sndFiles[] = {"1INTROIV.snd", "2INTROIV.snd"};
-	static const char *palFiles[] = {"2ou2.clt", "2ou3.clt", "2ou4.clt", "2ou5.clt"};
+	static const char *const sndFiles[] = {"1INTROIV.snd", "2INTROIV.snd"};
+	static const char *const palFiles[] = {"2ou2.clt", "2ou3.clt", "2ou4.clt", "2ou5.clt"};
 
 	int32 size;
 
diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 212116f689..e064a312c2 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -330,7 +330,7 @@ void Sound::adlibPlayBgMusic() {
 	if (!_adlPlayer)
 		_adlPlayer = new ADLPlayer(*_vm->_mixer);
 
-	static const char *tracksMac[] = {
+	static const char *const tracksMac[] = {
 //		"musmac1.adl", // TODO: This track isn't played correctly at all yet
 		"musmac2.adl",
 		"musmac3.adl",
@@ -339,7 +339,7 @@ void Sound::adlibPlayBgMusic() {
 		"musmac6.adl"
 	};
 
-	static const char *tracksWin[] = {
+	static const char *const tracksWin[] = {
 		"musmac1.mid",
 		"musmac2.mid",
 		"musmac3.mid",
@@ -534,7 +534,7 @@ void Sound::cdPlayBgMusic() {
 	if (!_cdrom)
 		return;
 
-	static const char *tracks[][2] = {
+	static const char *const tracks[][2] = {
 		{"avt00.tot",  "mine"},
 		{"avt001.tot", "nuit"},
 		{"avt002.tot", "campagne"},
@@ -571,7 +571,7 @@ void Sound::cdPlayMultMusic() {
 	if (!_cdrom)
 		return;
 
-	static const char *tracks[][6] = {
+	static const char *const tracks[][6] = {
 		{"avt005.tot", "fra1", "all1", "ang1", "esp1", "ita1"},
 		{"avt006.tot", "fra2", "all2", "ang2", "esp2", "ita2"},
 		{"avt012.tot", "fra3", "all3", "ang3", "esp3", "ita3"},
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index c03218460c..221f5ab3c9 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -61,7 +61,7 @@ void VideoPlayer::Video::close() {
 }
 
 
-const char *VideoPlayer::_extensions[] = { "IMD", "IMD", "VMD", "RMD", "SMD" };
+const char *const VideoPlayer::_extensions[] = { "IMD", "IMD", "VMD", "RMD", "SMD" };
 
 VideoPlayer::VideoPlayer(GobEngine *vm) : _vm(vm), _needBlit(false),
 	_noCursorSwitch(false), _woodruffCohCottWorkaround(false) {
diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h
index 373832939a..bc7cb48768 100644
--- a/engines/gob/videoplayer.h
+++ b/engines/gob/videoplayer.h
@@ -167,7 +167,7 @@ private:
 
 	static const int kVideoSlotCount = 32;
 
-	static const char *_extensions[];
+	static const char *const _extensions[];
 
 	GobEngine *_vm;
 
-- 
cgit v1.2.3