From 0052edae47d1e6ae613497c524719eff5838f52a Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 18 Feb 2022 23:54:30 +0100 Subject: Switched to use GetIntance for Game instead of static methods --- Stars45/FormDef.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Stars45/FormDef.cpp') diff --git a/Stars45/FormDef.cpp b/Stars45/FormDef.cpp index f4aadc4..360217d 100644 --- a/Stars45/FormDef.cpp +++ b/Stars45/FormDef.cpp @@ -621,7 +621,7 @@ FormDef::Load(const char* fname) pdef->name()->value() == "caption") { GetDefText(buf, pdef, filename); - form->SetText(Game::GetText(buf)); + form->SetText(Game::GetInstance()->GetText(buf)); } else if (pdef->name()->value() == "id") { @@ -798,7 +798,7 @@ void FormDef::ParseCtrlDef(CtrlDef* ctrl, TermStruct* val) if (pdef->name()->value() == "text" || pdef->name()->value() == "caption") { GetDefText(buf, pdef, filename); - ctrl->SetText(Game::GetText(buf)); + ctrl->SetText(Game::GetInstance()->GetText(buf)); } else if (pdef->name()->value() == "id") { @@ -815,7 +815,7 @@ void FormDef::ParseCtrlDef(CtrlDef* ctrl, TermStruct* val) else if (pdef->name()->value() == "alt") { GetDefText(buf, pdef, filename); - ctrl->SetAltText(Game::GetText(buf)); + ctrl->SetAltText(Game::GetInstance()->GetText(buf)); } else if (pdef->name()->value() == "type") { @@ -966,7 +966,7 @@ void FormDef::ParseCtrlDef(CtrlDef* ctrl, TermStruct* val) else if (pdef->name()->value() == "item") { GetDefText(buf, pdef, filename); - ctrl->AddItem(Game::GetText(buf)); + ctrl->AddItem(Game::GetInstance()->GetText(buf)); } else if (pdef->name()->value() == "tab") { @@ -1182,7 +1182,7 @@ void FormDef::ParseColumnDef(CtrlDef* ctrl, TermStruct* val) if (pdef->name()->value() == "text" || pdef->name()->value() == "title") { GetDefText(buf, pdef, filename); - text = Game::GetText(buf); + text = Game::GetInstance()->GetText(buf); } else if (pdef->name()->value() == "width") { -- cgit v1.1