fiddlerwoaroof/crawl - Change R325RPUV26YH65VIJKYEFZ2XCVXQHO5N3ELPX6RNQ5TSI3JJNQGQC

Fix monster-comes-into-view messages when the monster was already in view to

start with.

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

Created by dshaligram on January 2, 2007

R325RPUV26YH65VIJKYEFZ2XCVXQHO5N3ELPX6RNQ5TSI3JJNQGQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/misc.h at line 150 [7.1928926]
B:BD[6.541057] → [6.541057:541077]
```
bool i_feel_safe();
```
[6.541057]
[2.460]
```
bool i_feel_safe(bool announce = false);
```
Replacement in crawl-ref/source/misc.cc at line 1773 [7.1933596]
B:BD[6.547767] → [6.547767:547786]
```
bool i_feel_safe()
```
[6.547767]
[6.547786]
```
bool i_feel_safe(bool announce)
```

Replacement in crawl-ref/source/misc.cc at line 1786 [7.1933596]

B:BD[6.548212] → [6.548212:548284]

             you.visible_statue[STATUE_ORANGE_CRYSTAL] )
	return false;

[6.548212]

[6.548284]

        you.visible_statue[STATUE_ORANGE_CRYSTAL] )
    {
        if (announce)
            mprf(MSGCH_WARN, "There are scary statues in view.");
        return false;
    }

Insertion in crawl-ref/source/misc.cc at line 1794 [7.1933596]
[6.548285]
[6.548285]
```
    std::vector<const monsters *> mons;
```

Replacement in crawl-ref/source/misc.cc at line 1796 [7.1933596]

B:BD[6.548309] → [6.548309:548862]

    for ( int y = ystart; y < yend; ++y ) {
	for ( int x = xstart; x < xend; ++x ) {
	    /* if you can see a nonfriendly monster then you feel
	       unsafe */
	    if ( see_grid(x,y) ) {
		const unsigned char targ_monst = mgrd[x][y];
		if ( targ_monst != NON_MONSTER ) {
		    struct monsters *mon = &menv[targ_monst];
		    if ( !mons_friendly(mon) &&
			 player_monster_visible(mon) &&
			 !mons_is_mimic(mon->type) &&
			 (!Options.safe_zero_exp ||
			  !mons_class_flag( mon->type, M_NO_EXP_GAIN ))) {
		      return false;
		    }
		}
	    }
	}

[6.548309]

[6.548862]

    for ( int y = ystart; y < yend; ++y )
    {
        for ( int x = xstart; x < xend; ++x )
        {
            /* if you can see a nonfriendly monster then you feel
               unsafe */
            if ( see_grid(x,y) )
            {
                const unsigned char targ_monst = mgrd[x][y];
                if ( targ_monst != NON_MONSTER )
                {
                    struct monsters *mon = &menv[targ_monst];
                    if ( !mons_friendly(mon) &&
                         player_monster_visible(mon) &&
                         !mons_is_mimic(mon->type) &&
                         (!Options.safe_zero_exp ||
                          !mons_class_flag( mon->type, M_NO_EXP_GAIN )))
                    {
                        if (announce)
                            mons.push_back(mon);
                        else
                            return false;
                    }
                }
            }
        }
    }
    if (announce)
    {
        if (mons.size() == 1)
        {
            const monsters *m = mons[0];
            switch (random2(3))
            {
            case 0:
                mprf(MSGCH_WARN, "Not with %s in view!",
                     ptr_monam(m, DESC_NOCAP_A));
                break;
            case 1:
                mprf(MSGCH_WARN, "There's %s right there!",
                     ptr_monam(m, DESC_NOCAP_A));
                break;
            case 2:
                mprf(MSGCH_WARN, "Wait, there's %s in sight!",
                     ptr_monam(m, DESC_NOCAP_A));
                break;
            }
        }
        else if (mons.size() > 1)
        {
            mprf(MSGCH_WARN, "Not with these monsters around!");
        }
        return (mons.empty());

Insertion in crawl-ref/source/misc.cc at line 1851 [7.1933596]
[6.548868]
[6.548868]
```
    
```

Replacement in crawl-ref/source/acr.cc at line 758 [7.4397395]

B:BD[7.4417689] → [6.1257082:1257121]

    you.running.initialise(dir, mode);

[7.4417689]

[6.1257121]

    if (i_feel_safe(true))
        you.running.initialise(dir, mode);

Deletion in crawl-ref/source/acr.cc at line 1006 [7.4397395]

B:BD[7.4425496] → [4.449:635]

        if ( you.hp == you.hp_max &&
             you.magic_points == you.max_magic_points )
            mpr("You start searching.");
        else
            mpr("You start resting.");

Insertion in crawl-ref/source/acr.cc at line 1007 [7.4397395]

[6.1264210]

        if (you.running)
        {
            if ( you.hp == you.hp_max &&
                 you.magic_points == you.max_magic_points )
                mpr("You start searching.");
            else
                mpr("You start resting.");
        }

Replacement in crawl-ref/source/acr.cc at line 1247 [7.4397395]

B:BD[8.551858] → [8.551858:551893]

B:BD[8.551893] → [5.405:423]

        start_translevel_travel();
        mesclr();

[8.551858]

[8.551918]

        if (i_feel_safe(true))
        {
            start_translevel_travel();
            mesclr();
        }

Replacement in crawl-ref/source/acr.cc at line 1261 [7.4397395]

B:BD[8.552194] → [3.1461:1508]

        start_explore(Options.explore_greedy);

[8.552194]

[7.4432956]

        if (i_feel_safe(true))
            start_explore(Options.explore_greedy);

Replacement in crawl-ref/source/acr.cc at line 1276 [7.4397395]
B:BD[7.4433302] → [8.552220:552246]
```
        if (plox[0] > 0) 
```
[7.4433302]
[8.552246]
```
        if (plox[0] > 0 && i_feel_safe(true))
```

Fix monster-comes-into-view messages when the monster was already in view to

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/misc.h at line 150 [7.1928926]

Replacement in crawl-ref/source/misc.cc at line 1773 [7.1933596]