From 6f0573dff84ff30e7dc27457e7f6471fe9d419d4 Mon Sep 17 00:00:00 2001 From: Peisong Xiao Date: Tue, 9 Jul 2024 23:27:49 -0400 Subject: [PATCH] started working on map and potions --- src/game.h | 7 ++++--- src/main.cc | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/game.h b/src/game.h index 36d155e..9e863c6 100644 --- a/src/game.h +++ b/src/game.h @@ -12,17 +12,18 @@ class game final { private: + feature features; std::unique_ptr ∈ std::unique_ptr &out; std::unique_ptr &log; - feature features; - std::unique_ptr rng; + std::unique_ptr &rng; std::unique_ptr player; public: game(const feature enabled_features, std::unique_ptr &new_in, std::unique_ptr &new_out, - std::unique_ptr &new_log); + std::unique_ptr &new_log, + std::unique_ptr &new_rng); game_status run(); private: int getcmd() const; diff --git a/src/main.cc b/src/main.cc index 10ff2b1..44332fa 100644 --- a/src/main.cc +++ b/src/main.cc @@ -9,17 +9,17 @@ int main(int argc, char **argv) { std::unique_ptr rng; - feature enabled_features = proc_args(argc, argv, + feature enabled_features = proc_args(argc, argv, curse, in, out, log, rng); if (enabled_features & - (FEATURE_PANIC | FEATURE_PANIC_FILE | + (FEATURE_PANIC | FEATURE_PANIC_FILE | FEATURE_CONFLICT | FEATURE_PANIC_SEED)) { panic_args(enabled_features); return RETURN_PANICKED; } - game game_proc(enabled_features, in, out, log); + game game_proc(enabled_features, in, out, log, rng); while (game_proc.run() != game_status::terminated) out->render();