mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21698) -Fix: incorrectly named global variable

release/1.1
rubidium 2011-01-02 18:12:39 +00:00
parent 4ec6c19d44
commit ad15cd37a6
5 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/music_gui.cpp
View File

@ -63,8 +63,8 @@ static byte _playlist_new_style[NUM_SONGS_CLASS + 1];
/** Indices of all ezy street songs */ /** Indices of all ezy street songs */
static byte _playlist_ezy_street[NUM_SONGS_CLASS + 1]; static byte _playlist_ezy_street[NUM_SONGS_CLASS + 1];
assert_compile(lengthof(msf.custom_1) == NUM_SONGS_PLAYLIST + 1); assert_compile(lengthof(_msf.custom_1) == NUM_SONGS_PLAYLIST + 1);
assert_compile(lengthof(msf.custom_2) == NUM_SONGS_PLAYLIST + 1); assert_compile(lengthof(_msf.custom_2) == NUM_SONGS_PLAYLIST + 1);
/** The different playlists that can be played. */ /** The different playlists that can be played. */
static byte * const _playlists[] = { static byte * const _playlists[] = {
@ -72,8 +72,8 @@ static byte * const _playlists[] = {
_playlist_old_style, _playlist_old_style,
_playlist_new_style, _playlist_new_style,
_playlist_ezy_street, _playlist_ezy_street,
msf.custom_1, _msf.custom_1,
msf.custom_2, _msf.custom_2,
}; };
/** /**
@ -116,8 +116,8 @@ void InitializeMusic()
_playlists[k + 1][j] = 0; _playlists[k + 1][j] = 0;
} }
ValidatePlaylist(msf.custom_1); ValidatePlaylist(_msf.custom_1);
ValidatePlaylist(msf.custom_2); ValidatePlaylist(_msf.custom_2);
if (BaseMusic::GetUsedSet()->num_available < _music_wnd_cursong) { if (BaseMusic::GetUsedSet()->num_available < _music_wnd_cursong) {
/* If there are less songs than the currently played song, /* If there are less songs than the currently played song,
@ -191,17 +191,17 @@ static void SelectSongToPlay()
memset(_cur_playlist, 0, sizeof(_cur_playlist)); memset(_cur_playlist, 0, sizeof(_cur_playlist));
do { do {
const char *filename = BaseMusic::GetUsedSet()->files[_playlists[msf.playlist][i] - 1].filename; const char *filename = BaseMusic::GetUsedSet()->files[_playlists[_msf.playlist][i] - 1].filename;
/* We are now checking for the existence of that file prior /* We are now checking for the existence of that file prior
* to add it to the list of available songs */ * to add it to the list of available songs */
if (!StrEmpty(filename) && FioCheckFileExists(filename, GM_DIR)) { if (!StrEmpty(filename) && FioCheckFileExists(filename, GM_DIR)) {
_cur_playlist[j] = _playlists[msf.playlist][i]; _cur_playlist[j] = _playlists[_msf.playlist][i];
j++; j++;
} }
} while (_playlists[msf.playlist][++i] != 0 && j < lengthof(_cur_playlist) - 1); } while (_playlists[_msf.playlist][++i] != 0 && j < lengthof(_cur_playlist) - 1);
/* Do not shuffle when on the intro-start window, as the song to play has to be the original TTD Theme*/ /* Do not shuffle when on the intro-start window, as the song to play has to be the original TTD Theme*/
if (msf.shuffle && _game_mode != GM_MENU) { if (_msf.shuffle && _game_mode != GM_MENU) {
i = 500; i = 500;
do { do {
uint32 r = InteractiveRandom(); uint32 r = InteractiveRandom();
@ -235,7 +235,7 @@ static void PlayPlaylistSong()
if (_cur_playlist[0] == 0) { if (_cur_playlist[0] == 0) {
_song_is_active = false; _song_is_active = false;
_music_wnd_cursong = 0; _music_wnd_cursong = 0;
msf.playing = false; _msf.playing = false;
return; return;
} }
} }
@ -254,9 +254,9 @@ void ResetMusic()
void MusicLoop() void MusicLoop()
{ {
if (!msf.playing && _song_is_active) { if (!_msf.playing && _song_is_active) {
StopMusic(); StopMusic();
} else if (msf.playing && !_song_is_active) { } else if (_msf.playing && !_song_is_active) {
PlayPlaylistSong(); PlayPlaylistSong();
} }
@ -275,7 +275,7 @@ void MusicLoop()
static void SelectPlaylist(byte list) static void SelectPlaylist(byte list)
{ {
msf.playlist = list; _msf.playlist = list;
InvalidateWindowData(WC_MUSIC_TRACK_SELECTION, 0); InvalidateWindowData(WC_MUSIC_TRACK_SELECTION, 0);
InvalidateWindowData(WC_MUSIC_WINDOW, 0); InvalidateWindowData(WC_MUSIC_WINDOW, 0);
} }
@ -299,15 +299,15 @@ struct MusicTrackSelectionWindow : public Window {
this->InitNested(desc, number); this->InitNested(desc, number);
this->LowerWidget(MTSW_LIST_LEFT); this->LowerWidget(MTSW_LIST_LEFT);
this->LowerWidget(MTSW_LIST_RIGHT); this->LowerWidget(MTSW_LIST_RIGHT);
this->SetWidgetDisabledState(MTSW_CLEAR, msf.playlist <= 3); this->SetWidgetDisabledState(MTSW_CLEAR, _msf.playlist <= 3);
this->LowerWidget(MTSW_ALL + msf.playlist); this->LowerWidget(MTSW_ALL + _msf.playlist);
} }
virtual void SetStringParameters(int widget) const virtual void SetStringParameters(int widget) const
{ {
switch (widget) { switch (widget) {
case MTSW_PLAYLIST: case MTSW_PLAYLIST:
SetDParam(0, STR_MUSIC_PLAYLIST_ALL + msf.playlist); SetDParam(0, STR_MUSIC_PLAYLIST_ALL + _msf.playlist);
break; break;
} }
} }
@ -315,9 +315,9 @@ struct MusicTrackSelectionWindow : public Window {
virtual void OnInvalidateData(int data = 0) virtual void OnInvalidateData(int data = 0)
{ {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
this->SetWidgetLoweredState(MTSW_ALL + i, i == msf.playlist); this->SetWidgetLoweredState(MTSW_ALL + i, i == _msf.playlist);
} }
this->SetWidgetDisabledState(MTSW_CLEAR, msf.playlist <= 3); this->SetWidgetDisabledState(MTSW_CLEAR, _msf.playlist <= 3);
this->SetDirty(); this->SetDirty();
} }
@ -383,7 +383,7 @@ struct MusicTrackSelectionWindow : public Window {
GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, 0); GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, 0);
int y = r.top + WD_FRAMERECT_TOP; int y = r.top + WD_FRAMERECT_TOP;
for (const byte *p = _playlists[msf.playlist]; *p != 0; p++) { for (const byte *p = _playlists[_msf.playlist]; *p != 0; p++) {
uint i = *p - 1; uint i = *p - 1;
SetDParam(0, GetTrackNumber(i)); SetDParam(0, GetTrackNumber(i));
SetDParam(1, 2); SetDParam(1, 2);
@ -402,10 +402,10 @@ struct MusicTrackSelectionWindow : public Window {
case MTSW_LIST_LEFT: { // add to playlist case MTSW_LIST_LEFT: { // add to playlist
int y = this->GetRowFromWidget(pt.y, widget, 0, FONT_HEIGHT_SMALL); int y = this->GetRowFromWidget(pt.y, widget, 0, FONT_HEIGHT_SMALL);
if (msf.playlist < 4) return; if (_msf.playlist < 4) return;
if (!IsInsideMM(y, 0, BaseMusic::GetUsedSet()->num_available)) return; if (!IsInsideMM(y, 0, BaseMusic::GetUsedSet()->num_available)) return;
byte *p = _playlists[msf.playlist]; byte *p = _playlists[_msf.playlist];
for (uint i = 0; i != NUM_SONGS_PLAYLIST - 1; i++) { for (uint i = 0; i != NUM_SONGS_PLAYLIST - 1; i++) {
if (p[i] == 0) { if (p[i] == 0) {
/* Find the actual song number */ /* Find the actual song number */
@ -427,10 +427,10 @@ struct MusicTrackSelectionWindow : public Window {
case MTSW_LIST_RIGHT: { // remove from playlist case MTSW_LIST_RIGHT: { // remove from playlist
int y = this->GetRowFromWidget(pt.y, widget, 0, FONT_HEIGHT_SMALL); int y = this->GetRowFromWidget(pt.y, widget, 0, FONT_HEIGHT_SMALL);
if (msf.playlist < 4) return; if (_msf.playlist < 4) return;
if (!IsInsideMM(y, 0, NUM_SONGS_PLAYLIST)) return; if (!IsInsideMM(y, 0, NUM_SONGS_PLAYLIST)) return;
byte *p = _playlists[msf.playlist]; byte *p = _playlists[_msf.playlist];
for (uint i = y; i != NUM_SONGS_PLAYLIST - 1; i++) { for (uint i = y; i != NUM_SONGS_PLAYLIST - 1; i++) {
p[i] = p[i + 1]; p[i] = p[i + 1];
} }
@ -441,7 +441,7 @@ struct MusicTrackSelectionWindow : public Window {
} }
case MTSW_CLEAR: // clear case MTSW_CLEAR: // clear
for (uint i = 0; _playlists[msf.playlist][i] != 0; i++) _playlists[msf.playlist][i] = 0; for (uint i = 0; _playlists[_msf.playlist][i] != 0; i++) _playlists[_msf.playlist][i] = 0;
this->SetDirty(); this->SetDirty();
StopMusic(); StopMusic();
SelectSongToPlay(); SelectSongToPlay();
@ -535,8 +535,8 @@ struct MusicWindow : public Window {
MusicWindow(const WindowDesc *desc, WindowNumber number) : Window() MusicWindow(const WindowDesc *desc, WindowNumber number) : Window()
{ {
this->InitNested(desc, number); this->InitNested(desc, number);
this->LowerWidget(msf.playlist + MW_ALL); this->LowerWidget(_msf.playlist + MW_ALL);
this->SetWidgetLoweredState(MW_SHUFFLE, msf.shuffle); this->SetWidgetLoweredState(MW_SHUFFLE, _msf.shuffle);
} }
virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
@ -624,7 +624,7 @@ struct MusicWindow : public Window {
case MW_MUSIC_VOL: case MW_EFFECT_VOL: { case MW_MUSIC_VOL: case MW_EFFECT_VOL: {
DrawFrameRect(r.left, r.top + 2, r.right, r.bottom - 2, COLOUR_GREY, FR_LOWERED); DrawFrameRect(r.left, r.top + 2, r.right, r.bottom - 2, COLOUR_GREY, FR_LOWERED);
byte volume = (widget == MW_MUSIC_VOL) ? msf.music_vol : msf.effect_vol; byte volume = (widget == MW_MUSIC_VOL) ? _msf.music_vol : _msf.effect_vol;
int x = (volume * (r.right - r.left) / 127); int x = (volume * (r.right - r.left) / 127);
if (_current_text_dir == TD_RTL) { if (_current_text_dir == TD_RTL) {
x = r.right - x; x = r.right - x;
@ -640,7 +640,7 @@ struct MusicWindow : public Window {
virtual void OnInvalidateData(int data = 0) virtual void OnInvalidateData(int data = 0)
{ {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
this->SetWidgetLoweredState(MW_ALL + i, i == msf.playlist); this->SetWidgetLoweredState(MW_ALL + i, i == _msf.playlist);
} }
this->SetDirty(); this->SetDirty();
} }
@ -661,17 +661,17 @@ struct MusicWindow : public Window {
break; break;
case MW_STOP: // stop playing case MW_STOP: // stop playing
msf.playing = false; _msf.playing = false;
break; break;
case MW_PLAY: // start playing case MW_PLAY: // start playing
msf.playing = true; _msf.playing = true;
break; break;
case MW_MUSIC_VOL: case MW_EFFECT_VOL: { // volume sliders case MW_MUSIC_VOL: case MW_EFFECT_VOL: { // volume sliders
int x = pt.x - this->GetWidget<NWidgetBase>(widget)->pos_x; int x = pt.x - this->GetWidget<NWidgetBase>(widget)->pos_x;
byte *vol = (widget == MW_MUSIC_VOL) ? &msf.music_vol : &msf.effect_vol; byte *vol = (widget == MW_MUSIC_VOL) ? &_msf.music_vol : &_msf.effect_vol;
byte new_vol = x * 127 / this->GetWidget<NWidgetBase>(widget)->current_x; byte new_vol = x * 127 / this->GetWidget<NWidgetBase>(widget)->current_x;
if (_current_text_dir == TD_RTL) new_vol = 127 - new_vol; if (_current_text_dir == TD_RTL) new_vol = 127 - new_vol;
@ -686,8 +686,8 @@ struct MusicWindow : public Window {
} }
case MW_SHUFFLE: // toggle shuffle case MW_SHUFFLE: // toggle shuffle
msf.shuffle ^= 1; _msf.shuffle ^= 1;
this->SetWidgetLoweredState(MW_SHUFFLE, msf.shuffle); this->SetWidgetLoweredState(MW_SHUFFLE, _msf.shuffle);
this->SetWidgetDirty(MW_SHUFFLE); this->SetWidgetDirty(MW_SHUFFLE);
StopMusic(); StopMusic();
SelectSongToPlay(); SelectSongToPlay();

2
src/openttd.cpp
View File

@ -691,7 +691,7 @@ int ttd_main(int argc, char *argv[])
_screen.zoom = ZOOM_LVL_NORMAL; _screen.zoom = ZOOM_LVL_NORMAL;
/* restore saved music volume */ /* restore saved music volume */
_music_driver->SetVolume(msf.music_vol); _music_driver->SetVolume(_msf.music_vol);
NetworkStartUp(); // initialize network-core NetworkStartUp(); // initialize network-core

2
src/settings.cpp
View File

@ -1479,7 +1479,7 @@ static void GRFSaveConfig(IniFile *ini, const char *grpname, const GRFConfig *li
static void HandleSettingDescs(IniFile *ini, SettingDescProc *proc, SettingDescProcList *proc_list) static void HandleSettingDescs(IniFile *ini, SettingDescProc *proc, SettingDescProcList *proc_list)
{ {
proc(ini, (const SettingDesc*)_misc_settings, "misc", NULL); proc(ini, (const SettingDesc*)_misc_settings, "misc", NULL);
proc(ini, (const SettingDesc*)_music_settings, "music", &msf); proc(ini, (const SettingDesc*)_music_settings, "music", &_msf);
#if defined(WIN32) && !defined(DEDICATED) #if defined(WIN32) && !defined(DEDICATED)
proc(ini, (const SettingDesc*)_win32_settings, "win32", NULL); proc(ini, (const SettingDesc*)_win32_settings, "win32", NULL);
#endif /* WIN32 */ #endif /* WIN32 */

8
src/sound.cpp
View File

@ -22,7 +22,7 @@
#include "base_media_func.h" #include "base_media_func.h"
static SoundEntry _original_sounds[ORIGINAL_SAMPLE_COUNT]; static SoundEntry _original_sounds[ORIGINAL_SAMPLE_COUNT];
MusicFileSettings msf; MusicFileSettings _msf;
static void OpenBankFile(const char *filename) static void OpenBankFile(const char *filename)
{ {
@ -227,7 +227,7 @@ void SndCopyToPool()
*/ */
static void SndPlayScreenCoordFx(SoundID sound, int left, int right, int top, int bottom) static void SndPlayScreenCoordFx(SoundID sound, int left, int right, int top, int bottom)
{ {
if (msf.effect_vol == 0) return; if (_msf.effect_vol == 0) return;
const Window *w; const Window *w;
FOR_ALL_WINDOWS_FROM_BACK(w) { FOR_ALL_WINDOWS_FROM_BACK(w) {
@ -243,7 +243,7 @@ static void SndPlayScreenCoordFx(SoundID sound, int left, int right, int top, in
StartSound( StartSound(
sound, sound,
panning, panning,
(msf.effect_vol * _vol_factor_by_zoom[vp->zoom - ZOOM_LVL_BEGIN]) / 256 (_msf.effect_vol * _vol_factor_by_zoom[vp->zoom - ZOOM_LVL_BEGIN]) / 256
); );
return; return;
} }
@ -272,7 +272,7 @@ void SndPlayVehicleFx(SoundID sound, const Vehicle *v)
void SndPlayFx(SoundID sound) void SndPlayFx(SoundID sound)
{ {
StartSound(sound, 0.5, msf.effect_vol); StartSound(sound, 0.5, _msf.effect_vol);
} }
INSTANTIATE_BASE_MEDIA_METHODS(BaseMedia<SoundsSet>, SoundsSet) INSTANTIATE_BASE_MEDIA_METHODS(BaseMedia<SoundsSet>, SoundsSet)

2
src/sound_func.h
View File

@ -16,7 +16,7 @@
#include "vehicle_type.h" #include "vehicle_type.h"
#include "tile_type.h" #include "tile_type.h"
extern MusicFileSettings msf; extern MusicFileSettings _msf;
void SndPlayTileFx(SoundID sound, TileIndex tile); void SndPlayTileFx(SoundID sound, TileIndex tile);
void SndPlayVehicleFx(SoundID sound, const Vehicle *v); void SndPlayVehicleFx(SoundID sound, const Vehicle *v);