fiddlerwoaroof/crawl - Change FZGNBY4N3TAGDD63NWRKAN46UTXSXVE2O2DGIY4HHZVTJ5R6HO4QC

Fix [2004924], using sorear's suggested method: Avoid doing fractional

arithmetic in _exercise2() by pre-multiplying the factors by 10, which allows crosstraining to work properly when the experience pool isn't full.

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

Created by dolorous on July 1, 2008

FZGNBY4N3TAGDD63NWRKAN46UTXSXVE2O2DGIY4HHZVTJ5R6HO4QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/skills.cc at line 181 [3.745542]
B:BD[3.749872] → [3.749872:749889]
```
    int deg = 1;
```
[3.749872]
[3.749889]
```
    int deg = 10;
```
Replacement in crawl-ref/source/skills.cc at line 193 [3.745542]
B:BD[3.750405] → [3.750405:750438]
```
            bonus += random2(3);
```
[3.750405]
[3.750438]
```
            bonus += random2(30);
```
Replacement in crawl-ref/source/skills.cc at line 201 [3.745542]
B:BD[3.750663] → [3.750663:750696]
```
            bonus += random2(3);
```
[3.750663]
[3.750696]
```
            bonus += random2(30);
```
Replacement in crawl-ref/source/skills.cc at line 209 [3.745542]
B:BD[3.750927] → [3.750927:750960]
```
            bonus += random2(3);
```
[3.750927]
[3.750960]
```
            bonus += random2(30);
```
Replacement in crawl-ref/source/skills.cc at line 217 [3.745542]
B:BD[4.2481] → [4.2481:2514]
```
            bonus += random2(3);
```
[4.2481]
[4.2514]
```
            bonus += random2(30);
```
Replacement in crawl-ref/source/skills.cc at line 225 [3.745542]
B:BD[4.2962] → [4.2962:2995]
```
            bonus += random2(3);
```
[4.2962]
[4.2995]
```
            bonus += random2(30);
```
Deletion in crawl-ref/source/skills.cc at line 294 [3.745542]
B:BD[3.753373] → [3.753373:753395]
```
    int fraction = 0;
```

Replacement in crawl-ref/source/skills.cc at line 307 [3.745542]

B:BD[3.754089] → [3.754089:754209]

            fraction = (spending_limit * 10) / skill_change;
            skill_change = (skill_change * fraction) / 10;

[3.754089]

[3.754209]

            int fraction = (spending_limit * 10) / skill_change;

Replacement in crawl-ref/source/skills.cc at line 309 [3.745542]
B:BD[3.754210] → [3.754210:754251]
```
            deg = (deg * fraction) / 10;
```
[3.754210]
[3.754251]
```
            deg *= fraction;
```
Replacement in crawl-ref/source/skills.cc at line 312 [3.745542]
B:BD[3.754278] → [3.754278:754327]
```
                bonus = (bonus * fraction) / 10;
```
[3.754278]
[3.754327]
```
                bonus *= fraction;
```

Replacement in crawl-ref/source/skills.cc at line 315 [3.745542]

B:BD[3.754350] → [3.754350:754517]

B:BD[3.754531] → [3.754531:754556]

        {
            if ((skill_change / 2) > MAX_SPENDING_LIMIT)
            {
                deg = 0;
                fraction = 5;
            }
            else
                deg = 1;

[3.754350]

[3.754570]

            deg = ((skill_change / 2) > MAX_SPENDING_LIMIT) ? 5 : 10;

Replacement in crawl-ref/source/skills.cc at line 317 [3.745542]
B:BD[3.754571] → [3.754571:754624]
```
            skill_change = spending_limit;
        }
```
[3.754571]
[3.754624]
```
        skill_change = spending_limit;
```

Replacement in crawl-ref/source/skills.cc at line 326 [3.745542]

∅:D[2.1166] → [5.203:274]

B:BD[3.754788] → [5.203:274]

        skill_change = (fraction > 0 || deg > 0 || bonus > 0) ? 1 : 0;

[2.1166]

[3.754911]

        skill_change = (deg > 0 || bonus > 0) ? 1 : 0;

Replacement in crawl-ref/source/skills.cc at line 330 [3.745542]
∅:D[2.1221] → [3.754968:755019]
B:BD[3.754968] → [3.754968:755019]
```
    int skill_inc = (deg + bonus) * 10 + fraction;
```
[2.1221]
[3.755019]
```
    int skill_inc = deg + bonus;
```

Fix [2004924], using sorear's suggested method: Avoid doing fractional

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/skills.cc at line 181 [3.745542]

Replacement in crawl-ref/source/skills.cc at line 193 [3.745542]

Replacement in crawl-ref/source/skills.cc at line 201 [3.745542]

Replacement in crawl-ref/source/skills.cc at line 209 [3.745542]

Replacement in crawl-ref/source/skills.cc at line 217 [3.745542]

Replacement in crawl-ref/source/skills.cc at line 225 [3.745542]

Deletion in crawl-ref/source/skills.cc at line 294 [3.745542]

Replacement in crawl-ref/source/skills.cc at line 307 [3.745542]

Replacement in crawl-ref/source/skills.cc at line 309 [3.745542]

Replacement in crawl-ref/source/skills.cc at line 312 [3.745542]

Replacement in crawl-ref/source/skills.cc at line 315 [3.745542]

Replacement in crawl-ref/source/skills.cc at line 317 [3.745542]

Replacement in crawl-ref/source/skills.cc at line 326 [3.745542]

Replacement in crawl-ref/source/skills.cc at line 330 [3.745542]