Menu
▾
▴
[PlaneShift-svn] SF.net SVN: planeshift:[2864] trunk/src/server
|
From: <Ven...@us...> - 2009-01-11 22:50:36
|
Revision: 2864
http://planeshift.svn.sourceforge.net/planeshift/?rev=2864&view=rev
Author: Vengeance2001
Date: 2009-01-11 22:50:29 +0000 (Sun, 11 Jan 2009)
Log Message:
-----------
Updated tutorial and spell manager to functor messaging.
Renamed psSpellManager to SpellManager for consistency.
Modified Paths:
--------------
trunk/src/server/bulkobjects/psspell.cpp
trunk/src/server/bulkobjects/psspell.h
trunk/src/server/psserver.cpp
trunk/src/server/psserver.h
trunk/src/server/psserverchar.cpp
trunk/src/server/spellmanager.cpp
trunk/src/server/spellmanager.h
trunk/src/server/tutorialmanager.cpp
trunk/src/server/tutorialmanager.h
trunk/src/server/usermanager.cpp
Modified: trunk/src/server/bulkobjects/psspell.cpp
===================================================================
--- trunk/src/server/bulkobjects/psspell.cpp 2009-01-11 07:33:24 UTC (rev 2863)
+++ trunk/src/server/bulkobjects/psspell.cpp 2009-01-11 22:50:29 UTC (rev 2864)
@@ -232,7 +232,7 @@
return true;
}
-psSpellCastGameEvent *psSpell::Cast(psSpellManager * mgr, Client * client, csString &effectName,
+psSpellCastGameEvent *psSpell::Cast(SpellManager * mgr, Client * client, csString &effectName,
csVector3 &offset, EID &anchorID, EID &targetID, unsigned int &castingDuration, csString & castingText) const
{
gemActor *caster = client->GetActor();
@@ -444,7 +444,7 @@
return targetsInRange;
}
-bool psSpell::AffectTargets(psSpellManager * mgr, psSpellCastGameEvent * event, csString &effectName, csVector3 &offset,
+bool psSpell::AffectTargets(SpellManager * mgr, psSpellCastGameEvent * event, csString &effectName, csVector3 &offset,
EID &anchorID, EID &targetID, csString & affectText) const
{
gemActor * caster = event->caster->GetActor();
Modified: trunk/src/server/bulkobjects/psspell.h
===================================================================
--- trunk/src/server/bulkobjects/psspell.h 2009-01-11 07:33:24 UTC (rev 2863)
+++ trunk/src/server/bulkobjects/psspell.h 2009-01-11 22:50:29 UTC (rev 2864)
@@ -36,7 +36,7 @@
#include "psskills.h"
class csVector3;
-class psSpellManager;
+class SpellManager;
class Client;
class gemObject;
class gemActor;
@@ -112,7 +112,7 @@
*
* @return An array of new psSpellCastGameEvents that are ready to be pushed inot the event stream.
*/
- psSpellCastGameEvent *Cast(psSpellManager * mgr, Client * client, csString &effectName, csVector3 &offset,
+ psSpellCastGameEvent *Cast(SpellManager * mgr, Client * client, csString &effectName, csVector3 &offset,
EID & anchorID, EID & targetID, unsigned int & castingDuration, csString & castingText) const;
/** Find all objects in range for spell around caster
@@ -125,7 +125,7 @@
*/
csArray< gemObject *> *getTargetsInRange(Client * client, float max_range, float range) const;
- bool AffectTargets(psSpellManager * mgr,psSpellCastGameEvent * event, csString &effectName, csVector3 &offset,
+ bool AffectTargets(SpellManager * mgr,psSpellCastGameEvent * event, csString &effectName, csVector3 &offset,
EID & anchorID, EID & targetID, csString & affectText) const;
bool AffectTarget( psSpellCastGameEvent * event, csString &effectName, csVector3 &offset,
EID & anchorID, EID & targetID, csString & affectText) const;
Modified: trunk/src/server/psserver.cpp
===================================================================
--- trunk/src/server/psserver.cpp 2009-01-11 07:33:24 UTC (rev 2863)
+++ trunk/src/server/psserver.cpp 2009-01-11 22:50:29 UTC (rev 2864)
@@ -423,7 +423,7 @@
Debug1(LOG_STARTUP,0,"Started Combat Manager\n");
// Start Spell Manager
- spellmanager = new psSpellManager(GetConnections(), object_reg);
+ spellmanager = new SpellManager(GetConnections(), object_reg);
Debug1(LOG_STARTUP,0,"Started Spell Manager\n");
// Start Weather Manager
Modified: trunk/src/server/psserver.h
===================================================================
--- trunk/src/server/psserver.h 2009-01-11 07:33:24 UTC (rev 2863)
+++ trunk/src/server/psserver.h 2009-01-11 22:50:29 UTC (rev 2864)
@@ -60,7 +60,7 @@
class ServerStatus;
class psMarriageManager;
class CombatManager;
-class psSpellManager;
+class SpellManager;
class ExchangeManager;
class ProgressionManager;
class NPCManager;
@@ -296,7 +296,7 @@
* @return Returns a reference to the current spell manager for the
* server.
*/
- psSpellManager* GetSpellManager() { return spellmanager; }
+ SpellManager* GetSpellManager() { return spellmanager; }
/** Returns the work manager.
*
@@ -524,7 +524,7 @@
SpawnManager* spawnmanager;
csRef<EventManager> eventmanager;
WeatherManager* weathermanager;
- psSpellManager* spellmanager;
+ SpellManager* spellmanager;
ProgressionManager* progression;
psWorkManager* workmanager;
EconomyManager* economymanager;
Modified: trunk/src/server/psserverchar.cpp
===================================================================
--- trunk/src/server/psserverchar.cpp 2009-01-11 07:33:24 UTC (rev 2863)
+++ trunk/src/server/psserverchar.cpp 2009-01-11 22:50:29 UTC (rev 2864)
@@ -477,7 +477,7 @@
SendInventory( clientNum );
// If glyph window is up, update it
- psserver->GetSpellManager()->SendGlyphs(client);
+ psserver->GetSpellManager()->SendGlyphs(NULL,client);
if ( slotManager->worldContainer )
{
Modified: trunk/src/server/spellmanager.cpp
===================================================================
--- trunk/src/server/spellmanager.cpp 2009-01-11 07:33:24 UTC (rev 2863)
+++ trunk/src/server/spellmanager.cpp 2009-01-11 22:50:29 UTC (rev 2864)
@@ -52,7 +52,7 @@
#include "commandmanager.h"
-psSpellManager::psSpellManager(ClientConnectionSet *ccs,
+SpellManager::SpellManager(ClientConnectionSet *ccs,
iObjectRegistry * object_reg)
{
clients = ccs;
@@ -60,12 +60,12 @@
randomgen = psserver->rng;
- psserver->GetEventManager()->Subscribe(this,MSGTYPE_GLYPH_REQUEST,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
- psserver->GetEventManager()->Subscribe(this,MSGTYPE_GLYPH_ASSEMBLE,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
- psserver->GetEventManager()->Subscribe(this,MSGTYPE_SPELL_CAST,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
- psserver->GetEventManager()->Subscribe(this,MSGTYPE_PURIFY_GLYPH,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
- psserver->GetEventManager()->Subscribe(this,MSGTYPE_SPELL_BOOK,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
- psserver->GetEventManager()->Subscribe(this,MSGTYPE_SPELL_CANCEL,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
+ psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<SpellManager>(this,&SpellManager::SendGlyphs),MSGTYPE_GLYPH_REQUEST,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
+ psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<SpellManager>(this,&SpellManager::HandleAssembler),MSGTYPE_GLYPH_ASSEMBLE,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
+ psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<SpellManager>(this,&SpellManager::Cast),MSGTYPE_SPELL_CAST,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
+ psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<SpellManager>(this,&SpellManager::StartPurifying),MSGTYPE_PURIFY_GLYPH,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
+ psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<SpellManager>(this,&SpellManager::SendSpellBook),MSGTYPE_SPELL_BOOK,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
+ psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<SpellManager>(this,&SpellManager::HandleCancelSpell),MSGTYPE_SPELL_CANCEL,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
researchSpellScript = psserver->GetMathScriptEngine()->FindScript("CalculateChanceOfResearchSuccess");
if ( researchSpellScript )
@@ -80,7 +80,7 @@
}
}
-psSpellManager::~psSpellManager()
+SpellManager::~SpellManager()
{
if (psserver->GetEventManager())
{
@@ -93,57 +93,14 @@
}
}
-void psSpellManager::HandleMessage(MsgEntry *me,Client *client)
-{
- switch( me->GetType())
- {
- case MSGTYPE_SPELL_CAST:
- {
- psSpellCastMessage mesg(me);
- Cast(client,mesg.spell,mesg.kFactor);
- break;
- }
- case MSGTYPE_PURIFY_GLYPH:
- {
- psPurifyGlyphMessage mesg(me);
- StartPurifying(client, mesg.glyph);
- break;
- }
- case MSGTYPE_SPELL_BOOK:
- {
- SendSpellBook( client );
- break;
- }
- case MSGTYPE_GLYPH_REQUEST:
- {
- SendGlyphs( client );
- break;
- }
- case MSGTYPE_GLYPH_ASSEMBLE:
- {
- HandleAssembler( client, me );
- break;
- }
-
- case MSGTYPE_SPELL_CANCEL:
- {
- client->GetCharacterData()->InterruptSpellCasting();
- break;
- }
- }
-}
-//debug:
-void DumpAssembler(Client * client, glyphList_t & assembler)
+void SpellManager::HandleCancelSpell(MsgEntry* notused, Client* client)
{
- psString msg;
- msg="";
- for (size_t i=0; i < assembler.GetSize(); i++)
- msg.AppendFmt("S%u ",assembler[i]->GetUID());
- psserver->SendSystemInfo(client->GetClientNum(), msg.GetData());
+ client->GetCharacterData()->InterruptSpellCasting();
}
-void psSpellManager::HandleAssembler( Client* client, MsgEntry* me )
+
+void SpellManager::HandleAssembler(MsgEntry* me, Client* client)
{
psGlyphAssembleMessage mesg;
mesg.FromClient( me );
@@ -172,7 +129,7 @@
if (!client->GetCharacterData()->Inventory().HasPurifiedGlyphs(assembler))
{
Error2( "Client %i tried to research spell with glyphs he actually doesn't have", client->GetClientNum() );
- SendGlyphs( client );
+ SendGlyphs(NULL,client);
return;
}
@@ -256,7 +213,7 @@
}
-void psSpellManager::SaveSpell(Client * client, csString spellName)
+void SpellManager::SaveSpell(Client * client, csString spellName)
{
psSpell * spell = client->GetCharacterData()->GetSpellByName(spellName);
if (spell)
@@ -279,14 +236,18 @@
psServer::CharacterLoader.SaveCharacterData(client->GetCharacterData(),client->GetActor());
- SendSpellBook(client);
+ SendSpellBook(NULL,client);
psserver->SendSystemInfo(client->GetClientNum(),
"%s added to your spell book!",spellName.GetData());
}
-void psSpellManager::Cast(Client * client, csString spellName, float kFactor)
+void SpellManager::Cast(MsgEntry *me, Client * client)
{
+ psSpellCastMessage msg(me);
+
psSpell *spell = NULL;
+ csString spellName = msg.spell;
+ float kFactor = msg.kFactor;
// Allow developers to cast any spell, even if unknown to the character.
if (CacheManager::GetSingleton().GetCommandManager()->Validate(client->GetSecurityLevel(), "cast all spells"))
@@ -342,7 +303,7 @@
}
}
-void psSpellManager::SendSpellBook(Client * client)
+void SpellManager::SendSpellBook(MsgEntry *notused, Client * client)
{
psSpellBookMessage mesg(client->GetClientNum());
csArray<psSpell*> spells = client->GetCharacterData()->GetSpellList();
@@ -369,7 +330,7 @@
mesg.SendMessage();
}
-void psSpellManager::SendGlyphs( Client * client)
+void SpellManager::SendGlyphs(MsgEntry *notused, Client * client)
{
psCharacter * character = client->GetCharacterData();
csArray <glyphSlotInfo> slots;
@@ -444,8 +405,11 @@
return NULL;
}
-void psSpellManager::StartPurifying(Client * client, int statID)
+void SpellManager::StartPurifying(MsgEntry *me, Client * client)
{
+ psPurifyGlyphMessage mesg(me);
+ int statID = mesg.glyph;
+
psCharacter* character = client->GetCharacterData();
psGlyph* glyph = FindUnpurifiedGlyph(character, statID);
@@ -475,7 +439,7 @@
// Reset the stack count to account for the one that was destroyed.
stackOfGlyphs->SetStackCount(stackOfGlyphs->GetStackCount() + 1);
- SendGlyphs(client);
+ SendGlyphs(NULL,client);
return;
}
stackOfGlyphs->Save(false);
@@ -495,11 +459,11 @@
event.Format("<evt><script delay=\"%d\" persistent=\"yes\"><purify glyph=\"%u\"/></script></evt>",20000,glyph->GetUID());
psserver->GetProgressionManager()->ProcessScript(event.GetData(),client->GetActor(),client->GetActor());
- SendGlyphs(client);
+ SendGlyphs(NULL,client);
psserver->GetCharManager()->SendInventory(client->GetClientNum());
}
-void psSpellManager::EndPurifying(psCharacter * character, uint32 glyphUID)
+void SpellManager::EndPurifying(psCharacter * character, uint32 glyphUID)
{
Client * client = clients->FindPlayer(character->GetPID());
if (!client)
@@ -517,14 +481,14 @@
glyph->PurifyingFinished();
glyph->Save(false);
psserver->SendSystemInfo(client->GetClientNum(), "The glyph %s is now purified", glyph->GetName());
- SendGlyphs(client);
+ SendGlyphs(NULL,client);
psserver->GetCharManager()->SendInventory(client->GetClientNum());
return;
}
}
}
-psSpell* psSpellManager::FindSpell(Client * client, const glyphList_t & assembler)
+psSpell* SpellManager::FindSpell(Client * client, const glyphList_t & assembler)
{
CacheManager::SpellIterator loop = CacheManager::GetSingleton().GetSpellIterator();
@@ -544,12 +508,12 @@
return NULL;
}
-psSpell* psSpellManager::FindSpell(csString& name)
+psSpell* SpellManager::FindSpell(csString& name)
{
return CacheManager::GetSingleton().GetSpellByName(name);
}
-psSpell* psSpellManager::FindSpell(int spellID)
+psSpell* SpellManager::FindSpell(int spellID)
{
return CacheManager::GetSingleton().GetSpellByID(spellID);
}
@@ -557,7 +521,7 @@
/**
* This is the meat and potatoes of the spell engine here.
*/
-void psSpellManager::HandleSpellCastEvent(psSpellCastGameEvent *event)
+void SpellManager::HandleSpellCastEvent(psSpellCastGameEvent *event)
{
csString responseEffectName;
csVector3 offset;
@@ -630,7 +594,7 @@
}
}
-void psSpellManager::HandleSpellAffectEvent( psSpellAffectGameEvent *event )
+void SpellManager::HandleSpellAffectEvent( psSpellAffectGameEvent *event )
{
// Since we just came in from an event, make sure target is still alive.
if ( event->target->IsAlive())
@@ -673,7 +637,7 @@
/*-------------------------------------------------------------*/
-psSpellCastGameEvent::psSpellCastGameEvent(psSpellManager *mgr,
+psSpellCastGameEvent::psSpellCastGameEvent(SpellManager *mgr,
const psSpell * spell,
Client *caster,
gemObject *target,
@@ -755,7 +719,7 @@
/*-------------------------------------------------------------*/
-psSpellAffectGameEvent::psSpellAffectGameEvent(psSpellManager *mgr,
+psSpellAffectGameEvent::psSpellAffectGameEvent(SpellManager *mgr,
const psSpell *spell,
Client *caster,
gemObject *target,
Modified: trunk/src/server/spellmanager.h
===================================================================
--- trunk/src/server/spellmanager.h 2009-01-11 07:33:24 UTC (rev 2863)
+++ trunk/src/server/spellmanager.h 2009-01-11 22:50:29 UTC (rev 2864)
@@ -59,13 +59,13 @@
/** Manager class that handles loading/searching/casting spells.
* This class also manages a number of psSpell Events.
*/
-class psSpellManager : public MessageManager
+class SpellManager : public MessageManager
{
public:
- psSpellManager(ClientConnectionSet *clients,
+ SpellManager(ClientConnectionSet *clients,
iObjectRegistry * object_reg);
- virtual ~psSpellManager();
+ virtual ~SpellManager();
/** Handles a network message.
* This is a factory for the different types of message that the manager handles.
@@ -73,7 +73,7 @@
* @param me The message entry incoming.
* @param client The client that this message came from.
*/
- virtual void HandleMessage(MsgEntry *me,Client *client);
+ virtual void HandleMessage(MsgEntry *me,Client *client) { }
/** Purifying on a glyph has been complete.
* This will send out a network message to the client and update it's inventory
@@ -89,7 +89,7 @@
*
* @param client The client that will be sent it's current glyphs.
*/
- void SendGlyphs(Client * client);
+ void SendGlyphs(MsgEntry *notused, Client * client);
/** Handles a cast event object.
* @param event The event that needs to be handled.
@@ -115,13 +115,15 @@
* @param spellName The name of the spell to cast.
* @param kFactor The power factor that the spell is cast with.
*/
- void Cast(Client * client, csString spellName, float kFactor);
-
+ void Cast(MsgEntry *me, Client * client);
+
+ void HandleCancelSpell(MsgEntry* notused, Client* client);
+
/** Send the player's spell book.
*
* @param client The client that will be sent the spell book.
*/
- void SendSpellBook(Client * client);
+ void SendSpellBook(MsgEntry *notused, Client * client);
/** Start to purify a glyph.
* This will also send out notifications to the client about the start of operation.
@@ -129,7 +131,7 @@
* @param client The client that this data is for.
* @param The stat ID of the glyph that the player wants to purify.
*/
- void StartPurifying(Client * client, int statID);
+ void StartPurifying(MsgEntry *me, Client * client);
/** Find a spell in the assorted glyphs.
* This checks ths list of glyphs and see if it matches any
@@ -163,7 +165,7 @@
* @param client The client this is for.
* @param me The message from that client.
*/
- void HandleAssembler(Client* client, MsgEntry* me);
+ void HandleAssembler(MsgEntry* me,Client* client);
MathScript *researchSpellScript;
MathScriptVar *varCaster;
@@ -183,7 +185,7 @@
class psSpellCastGameEvent : public psGameEvent, public iDeleteObjectCallback
{
protected:
- psSpellManager *spellmanager;
+ SpellManager *spellmanager;
public:
@@ -195,7 +197,7 @@
float powerLevel;
csTicks duration;
- psSpellCastGameEvent(psSpellManager *mgr,
+ psSpellCastGameEvent(SpellManager *mgr,
const psSpell *spell,
Client *caster,
gemObject *target,
@@ -220,7 +222,7 @@
class psSpellAffectGameEvent : public psGameEvent, public iDeleteObjectCallback, public iDeathCallback
{
protected:
- psSpellManager *spellmanager;
+ SpellManager *spellmanager;
public:
@@ -233,7 +235,7 @@
float powerLevel;
csTicks duration;
- psSpellAffectGameEvent(psSpellManager *mgr,
+ psSpellAffectGameEvent(SpellManager *mgr,
const psSpell *spell,
Client *caster,
gemObject *target,
Modified: trunk/src/server/tutorialmanager.cpp
===================================================================
--- trunk/src/server/tutorialmanager.cpp 2009-01-11 07:33:24 UTC (rev 2863)
+++ trunk/src/server/tutorialmanager.cpp 2009-01-11 22:50:29 UTC (rev 2864)
@@ -49,12 +49,12 @@
TutorialManager::TutorialManager(ClientConnectionSet *pCCS)
{
clients = pCCS;
- psserver->GetEventManager()->Subscribe(this,MSGTYPE_CONNECT_EVENT, REQUIRE_ANY_CLIENT);
- psserver->GetEventManager()->Subscribe(this,MSGTYPE_MOVEMENT_EVENT,REQUIRE_ANY_CLIENT);
- psserver->GetEventManager()->Subscribe(this,MSGTYPE_TARGET_EVENT, NO_VALIDATION);
- psserver->GetEventManager()->Subscribe(this,MSGTYPE_GENERIC_EVENT, REQUIRE_ANY_CLIENT);
- psserver->GetEventManager()->Subscribe(this,MSGTYPE_DAMAGE_EVENT, NO_VALIDATION);
- psserver->GetEventManager()->Subscribe(this,MSGTYPE_DEATH_EVENT, NO_VALIDATION);
+ psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<TutorialManager>(this,&TutorialManager::HandleConnect),MSGTYPE_CONNECT_EVENT, REQUIRE_ANY_CLIENT);
+ psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<TutorialManager>(this,&TutorialManager::HandleMovement),MSGTYPE_MOVEMENT_EVENT,REQUIRE_ANY_CLIENT);
+ psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<TutorialManager>(this,&TutorialManager::HandleTarget),MSGTYPE_TARGET_EVENT, NO_VALIDATION);
+ psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<TutorialManager>(this,&TutorialManager::HandleGeneric),MSGTYPE_GENERIC_EVENT, REQUIRE_ANY_CLIENT);
+ psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<TutorialManager>(this,&TutorialManager::HandleDamage),MSGTYPE_DAMAGE_EVENT, NO_VALIDATION);
+ psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<TutorialManager>(this,&TutorialManager::HandleDeath),MSGTYPE_DEATH_EVENT, NO_VALIDATION);
LoadTutorialStrings();
}
@@ -99,24 +99,11 @@
msg.SendMessage();
}
-void TutorialManager::HandleMessage(MsgEntry *pMsg,Client *client)
-{
- switch (pMsg->GetType())
- {
- case MSGTYPE_CONNECT_EVENT: HandleConnect(pMsg,client); break;
- case MSGTYPE_MOVEMENT_EVENT: HandleMovement(pMsg,client); break;
- case MSGTYPE_TARGET_EVENT: HandleTarget(pMsg,client); break;
- case MSGTYPE_DAMAGE_EVENT: HandleDamage(pMsg,client); break;
- case MSGTYPE_DEATH_EVENT: HandleDeath(pMsg,client); break;
- case MSGTYPE_GENERIC_EVENT: HandleGeneric(pMsg,client); break;
- default: break;
- }
-}
-void TutorialManager::HandleConnect(MsgEntry *pMsg,Client *client)
+void TutorialManager::HandleConnect(MsgEntry *me,Client *client)
{
// printf("Got psConnectEvent\n");
- psConnectEvent evt(pMsg);
+ psConnectEvent evt(me);
if (client)
{
psCharacter *ch = client->GetCharacterData();
@@ -128,10 +115,10 @@
}
}
-void TutorialManager::HandleMovement(MsgEntry *pMsg,Client *client)
+void TutorialManager::HandleMovement(MsgEntry *me,Client *client)
{
// printf("Got psMovementEvent\n");
- psMovementEvent evt(pMsg);
+ psMovementEvent evt(me);
if (client)
{
psCharacter *ch = client->GetCharacterData();
@@ -144,10 +131,10 @@
}
// psTargetEvent already published so intercepting this takes zero code
-void TutorialManager::HandleTarget(MsgEntry *pMsg,Client *client)
+void TutorialManager::HandleTarget(MsgEntry *me,Client *client)
{
// printf("Got psTargetEvent\n");
- psTargetChangeEvent evt(pMsg);
+ psTargetChangeEvent evt(me);
if (evt.character)
{
client = evt.character->GetClient();
@@ -167,10 +154,10 @@
}
/// Specifically handle the Damage event in the tutorial
-void TutorialManager::HandleDamage(MsgEntry *pMsg,Client *client)
+void TutorialManager::HandleDamage(MsgEntry *me,Client *client)
{
//printf("Got psDamageEvent\n");
- psDamageEvent evt(pMsg);
+ psDamageEvent evt(me);
if (evt.target && evt.attacker) // someone hurt us
{
client = evt.target->GetClient();
@@ -200,10 +187,10 @@
}
/// Specifically handle the Damage event in the tutorial
-void TutorialManager::HandleDeath(MsgEntry *pMsg,Client *client)
+void TutorialManager::HandleDeath(MsgEntry *me,Client *client)
{
//printf("Got psDeathEvent\n");
- psDeathEvent evt(pMsg);
+ psDeathEvent evt(me);
if (evt.deadActor) // We're dead
{
client = evt.deadActor->GetClient();
@@ -219,10 +206,10 @@
}
}
-void TutorialManager::HandleGeneric(MsgEntry *pMsg,Client *client)
+void TutorialManager::HandleGeneric(MsgEntry *me,Client *client)
{
// printf("Got psGenericEvent\n");
- psGenericEvent evt(pMsg);
+ psGenericEvent evt(me);
if (evt.client_id)
{
switch (evt.eventType)
Modified: trunk/src/server/tutorialmanager.h
===================================================================
--- trunk/src/server/tutorialmanager.h 2009-01-11 07:33:24 UTC (rev 2863)
+++ trunk/src/server/tutorialmanager.h 2009-01-11 22:50:29 UTC (rev 2864)
@@ -60,7 +60,7 @@
TutorialManager(ClientConnectionSet *pCCS);
virtual ~TutorialManager();
- virtual void HandleMessage(MsgEntry *pMsg,Client *client);
+ virtual void HandleMessage(MsgEntry *pMsg,Client *client) { }
protected:
/// Specifically handle the Connect event in the tutorial
Modified: trunk/src/server/usermanager.cpp
===================================================================
--- trunk/src/server/usermanager.cpp 2009-01-11 07:33:24 UTC (rev 2863)
+++ trunk/src/server/usermanager.cpp 2009-01-11 22:50:29 UTC (rev 2864)
@@ -130,7 +130,6 @@
psserver->GetEventManager()->Subscribe(this,MSGTYPE_MOTDREQUEST,REQUIRE_ANY_CLIENT);
psserver->GetEventManager()->Subscribe(this,MSGTYPE_CHARDETAILSREQUEST,REQUIRE_READY_CLIENT);
psserver->GetEventManager()->Subscribe(this,MSGTYPE_CHARDESCUPDATE,REQUIRE_READY_CLIENT);
-
psserver->GetEventManager()->Subscribe(this,MSGTYPE_TARGET_EVENT,NO_VALIDATION);
psserver->GetEventManager()->Subscribe(this,MSGTYPE_ENTRANCE,REQUIRE_READY_CLIENT);
}
@@ -143,7 +142,6 @@
psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_MOTDREQUEST);
psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_CHARDETAILSREQUEST);
psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_CHARDESCUPDATE);
-
psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_TARGET_EVENT);
psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_ENTRANCE);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|