refactoring gameMode and particle setting

scripts/drawSpace.js

@@ -21,7 +21,7 @@ function initSpace()                       // ??
 
 function drawParticles()
 {
-	if(drawParticleFlag && particles)
+	if(drawParticleFlag && particleIsEnabled())
 	{
 		for (var i = 0; i < particleCount; i++)
 		{
@@ -41,7 +41,7 @@ function drawParticles()
 
 function drawParticlesLevel()
 {
-	if(drawParticleFlag && particles)
+	if(drawParticleFlag && particleIsEnabled())
 	{
 		for (var i = 0; i < 50; i++)
 		{

scripts/levels.js

@@ -1341,7 +1341,7 @@ function drawGUI()
 	gameArena.fillStyle = "#E6FFFF";
 	gameArena.fillText("Score: " + currentScore, midx-(55+250)*(width/1220), midy-273*(width/1220));
 
-	if(!gameMode) {                     //  gamemode is 1 for survival and 0 for arcard     // lives only in arcard mode
+	if(isArcade()) {                     // lives only in arcade mode
 		colorCheck = "#E6FFFF";
 		gameArena.shadowBlur = 20;
 		gameArena.shadowColor = "#18CAE6";
@@ -2442,4 +2442,14 @@ function drawGC()
 	}
 }
 
+function isArcade()
+{
+	return gameMode == gameType.ARCADE;
+}
+
+function isSurvival()
+{
+	return gameMode == gameType.SURVIVAL;
+}
+
 // erreor may be at 1053    circ_wow

scripts/mainmenu.js

@@ -82,7 +82,7 @@ function mainMenu_click()
 		currentScore = 0;
 		sceneNumber = 6;
 		levelNumber = 1;
-		if(gameMode) lives = 1;
+		if(isSurvival()) lives = 1;
 		else lives = 3;
 		clearInterval(gameTimer);
 		update();

scripts/script.js

@@ -2,15 +2,25 @@ var canvas = document.getElementById("arena");
 canvas.width = (0.9377402)*window.innerWidth;
 canvas.height = (0.508196721)*canvas.width;
 
+var gameType = {
+	ARCADE: 0,
+	SURVIVAL: 1
+};
+
+var particlesSetting = {
+	OFF: 0,
+	ON: 1
+};
+
 var gameArena = canvas.getContext("2d");
 var rect = canvas.getBoundingClientRect();         // which rect area it gives
 var loading = 0;
 var currentScore = 0;
 var lives = 3;
 var iterations = 0;
-var gameMode = 0;	//0 -> Arcade		1 -> Survival
+var gameMode = gameType.ARCADE;
 var volume = 1;
-var particles = 1;
+var particles = particlesSetting.ON;
 var runtime1 = 0;
 
 

scripts/settings.js

@@ -50,7 +50,7 @@ function settings()
 
 	gameArena.shadowBlur = 0;
 
-	if(!gameMode)
+	if(isArcade())
 	{
 		color1 = "#E6FFFF";
 		color2 = "#18CAE6";
@@ -72,7 +72,7 @@ function settings()
 		color4 = "#E6FFFF";
 	}
 
-	if(particles)
+	if(particleIsEnabled())
 	{
 		color5 = "#E6FFFF";
 		color6 = "#18CAE6";
@@ -84,15 +84,15 @@ function settings()
 	}
 
 
-	if(hoverCheck == 1 && gameMode == 1)
+	if(hoverCheck == 1 && isSurvival())
 	{
 		gameArena.shadowBlur = 10;
 		gameArena.shadowColor = "#E6FFFF";
 		mark = true;
 	}
 	drawLeftRoundedRectangle(midx , midy-92*(width/1220), 140*(width/1220), 36*(width/1220), color1, 3);
 	gameArena.shadowBlur = 0;
-	if(hoverCheck == 2 && gameMode == 0)
+	if(hoverCheck == 2 && isArcade())
 	{
 		gameArena.shadowBlur = 10;
 		gameArena.shadowColor = "#E6FFFF";
@@ -134,15 +134,15 @@ function settings()
 	gameArena.fillText("off",midx + (100 + 6)*(width/1220),midy-(80-60 - 50)*(width/1220));
 
 
-	if(hoverCheck == 5 && particles == 0)
+	if(hoverCheck == 5 && !particleIsEnabled())
 	{
 		gameArena.shadowBlur = 10;
 		gameArena.shadowColor = "#E6FFFF";
 		mark = true;
 	}
 	drawLeftRoundedRectangle(midx + (100 - 100)*(width/1220), midy + (2 + 100)*(width/1220), (70)*(width/1220), (36)*(width/1220), color5, 3);
 	gameArena.shadowBlur = 0;
-	if(hoverCheck == 6 && particles == 1)
+	if(hoverCheck == 6 && particleIsEnabled())
 	{
 		gameArena.shadowBlur = 10;
 		gameArena.shadowColor = "#E6FFFF";
@@ -195,12 +195,12 @@ function settings_click()
 	if(mousex >= midx && mousex <= midx+140*(width/1220) && mousey >= midy-92*(width/1220) && mousey <= midy-(  92 - 36)*(width/1220))
 	{
 		if(volume) menu_click.play();
-		gameMode = 0;
+		gameMode = gameType.ARCADE;
 	}
 	if(mousex >= midx + 143*(width/1220) && mousex <= midx+(140 + 143)*(width/1220) && mousey >= midy-(92)*(width/1220) && mousey <= midy-(  92 - 36)*(width/1220))
 	{
 		if(volume) menu_click.play();
-		gameMode = 1;
+		gameMode = gameType.SURVIVAL;
 	}
 	if(mousex >= midx && mousex <= midx+(70)*(width/1220) && mousey >= midy-(  45 - 50)*(width/1220) && mousey <= midy-( 45 - 36 - 50)*(width/1220))
 	{
@@ -215,11 +215,16 @@ function settings_click()
 	if(mousex >= midx && mousex <= midx+(70)*(width/1220) && mousey >= midy+( 2 + 100)*(width/1220)&& mousey <= midy+(2 + 36 + 100)*(width/1220))
 	{
 		if(volume) menu_click.play();
-		particles = 1;
+		particles = particlesSetting.ON;
 	}
 	if(mousex >= midx + 73*(width/1220) && mousex <= midx+(143)*(width/1220) && mousey >= midy+( 2 + 100)*(width/1220) && mousey <= midy+( 2 + 36 + 100)*(width/1220))
 	{
 		if(volume) menu_click.play();
-		particles = 0;
+		particles = particlesSetting.OFF;
 	}
+}
+
+function particleIsEnabled()
+{
+	return particles == particlesSetting.ON;
 }