diff options
| author | Aki <please@ignore.pl> | 2022-02-23 23:36:37 +0100 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2022-02-23 23:36:37 +0100 |
| commit | 0da933a0146a0689546b21231e14f2dfc2bc14e8 (patch) | |
| tree | b917762280e2094d77fae2a607d6ad3151174fce /Stars45/FormDef.cpp | |
| parent | 8b778dda61c45f5d7a4dc416478c42ff4aa1de7f (diff) | |
| download | starshatter-0da933a0146a0689546b21231e14f2dfc2bc14e8.zip starshatter-0da933a0146a0689546b21231e14f2dfc2bc14e8.tar.gz starshatter-0da933a0146a0689546b21231e14f2dfc2bc14e8.tar.bz2 | |
Switched to use ContentBundle's GetText
Diffstat (limited to 'Stars45/FormDef.cpp')
| -rw-r--r-- | Stars45/FormDef.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Stars45/FormDef.cpp b/Stars45/FormDef.cpp index 360217d..77eb1ca 100644 --- a/Stars45/FormDef.cpp +++ b/Stars45/FormDef.cpp @@ -17,6 +17,7 @@ #include "DataLoader.h" #include "Bitmap.h" #include "Game.h" +#include "ContentBundle.h" // +----------------------------------------------------------------------+ @@ -621,7 +622,7 @@ FormDef::Load(const char* fname) pdef->name()->value() == "caption") { GetDefText(buf, pdef, filename); - form->SetText(Game::GetInstance()->GetText(buf)); + form->SetText(ContentBundle::GetInstance()->GetText(buf)); } else if (pdef->name()->value() == "id") { @@ -798,7 +799,7 @@ void FormDef::ParseCtrlDef(CtrlDef* ctrl, TermStruct* val) if (pdef->name()->value() == "text" || pdef->name()->value() == "caption") { GetDefText(buf, pdef, filename); - ctrl->SetText(Game::GetInstance()->GetText(buf)); + ctrl->SetText(ContentBundle::GetInstance()->GetText(buf)); } else if (pdef->name()->value() == "id") { @@ -815,7 +816,7 @@ void FormDef::ParseCtrlDef(CtrlDef* ctrl, TermStruct* val) else if (pdef->name()->value() == "alt") { GetDefText(buf, pdef, filename); - ctrl->SetAltText(Game::GetInstance()->GetText(buf)); + ctrl->SetAltText(ContentBundle::GetInstance()->GetText(buf)); } else if (pdef->name()->value() == "type") { @@ -966,7 +967,7 @@ void FormDef::ParseCtrlDef(CtrlDef* ctrl, TermStruct* val) else if (pdef->name()->value() == "item") { GetDefText(buf, pdef, filename); - ctrl->AddItem(Game::GetInstance()->GetText(buf)); + ctrl->AddItem(ContentBundle::GetInstance()->GetText(buf)); } else if (pdef->name()->value() == "tab") { @@ -1182,7 +1183,7 @@ void FormDef::ParseColumnDef(CtrlDef* ctrl, TermStruct* val) if (pdef->name()->value() == "text" || pdef->name()->value() == "title") { GetDefText(buf, pdef, filename); - text = Game::GetInstance()->GetText(buf); + text = ContentBundle::GetInstance()->GetText(buf); } else if (pdef->name()->value() == "width") { |