From 29051a64cb3e3e9099e754e574e4d12d8edbe7ff Mon Sep 17 00:00:00 2001
From: Ian C <ianc@noddybox.co.uk>
Date: Sun, 2 Oct 2005 23:16:48 +0000
Subject: Development checkin

---
 Default.ppinch | Bin 1740 -> 1727 bytes
 designer.bmx   |   5 +++--
 game.bmx       |  31 ++++++++++++++++++++++++-------
 main.bmx       |   7 +++++--
 menu.bmx       |   4 ++--
 5 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/Default.ppinch b/Default.ppinch
index 8cff31f..bed0408 100644
Binary files a/Default.ppinch and b/Default.ppinch differ
diff --git a/designer.bmx b/designer.bmx
index e5ded2c..a45034d 100644
--- a/designer.bmx
+++ b/designer.bmx
@@ -692,10 +692,11 @@ End Function
 Function TestCallback(w:TWidget)
 	Designer.SaveLevel()
 	Local g:TGame=TGame.Create(Designer.level)
+	Local res:Int=TGame.LEVEL_NOTOVER
 	
-	While Not KeyHit(KEY_ESCAPE)
+	While res<>TGame.LEVEL_FINISHED And res<>TGame.LEVEL_CANCELLED
 		Cls
-		g.Play()
+		res=g.Play()
 		SetColor(255,255,255)
 		DrawImage(GameGFX.pointer,MouseX(),MouseY())
 		FlushMem
diff --git a/game.bmx b/game.bmx
index 3556409..710bb24 100644
--- a/game.bmx
+++ b/game.bmx
@@ -15,6 +15,8 @@ Type TGame
 	Const LEVEL_NOTOVER:Int=	0
 	Const LEVEL_WON:Int=		1
 	Const LEVEL_LOST:Int=		2
+	Const LEVEL_FINISHED:Int=	3
+	Const LEVEL_CANCELLED:Int=	4
 	
 	Field level:TLevel
 	Field mass:TList
@@ -121,19 +123,20 @@ Type TGame
 	
 		GameGFX.font.CentreColoured("Need "+level.winpercent+"% to clear",y,col/2,col,col)
 		y:+yi
+		
+		Local n:Int=Int(level.placemass)
+		
+		If level.invmass
+			n=-n
+		EndIf
 
 		If level.maxmass>1
-			GameGFX.font.CentreColoured("You can place only "+level.maxmass+" masses of " + Int(level.placemass) + " Newtons",y,col/2,col,col)
+			GameGFX.font.CentreColoured("You can place "+level.maxmass+" masses of " + n + " Newtons",y,col/2,col,col)
 		Else
-			GameGFX.font.CentreColoured("You can place only 1 mass of " + Int(level.placemass) + " Newtons",y,col/2,col,col)
+			GameGFX.font.CentreColoured("You can place 1 mass of " + n + " Newtons",y,col/2,col,col)
 		EndIf
 		y:+yi
 
-		If level.invmass
-			GameGFX.font.CentreColoured("PLACED MASSES ARE INVERTED!",y,col,col/2,col/2)
-			y:+yi
-		EndIf
-	
 		If level.placefriend
 			GameGFX.font.CentreColoured("PLACED MASSES ARE COLLECTORS!",y,col,col/2,col/2)
 			y:+yi
@@ -275,6 +278,10 @@ Type TGame
 						playing=True
 					EndIf
 				EndIf
+				
+				If KeyHit(KEY_ESCAPE)
+					done=LEVEL_CANCELLED
+				EndIf
 			Case LEVEL_WON
 				If final_percent=100
 					SetScale(4,4)
@@ -291,14 +298,24 @@ Type TGame
 				SetAlpha(0.7)
 				GameGFX.font.CentreColoured("LEVEL COMPLETED!",GraphicsHeight()/2+20,255,255,0)
 				GameGFX.font.CentreColoured("You got the pass mark with "+pass_time+" left on the clock",GraphicsHeight()/2+40,255,255,0)
+				GameGFX.font.Centre("Press the Left Mouse Button",GraphicsHeight()/2+80)
 				SetScale(1,1)
 				SetAlpha(1)
+				
+				If MouseHit(1)
+					done=LEVEL_FINISHED
+				EndIf
 			Case LEVEL_LOST
 				SetScale(2,2)
 				SetAlpha(0.7)
 				GameGFX.font.CentreColoured("LEVEL FAILED!",GraphicsHeight()/2+20,255,64,64)
+				GameGFX.font.Centre("Press the Left Mouse Button",GraphicsHeight()/2+60)
 				SetScale(1,1)
 				SetAlpha(1)
+
+				If MouseHit(1)
+					done=LEVEL_FINISHED
+				EndIf
 		EndSelect
 		
 		Return done
diff --git a/main.bmx b/main.bmx
index 641adc6..07e1048 100644
--- a/main.bmx
+++ b/main.bmx
@@ -192,14 +192,17 @@ Function Menu()
 		Select sel
 			Case MENU_PLAY
 				done=True
+				FlushKeys()
+			Case MENU_SCORES
+				FlushKeys()
 			Case MENU_LOAD
-				LevelDesigner()
 				FlushKeys()
 			Case MENU_EDIT
 				LevelDesigner()
 				FlushKeys()
 			Case MENU_TOY
 				done=True
+				FlushKeys()
 			Case MENU_QUIT
 				done=True
 				quit=True
@@ -215,7 +218,7 @@ Function Menu()
 		
 		SetScale(2,2)
 		GameGFX.font.CentreColoured("PARTICLE PINCH",0,255,255,0)
-		GameGFX.font.CentreColoured("Start Level",530,255,0,255)
+		GameGFX.font.CentreColoured("Start Level",530,0,255,255)
 		GameGFX.font.Centre(levelset.Get(selected_level).name,545)
 
 		SetScale(1,1)
diff --git a/menu.bmx b/menu.bmx
index f156891..1a9c220 100644
--- a/menu.bmx
+++ b/menu.bmx
@@ -47,7 +47,7 @@ Type TMenu
 		
 		For Local opt:TMenuOpt=EachIn list
 			If opt.InBox(mx,my)
-				SetColor(255,255,200)
+				SetColor(255,255,255)
 		
 				If KeyDown(KEY_MOUSELEFT)
 					mbdown=True
@@ -61,7 +61,7 @@ Type TMenu
 					mbdown=False
 				EndIf
 			Else
-				SetColor(200,200,200)
+				SetColor(164,164,164)
 				DrawImage(opt.i,opt.x,opt.y)
 			EndIf
 		Next
-- 
cgit v1.2.3