Mercurial > hg > openttd

changeset 10553:5f07f8bc7a1d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r14810) -Codechange: use the proper style for global variables.
author rubidium <rubidium@openttd.org>
date Sat, 03 Jan 2009 17:09:31 +0000
parents 98f96fee4127
children 52c5bdc2a1e2
files src/music.cpp src/music.h src/music_gui.cpp src/strings.cpp
diffstat 4 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/music.cpp
+++ b/src/music.cpp
@@ -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 @@
 	{"gm_tt20.gm", "Jammit"},
 	{"gm_tt11.gm", "Hard Drivin'"},
 };
+
+assert_compile(NUM_SONGS_AVAILABLE == lengthof(_origin_songs_specs));
--- a/src/music.h
+++ b/src/music.h
@@ -13,6 +13,6 @@
 	char song_name[64];
 };
 
-extern const SongSpecs origin_songs_specs[NUM_SONGS_AVAILABLE];
+extern const SongSpecs _origin_songs_specs[];
 
 #endif //MUSIC_H
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -96,7 +96,7 @@
 {
 	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 @@
 	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++;
 		}
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -1189,7 +1189,7 @@
 			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? */