[Planeshift-cvs] CVS: planeshift/src/client cmdusers.cpp,1.21,1.22 psengine.cpp,1.258,1.259

[Andrew C. <ac...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client
In directory sc8-pr-cvs1:/tmp/cvs-serv23032/src/client

Modified Files:
	cmdusers.cpp psengine.cpp 
Log Message:
Added /assist command from iverns and added in new PAWS 
interact window to replace the old one.

Index: cmdusers.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/cmdusers.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** cmdusers.cpp	20 Apr 2003 01:22:57 -0000	1.21
--- cmdusers.cpp	29 May 2003 23:57:03 -0000	1.22
***************
*** 46,49 ****
--- 46,50 ----
      cmdsource->Subscribe("/sell",         "            Sell to merchant.", CmdHandler::VISIBLE_TO_USER, this);
      cmdsource->Subscribe("/trade",        "            Start a trade with current Target player.",CmdHandler::VISIBLE_TO_USER,this);
+     cmdsource->Subscribe("/assist",       "[player]    Make the specified player's target your own, or make your current target your own if no player is specified.", CmdHandler::VISIBLE_TO_USER, this);
  }
  
***************
*** 71,74 ****
--- 72,76 ----
      cmdsource->Unsubscribe("/sell", this);
      cmdsource->Unsubscribe("/trade",this);
+     cmdsource->Unsubscribe( "/assist", this );
  }
  

Index: psengine.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/psengine.cpp,v
retrieving revision 1.258
retrieving revision 1.259
diff -C2 -d -r1.258 -r1.259
*** psengine.cpp	26 May 2003 17:46:47 -0000	1.258
--- psengine.cpp	29 May 2003 23:57:03 -0000	1.259
***************
*** 169,172 ****
--- 169,173 ----
          csReport (object_reg, CS_REPORTER_SEVERITY_NOTIFY, PSAPP, CS_VERSION);
  
+ 
          // Query for plugins
          PS_QUERY_PLUGIN (queue, iEventQueue, "iEventQueue");
***************
*** 519,522 ****
--- 520,525 ----
          paws->LoadWidget( "/this/data/inventory.xml" );
          paws->LoadWidget( "/this/data/itemdesc.xml" );
+         if ( !paws->LoadWidget( "/this/data/interact.xml" ) )
+             printf("Failed to load!\n");
  
          if (!gameLoaded)
***************
*** 813,817 ****
      // Do some basic CS init stuff
     iObjectRegistry *object_reg = InitCS(argc, argv, "/this/psclient.cfg",
! 					 CONFIGFILENAME);
  
      pslog::Initialize (object_reg);
--- 816,820 ----
      // Do some basic CS init stuff
     iObjectRegistry *object_reg = InitCS(argc, argv, "/this/psclient.cfg",
!    					 CONFIGFILENAME);
  
      pslog::Initialize (object_reg);