dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r15428) -Codechange: consistently use colour instead of having both color and colour.

Browse Source
This commit is contained in:
rubidium
2009-02-09 02:57:15 +00:00
parent 90e2465d7d
commit c0a8d09ca7
102 changed files with 862 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/saveload/afterload.cpp
View File

@@ -203,7 +203,7 @@ static bool InitializeWindowsAndCaches()
{
/* Initialize windows */
ResetWindowSystem();
SetupColorsAndInitialWindow();
SetupColoursAndInitialWindow();
ResetViewportAfterLoadGame();
@@ -1754,7 +1754,7 @@ void ReloadNewGRFData()
/* Check and update house and town values */
UpdateHousesAndTowns();
/* Update livery selection windows */
for (CompanyID i = COMPANY_FIRST; i < MAX_COMPANIES; i++) InvalidateWindowData(WC_COMPANY_COLOR, i, _loaded_newgrf_features.has_2CC);
for (CompanyID i = COMPANY_FIRST; i < MAX_COMPANIES; i++) InvalidateWindowData(WC_COMPANY_COLOUR, i, _loaded_newgrf_features.has_2CC);
/* redraw the whole screen */
MarkWholeScreenDirty();
CheckTrainsLengths();

2
src/saveload/company_sl.cpp
View File

@@ -18,7 +18,7 @@
* - 10 to 13: nose
* - 13 to 15: lips (also moustache for males)
* - 16 to 19: hair
* - 20 to 22: eye color
* - 20 to 22: eye colour
* - 20 to 27: tie, ear rings etc.
* - 28 to 30: glasses
* - 19, 26 and 27: race (bit 27 set and bit 19 equal to bit 26 = black, otherwise white)

2
src/saveload/industry_sl.cpp
View File

@@ -35,7 +35,7 @@ static const SaveLoad _industry_desc[] = {
SLE_VAR(Industry, type, SLE_UINT8),
SLE_VAR(Industry, owner, SLE_UINT8),
SLE_VAR(Industry, random_color, SLE_UINT8),
SLE_VAR(Industry, random_colour, SLE_UINT8),
SLE_CONDVAR(Industry, last_prod_year, SLE_FILE_U8 | SLE_VAR_I32, 0, 30),
SLE_CONDVAR(Industry, last_prod_year, SLE_INT32, 31, SL_MAX_VERSION),
SLE_VAR(Industry, was_cargo_delivered, SLE_UINT8),

8
src/saveload/oldloader_sl.cpp
View File

@@ -853,7 +853,7 @@ static const OldChunks industry_chunk[] = {
OCL_SVAR( OC_UINT8, Industry, type ),
OCL_SVAR( OC_TTO | OC_FILE_U8 | OC_VAR_U16, Industry, counter ),
OCL_SVAR( OC_UINT8, Industry, owner ),
OCL_SVAR( OC_UINT8, Industry, random_color ),
OCL_SVAR( OC_UINT8, Industry, random_colour ),
OCL_SVAR( OC_TTD | OC_FILE_U8 | OC_VAR_I32, Industry, last_prod_year ),
OCL_SVAR( OC_TTD | OC_UINT16, Industry, counter ),
OCL_SVAR( OC_TTD | OC_UINT8, Industry, was_cargo_delivered ),
@@ -879,7 +879,7 @@ static bool LoadOldIndustry(LoadgameState *ls, int num)
ConvertDateToYMD(_date, &ymd);
i->last_prod_year = ymd.year;
i->random_color = RemapTTOColour(i->random_color);
i->random_colour = RemapTTOColour(i->random_colour);
}
IncIndustryTypeCount(i->type);
@@ -1004,7 +1004,7 @@ static bool LoadOldCompany(LoadgameState *ls, int num)
if (_savegame_type == SGT_TTO) {
/* adjust manager's face */
if (HasBit(c->face, 27) && GB(c->face, 26, 1) == GB(c->face, 19, 1)) {
/* if face would be black in TTD, adjust tie color and thereby face color */
/* if face would be black in TTD, adjust tie colour and thereby face colour */
ClrBit(c->face, 27);
}
@@ -1715,7 +1715,7 @@ static const OldChunks main_chunk[] = {
OCL_VAR ( OC_FILE_U8 | OC_VAR_U32, 1, &_cur_company_tick_index ),
OCL_NULL( 2 ), ///< Date stuff, calculated automatically
OCL_NULL( 8 ), ///< Company colors, calculated automatically
OCL_NULL( 8 ), ///< Company colours, calculated automatically
OCL_VAR ( OC_UINT8, 1, &_economy.infl_amount ),
OCL_VAR ( OC_UINT8, 1, &_economy.infl_amount_pr ),

4
src/saveload/saveload.cpp
View File

@@ -1622,7 +1622,7 @@ static SaveOrLoadResult SaveFileToDisk(bool threaded)
AbortSaveLoad();
if (_sl.excpt_uninit != NULL) _sl.excpt_uninit();
/* Skip the "color" character */
/* Skip the "colour" character */
DEBUG(sl, 0, GetSaveLoadErrorString() + 3);
if (threaded) {
@@ -1822,7 +1822,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb)
/* deinitialize compressor. */
if (_sl.excpt_uninit != NULL) _sl.excpt_uninit();
/* Skip the "color" character */
/* Skip the "colour" character */
DEBUG(sl, 0, GetSaveLoadErrorString() + 3);
/* A saver/loader exception!! reinitialize all variables to prevent crash! */