fiddlerwoaroof/crawl - Change J3M6J3UPL4AUJDXINY7UKH2JZQVQLKGH7AMOKI6L3QI7Y2F33O5QC

Adding lua bindings to X11 makefile by default. Removing more unused iso-mode code.

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

Created by ennewalker on January 5, 2008

J3M6J3UPL4AUJDXINY7UKH2JZQVQLKGH7AMOKI6L3QI7Y2F33O5QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/tile1.cc at line 22 [4.96318]

B:BD[4.96701] → [4.96701:96977]


#ifdef TILEP_DEBUG
#include "tilep-cmt.h"
#endif
/* external */
extern short get_helmet_type( const item_def &item );
extern bool player_is_airborne(void);
extern bool item_cursed( const item_def &item );
extern bool item_ident( const item_def &item, unsigned long flags );

Deletion in crawl-ref/source/tile1.cc at line 27 [4.96318]

B:BD[4.97152] → [4.97152:97281]

static FixedArray < unsigned char, GXM, GYM > wall_flag;
#define WFLAG_L 1
#define WFLAG_U 2
#define WFLAG_D 4
#define WFLAG_R 8

Replacement in crawl-ref/source/tile1.cc at line 1144 [4.96318]
B:BD[4.143599] → [4.143599:143619]
```
	case OBJ_MISSILES:
```
[4.143599]
[3.2469]
```
    case OBJ_MISSILES:
```
Replacement in crawl-ref/source/tile1.cc at line 1160 [4.96318]
B:BD[4.144130] → [4.144130:144146]
```
	case OBJ_FOOD:
```
[4.144130]
[3.2551]
```
    case OBJ_FOOD:
```

Replacement in crawl-ref/source/tile1.cc at line 1247 [4.96318]

B:BD[4.146280] → [4.146280:146505]

    if ( 5*ay < 2*ax )
    {
	return (dx > 0)? 2:6;
    }
    else if ( 5*ax < 2*ay)
    {
        return ( dy > 0 )? 4:0;
    }
    else 
    {
        if (dx>0)
	    return (dy>0)? 3:1;
	else
	    return (dy>0)? 5:7;
    }

[4.146280]

[4.146505]

    if (5*ay < 2*ax)
        return (dx > 0) ? 2 : 6;
    else if (5*ax < 2*ay)
        return (dy > 0) ? 4 : 0;
    else if (dx>0)
        return (dy>0) ? 3 : 1;
    else
        return (dy>0) ? 5: 7;

Replacement in crawl-ref/source/tile1.cc at line 1514 [4.96318]
B:BD[4.155246] → [4.155246:155271]
```
	ch |= TILE_FLAG_FLYING;
```
[4.155246]
[4.155271]
```
        ch |= TILE_FLAG_FLYING;
```
Insertion in crawl-ref/source/tile1.cc at line 1531 [4.96318]
[4.155581]
[4.155581]
```
    {
```
Insertion in crawl-ref/source/tile1.cc at line 1533 [4.96318]
[4.155640]
[4.155640]
```
    }
```
Replacement in crawl-ref/source/tile1.cc at line 1543 [4.96318]
B:BD[4.155877] → [4.155877:155888]
```
	case 130:
```
[4.155877]
[4.155888]
```
        case 130:
```
Deletion in crawl-ref/source/tile1.cc at line 1549 [4.96318]
B:BD[4.155991] → [4.155991:156000]
```
	// old;
```

Replacement in crawl-ref/source/tile1.cc at line 1647 [4.96318]

B:BD[2.1209] → [2.1209:1241]

        orig == TILE_DNGN_LAVA)

[2.1209]

[2.1241]

        orig == TILE_DNGN_LAVA ||
        orig == TILE_DNGN_STONE_WALL)

Replacement in crawl-ref/source/tile1.cc at line 2185 [4.96318]
B:BD[4.177060] → [4.177060:177085]
```
	int p = parts_saved[i];
```
[4.177060]
[4.177085]
```
        int p = parts_saved[i];
```
Replacement in crawl-ref/source/tile1.cc at line 2188 [4.96318]
B:BD[4.177150] → [4.177150:177183]
```
		&& (ccount<4) && (gcount<48) )
```
[4.177150]
[4.177183]
```
            && (ccount<4) && (gcount<48) )
```
Replacement in crawl-ref/source/tile1.cc at line 2225 [4.96318]
B:BD[4.178017] → [4.178017:178042]
```
	int p = parts_saved[i];
```
[4.178017]
[4.178042]
```
        int p = parts_saved[i];
```
Deletion in crawl-ref/source/tile1.cc at line 3120 [4.96318]
B:BD[4.209255] → [4.209255:209301]
```
            unsigned char this_is_wall = 128;
```

Deletion in crawl-ref/source/tile1.cc at line 3122 [4.96318]

B:BD[4.209375] → [4.209375:209631]

            if (env.map[x][y].glyph() != 0)
            {
                int g = grd[x][y];
                if (g >= DNGN_ORCISH_IDOL && g != DNGN_OPEN_DOOR)
                    this_is_wall = 0;
            }
            wall_flag[x][y] = this_is_wall;

Deletion in crawl-ref/source/tile1.cc at line 3124 [4.96318]

B:BD[4.209647] → [4.209647:210135]


    for (int y = 0; y < GYM; y++)
    {
        for (int x = 0; x < GXM; x++)
        {
            unsigned char w = wall_flag[x][y]&0x80;
            if (w)
            {
                if (x != 0)     wall_flag[x-1][y] |= WFLAG_R;
                if (x != GXM-1) wall_flag[x+1][y] |= WFLAG_L;
                if (y != 0)     wall_flag[x][y-1] |= WFLAG_D;
                if (y != GYM-1) wall_flag[x][y+1] |= WFLAG_U;
            }
            wall_flag[x][y] &= 0xf;
        }
    }

Deletion in crawl-ref/source/tile1.cc at line 3148 [4.96318]

B:BD[4.210907] → [4.210907:211946]


                    unsigned char wall = 0xff;
                    if (object >= DNGN_ORCISH_IDOL && object != DNGN_OPEN_DOOR)
                        wall = 0;
                    if (gc.x != 0)
                    {
                        wall_flag[gc.x-1][gc.y] = (wall_flag[gc.x-1][gc.y] & 
                            (~WFLAG_R)) | (wall & WFLAG_R);
                    }
                    if (gc.x != GXM-1)
                    {
                        wall_flag[gc.x+1][gc.y] = (wall_flag[gc.x+1][gc.y] & 
                            (~WFLAG_L)) | (wall & WFLAG_L);
                    }
                    if (gc.y != 0)
                    {
                        wall_flag[gc.x][gc.y-1] = (wall_flag[gc.x][gc.y-1] & 
                            (~WFLAG_D)) | (wall & WFLAG_D);
                    }
                    if (gc.y != GYM-1)
                    {
                        wall_flag[gc.x][gc.y+1] = (wall_flag[gc.x][gc.y+1] & 
                            (~WFLAG_U)) | (wall & WFLAG_U);
                    }

Replacement in crawl-ref/source/tile1.cc at line 3210 [4.96318]
B:BD[4.213465] → [4.213465:213513]
```
	    menv[idx].type <= MONS_DRACONIAN_SCORCHER)
```
[4.213465]
[4.213513]
```
        menv[idx].type <= MONS_DRACONIAN_SCORCHER)
```

Replacement in crawl-ref/source/tile1.cc at line 3212 [4.96318]

B:BD[4.213519] → [4.213519:213678]

	int race = draco_subspecies(&menv[idx]);
	int cls = menv[idx].type;
	int eq = 0;
	if (mon_wep != NON_ITEM &&
		(cls == race || cls == MONS_DRACONIAN_KNIGHT))

[4.213519]

[4.213678]

        int race = draco_subspecies(&menv[idx]);
        int cls = menv[idx].type;
        int eq = 0;
        if (mon_wep != NON_ITEM &&
            (cls == race || cls == MONS_DRACONIAN_KNIGHT))
        {

Insertion in crawl-ref/source/tile1.cc at line 3219 [4.96318]
[4.213728]
[4.213728]
```
        }
```
Deletion in crawl-ref/source/tile1.cc at line 3366 [4.96318]
B:BD[4.217759] → [4.217759:217801]
```
                wall = wall_flag[gx][gy];
```

Insertion in crawl-ref/source/rltiles/tool/dcpl.c at line 384 [4.560540]

[4.570013]

                i=strlen(st);
                strncpy(&comment[pos_comment],st,i);

Insertion in crawl-ref/source/rltiles/tool/dcpl.c at line 390 [4.560540]

[4.570126]

                parts_names[i][0] = 0;
                i = 1;
                strncpy(&comment[pos_comment],"\0",i);

Deletion in crawl-ref/source/rltiles/tool/dcpl.c at line 395 [4.560540]
B:BD[4.570141] → [4.570141:570216]
```
            i=strlen(st);
            strncpy(&comment[pos_comment],st,i);
```
Insertion in crawl-ref/source/rltiles/tool/dcpl.c at line 547 [4.560540]
[4.574043]
[4.574043]
```
    fprintf(sfp,"#include \"tiledef-p.h\"\n");
```
Replacement in crawl-ref/source/makefile.x11 at line 19 [4.5756330]
B:BD[4.5756746] → [4.5756746:5756784]
```
EXTRA_INCLUDES = -DUSE_X11 -DUSE_TILE
```
[4.5756746]
[4.5756784]
```
EXTRA_INCLUDES = -DUSE_X11 -DUSE_TILE -DCLUA_BINDINGS
```

Adding lua bindings to X11 makefile by default. Removing more unused iso-mode code.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/tile1.cc at line 22 [4.96318]

Deletion in crawl-ref/source/tile1.cc at line 27 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 1144 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 1160 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 1247 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 1514 [4.96318]

Insertion in crawl-ref/source/tile1.cc at line 1531 [4.96318]

Insertion in crawl-ref/source/tile1.cc at line 1533 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 1543 [4.96318]

Deletion in crawl-ref/source/tile1.cc at line 1549 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 1647 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 2185 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 2188 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 2225 [4.96318]

Deletion in crawl-ref/source/tile1.cc at line 3120 [4.96318]

Deletion in crawl-ref/source/tile1.cc at line 3122 [4.96318]

Deletion in crawl-ref/source/tile1.cc at line 3124 [4.96318]

Deletion in crawl-ref/source/tile1.cc at line 3148 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 3210 [4.96318]

Replacement in crawl-ref/source/tile1.cc at line 3212 [4.96318]

Insertion in crawl-ref/source/tile1.cc at line 3219 [4.96318]

Deletion in crawl-ref/source/tile1.cc at line 3366 [4.96318]

Insertion in crawl-ref/source/rltiles/tool/dcpl.c at line 384 [4.560540]

Insertion in crawl-ref/source/rltiles/tool/dcpl.c at line 390 [4.560540]

Deletion in crawl-ref/source/rltiles/tool/dcpl.c at line 395 [4.560540]

Insertion in crawl-ref/source/rltiles/tool/dcpl.c at line 547 [4.560540]

Replacement in crawl-ref/source/makefile.x11 at line 19 [4.5756330]