From 4f5ec4e8fc44a4551f4a9f8d6aad3430555598e0 Mon Sep 17 00:00:00 2001
From: iggy <iggy@yggi.de>
Date: Wed, 3 Aug 2011 17:45:57 +0200
Subject: [PATCH] invaders scoring

---
 firmware/loadable/spaceinvaders.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/firmware/loadable/spaceinvaders.c b/firmware/loadable/spaceinvaders.c
index c4f6457..029625e 100644
--- a/firmware/loadable/spaceinvaders.c
+++ b/firmware/loadable/spaceinvaders.c
@@ -6,9 +6,9 @@
 #include "lcd/display.h"
 #include "lcd/allfonts.h"
 
-void ReinvokeISP(void);
-void EnableWatchdog(uint32_t ms);
-void delayms(uint32_t ms);
+//void ReinvokeISP(void);
+//void EnableWatchdog(uint32_t ms);
+//void delayms(uint32_t ms);
 
 /**************************************************************************/
 #define POS_PLAYER_Y 60
@@ -150,11 +150,17 @@ void init_game(void) {
 	game.shot_y = 0;
 	game.alive = ENEMY_ROWS*ENEMY_COLUMNS;
 	game.move = 0;
-	game.direction = -1;
-	game.lastcol = ENEMY_COLUMNS-1;
+	if (getRandom()%2 == 0) {
+		game.direction = -1;
+		game.lastcol = ENEMY_COLUMNS-1;
+	} else {
+		game.direction = 1;
+		game.lastcol = 0;
+	}
 	game.killed = 0;
 	game.step = false;
 	game.ufo = DISABLED;
+	game.score = 0;
 	init_enemy();
 	
 	for (char col=0; col<ENEMY_COLUMNS; col++){
@@ -242,7 +248,7 @@ void move_shot() {
                     game.enemy_x[row][col]=DISABLED;
                     game.shot_x = DISABLED;
                     game.alive--;
-					game.score++;
+					game.score+=(3-row)*10;
                     return;
                 }
             }
@@ -255,7 +261,7 @@ void move_shot() {
 		game.shot_y<8) {
 
 		game.ufo = DISABLED;
-		game.score += 5;
+		game.score += 50;
 	}
 
     game.shot_y -= 2;