Merge pull request #27 from Oblomov/master

[dragonfireclient.git] / src / utility.h

diff --git a/src/utility.h b/src/utility.h
index f18d3127841522732f0c514adc47790bca804351..497f79fa0dfed76ca441ec5e11824feb5b90a4d0 100644 (file)
--- a/src/utility.h
+++ b/src/utility.h
@@ -244,6 +244,9 @@ inline f32 readF1000(std::istream &is)
 {
        char buf[2];
        is.read(buf, 2);
+       // TODO: verify if this gets rid of the valgrind warning
+       //if(is.gcount() != 2)
+       //      return 0;
        return readF1000((u8*)buf);
 }
 
@@ -1738,6 +1741,11 @@ void mysrand(unsigned seed);
 
 inline int myrand_range(int min, int max)
 {
+       if(max-min > MYRAND_MAX)
+       {
+               dstream<<"WARNING: myrand_range: max-min > MYRAND_MAX"<<std::endl;
+               assert(0);
+       }
        if(min > max)
        {
                assert(0);