[Planeshift-cvs] CVS: planeshift/src/client/gui pawsconfigkeys.cpp, 1.34, 1.35

[DaveG <da...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11948/src/client/gui

Modified Files:
	pawsconfigkeys.cpp 
Log Message:
fixing little bug where if you set an action to it's old combo it would complain that it is already set

Index: pawsconfigkeys.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsconfigkeys.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** pawsconfigkeys.cpp	10 Jun 2006 12:24:23 -0000	1.34
--- pawsconfigkeys.cpp	24 Jun 2006 19:48:18 -0000	1.35
***************
*** 343,348 ****
          const psControl* other = psengine->GetCharControl()->GetMappedTrigger(device,button,mods);
          CS_ASSERT(other);
!         fingWnd->SetCollisionInfo(other->name);
!         return false;
      }
  }
--- 343,352 ----
          const psControl* other = psengine->GetCharControl()->GetMappedTrigger(device,button,mods);
          CS_ASSERT(other);
!         if (other->name != editedCmd)
!         {
!             fingWnd->SetCollisionInfo(GetDisplayName(other->name));
!             return false;  // Keep fingering window up; invalid combo to set
!         }
!         else return true;  // Hide fingering window; combo is the same as old
      }
  }
***************
*** 430,436 ****
  void pawsFingeringWindow::SetCollisionInfo(const char* action)
  {
!     csString str = "Key combo \"";
      str += combo;
!     str += "\" has already been assigned to \"";
      str += action;
      str += "\"";
--- 434,440 ----
  void pawsFingeringWindow::SetCollisionInfo(const char* action)
  {
!     csString str = "\"";
      str += combo;
!     str += "\" is already set to \"";
      str += action;
      str += "\"";