cpp/openttd-patchpack/source Changeset - r10553:183a2657f9ea

Changeset - r10553:183a2657f9ea

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 16 years ago 2009-01-03 17:09:31
rubidium@openttd.org

(svn r14810) -Codechange: use the proper style for global variables.

4 files changed with 7 insertions and 5 deletions:

src/music.cpp

src/music.h

src/music_gui.cpp

src/strings.cpp

0 comments (0 inline, 0 general)

src/music.cpp

➞

Show inline comments

@@ @@ -5,7 +5,7 @@ @@
 #include "stdafx.h"
 #include "music.h"
-const SongSpecs origin_songs_specs[NUM_SONGS_AVAILABLE] = {
+const SongSpecs _origin_songs_specs[] = {
 	{"gm_tt00.gm", "Tycoon DELUXE Theme"},
 	{"gm_tt02.gm", "Easy Driver"},
 	{"gm_tt03.gm", "Little Red Diesel"},
@@ @@ -29,3 +29,5 @@ const SongSpecs origin_songs_specs[NUM_S @@
 	{"gm_tt20.gm", "Jammit"},
 	{"gm_tt11.gm", "Hard Drivin'"},
 };
 assert_compile(NUM_SONGS_AVAILABLE == lengthof(_origin_songs_specs));

src/music.h

➞

Show inline comments

@@ @@ -13,6 +13,6 @@ struct SongSpecs { @@
 	char song_name[64];
 };
-extern const SongSpecs origin_songs_specs[NUM_SONGS_AVAILABLE];
+extern const SongSpecs _origin_songs_specs[];
 #endif //MUSIC_H

src/music_gui.cpp

➞

Show inline comments

@@ @@ -96,7 +96,7 @@ static void DoPlaySong() @@
+{
 	char filename[MAX_PATH];
 	FioFindFullPath(filename, lengthof(filename), GM_DIR,
-			origin_songs_specs[_music_wnd_cursong - 1].filename);
+			_origin_songs_specs[_music_wnd_cursong - 1].filename);
 	_music_driver->PlaySong(filename);
+}
@@ @@ -114,7 +114,7 @@ static void SelectSongToPlay() @@
 	do {
 		/* We are now checking for the existence of that file prior
 		 * to add it to the list of available songs */
-		if (FioCheckFileExists(origin_songs_specs[_playlists[msf.playlist][i] - 1].filename, GM_DIR)) {
+		if (FioCheckFileExists(_origin_songs_specs[_playlists[msf.playlist][i] - 1].filename, GM_DIR)) {
 			_cur_playlist[j] = _playlists[msf.playlist][i];
 			j++;
+		}

src/strings.cpp

➞

Show inline comments

@@ @@ -1189,7 +1189,7 @@ static char *GetSpecialNameString(char * @@
 			return GenPresidentName(buff, GetInt32(&argv), last);
 		case 4: // song names
-			return strecpy(buff, origin_songs_specs[GetInt32(&argv) - 1].song_name, last);
+			return strecpy(buff, _origin_songs_specs[GetInt32(&argv) - 1].song_name, last);
+	}
 	/* town name? */

0 comments (0 inline, 0 general)