fiddlerwoaroof/crawl - Change C4WXQRJTDW53PYFWQ4LOINSCI2IWMIQTH5WDSI7QUP72PKDBYHZAC

Fixing compilation issues from ghost changes.

Fixing incorrect asserts in tiles code.

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

Created by ennewalker on January 9, 2008

C4WXQRJTDW53PYFWQ4LOINSCI2IWMIQTH5WDSI7QUP72PKDBYHZAC

Dependencies

[2] 25CH7HH4LKXFIZ75YNMXS3TSXO6O27DYSOPLOD45K4OCNFWLS4LQC

In channels

main

Change contents

Insertion in crawl-ref/source/tile2.cc at line 13 [2.13289]
[2.13469]
[2.13469]
```
#include "ghost.h"
```

Replacement in crawl-ref/source/tile2.cc at line 2114 [2.13289]

B:BD[2.74412] → [2.74412:74482]

    unsigned int pseudo_rand = ghost.values[GVAL_MAX_HP]*54321*54321;

[2.74412]

[2.74482]

    unsigned int pseudo_rand = ghost.max_hp*54321*54321;

Replacement in crawl-ref/source/tile2.cc at line 2127 [2.13289]

B:BD[2.74760] → [2.74760:74945]

    tilep_race_default(ghost.values[GVAL_SPECIES], g_gender,
        ghost.values[GVAL_EXP_LEVEL], doll.parts);
    tilep_job_default (ghost.values[GVAL_CLASS], g_gender,  doll.parts);

[2.74760]

[2.74945]

    tilep_race_default(ghost.species, g_gender,
        ghost.xl, doll.parts);
    tilep_job_default (ghost.job, g_gender,  doll.parts);

Replacement in crawl-ref/source/tile2.cc at line 2140 [2.13289]

B:BD[2.75217] → [2.75217:75265]

                int ac = ghost.values[GVAL_AC];

[2.75217]

[2.75265]

                int ac = ghost.ac;

Replacement in crawl-ref/source/tile2.cc at line 2160 [2.13289]

B:BD[2.75842] → [2.75842:75927]

    int sk = ghost.values[GVAL_BEST_SKILL];
    int dam = ghost.values[GVAL_DAMAGE];

[2.75842]

[2.75927]

    int sk = ghost.best_skill;
    int dam = ghost.damage;

Insertion in crawl-ref/source/tile1.cc at line 2238 [2.96318]

[2.165190]

            if (gender==TILEP_GENDER_MALE)
                hair = TILEP_HAIR_ARAGORN;
            else
                hair = TILEP_HAIR_ARWEN;

Deletion in crawl-ref/source/guic.cc at line 521 [2.5865841]

B:BD[2.5876165] → [2.5876165:5876554]

#ifdef JP
    if (dos_char)
    {
        *x2 = *x2 + 1;
        return;
    }
    int nx1 = 0;
    int nx2 = mx;
    unsigned char *ptr = &cbuf[y * mx];
    int x = 0;
    while (x<mx)
    {
        if(x<=*x1) nx1=x;
        if(x>*x2)
        {
            nx2=x;
            break;
        }
        if (ptr[x] & 0x80) x+=2;
        else x++;
    }
    *x1 = nx1;
    *x2 = nx2;
#else

Deletion in crawl-ref/source/guic.cc at line 522 [2.5865841]
B:BD[2.5876573] → [2.5876573:5876580]
```
#endif
```

Deletion in crawl-ref/source/guic.cc at line 581 [2.5865841]

B:BD[2.5877739] → [2.5877739:5877915]

#ifdef JP
    // prevent half displayed kanji
    cbuf[adrs+head] = ' ';
    abuf[adrs+head] = text_col;
    cbuf[adrs+tail-1] = ' ';
    abuf[adrs+tail-1] = text_col;
#endif

Deletion in crawl-ref/source/guic.cc at line 618 [2.5865841]

B:BD[2.5878773] → [2.5878773:5878914]

#ifdef JP
            if ( ((c[x] & 0x80) == 0x80) && (dos_char == false))
                x+=2;
            else
                x++;
#else

Deletion in crawl-ref/source/guic.cc at line 619 [2.5865841]
B:BD[2.5878931] → [2.5878931:5878938]
```
#endif
```
Replacement in crawl-ref/source/guic-x11.cc at line 768 [2.5880963]
B:BD[2.5899731] → [2.5899731:5899776]
```
    ASSERT(right<mx);
    ASSERT(bottom<my);
```
[2.5899731]
[2.5899776]
```
    ASSERT(right<mx*dx);
    ASSERT(bottom<my*dy);
```