fiddlerwoaroof/crawl - Change WPHAESFAZ7WNOGWTTLDBAIOVHC37PO5YZSNCMRSJERFZ6RNCIQJQC

Fix 2511848: manual explosions having their flavour overriden.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8559 c06c8d41-db1a-0410-9941-cceddc491573

Created by haranp on January 18, 2009

WPHAESFAZ7WNOGWTTLDBAIOVHC37PO5YZSNCMRSJERFZ6RNCIQJQC

Dependencies

[2] 2YD477TH5GQ36WMPP5P63K6CE44BBZ4DNT66REMTMINEIXVUPY5QC
[3] SNSU5AMDAZNG55NQ4JDHU2YBK62MXPIE2QTSYS7PGV7Y2N3VJBFQC
[4] K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC
[5] UADYVV3UD5ERJTZZJGY4EUQ4NJ2JSBG7YYUJ75ZRBIXRQXQKOJPAC

In channels

main

Change contents

Replacement in crawl-ref/source/beam.cc at line 5156 [4.4128068]

B:BD[3.4593] → [2.2987:3015]

    flavour = real_flavour;

[3.4593]

[5.68313]

    // explode() can be called manually without setting real_flavour.
    // FIXME: The entire flavour/real_flavour thing needs some
    // rewriting!
    if (real_flavour == BEAM_CHAOS || real_flavour == BEAM_RANDOM)
        flavour = real_flavour;
    else
        real_flavour = flavour;