Merge branch 'master' into Mario/vaporizer_damage

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / prandom.qc

diff --git a/qcsrc/client/prandom.qc b/qcsrc/client/prandom.qc
index 1fae8abe0db94bbeb1cf165a969a83d9c983ff29..935f1421ed1379f26ce486ce56747fc8cf80385c 100644 (file)
--- a/qcsrc/client/prandom.qc
+++ b/qcsrc/client/prandom.qc
@@ -1,3 +1,11 @@
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qh"
+       #include "../warpzonelib/mathlib.qh"
+       #include "prandom.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 // prandom - PREDICTABLE random number generator (not seeded yet)
 
 #ifdef USE_PRANDOM
@@ -5,11 +13,11 @@ float prandom_seed;
 float prandom()
 {
        float c;
-       c = crc16(FALSE, strcat(ftos(prandom_seed), ftos(prandom_seed + M_PI)));
+       c = crc16(false, strcat(ftos(prandom_seed), ftos(prandom_seed + M_PI)));
        prandom_seed = c;
 
 #ifdef USE_PRANDOM_DEBUG
-       print("RANDOM -> ", ftos(c), "\n");
+       dprint("RANDOM -> ", ftos(c), "\n");
 #endif
 
        return c / 65536; // in [0..1[
@@ -21,9 +29,9 @@ vector prandomvec()
 
        do
        {
-               v_x = prandom();
-               v_y = prandom();
-               v_z = prandom();
+               v.x = prandom();
+               v.y = prandom();
+               v.z = prandom();
        }
        while(v * v > 1);
 
@@ -34,14 +42,14 @@ void psrandom(float seed)
 {
        prandom_seed = seed;
 #ifdef USE_PRANDOM_DEBUG
-       print("SRANDOM ", ftos(seed), "\n");
+       dprint("SRANDOM ", ftos(seed), "\n");
 #endif
 }
 
 #ifdef USE_PRANDOM_DEBUG
 void prandom_debug()
 {
-       print("Current random seed = ", ftos(prandom_seed), "\n");
+       dprint("Current random seed = ", ftos(prandom_seed), "\n");
 }
 #endif
 #endif