From ca7dbc39621c1d9dfcf05ce80a10a8c352eaccc3 Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@ucw.cz>
Date: Sat, 3 Dec 2011 19:25:39 +0100
Subject: [PATCH] agent::attack_dir(): Cleanup

---
 agent.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/agent.cc b/agent.cc
index 0677865..a13af9c 100644
--- a/agent.cc
+++ b/agent.cc
@@ -81,8 +81,11 @@ agent::attack_dir(int dir_x, int dir_y)
 	if (dead || a->dead)
 		return true;
 
-	int dice = random() % ((int) round(attr.attack * energy) + (int) round(a->attr.defense * a->energy));
-	if (dice < attr.attack * energy) {
+	int attack_dice = round(attr.attack * energy);
+	int defense_dice = round(a->attr.defense * a->energy);
+
+	int dice = random() % (attack_dice + defense_dice);
+	if (dice < attack_dice) {
 		a->die();
 	} else {
 		die();