diff --git a/CMakeLists.txt b/CMakeLists.txt index 58e54d2..989b025 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15.0) project( R136 - VERSION 3.4.1) + VERSION 3.4.2) set(CURSES_NEED_NCURSES 1) set(CURSES_NEED_WIDE 1) diff --git a/include/base.h b/include/base.h index 3c768b7..e3d0309 100644 --- a/include/base.h +++ b/include/base.h @@ -7,7 +7,4 @@ AnimateStatus operator++(AnimateStatus& status, int); AnimateStatus& operator++(AnimateStatus& status); #include "templates/base.h" -#include "inlines/base.h" - -#define select(...) select_language_param(core.language, __VA_ARGS__) -#define get_y_or_n() (tolower(console.main().get_char_input(select("jJnN", "yYnN"))) == select((int)'j', (int)'y')) \ No newline at end of file +#include "inlines/base.h" \ No newline at end of file diff --git a/include/inlines/base.h b/include/inlines/base.h index dda9256..8cfae25 100644 --- a/include/inlines/base.h +++ b/include/inlines/base.h @@ -75,9 +75,9 @@ inline AnimateStatus& Item::target_status(CoreData& core) return core.animates[usable_on].status; } -inline void Item::report_pointless_use() +inline void Item::report_pointless_use(CoreData &core) { - console.main().print("Dat heeft geen zin.\n"); + console.main().print(select("Dat heeft geen zin.\n", "That serves no use.\n")); } inline bool Item::use_to_status(CoreData& core, AnimateStatus to_status) @@ -99,7 +99,7 @@ inline bool Item::use(CoreData& core) if (is_target_present(core)) return use_with_target_present(core); - report_pointless_use(); + report_pointless_use(core); return true; } diff --git a/include/inlines/items.h b/include/inlines/items.h index 2666e4f..37c4f8d 100644 --- a/include/inlines/items.h +++ b/include/inlines/items.h @@ -31,20 +31,20 @@ inline bool Nightcap::use_with_target_present(CoreData& core) if (target_status(core) == AnimateStatus::sleeping_lightly) return use_to_status(core); - report_pointless_use(); + report_pointless_use(core); return false; } inline bool Gasmask::use(CoreData& core) { - console.main().print("Je hebt het gasmasker al op."); + console.main().print(select("Je hebt het gasmasker al op.", "You're already wearing the gas mask.")); console.main().empty_line(); return false; } inline bool ThermalSuit::use(CoreData& core) { - console.main().print("Je hebt het hittepak al aan."); + console.main().print(select("Je hebt het hittepak al aan.", "You're already wearing the thermal suit.")); console.main().empty_line(); return false; } diff --git a/include/types/base.h b/include/types/base.h index a51cd68..6d7845e 100644 --- a/include/types/base.h +++ b/include/types/base.h @@ -17,6 +17,10 @@ constexpr auto to_value(E e) noexcept return static_cast>(e); } +// included here because they are used in some headers that directly include this types/base.h +#define select(...) select_language_param(core.language, __VA_ARGS__) +#define get_y_or_n() (tolower(console.main().get_char_input(select("jJnN", "yYnN"))) == select((int)'j', (int)'y')) + enum class RoomType : char { forest, @@ -291,7 +295,7 @@ struct Item : Entity AnimateStatus sets_target_to_status; bool is_target_present(CoreData& core); AnimateStatus& target_status(CoreData& core); - void report_pointless_use(); + void report_pointless_use(CoreData& core); virtual bool use_with_target_present(CoreData& core); virtual bool use_to_status(CoreData& core, AnimateStatus to_status = AnimateStatus::undefined); diff --git a/src/intro.cpp b/src/intro.cpp index 4737a5c..0e2ed64 100644 --- a/src/intro.cpp +++ b/src/intro.cpp @@ -324,7 +324,7 @@ namespace startup console.main().empty_line(); console.main().set_attribute(A_BOLD); - console.main().print_centered(select("Versie 3.4.1, (C) 1998, 2022 R.I.P.", "Version 3.4.1, (C) 1998, 2022 R.I.P.")); + console.main().print_centered(select("Versie 3.4.2, (C) 1998, 2023 R.I.P.", "Version 3.4.2, (C) 1998, 2023 R.I.P.")); console.main().unset_attribute(A_BOLD); console.main().empty_line(); } diff --git a/src/items/sword.cpp b/src/items/sword.cpp index c77c3dd..836978e 100644 --- a/src/items/sword.cpp +++ b/src/items/sword.cpp @@ -16,7 +16,7 @@ bool Sword::use(CoreData& core) monsterID = AnimateID::plant; else { - report_pointless_use(); + report_pointless_use(core); return false; }