From 3ae82841f4bcc69dae9ccd8e910058b1708d5e1f Mon Sep 17 00:00:00 2001 From: Peisong Xiao Date: Sat, 13 Jul 2024 14:22:06 -0400 Subject: [PATCH] removed room.* (unused) --- src/gold.h | 17 +---------------- src/level.h | 2 +- src/rng.cc | 19 ------------------- src/rng.h | 19 +++++++++++++++++-- src/room.cc | 1 - src/room.h | 6 ------ 6 files changed, 19 insertions(+), 45 deletions(-) delete mode 100644 src/room.cc delete mode 100644 src/room.h diff --git a/src/gold.h b/src/gold.h index 92bc7c8..6ada545 100644 --- a/src/gold.h +++ b/src/gold.h @@ -13,21 +13,6 @@ struct gold { typedef std::vector gold_list; -int rand_gold_pile(RNG *rng) { - const int denominator = 8; - const int normal = 5; - const int dragon = 6; - - int tmp = rng->rand_under(denominator); - - if (tmp < normal) - return GOLD_NORMAL; - else if (tmp < dragon) - return GOLD_DRAGON; - else - return GOLD_SMALL; - - return 0; -} +int rand_gold_pile(RNG *rng); #endif diff --git a/src/level.h b/src/level.h index 3174861..1ec91bf 100644 --- a/src/level.h +++ b/src/level.h @@ -5,10 +5,10 @@ #include #include #include "display.h" +#include "gold.h" #include "enemies.h" #include "potions.h" #include "constants.h" -#include "gold.h" #include "map.h" class level { diff --git a/src/rng.cc b/src/rng.cc index 6a65f35..8c612dd 100644 --- a/src/rng.cc +++ b/src/rng.cc @@ -47,22 +47,3 @@ int RNG::exclude_middle(const int lower_bound, const int upper_bound, int tmp = (curr_rand_num % (upper_bound - lower_bound - 1)); return tmp >= excluded ? tmp + 1 : tmp; } - -template T RNG::rand_exclude(std::vector &vec, T &target) { - std::size_t idx = 0; - - for (; idx < vec.size(); ++idx) - if (vec[idx] == target) - break; - - return vec[exclude_middle(0, vec.size(), idx)]; -} - -template T RNG::get_rand_in_vector(std::vector &vec) { - if (!vec.size()) - return T{}; - - curr_rand_num = rand(); - - return vec[curr_rand_num % vec.size()]; -} diff --git a/src/rng.h b/src/rng.h index aba6324..0abd2c2 100644 --- a/src/rng.h +++ b/src/rng.h @@ -33,9 +33,24 @@ public: int exclude_middle(const int lower_bound, const int upper_bound, const int excluded); - template T rand_exclude(std::vector &vec, T &target); + template T rand_exclude(std::vector &vec, T &target) { + std::size_t idx = 0; - template T get_rand_in_vector(std::vector &vec); + for (; idx < vec.size(); ++idx) + if (vec[idx] == target) + break; + + return vec[exclude_middle(0, vec.size(), idx)]; + } + + template T get_rand_in_vector(std::vector &vec) { + if (!vec.size()) + return T{}; + + curr_rand_num = rand(); + + return vec[curr_rand_num % vec.size()]; + } }; #endif diff --git a/src/room.cc b/src/room.cc deleted file mode 100644 index fe6026a..0000000 --- a/src/room.cc +++ /dev/null @@ -1 +0,0 @@ -#include "room.h" diff --git a/src/room.h b/src/room.h deleted file mode 100644 index f0a7b58..0000000 --- a/src/room.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ROOM_H__ -#define __ROOM_H__ - - - -#endif