Use templates for random_choose() to eliminate the need for multiple definitions.

1 files changed, 3 insertions, 77 deletions

diff --git a/crawl-ref/source/random.cc b/crawl-ref/source/random.cc
index 323fa45ebc..91ba6191b6 100644
--- a/crawl-ref/source/random.cc
+++ b/crawl-ref/source/random.cc
@@ -18,47 +18,11 @@ int random_range(int low, int high, int nrolls)
     return low + roll;
 }
 
-// Chooses one of the numbers passed in at random. The list of numbers
-// must be terminated with -1.
-static int _random_choose(int first, va_list args)
-{
-    int chosen = first, count = 1, nargs = 100;
-
-    while (nargs-- > 0)
-    {
-        const int pick = va_arg(args, int);
-        if (pick == -1)
-            break;
-        if (one_chance_in(++count))
-            chosen = pick;
-    }
-
-    ASSERT(nargs > 0);
-    return (chosen);
-}
-
-int random_choose(int first, ...)
-{
-    va_list args;
-    va_start(args, first);
-    int chosen = _random_choose(first, args);
-    va_end(args);
-    return chosen;
-}
-
-monster_type random_choose(monster_type first, ...)
-{
-    va_list args;
-    va_start(args, first);
-    int chosen = _random_choose(first, args);
-    va_end(args);
-    return (monster_type)chosen;
-}
-
 // Chooses one of the strings passed in at random. The list of strings
-// must be terminated with NULL.  Sadly, NULL is not -1, and 0 is popular
+// must be terminated with NULL.  NULL is not -1, and 0 is popular
 // value for enums, so we need to copy the function.
-const char* random_choose_string(const char* first, ...)
+template <>
+const char* random_choose<const char*>(const char* first, ...)
 {
     va_list args;
     va_start(args, first);
@@ -81,44 +45,6 @@ const char* random_choose_string(const char* first, ...)
     return (chosen);
 }
 
-static int _random_choose_weighted(int weight, int first, va_list args)
-{
-    int chosen = first, cweight = weight, nargs = 100;
-
-    while (nargs-- > 0)
-    {
-        const int nweight = va_arg(args, int);
-        if (!nweight)
-            break;
-
-        const int choice = va_arg(args, int);
-        if (random2(cweight += nweight) < nweight)
-            chosen = choice;
-    }
-
-    ASSERT(nargs > 0);
-
-    return (chosen);
-}
-
-int random_choose_weighted(int weight, int first, ...)
-{
-    va_list args;
-    va_start(args, first);
-    int chosen = _random_choose_weighted(weight, first, args);
-    va_end(args);
-    return chosen;
-}
-
-monster_type random_choose_weighted(int weight, monster_type first, ...)
-{
-    va_list args;
-    va_start(args, first);
-    int chosen = _random_choose_weighted(weight, first, args);
-    va_end(args);
-    return (monster_type)chosen;
-}
-
 #ifndef UINT32_MAX
 #define UINT32_MAX ((uint32_t)(-1))
 #endif