[Scummvm-cvs-logs] scummvm master -> ab719630ba08d243baae155836d287ec4a1bd57d

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ab719630ba TONY: Move const tables back to .cpp, as suggested by LordHoto


Commit: ab719630ba08d243baae155836d287ec4a1bd57d
    https://github.com/scummvm/scummvm/commit/ab719630ba08d243baae155836d287ec4a1bd57d
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-09-06T22:39:58-07:00

Commit Message:
TONY: Move const tables back to .cpp, as suggested by LordHoto

Changed paths:
    engines/tony/custom.cpp
    engines/tony/custom.h



diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp
index 16afa2d..2e5705f 100644
--- a/engines/tony/custom.cpp
+++ b/engines/tony/custom.cpp
@@ -41,6 +41,43 @@
 
 namespace Tony {
 
+static const char *kAmbianceFile[] =  {
+	"None",
+	"1.ADP",    // Grilli.WAV
+	"2.ADP",    // Grilli-Ovattati.WAV
+	"3.ADP",    // Grilli-Vento.WAV
+	"3.ADP",    // Grilli-Vento1.WAV
+	"5.ADP",    // Vento1.WAV
+	"4.ADP",    // Mare1.WAV
+	"6.ADP"     // Mare1.WAV half volume
+};
+
+static const MusicFileEntry kMusicFiles[] =  {
+	{"00.ADP", 0},    {"01.ADP", 0},    {"02.ADP", 0},    {"03.ADP", 0},
+	{"04.ADP", 0},    {"05.ADP", 0},    {"06.ADP", 0},    {"07.ADP", 0},
+	{"08.ADP", 2450}, {"09.ADP", 0},    {"10.ADP", 0},    {"11.ADP", 0},
+	{"12.ADP", 0},    {"13.ADP", 0},    {"14.ADP", 0},    {"15.ADP", 0},
+	{"16.ADP", 0},    {"17.ADP", 0},    {"18.ADP", 0},    {"19.ADP", 0},
+	{"20.ADP", 0},    {"21.ADP", 0},    {"22.ADP", 0},    {"23.ADP", 0},
+	{"24.ADP", 0},    {"25.ADP", 0},    {"26.ADP", 0},    {"27.ADP", 0},
+	{"28.ADP", 1670}, {"29.ADP", 0},    {"30.ADP", 0},    {"31.ADP", 0},
+	{"32.ADP", 2900}, {"33.ADP", 0},    {"34.ADP", 0},    {"35.ADP", 0},
+	{"36.ADP", 0},    {"37.ADP", 0},    {"38.ADP", 0},    {"39.ADP", 0},
+	{"40.ADP", 0},    {"41.ADP", 1920}, {"42.ADP", 1560}, {"43.ADP", 1920},
+	{"44.ADP", 1920}, {"45.ADP", 1920}, {"46.ADP", 1920}, {"47.ADP", 1920},
+	{"48.ADP", 1920}, {"49.ADP", 1920}, {"50.ADP", 1920}, {"51.ADP", 1920},
+	{"52.ADP", 1920}, {"53.ADP", 0},    {"54.ADP", 0},    {"55.ADP", 0},
+	{"56.ADP", 0},    {"57.ADP", 0},    {"58.ADP", 0},    {"59.ADP", 0}
+};
+
+
+static const char *kJingleFileNames[] = {
+	"S00.ADP", "S01.ADP", "S02.ADP", "S03.ADP", "S04.ADP", 
+	"S05.ADP", "S06.ADP", "S07.ADP", "S08.ADP", "S09.ADP", 
+	"S10.ADP", "S11.ADP", "S12.ADP", "S13.ADP", "S14.ADP", 
+	"S15.ADP", "S16.ADP", "S17.ADP", "S18.ADP"
+};
+
 void ReapplyChangedHotspot() {
 	for (int i = 0; i < GLOBALS._curChangedHotspot; i++)
 		GLOBALS._loc->getItemFromCode(GLOBALS._changedHotspot[i]._dwCode)->changeHotspot(RMPoint(GLOBALS._changedHotspot[i]._nX, GLOBALS._changedHotspot[i]._nY));
@@ -63,7 +100,6 @@ void LoadChangedHotspot(Common::InSaveFile *f) {
 	}
 }
 
-
 /**
  * Classes required for custom functions
  *
diff --git a/engines/tony/custom.h b/engines/tony/custom.h
index 4d96dc0..2890839 100644
--- a/engines/tony/custom.h
+++ b/engines/tony/custom.h
@@ -41,43 +41,6 @@ struct MusicFileEntry {
 	int _sync;
 };
 
-static const char *kAmbianceFile[] =  {
-	"None",
-	"1.ADP",    // Grilli.WAV
-	"2.ADP",    // Grilli-Ovattati.WAV
-	"3.ADP",    // Grilli-Vento.WAV
-	"3.ADP",    // Grilli-Vento1.WAV
-	"5.ADP",    // Vento1.WAV
-	"4.ADP",    // Mare1.WAV
-	"6.ADP"     // Mare1.WAV half volume
-};
-
-static const MusicFileEntry kMusicFiles[] =  {
-	{"00.ADP", 0},    {"01.ADP", 0},    {"02.ADP", 0},    {"03.ADP", 0},
-	{"04.ADP", 0},    {"05.ADP", 0},    {"06.ADP", 0},    {"07.ADP", 0},
-	{"08.ADP", 2450}, {"09.ADP", 0},    {"10.ADP", 0},    {"11.ADP", 0},
-	{"12.ADP", 0},    {"13.ADP", 0},    {"14.ADP", 0},    {"15.ADP", 0},
-	{"16.ADP", 0},    {"17.ADP", 0},    {"18.ADP", 0},    {"19.ADP", 0},
-	{"20.ADP", 0},    {"21.ADP", 0},    {"22.ADP", 0},    {"23.ADP", 0},
-	{"24.ADP", 0},    {"25.ADP", 0},    {"26.ADP", 0},    {"27.ADP", 0},
-	{"28.ADP", 1670}, {"29.ADP", 0},    {"30.ADP", 0},    {"31.ADP", 0},
-	{"32.ADP", 2900}, {"33.ADP", 0},    {"34.ADP", 0},    {"35.ADP", 0},
-	{"36.ADP", 0},    {"37.ADP", 0},    {"38.ADP", 0},    {"39.ADP", 0},
-	{"40.ADP", 0},    {"41.ADP", 1920}, {"42.ADP", 1560}, {"43.ADP", 1920},
-	{"44.ADP", 1920}, {"45.ADP", 1920}, {"46.ADP", 1920}, {"47.ADP", 1920},
-	{"48.ADP", 1920}, {"49.ADP", 1920}, {"50.ADP", 1920}, {"51.ADP", 1920},
-	{"52.ADP", 1920}, {"53.ADP", 0},    {"54.ADP", 0},    {"55.ADP", 0},
-	{"56.ADP", 0},    {"57.ADP", 0},    {"58.ADP", 0},    {"59.ADP", 0}
-};
-
-
-static const char *kJingleFileNames[] = {
-	"S00.ADP", "S01.ADP", "S02.ADP", "S03.ADP", "S04.ADP", 
-	"S05.ADP", "S06.ADP", "S07.ADP", "S08.ADP", "S09.ADP", 
-	"S10.ADP", "S11.ADP", "S12.ADP", "S13.ADP", "S14.ADP", 
-	"S15.ADP", "S16.ADP", "S17.ADP", "S18.ADP"
-};
-
 #define INIT_CUSTOM_FUNCTION            MapCustomFunctions
 
 #define DECLARE_CUSTOM_FUNCTION(x)      void x