Merge branch 'master' into Mario/wepent_experimental

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / random.qh

diff --git a/qcsrc/lib/random.qh b/qcsrc/lib/random.qh
index 5b7fb0d3cce723e58d9b7ca4ecb27edde91d9542..b2fc53f0cac4edaaa3ef964c25b7b6093ac2ae2c 100644 (file)
--- a/qcsrc/lib/random.qh
+++ b/qcsrc/lib/random.qh
@@ -1,14 +1,18 @@
-#ifndef RANDOM_H
-#define RANDOM_H
+#pragma once
 
 float RandomSelection_totalweight;
 float RandomSelection_best_priority;
 entity RandomSelection_chosen_ent;
 float RandomSelection_chosen_float;
 string RandomSelection_chosen_string;
+vector RandomSelection_chosen_vec;
 
 void RandomSelection_Init();
-void RandomSelection_Add(entity e, float f, string s, float weight, float priority);
+void RandomSelection_Add(entity e, float f, string s, vector v, float weight, float priority);
+#define RandomSelection_AddEnt(e, weight, priority) RandomSelection_Add(e, 0, string_null, '0 0 0', weight, priority)
+#define RandomSelection_AddFloat(f, weight, priority) RandomSelection_Add(NULL, f, string_null, '0 0 0', weight, priority)
+#define RandomSelection_AddString(s, weight, priority) RandomSelection_Add(NULL, 0, s, '0 0 0', weight, priority)
+#define RandomSelection_AddVec(v, weight, priority) RandomSelection_Add(NULL, 0, string_null, v, weight, priority)
 
 // prandom - PREDICTABLE random number generator
 
@@ -30,4 +34,3 @@ void RandomSelection_Add(entity e, float f, string s, float weight, float priori
        #define psrandom(x)
        #define prandom_debug()
 #endif
-#endif