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

(svn r16755) -Codechange: apply some codestyle to newgrf.cpp

release/1.0
yexo 2009-07-05 20:59:42 +00:00
parent ed549f7563
commit 1cf14caee0
1 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/newgrf.cpp
View File

@ -5420,12 +5420,9 @@ static void ResetCustomStations()
static void ResetCustomHouses() static void ResetCustomHouses()
{ {
GRFFile *file; for (GRFFile *file = _first_grffile; file != NULL; file = file->next) {
uint i;
for (file = _first_grffile; file != NULL; file = file->next) {
if (file->housespec == NULL) continue; if (file->housespec == NULL) continue;
for (i = 0; i < HOUSE_MAX; i++) { for (uint i = 0; i < HOUSE_MAX; i++) {
free(file->housespec[i]); free(file->housespec[i]);
} }
@ -5436,56 +5433,45 @@ static void ResetCustomHouses()
static void ResetCustomIndustries() static void ResetCustomIndustries()
{ {
GRFFile *file; for (GRFFile *file = _first_grffile; file != NULL; file = file->next) {
for (file = _first_grffile; file != NULL; file = file->next) {
uint i;
/* We are verifiying both tiles and industries specs loaded from the grf file /* We are verifiying both tiles and industries specs loaded from the grf file
* First, let's deal with industryspec */ * First, let's deal with industryspec */
if (file->industryspec != NULL) { if (file->industryspec != NULL) {
for (i = 0; i < NUM_INDUSTRYTYPES; i++) { for (uint i = 0; i < NUM_INDUSTRYTYPES; i++) {
IndustrySpec *ind = file->industryspec[i]; IndustrySpec *ind = file->industryspec[i];
if (ind == NULL) continue;
if (ind != NULL) { /* We need to remove the sounds array */
/* We need to remove the sounds array */ if (HasBit(ind->cleanup_flag, CLEAN_RANDOMSOUNDS)) {
if (HasBit(ind->cleanup_flag, CLEAN_RANDOMSOUNDS)) { free((void*)ind->random_sounds);
free((void*)ind->random_sounds);
}
/* We need to remove the tiles layouts */
if (HasBit(ind->cleanup_flag, CLEAN_TILELSAYOUT) && ind->table != NULL) {
for (int j = 0; j < ind->num_table; j++) {
/* remove the individual layouts */
if (ind->table[j] != NULL) {
free((void*)ind->table[j]);
}
}
/* remove the layouts pointers */
free((void*)ind->table);
ind->table = NULL;
}
free(ind);
ind = NULL;
} }
/* We need to remove the tiles layouts */
if (HasBit(ind->cleanup_flag, CLEAN_TILELSAYOUT) && ind->table != NULL) {
for (int j = 0; j < ind->num_table; j++) {
/* remove the individual layouts */
free((void*)ind->table[j]);
}
/* remove the layouts pointers */
free((void*)ind->table);
ind->table = NULL;
}
free(ind);
} }
free(file->industryspec); free(file->industryspec);
file->industryspec = NULL; file->industryspec = NULL;
} }
if (file->indtspec != NULL) { if (file->indtspec == NULL) continue;
for (i = 0; i < NUM_INDUSTRYTILES; i++) { for (uint i = 0; i < NUM_INDUSTRYTILES; i++) {
if (file->indtspec[i] != NULL) { free(file->indtspec[i]);
free(file->indtspec[i]);
file->indtspec[i] = NULL;
}
}
free(file->indtspec);
file->indtspec = NULL;
} }
free(file->indtspec);
file->indtspec = NULL;
} }
} }