colors staan nu colorgenerator

olafmaas · Jun 24, 2014 · 9fec127 · 9fec127
1 parent 7ea6efe
commit 9fec127
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/client/index.html b/src/client/index.html
@@ -22,14 +22,14 @@
         <!-- enum -->
         <script src="../common/Enums.js"></script>
 
+        <!-- settings -->
+        <script src="../common/Settings.js"></script>  
+
         <!-- utils -->
         <script src="../common/game/util/IDDistributor.js"></script>
         <script src="../common/game/util/ColorGenerator.js"></script>
         <script src="../common/game/util/Group.js"></script>
         <script src="../common/game/util/GroupManager.js"></script>
-
-        <!-- settings -->
-        <script src="../common/Settings.js"></script>  
 
         <!-- timers -->
         <script src="../common/game/time/Timer.js"></script>

diff --git a/src/client/mainscreen.html b/src/client/mainscreen.html
@@ -22,15 +22,15 @@
         <!-- enum -->
         <script src="../common/Enums.js"></script>
 
+        <!-- settings -->
+        <script src="../common/Settings.js"></script>  
+
         <!-- utils -->
         <script src="../common/game/util/IDDistributor.js"></script>
         <script src="../common/game/util/ColorGenerator.js"></script>
         <script src="../common/game/util/Group.js"></script>
         <script src="../common/game/util/GroupManager.js"></script>
 
-        <!-- settings -->
-        <script src="../common/Settings.js"></script>  
-
         <!-- timers -->
         <script src="../common/game/time/Timer.js"></script>
         <script src="../common/game/time/PlayerTimer.js"></script>

diff --git a/src/common/Settings.js b/src/common/Settings.js
@@ -101,9 +101,7 @@ var Settings = {
 		//Positions of initial ball
 		x: 100,
 		y: 100,
-		nrOfNewBalls: 3, //Number of new balls created per player. 
-		colors: ["#2237FF", "#2237FF", "#FF0067", "#838FFF", "#FFD870", "#FFBC8C", 
-	"#FF70AA", "#FF004D", "#7716FF", "#FFE700"]
+		nrOfNewBalls: 3 //Number of new balls created per player. 
 	},
 
 	player: {

diff --git a/src/common/game/util/ColorGenerator.js b/src/common/game/util/ColorGenerator.js
@@ -10,7 +10,8 @@ if(typeof module != 'undefined'){
 */
 var ColorGenerator = {	
 
-	colors: Settings.ball.colors,
+	colors: ["#2237FF", "#2237FF", "#FF0067", "#838FFF", "#FFD870", "#FFBC8C", 
+	"#FF70AA", "#FF004D", "#7716FF", "#FFE700"],
 
 	/**
 	* Returns a random color from the predefined color list above.