mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Get rid of unused file references, comment out unused obsolete config file code

Browse Source
This commit is contained in:
Gymnasiast
2015-08-12 22:05:13 +02:00
parent 4d81eb578e
commit fcb74d13b2
4 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/audio/audio.c
View File

@@ -1714,7 +1714,8 @@ void audio_init1()
}
}
m++;
} while(m + 1 < 0x2E);
// 46 is the number of files in ride_music_info_list
} while(m + 1 < 46);
}
/**

8
src/config.c
View File

@@ -820,7 +820,7 @@ void config_apply_to_old_addresses()
* Reads the config file data/config.cfg
* rct2: 0x006752D5
*/
void config_dat_load()
/*void config_dat_load()
{
FILE *fp=NULL;
@@ -898,13 +898,13 @@ void config_dat_load()
if (!(RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) & CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS))
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) + 1) * 256;
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FIRST_TIME_LOAD_OBJECTS, sint8) = 1;
}
}*/
/**
* Save configuration to the data/config.cfg file
* rct2: 0x00675487
*/
void config_dat_save()
/*void config_dat_save()
{
FILE *fp = fopen(get_file_path(PATH_ID_GAMECFG), "wb");
if (fp != NULL){
@@ -912,7 +912,7 @@ void config_dat_save()
fwrite((void*)0x009AAC5C, 2155, 1, fp);
fclose(fp);
}
}
}*/
#pragma endregion

22
src/rct2.h
View File

@@ -150,7 +150,6 @@ enum {
enum {
PATH_ID_G1,
PATH_ID_PLUGIN,
PATH_ID_CSS1,
PATH_ID_CSS2,
PATH_ID_CSS4,
@@ -159,22 +158,12 @@ enum {
PATH_ID_CSS7,
PATH_ID_CSS8,
PATH_ID_CSS9,
PATH_ID_CSS10,
PATH_ID_CSS11,
PATH_ID_CSS12,
PATH_ID_CSS13,
PATH_ID_CSS14,
PATH_ID_CSS15,
PATH_ID_CSS16,
PATH_ID_CSS3,
PATH_ID_GAMECFG,
PATH_ID_TUT640A,
PATH_ID_TUT640B,
PATH_ID_TUT640C,
PATH_ID_TUT800A,
PATH_ID_TUT800B,
PATH_ID_TUT800C,
PATH_ID_KANJI,
PATH_ID_CSS17,
PATH_ID_CSS18,
PATH_ID_CSS19,
@@ -219,7 +208,6 @@ enum {
static const char * const file_paths[] =
{
"Data\\G1.DAT",
"Data\\PLUGIN.DAT",
"Data\\CSS1.DAT",
"Data\\CSS2.DAT",
"Data\\CSS4.DAT",
@@ -228,22 +216,12 @@ static const char * const file_paths[] =
"Data\\CSS7.DAT",
"Data\\CSS8.DAT",
"Data\\CSS9.DAT",
"Data\\CSS10.DAT",
"Data\\CSS11.DAT",
"Data\\CSS12.DAT",
"Data\\CSS13.DAT",
"Data\\CSS14.DAT",
"Data\\CSS15.DAT",
"Data\\CSS16.DAT",
"Data\\CSS3.DAT",
"Data\\GAME.CFG",
"Data\\TUT640A.DAT",
"Data\\TUT640B.DAT",
"Data\\TUT640C.DAT",
"Data\\TUT800A.DAT",
"Data\\TUT800B.DAT",
"Data\\TUT800C.DAT",
"Data\\KANJI.DAT",
"Data\\CSS17.DAT",
"Data\\CSS18.DAT",
"Data\\CSS19.DAT",

4
src/ride/ride.c
View File

@@ -3320,13 +3320,13 @@ rct_ride_music_info* ride_music_info_list[] = {
INIT_MUSIC_INFO(PATH_ID_CSS7, 1378, 15331658, 0),
INIT_MUSIC_INFO(PATH_ID_CSS8, 1378, 17503414, 0),
INIT_MUSIC_INFO(PATH_ID_CSS9, 1378, 7005802, 0),
INIT_MUSIC_INFO(PATH_ID_CSS10, 1378, 0, 0),
INIT_MUSIC_INFO(0, 1378, 0, 0), // Referred to the nearly empty CSS10.DAT file
INIT_MUSIC_INFO(PATH_ID_CSS11, 1378, 7023288, 0),
INIT_MUSIC_INFO(PATH_ID_CSS12, 1378, 2767948, 0),
INIT_MUSIC_INFO(PATH_ID_CSS13, 1378, 3373390, 0),
INIT_MUSIC_INFO(PATH_ID_CSS14, 1378, 20783042, 0),
INIT_MUSIC_INFO(PATH_ID_CSS15, 1378, 10009312, 0),
INIT_MUSIC_INFO(PATH_ID_CSS16, 1378, 0, 0),
INIT_MUSIC_INFO(0, 1378, 0, 0), // Referred to the nearly empty CSS16.DAT file
INIT_MUSIC_INFO(PATH_ID_CSS3, 689, 1244886, 1),
INIT_MUSIC_INFO(PATH_ID_CSS17, 2756, -1, 0),
INIT_MUSIC_INFO(PATH_ID_CSS18, 2756, 8429568, 1),