Merge pull request #66 from OzoneH3/master

Update: Item list, press I to compare with inventory

game.cpp

@@ -5236,13 +5236,22 @@ void game::list_items()
  int iActive = 0;
  int iMaxRows = 25-iInfoHeight-2;
  int iStartPos = 0;
+ int iActiveX = 0;
+ int iActiveY = 0;
  long ch = '.';
 
  do {
   if (iItemNum > 0) {
    u.view_offset_x = 0;
    u.view_offset_y = 0;
 
+   if (ch == 'I') {
+    compare(iActiveX, iActiveY);
+    ch = '.';
+    wborder(w_items, LINE_XOXO, LINE_XOXO, LINE_OXOX, LINE_OXOX,
+                     LINE_OXXO, LINE_OOXX, LINE_XXOO, LINE_XOOX );
+   }
+
    switch(ch) {
     case KEY_UP:
      iActive--;
@@ -5272,8 +5281,8 @@ void game::list_items()
    wprintz(w_items, c_white, " / %*d ", ((iItemNum > 9) ? 2 : 1), iItemNum);
 
    int iNum = 0;
-   int iActiveX = 0;
-   int iActiveY = 0;
+   iActiveX = 0;
+   iActiveY = 0;
    std::string sActiveItemName;
    std::stringstream sText;
    for (int iRow = (iSearchY * -1); iRow <= iSearchY; iRow++) {

game.h

@@ -308,7 +308,7 @@ class game
   void pickup(int posx, int posy, int min);// Pickup items; ',' or via examine()
 // Pick where to put liquid; false if it's left where it was
   bool handle_liquid(item &liquid, bool from_ground, bool infinite);
-  void compare(); // Compare two Items	'I'
+  void compare(int iCompareX = -999, int iCompareY = -999); // Compare two Items	'I'
   void drop();	  // Drop an item		'd'
   void drop_in_direction(); // Drop w/ direction 'D'
   void reassign_item(); // Reassign the letter of an item   '='

inventory_ui.cpp

@@ -479,19 +479,29 @@ std::vector<item> game::multidrop()
  return ret;
 }
 
-void game::compare()
+void game::compare(int iCompareX, int iCompareY)
 {
- mvwprintw(w_terrain, 0, 0, "Compare where? (Direction button)");
- wrefresh(w_terrain);
  int examx, examy;
- char ch = input();
- last_action += ch;
- if (ch == KEY_ESCAPE || ch == 'I' || ch == 'q')
-  return;
- get_direction(this, examx, examy, ch);
- if (examx == -2 || examy == -2) {
-  add_msg("Invalid direction.");
-  return;
+ char ch = '.';
+
+ if (iCompareX != -999 && iCompareX != -999) {
+  examx = iCompareX;
+  examy = iCompareY;
+ } else {
+  mvwprintw(w_terrain, 0, 0, "Compare where? (Direction button)");
+  wrefresh(w_terrain);
+
+  ch = input();
+  last_action += ch;
+  if (ch == KEY_ESCAPE || ch == 'q')
+   return;
+  if (ch == '\n' || ch == 'I')
+   ch = '.';
+  get_direction(this, examx, examy, ch);
+  if (examx == -2 || examy == -2) {
+   add_msg("Invalid direction.");
+   return;
+  }
  }
  examx += u.posx;
  examy += u.posy;