From c72f09adfa6f776ff5cabd0b8e4b4e0a2e752703 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Fri, 30 Oct 2009 15:59:29 +0100 Subject: Splitting up stuff.cc. New: colour.cc, coord.cc, coordit.cc, random.cc, rng.cc. --- crawl-ref/source/beam.cc | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 95d981a414..c77a23f447 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -26,6 +26,7 @@ #include "cio.h" #include "cloud.h" +#include "colour.h" #include "delay.h" #include "dgnevent.h" #include "effects.h" @@ -288,31 +289,6 @@ bool player_tracer( zap_type ztype, int power, bolt &pbolt, int range) return (true); } -dice_def calc_dice( int num_dice, int max_damage ) -{ - dice_def ret( num_dice, 0 ); - - if (num_dice <= 1) - { - ret.num = 1; - ret.size = max_damage; - } - else if (max_damage <= num_dice) - { - ret.num = max_damage; - ret.size = 1; - } - else - { - // Divide the damage among the dice, and add one - // occasionally to make up for the fractions. -- bwr - ret.size = max_damage / num_dice; - ret.size += x_chance_in_y(max_damage % num_dice, num_dice); - } - - return (ret); -} - template struct power_deducer { -- cgit v1.2.3-54-g00ecf