Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv13639/src
Modified Files:
commands.cpp targetrequests.h
Log Message:
Rewrote some other commands in Python.
Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.193
retrieving revision 1.194
diff -C2 -d -r1.193 -r1.194
*** commands.cpp 26 Jul 2003 01:10:54 -0000 1.193
--- commands.cpp 26 Jul 2003 02:05:31 -0000 1.194
***************
*** 249,272 ****
}
- void commandWhere( cUOSocket *socket, const QString &command, QStringList &args ) throw()
- {
- Q_UNUSED(args);
- Q_UNUSED(command);
- P_PLAYER pChar = socket->player();
-
- if( !pChar )
- return;
-
- cTerritory *mRegion = AllTerritories::instance()->region( pChar->pos().x, pChar->pos().y, pChar->pos().map );
-
- QString message = tr( "You are" );
-
- if( mRegion )
- message.append( " " + tr( "in %1" ).arg( mRegion->name() ) );
-
- message.append( " " + tr( "at %1,%2,%3 on map %4" ).arg( pChar->pos().x ).arg( pChar->pos().y ).arg( pChar->pos().z ).arg( pChar->pos().map ) );
- pChar->message( message );
- }
-
void commandKill( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
--- 249,252 ----
***************
*** 601,637 ****
}
- void commandBank( cUOSocket *socket, const QString &command, QStringList &args ) throw()
- {
- Q_UNUSED(command);
- socket->sysMessage( tr( "Please chose the owner of the container you want to open" ) );
-
- bool ok = false;
- UINT8 layer = hex2dec( args.join( " " ) ).toUShort( &ok );
-
- if( !ok || !layer )
- layer = 0x1D; // Bank layer
-
- socket->attachTarget( new cBankTarget( layer ) );
- }
-
- void commandAction( cUOSocket *socket, const QString &command, QStringList &args ) throw()
- {
- Q_UNUSED(command);
- bool ok = false;
- UINT32 action = hex2dec( args.join( " " ) ).toInt( &ok );
-
- if( ok )
- {
- if( socket->player() )
- {
- socket->player()->action( action );
- }
- }
- else
- {
- socket->sysMessage( tr( "Invalid parameter: '%1'" ).arg( args.join( " " ) ) );
- }
- }
-
void commandSpawnRegion( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
--- 581,584 ----
***************
*** 1271,1275 ****
{
{ "ACCOUNT", commandAccount },
- { "ACTION", commandAction },
{ "ADD", commandAdd },
{ "ADDEVENT", commandAddEvent },
--- 1218,1221 ----
***************
*** 1279,1283 ****
{ "ALLSHOW", commandAllShow },
{ "ALLSKILLS", commandAllSkills },
- { "BANK", commandBank },
{ "BROADCAST", commandBroadcast },
{ "FIX", commandFix },
--- 1225,1228 ----
***************
*** 1308,1314 ****
{ "TELE", commandTele },
{ "TILE", commandTile },
- { "WHERE", commandWhere },
{ "WHO", commandWho },
{ NULL, NULL }
};
-
--- 1253,1257 ----
Index: targetrequests.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** targetrequests.h 26 Jul 2003 01:10:55 -0000 1.40
--- targetrequests.h 26 Jul 2003 02:05:31 -0000 1.41
***************
*** 481,514 ****
};
- class cBankTarget: public cTargetRequest
- {
- Q_OBJECT
- private:
- UINT8 layer;
- public:
- cBankTarget( UINT8 data ) { layer = data; }
-
- virtual bool responsed( cUOSocket *socket, cUORxTarget *target )
- {
- P_CHAR pChar = FindCharBySerial( target->serial() );
- if( !pChar )
- {
- socket->sysMessage( tr( "This does not appear to be a living being." ) );
- return true;
- }
-
- P_ITEM pItem = pChar->GetItemOnLayer( layer );
-
- if( !pItem )
- {
- socket->sysMessage( tr( "This being does not have a container on layer 0x%1" ).arg( layer, 2, 16 ) );
- return true;
- }
-
- socket->sendContainer( pItem );
- return true;
- }
- };
-
class cSetTagTarget: public cTargetRequest
{
--- 481,484 ----
|
