From 7f6009bb4a50fbcca80f1e4e2b85ab521ab628d6 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 15 Jul 2013 16:25:09 -0700
Subject: [PATCH] make randIntInRange inclusive on the max side

---
 animation-server/src/main.cpp       | 2 +-
 libraries/shared/src/SharedUtil.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/animation-server/src/main.cpp b/animation-server/src/main.cpp
index 126216ea9b..7b909b4e11 100644
--- a/animation-server/src/main.cpp
+++ b/animation-server/src/main.cpp
@@ -434,7 +434,7 @@ void sendDanceFloor() {
         for (int i = 0; i < DANCE_FLOOR_WIDTH; i++) {
             for (int j = 0; j < DANCE_FLOOR_LENGTH; j++) {
 
-                int randomColorIndex = randIntInRange( -(DANCE_FLOOR_COLORS), (DANCE_FLOOR_COLORS + 1));
+                int randomColorIndex = randIntInRange(-DANCE_FLOOR_COLORS, DANCE_FLOOR_COLORS);
                 ::danceFloorColors[i][j] = randomColorIndex;
                 ::danceFloorLights[i][j] = ::danceFloorPosition + 
                                          glm::vec3(i * DANCE_FLOOR_LIGHT_SIZE, 0, j * DANCE_FLOOR_LIGHT_SIZE);
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 3fa7295d90..eb46458b2c 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -40,7 +40,7 @@ float randFloat () {
 }
 
 int randIntInRange (int min, int max) {
-    return min + (rand() % (max - min));
+    return min + (rand() % ((max + 1) - min));
 }
 
 float randFloatInRange (float min,float max) {
@@ -48,7 +48,7 @@ float randFloatInRange (float min,float max) {
 }
 
 unsigned char randomColorValue(int miniumum) {
-    return miniumum + (rand() % (255 - miniumum));
+    return miniumum + (rand() % (256 - miniumum));
 }
 
 bool randomBoolean() {