summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/company_base.h2
-rw-r--r--src/economy.cpp6
-rw-r--r--src/news_gui.cpp10
-rw-r--r--src/news_type.h2
-rw-r--r--src/saveload/company_sl.cpp2
-rw-r--r--src/saveload/oldloader_sl.cpp2
6 files changed, 12 insertions, 12 deletions
diff --git a/src/company_base.h b/src/company_base.h
index 8f5ce6eb4..61aaae3c1 100644
--- a/src/company_base.h
+++ b/src/company_base.h
@@ -70,7 +70,7 @@ struct Company : CompanyPool::PoolItem<&_company_pool> {
Year inaugurated_year;
byte num_valid_stat_ent;
- byte quarters_of_bankrupcy;
+ byte quarters_of_bankruptcy;
CompanyMask bankrupt_asked; ///< which companies were asked about buying it?
int16 bankrupt_timeout;
Money bankrupt_value;
diff --git a/src/economy.cpp b/src/economy.cpp
index a4171f3df..997c882d8 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -482,17 +482,17 @@ static void CompanyCheckBankrupt(Company *c)
{
/* If the company has money again, it does not go bankrupt */
if (c->money >= 0) {
- c->quarters_of_bankrupcy = 0;
+ c->quarters_of_bankruptcy = 0;
c->bankrupt_asked = 0;
return;
}
- c->quarters_of_bankrupcy++;
+ c->quarters_of_bankruptcy++;
CompanyNewsInformation *cni = MallocT<CompanyNewsInformation>(1);
cni->FillData(c);
- switch (c->quarters_of_bankrupcy) {
+ switch (c->quarters_of_bankruptcy) {
case 0:
case 1:
free(cni);
diff --git a/src/news_gui.cpp b/src/news_gui.cpp
index c25715c56..67e130f25 100644
--- a/src/news_gui.cpp
+++ b/src/news_gui.cpp
@@ -54,7 +54,7 @@ static NewsItem *_current_news = NULL;
typedef void DrawNewsCallbackProc(struct Window *w, const NewsItem *ni);
void DrawNewsNewVehicleAvail(Window *w, const NewsItem *ni);
-static void DrawNewsBankrupcy(Window *w, const NewsItem *ni)
+static void DrawNewsBankruptcy(Window *w, const NewsItem *ni)
{
const CompanyNewsInformation *cni = (const CompanyNewsInformation*)ni->free_data;
@@ -134,10 +134,10 @@ static const NewsSubtypeData _news_subtype_data[] = {
{ NT_ARRIVAL_COMPANY, NM_THIN, NF_NONE, NULL }, ///< NS_ARRIVAL_COMPANY
{ NT_ARRIVAL_OTHER, NM_THIN, NF_NONE, NULL }, ///< NS_ARRIVAL_OTHER
{ NT_ACCIDENT, NM_THIN, NF_NONE, NULL }, ///< NS_ACCIDENT
- { NT_COMPANY_INFO, NM_NORMAL, NF_NONE, DrawNewsBankrupcy }, ///< NS_COMPANY_TROUBLE
- { NT_COMPANY_INFO, NM_NORMAL, NF_NONE, DrawNewsBankrupcy }, ///< NS_COMPANY_MERGER
- { NT_COMPANY_INFO, NM_NORMAL, NF_NONE, DrawNewsBankrupcy }, ///< NS_COMPANY_BANKRUPT
- { NT_COMPANY_INFO, NM_NORMAL, NF_NONE, DrawNewsBankrupcy }, ///< NS_COMPANY_NEW
+ { NT_COMPANY_INFO, NM_NORMAL, NF_NONE, DrawNewsBankruptcy }, ///< NS_COMPANY_TROUBLE
+ { NT_COMPANY_INFO, NM_NORMAL, NF_NONE, DrawNewsBankruptcy }, ///< NS_COMPANY_MERGER
+ { NT_COMPANY_INFO, NM_NORMAL, NF_NONE, DrawNewsBankruptcy }, ///< NS_COMPANY_BANKRUPT
+ { NT_COMPANY_INFO, NM_NORMAL, NF_NONE, DrawNewsBankruptcy }, ///< NS_COMPANY_NEW
{ NT_INDUSTRY_OPEN, NM_THIN, NF_NONE, NULL }, ///< NS_INDUSTRY_OPEN
{ NT_INDUSTRY_CLOSE, NM_THIN, NF_NONE, NULL }, ///< NS_INDUSTRY_CLOSE
{ NT_ECONOMY, NM_NORMAL, NF_NONE, NULL }, ///< NS_ECONOMY
diff --git a/src/news_type.h b/src/news_type.h
index e06ba7fb1..e1d600096 100644
--- a/src/news_type.h
+++ b/src/news_type.h
@@ -24,7 +24,7 @@ enum NewsType {
NT_ARRIVAL_COMPANY, ///< Cargo arrived for company
NT_ARRIVAL_OTHER, ///< Cargo arrived for competitor
NT_ACCIDENT, ///< An accident or disaster has occurred
- NT_COMPANY_INFO, ///< Company info (new companies, bankrupcy messages)
+ NT_COMPANY_INFO, ///< Company info (new companies, bankruptcy messages)
NT_INDUSTRY_OPEN, ///< Opening of industries
NT_INDUSTRY_CLOSE, ///< Closing of industries
NT_ECONOMY, ///< Economic changes (recession, industry up/dowm)
diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp
index ab3ee8b79..f81c51a40 100644
--- a/src/saveload/company_sl.cpp
+++ b/src/saveload/company_sl.cpp
@@ -124,7 +124,7 @@ static const SaveLoad _company_desc[] = {
SLE_VAR(Company, num_valid_stat_ent, SLE_UINT8),
- SLE_VAR(Company, quarters_of_bankrupcy, SLE_UINT8),
+ SLE_VAR(Company, quarters_of_bankruptcy,SLE_UINT8),
SLE_CONDVAR(Company, bankrupt_asked, SLE_FILE_U8 | SLE_VAR_U16, 0, 103),
SLE_CONDVAR(Company, bankrupt_asked, SLE_UINT16, 104, SL_MAX_VERSION),
SLE_VAR(Company, bankrupt_timeout, SLE_INT16),
diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp
index aea9f4938..36b757937 100644
--- a/src/saveload/oldloader_sl.cpp
+++ b/src/saveload/oldloader_sl.cpp
@@ -984,7 +984,7 @@ static const OldChunks _company_chunk[] = {
OCL_SVAR( OC_UINT8, Company, colour ),
OCL_SVAR( OC_UINT8, Company, money_fraction ),
- OCL_SVAR( OC_UINT8, Company, quarters_of_bankrupcy ),
+ OCL_SVAR( OC_UINT8, Company, quarters_of_bankruptcy ),
OCL_SVAR( OC_FILE_U8 | OC_VAR_U16, Company, bankrupt_asked ),
OCL_SVAR( OC_FILE_U32 | OC_VAR_I64, Company, bankrupt_value ),
OCL_SVAR( OC_UINT16, Company, bankrupt_timeout ),