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/Instruction.cpp | 64 ++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'Stars45/Instruction.cpp') diff --git a/Stars45/Instruction.cpp b/Stars45/Instruction.cpp index 5569709..368cbf5 100644 --- a/Stars45/Instruction.cpp +++ b/Stars45/Instruction.cpp @@ -340,67 +340,67 @@ Instruction::GetShortDescription() const switch (action) { case VECTOR: if (farcast) - sprintf_s(desc, Game::GetText("instr.short.farcast").data(), rgn_name.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.farcast").data(), rgn_name.data()); else - sprintf_s(desc, Game::GetText("instr.short.vector").data(), rgn_name.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.vector").data(), rgn_name.data()); break; case LAUNCH: - sprintf_s(desc, Game::GetText("instr.short.launch").data(), tgt_name.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.launch").data(), tgt_name.data()); break; case DOCK: - sprintf_s(desc, Game::GetText("instr.short.dock").data(), tgt_name.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.dock").data(), tgt_name.data()); break; case RTB: - sprintf_s(desc, Game::GetText("instr.short.return-to-base").data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.return-to-base").data()); break; case DEFEND: if (priority == PRIMARY) { - sprintf_s(desc, Game::GetText("instr.short.defend").data(), ActionName(action), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.defend").data(), ActionName(action), tgt_desc.data()); } else { - sprintf_s(desc, Game::GetText("instr.short.protect").data(), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.protect").data(), tgt_desc.data()); } break; case ESCORT: if (priority == PRIMARY) { - sprintf_s(desc, Game::GetText("instr.short.escort").data(), ActionName(action), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.escort").data(), ActionName(action), tgt_desc.data()); } else { - sprintf_s(desc, Game::GetText("instr.short.protect").data(), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.protect").data(), tgt_desc.data()); } break; case PATROL: - sprintf_s(desc, Game::GetText("instr.short.patrol").data(), + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.patrol").data(), tgt_desc.data(), rgn_name.data()); break; case SWEEP: - sprintf_s(desc, Game::GetText("instr.short.sweep").data(), + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.sweep").data(), tgt_desc.data(), rgn_name.data()); break; case INTERCEPT: - sprintf_s(desc, Game::GetText("instr.short.intercept").data(), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.intercept").data(), tgt_desc.data()); break; case STRIKE: - sprintf_s(desc, Game::GetText("instr.short.strike").data(), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.strike").data(), tgt_desc.data()); break; case ASSAULT: - sprintf_s(desc, Game::GetText("instr.short.assault").data(), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.assault").data(), tgt_desc.data()); break; case RECON: - sprintf_s(desc, Game::GetText("instr.short.recon").data(), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.short.recon").data(), tgt_desc.data()); break; default: @@ -410,7 +410,7 @@ Instruction::GetShortDescription() const if (status != PENDING) { strcat_s(desc, " - "); - strcat_s(desc, Game::GetText(StatusName(status))); + strcat_s(desc, Game::GetInstance()->GetText(StatusName(status))); } return desc; @@ -426,67 +426,67 @@ Instruction::GetDescription() const switch (action) { case VECTOR: if (farcast) - sprintf_s(desc, Game::GetText("instr.long.farcast").data(), rgn_name.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.farcast").data(), rgn_name.data()); else - sprintf_s(desc, Game::GetText("instr.long.vector").data(), rgn_name.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.vector").data(), rgn_name.data()); break; case LAUNCH: - sprintf_s(desc, Game::GetText("instr.long.launch").data(), tgt_name.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.launch").data(), tgt_name.data()); break; case DOCK: - sprintf_s(desc, Game::GetText("instr.long.dock").data(), tgt_name.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.dock").data(), tgt_name.data()); break; case RTB: - sprintf_s(desc, Game::GetText("instr.long.return-to-base").data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.return-to-base").data()); break; case DEFEND: if (priority == PRIMARY) { - sprintf_s(desc, Game::GetText("instr.long.defend").data(), ActionName(action), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.defend").data(), ActionName(action), tgt_desc.data()); } else { - sprintf_s(desc, Game::GetText("instr.long.protect").data(), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.protect").data(), tgt_desc.data()); } break; case ESCORT: if (priority == PRIMARY) { - sprintf_s(desc, Game::GetText("instr.long.escort").data(), ActionName(action), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.escort").data(), ActionName(action), tgt_desc.data()); } else { - sprintf_s(desc, Game::GetText("instr.long.protect").data(), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.protect").data(), tgt_desc.data()); } break; case PATROL: - sprintf_s(desc, Game::GetText("instr.long.patrol").data(), + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.patrol").data(), tgt_desc.data(), rgn_name.data()); break; case SWEEP: - sprintf_s(desc, Game::GetText("instr.long.sweep").data(), + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.sweep").data(), tgt_desc.data(), rgn_name.data()); break; case INTERCEPT: - sprintf_s(desc, Game::GetText("instr.long.intercept").data(), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.intercept").data(), tgt_desc.data()); break; case STRIKE: - sprintf_s(desc, Game::GetText("instr.long.strike").data(), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.strike").data(), tgt_desc.data()); break; case ASSAULT: - sprintf_s(desc, Game::GetText("instr.long.assault").data(), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.assault").data(), tgt_desc.data()); break; case RECON: - sprintf_s(desc, Game::GetText("instr.long.recon").data(), tgt_desc.data()); + sprintf_s(desc, Game::GetInstance()->GetText("instr.long.recon").data(), tgt_desc.data()); break; default: @@ -496,7 +496,7 @@ Instruction::GetDescription() const if (status != PENDING) { strcat_s(desc, " - "); - strcat_s(desc, Game::GetText(StatusName(status))); + strcat_s(desc, Game::GetInstance()->GetText(StatusName(status))); } return desc; -- cgit v1.1