fiddlerwoaroof/crawl - Change 3GLHLYH34NUBL2C5HSECKNVAO4ZFAAYXCW3Q5VZ2PXDDZ4SDD7LQC

Some more code clean-up.

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

Created by j-p-e-g on February 29, 2008

3GLHLYH34NUBL2C5HSECKNVAO4ZFAAYXCW3Q5VZ2PXDDZ4SDD7LQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/stuff.cc at line 721 [5.224557]
B:BD[5.238306] → [5.238306:238307]
Replacement in crawl-ref/source/stuff.cc at line 755 [5.224557]
B:BD[5.238961] → [5.238961:238982]
```
        mpr("Huh?");
```
[5.238961]
[6.421]
```
        mpr("Huh?", MSGCH_EXAMINE_FILTER);
```
Replacement in crawl-ref/source/item_use.cc at line 308 [5.2781507]
B:BD[5.2788785] → [5.2788785:2788814]
```
    you.wield_change = true;
```
[5.2788785]
[2.3940]
```
    you.wield_change  = true;
```
Replacement in crawl-ref/source/item_use.cc at line 310 [5.2781507]
∅:D[2.3970] → [7.732021:732050]
B:BD[5.2788814] → [7.732021:732050]
```
    you.turn_is_over = true;
```
[2.3970]
[8.365413]
```
    you.turn_is_over  = true;
```

Replacement in crawl-ref/source/item_use.cc at line 1383 [5.2781507]

B:BD[4.3276] → [4.3276:3473]

    bool no_other_items;
    {
        const int next_item = get_fire_item_index((item + 1) % ENDOFPACK, true, false);
        no_other_items = (next_item == ENDOFPACK || next_item == item);
    }

[4.3276]

[4.3473]

    const int next_item
                = get_fire_item_index((item + 1) % ENDOFPACK, true, false);
    bool no_other_items = (next_item == ENDOFPACK || next_item == item);

Deletion in crawl-ref/source/item_use.cc at line 1390 [5.2781507]
B:BD[4.3519] → [4.3519:3525]
```
    {
```
Deletion in crawl-ref/source/item_use.cc at line 1391 [5.2781507]
B:BD[4.3557] → [4.3557:3563]
```
    }
```

Insertion in crawl-ref/source/item_use.cc at line 1392 [5.2781507]

[4.3564]

    std::ostringstream msg;
    if (item == ENDOFPACK)
        msg << "Firing ";
    else

Replacement in crawl-ref/source/item_use.cc at line 1397 [5.2781507]

B:BD[4.3570] → [4.3570:4061]

        std::ostringstream msg;
        if (item == ENDOFPACK) msg << "Firing ";
        else {
            const item_def& item_def = you.inv[item];
            const launch_retval projected = is_launched(&you, you.weapon(), item_def);
            if (projected == LRET_FUMBLED)  msg << "Awkwardly throwing ";
            else if (projected == LRET_LAUNCHED) msg << "Firing ";
            else if (projected == LRET_THROWN)   msg << "Throwing ";
            else msg << "Buggy ";
        }

[4.3570]

[4.4061]

        const item_def& item_def = you.inv[item];
        const launch_retval projected = is_launched(&you, you.weapon(), item_def);

Replacement in crawl-ref/source/item_use.cc at line 1400 [5.2781507]

B:BD[4.4074] → [4.4074:4167]

        msg << (no_other_items ? "(i - change)" : "(^n ^p i - change)")
            << ": ";

[4.4074]

[4.4167]

        if (projected == LRET_FUMBLED)
            msg << "Awkwardly throwing ";
        else if (projected == LRET_LAUNCHED)
            msg << "Firing ";
        else if (projected == LRET_THROWN)
            msg << "Throwing ";
        else
            msg << "Buggy ";
    }

Replacement in crawl-ref/source/item_use.cc at line 1410 [5.2781507]

B:BD[4.4168] → [4.4168:4511]

        if (item == ENDOFPACK) {
            msg << "<red>" << _fire_get_noitem_reason() << "</red>";
        } else {
            const char* color = (selected_from_inventory ? "grey" : "w");
            msg << "<" << color << ">"
                << you.inv[item].name(DESC_INVENTORY_EQUIP)
                << "</" << color << ">";
        }

[4.4168]

[4.4511]

    msg << (no_other_items ? "(i - change)" : "(Ctrl-N, Ctrl-P, i: change)")
        << ": ";

Replacement in crawl-ref/source/item_use.cc at line 1413 [5.2781507]

B:BD[4.4512] → [4.4512:4643]

        // XXX: use another channel that doesn't spam the message log?
        formatted_message_history(msg.str(), MSGCH_PROMPT);

[4.4512]

[4.4643]

    if (item == ENDOFPACK)
        msg << "<red>" << _fire_get_noitem_reason() << "</red>";
    else
    {
        const char* color = (selected_from_inventory ? "grey" : "w");
        msg << "<" << color << ">"
            << you.inv[item].name(DESC_INVENTORY_EQUIP)
            << "</" << color << ">";

Insertion in crawl-ref/source/item_use.cc at line 1422 [5.2781507]
[4.4649]
[4.4649]
```
    formatted_message_history(msg.str(), MSGCH_PROMPT);
```

Replacement in crawl-ref/source/item_use.cc at line 1443 [5.2781507]

B:BD[9.2733] → [3.2584:2598]

∅:D[3.2598] → [9.2733:2756]

B:BD[9.2733] → [9.2733:2756]

B:BD[9.2756] → [4.4652:5149]

∅:D[4.5149] → [9.2782:2797]

B:BD[9.2782] → [9.2782:2797]

B:BD[9.2797] → [4.5150:5553]

∅:D[4.5553] → [9.2861:2931]

B:BD[9.2861] → [9.2861:2931]

B:BD[9.2931] → [4.5554:5585]

∅:D[4.5585] → [9.2964:3021]

B:BD[9.2964] → [9.2964:3021]

    case '(':
    case CONTROL('N'):
    case CONTROL('P'): {
        const int direction = (key == CONTROL('N')) ? +1 : -1;
        const int start = (item + ENDOFPACK + direction) % ENDOFPACK;
        const int next = get_fire_item_index(start, (direction==1), false);
        if (next != item && next != ENDOFPACK)
        {
            item = next;
            selected_from_inventory = false;
        }
        // Do this stuff unconditionally to make the prompt redraw
        message_ammo_prompt();
        need_prompt = true;
        break;
    }
    case 'i': {
        std::string err;
        const int selected = _fire_prompt_for_item(err);
        if (selected != ENDOFPACK &&
            _fire_validate_item(selected, err))
        {
            item = selected;
            selected_from_inventory = true;
        }
        message_ammo_prompt( err.length() ? &err : NULL );
        need_prompt = true;
        return CMD_NO_CMD;
    }
    case '?':
        show_targeting_help();
        redraw_screen();
        message_ammo_prompt();
        need_prompt = true;
        return (CMD_NO_CMD);

[9.2733]

[9.3021]

      case '(':
      case CONTROL('N'):
      case CONTROL('P'):
      {
          const int direction = (key == CONTROL('N')) ? +1 : -1;
          const int start = (item + ENDOFPACK + direction) % ENDOFPACK;
          const int next = get_fire_item_index(start, (direction==1), false);
          if (next != item && next != ENDOFPACK)
          {
              item = next;
              selected_from_inventory = false;
          }
          // Do this stuff unconditionally to make the prompt redraw
          message_ammo_prompt();
          need_prompt = true;
          break;
      }
      case 'i':
      {
          std::string err;
          const int selected = _fire_prompt_for_item(err);
          if (selected != ENDOFPACK &&
              _fire_validate_item(selected, err))
          {
              item = selected;
              selected_from_inventory = true;
          }
          message_ammo_prompt( err.length() ? &err : NULL );
          need_prompt = true;
          return CMD_NO_CMD;
      }
      case '?':
          show_targeting_help();
          redraw_screen();
          message_ammo_prompt();
          need_prompt = true;
          return (CMD_NO_CMD);

Some more code clean-up.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/stuff.cc at line 721 [5.224557]

Replacement in crawl-ref/source/stuff.cc at line 755 [5.224557]

Replacement in crawl-ref/source/item_use.cc at line 308 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 310 [5.2781507]