Tuned difficulty of the enemy attacks

Formated text on join screen.

actor.cpp

@@ -91,8 +91,10 @@ void Actor::update(int elapsed)
 			Bullet *b=*p;
 			if(b->isActive()) {
 				bulletList.push_back(b);
-			} else {
-                b->target->receiveAttack(b->damage,b->attackType);
+			} else {
+			    if(b->target->attackInRange(b)) {
+                    b->target->receiveAttack(b->damage,b->attackType);
+			    }
 				delete b;	// all done.
 			}
 		}
@@ -197,6 +199,14 @@ void Actor::receiveAttack(int amount, AttackType type) {
 		sound.playOnce(SFX_HAH);
 		noticeList.push_back(new Notice(sx,sy,"Blocked"));
 	}
+}
+
+bool Actor::attackInRange(Bullet *b)
+{
+    float dx=b->x-(this->tx*tile->tileWidth);
+    float dy=b->y-(this->ty*tile->tileHeight);
+
+    return dx*dx+dy*dy<24*24;
 }
 
 void Actor::block(AttackType type) {

actor.h

@@ -52,6 +52,7 @@ class Actor {
 	bool isAttackReady();
 	void attack(Actor *target,bool heavy);
 	void receiveAttack(int amount, AttackType type);
+	bool attackInRange(Bullet *b);
 	void block(AttackType type);
 	void enemyAttack();
 };

game.cpp

@@ -330,7 +330,7 @@ Player *Game::targetPlayer(Actor *enemy)
             dx=player->tx-enemy->tx;
             dy=player->ty-enemy->ty;
             closestDist=dx*dx+dy*dy;
-            if(dist>8*8) continue;
+            if(closestDist>8*8) continue;
             closest=player;
             continue;
         }
@@ -339,7 +339,7 @@ Player *Game::targetPlayer(Actor *enemy)
         dx=player->tx-enemy->tx;
         dy=player->ty-enemy->ty;
         dist=dx*dx+dy*dy;
-        if(dist>8*8) continue;
+        if(dist>6*6) continue;
         if(dist<closestDist) {
             closest=player;
             closestDist=dist;

join.cpp

@@ -41,8 +41,8 @@ void Join::draw()
 {
     maptop=0;
 
-    drawMessage(FONT_HEADLINE,"Select your player",10,-4);
-    drawMessage(FONT_LABEL,"Left and right then hit A",10,32);
+    drawMessage(FONT_HEADLINE,"Select your player",10,-8);
+    drawMessage(FONT_NOTICE,"Left and right then hit A",10,30);
 
     for(int i=0;i<6;i++) {
         char buffer[256];

player.cpp

@@ -50,11 +50,12 @@ void Player::handleAction(int id,bool down)
     else if(id==DPAD_DOWN && down && ty<118) y++;
     else if(id==DPAD_A) {
         Actor *target=game.targetEnemy(this);
-        if(target) attack(target,false);
+        if(target) attack(target,true);
     }
     else if(id==DPAD_B) {
-        Actor *target=game.targetEnemy(this);
-        if(target) attack(target,true);
+        //Actor *target=game.targetEnemy(this);
+        //if(target) attack(target,true);
+        block(AT_FORCE);
     }
 
     if(x!=tx || y!=ty) {