Planeshift: a 3D MMORPG

Revision: 6629
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6629&view=rev
Author:   rlydontknow
Date:     2010-12-29 23:31:08 +0000 (Wed, 29 Dec 2010)

Log Message:
-----------
even more pedantic warning fixes

Modified Paths:
--------------
    trunk/src/common/effects/pseffect2drenderer.cpp
    trunk/src/common/effects/pseffectanchor.cpp
    trunk/src/common/effects/pseffectanchorbasic.cpp
    trunk/src/common/effects/pseffectanchorsocket.h
    trunk/src/common/effects/pseffectanchorspline.cpp
    trunk/src/common/effects/pseffectmanager.cpp
    trunk/src/common/effects/pseffectobj.cpp
    trunk/src/common/effects/pseffectobjlabel.cpp
    trunk/src/common/effects/pseffectobjlight.cpp
    trunk/src/common/effects/pseffectobjquad.cpp
    trunk/src/common/effects/pseffectobjsound.cpp
    trunk/src/common/effects/pseffectobjspire.cpp
    trunk/src/common/effects/pseffectobjspire.h
    trunk/src/common/effects/pseffectobjstar.cpp
    trunk/src/common/effects/pseffectobjstar.h
    trunk/src/common/effects/pseffectobjtext2d.cpp
    trunk/src/common/effects/pseffectobjtext2d.h
    trunk/src/common/effects/pseffectobjtrail.cpp
    trunk/src/common/effects/pseffectobjtrail.h
    trunk/src/common/paws/pawscheckbox.cpp
    trunk/src/common/paws/pawscolorpromptwindow.cpp
    trunk/src/common/paws/pawscombo.cpp
    trunk/src/common/paws/pawscombopromptwindow.cpp
    trunk/src/common/paws/pawscrollbar.cpp
    trunk/src/common/paws/pawsfilenavigation.cpp
    trunk/src/common/paws/pawsimagedrawable.cpp
    trunk/src/common/paws/pawsimagedrawable.h
    trunk/src/common/paws/pawskeyselectbox.cpp
    trunk/src/common/paws/pawslistbox.cpp
    trunk/src/common/paws/pawsmainwidget.cpp
    trunk/src/common/paws/pawsmenu.cpp
    trunk/src/common/paws/pawsmouse.cpp
    trunk/src/common/paws/pawsnumberpromptwindow.cpp
    trunk/src/common/paws/pawsobjectview.cpp
    trunk/src/common/paws/pawsprogressbar.cpp
    trunk/src/common/paws/pawsradio.cpp
    trunk/src/common/paws/pawsspinbox.cpp
    trunk/src/common/paws/pawsstringpromptwindow.cpp
    trunk/src/common/paws/pawstextbox.cpp
    trunk/src/common/paws/pawstextwrap.cpp
    trunk/src/common/paws/pawstitle.h
    trunk/src/common/paws/pawstree.cpp
    trunk/src/common/paws/pawswidget.cpp
    trunk/src/common/paws/pawswidget.h
    trunk/src/common/paws/widgetconfigwindow.cpp
    trunk/src/common/recast/recastnavigation/RecastMeshDetail.cpp

Modified: trunk/src/common/effects/pseffect2drenderer.cpp
===================================================================
--- trunk/src/common/effects/pseffect2drenderer.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffect2drenderer.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -48,7 +48,7 @@
 	this->alpha = alpha;
 }
 
-void psEffect2DElement::Draw(iGraphics3D * g3d, iGraphics2D * g2d)
+void psEffect2DElement::Draw(iGraphics3D* /*g3d*/, iGraphics2D* /*g2d*/)
 {
 }
 
@@ -63,7 +63,7 @@
 {
 }
 
-void psEffect2DTextElement::Draw(iGraphics3D * g3d, iGraphics2D * g2d)
+void psEffect2DTextElement::Draw(iGraphics3D* /*g3d*/, iGraphics2D* g2d)
 {
 	int x = this->x + originx;
 	int y = this->y + originy;
@@ -93,28 +93,29 @@
 {
 }
 
-void psEffect2DImgElement::Draw(iGraphics3D * g3d, iGraphics2D * g2d)
+void psEffect2DImgElement::Draw(iGraphics3D* g3d, iGraphics2D* /*g2d*/)
 {
-	int tw = texRect.Width();
-	int th = texRect.Height();
-	int left = destRect.xmin + originx;
-	int top = destRect.ymin + originy;
-	if (!tiled)
-		g3d->DrawPixmap(texHandle, left, top, destRect.Width(), destRect.Height(), texRect.xmin, texRect.ymin, tw, th, 255 - alpha);
-	else
-	{
-		int right = left + destRect.Width();
-		int bottom = top + destRect.Height();
-		for (int x=left; x<right;  x+=tw)
-		{
-			for (int y=top; y<bottom; y+=th)
-			{
-				int w = csMin<int>(tw, right - x);
-				int h = csMin<int>(th, bottom - y);
-				g3d->DrawPixmap(texHandle, x, y, w, h, texRect.xmin, texRect.ymin, w, h, 255 - alpha);
-			}
-		}
-	}
+    int tw = texRect.Width();
+    int th = texRect.Height();
+    int left = destRect.xmin + originx;
+    int top = destRect.ymin + originy;
+    if (!tiled)
+        g3d->DrawPixmap(texHandle, left, top, destRect.Width(), destRect.Height(),
+                        texRect.xmin, texRect.ymin, tw, th, 255 - alpha);
+    else
+    {
+        int right = left + destRect.Width();
+        int bottom = top + destRect.Height();
+        for (int x=left; x<right;  x+=tw)
+        {
+            for (int y=top; y<bottom; y+=th)
+            {
+                int w = csMin<int>(tw, right - x);
+                int h = csMin<int>(th, bottom - y);
+                g3d->DrawPixmap(texHandle, x, y, w, h, texRect.xmin, texRect.ymin, w, h, 255 - alpha);
+            }
+        }
+    }
 }
 
 
@@ -126,7 +127,7 @@
 {
 }
 
-int psEffect2DRendererCompareZOrder(psEffect2DElement * const & a, psEffect2DElement * const & b)
+int psEffect2DRendererCompareZOrder(psEffect2DElement* const& a, psEffect2DElement* const& b)
 {
     if (a->GetZOrder() < b->GetZOrder())
         return -1;
@@ -135,7 +136,7 @@
     return 1;
 }
 
-psEffect2DElement * psEffect2DRenderer::Add2DElement(psEffect2DElement * elem)
+psEffect2DElement* psEffect2DRenderer::Add2DElement(psEffect2DElement* elem)
 {
     effect2DElements.Push(elem);
     effect2DElements.Sort(&psEffect2DRendererCompareZOrder);
@@ -143,7 +144,7 @@
     return elem;
 }
 
-void psEffect2DRenderer::Remove2DElement(psEffect2DElement * elem)
+void psEffect2DRenderer::Remove2DElement(psEffect2DElement* elem)
 {
     size_t a;
     size_t len = effect2DElements.GetSize();

Modified: trunk/src/common/effects/pseffectanchor.cpp
===================================================================
--- trunk/src/common/effects/pseffectanchor.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectanchor.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -218,7 +218,7 @@
     return true;
 }
 
-bool psEffectAnchor::Create(const csVector3 & offset, iMeshWrapper * posAttach, bool rotateWithMesh)
+bool psEffectAnchor::Create(const csVector3& /*offset*/, iMeshWrapper* /*posAttach*/, bool /*rotateWithMesh*/)
 {
     return false;
 }

Modified: trunk/src/common/effects/pseffectanchorbasic.cpp
===================================================================
--- trunk/src/common/effects/pseffectanchorbasic.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectanchorbasic.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -66,7 +66,7 @@
     return true;
 }
 
-bool psEffectAnchorBasic::Create(const csVector3 & offset, iMeshWrapper * posAttach, bool rotateWithMesh)
+bool psEffectAnchorBasic::Create(const csVector3& offset, iMeshWrapper* /*posAttach*/, bool rotateWithMesh)
 {
     static unsigned long nextUniqueID = 0;
     csString anchorID = "effect_anchor_basic_";

Modified: trunk/src/common/effects/pseffectanchorsocket.h
===================================================================
--- trunk/src/common/effects/pseffectanchorsocket.h	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectanchorsocket.h	2010-12-29 23:31:08 UTC (rev 6629)
@@ -40,9 +40,9 @@
 
     // these functions are overridden, because the parent mesh takes care of position/sectoring
     // we want to override these functions, because the default behaviour is for the effect to manage it
-    void SetRotBase(const csMatrix3 & newRotBase) {}
-    void SetPosition(const csVector3 & basePos, iSector * sector, const csMatrix3 & transf) {}
-    void SetPosition(const csVector3 & basePos, iSectorList * sectors, const csMatrix3 & transf) {}
+    void SetRotBase(const csMatrix3& /*newRotBase*/) {}
+    void SetPosition(const csVector3& /*basePos*/, iSector* /*sector*/, const csMatrix3& /*transf*/) {}
+    void SetPosition(const csVector3& /*basePos*/, iSectorList* /*sectors*/, const csMatrix3& /*transf*/) {}
 
     /** Gets the name of the socket where this anchor is attached.
      *   @return the name of the socket.

Modified: trunk/src/common/effects/pseffectanchorspline.cpp
===================================================================
--- trunk/src/common/effects/pseffectanchorspline.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectanchorspline.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -68,7 +68,7 @@
     return PostSetup();
 }
 
-bool psEffectAnchorSpline::Create(const csVector3 & offset, iMeshWrapper * posAttach, bool rotateWithMesh)
+bool psEffectAnchorSpline::Create(const csVector3& offset, iMeshWrapper* /*posAttach*/, bool rotateWithMesh)
 {
     static unsigned long nextUniqueID = 0;
     csString anchorID = "effect_anchor_spline";

Modified: trunk/src/common/effects/pseffectmanager.cpp
===================================================================
--- trunk/src/common/effects/pseffectmanager.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectmanager.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -48,13 +48,13 @@
 {
 }
 
-void psEffectLoader::SetManager(psEffectManager *manager)
+void psEffectLoader::SetManager(psEffectManager* manager)
 {
     this->manager = manager;
 }
 
-csPtr<iBase> psEffectLoader::Parse(iDocumentNode * node, iStreamSource * istream, iLoaderContext * ldr_context,
-                                   iBase * context)
+csPtr<iBase> psEffectLoader::Parse(iDocumentNode* node, iStreamSource* /*istream*/, iLoaderContext* ldr_context,
+                                   iBase* context)
 {
 #ifndef DONT_DO_EFFECTS
     if (manager)

Modified: trunk/src/common/effects/pseffectobj.cpp
===================================================================
--- trunk/src/common/effects/pseffectobj.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectobj.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -297,7 +297,7 @@
     // CS's smart pointer system
 }
 
-bool psEffectObj::Load(iDocumentNode *node, iLoaderContext* ldr_context)
+bool psEffectObj::Load(iDocumentNode *node, iLoaderContext* /*ldr_context*/)
 {
     
     csRef<iDocumentNode> dataNode;
@@ -446,7 +446,7 @@
 }
 
 
-bool psEffectObj::Render(const csVector3 &up)
+bool psEffectObj::Render(const csVector3& /*up*/)
 {
     return false;
 }

Modified: trunk/src/common/effects/pseffectobjlabel.cpp
===================================================================
--- trunk/src/common/effects/pseffectobjlabel.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectobjlabel.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -312,13 +312,13 @@
     return newObj;
 }
 
-bool psEffectObjLabel::SetText(const csArray<psEffectTextElement> & elements)
+bool psEffectObjLabel::SetText(const csArray<psEffectTextElement>& /*elements*/)
 {
    printf("settext <array> not supported\n");
    return false;
 }
 
-bool psEffectObjLabel::SetText(const csArray<psEffectTextRow> & rows)
+bool psEffectObjLabel::SetText(const csArray<psEffectTextRow>& /*rows*/)
 {
    printf("settext <textrow> not supported\n");
    return false;

Modified: trunk/src/common/effects/pseffectobjlight.cpp
===================================================================
--- trunk/src/common/effects/pseffectobjlight.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectobjlight.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -138,7 +138,7 @@
     return false;
 }
 
-bool psEffectObjLight::Render(const csVector3 &up)
+bool psEffectObjLight::Render(const csVector3& /*up*/)
 {
     if(light.IsValid())
         return true;

Modified: trunk/src/common/effects/pseffectobjquad.cpp
===================================================================
--- trunk/src/common/effects/pseffectobjquad.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectobjquad.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -256,12 +256,14 @@
   return false;
 }
 
-const csVector3 * psEffectObjQuad::MeshAnimControl::UpdateVertices(csTicks current, const csVector3 * verts, int num_verts, uint32 version_id)
+const csVector3* psEffectObjQuad::MeshAnimControl::UpdateVertices(csTicks /*current*/, const csVector3* /*verts*/,
+                                                                  int /*num_verts*/, uint32 /*version_id*/)
 {
     return parent->vert;
 }
 
-const csVector2 * psEffectObjQuad::MeshAnimControl::UpdateTexels(csTicks current, const csVector2 * texels, int num_texels, uint32 version_id)
+const csVector2* psEffectObjQuad::MeshAnimControl::UpdateTexels(csTicks /*current*/, const csVector2* /*texels*/,
+                                                                int /*num_texels*/, uint32 /*version_id*/)
 {
     return parent->texel;
 }

Modified: trunk/src/common/effects/pseffectobjsound.cpp
===================================================================
--- trunk/src/common/effects/pseffectobjsound.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectobjsound.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -114,7 +114,7 @@
     return PostSetup();
 }
 
-bool psEffectObjSound::Render(const csVector3 &up)
+bool psEffectObjSound::Render(const csVector3& /*up*/)
 {
     static unsigned long nextUniqueID = 0;
     effectID += nextUniqueID++;

Modified: trunk/src/common/effects/pseffectobjspire.cpp
===================================================================
--- trunk/src/common/effects/pseffectobjspire.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectobjspire.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -394,17 +394,20 @@
     return true;
 }
 
-const csVector3 * psEffectObjSpire::MeshAnimControl::UpdateVertices(csTicks current, const csVector3 * verts, int num_verts, uint32 version_id)
+const csVector3* psEffectObjSpire::MeshAnimControl::UpdateVertices(csTicks /*current*/, const csVector3* /*verts*/,
+                                                                   int /*num_verts*/, uint32 /*version_id*/)
 {
     return parent->vert;
 }
 
-const csVector2 * psEffectObjSpire::MeshAnimControl::UpdateTexels(csTicks current, const csVector2 * texels, int num_texels, uint32 version_id)
+const csVector2* psEffectObjSpire::MeshAnimControl::UpdateTexels(csTicks /*current*/, const csVector2* /*texels*/,
+                                                                 int /*num_texels*/, uint32 /*version_id*/)
 {
     return parent->texel;
 }
 
-const csColor4 * psEffectObjSpire::MeshAnimControl::UpdateColors(csTicks current, const csColor4 * colors, int num_colors, uint32 version_id)
+const csColor4* psEffectObjSpire::MeshAnimControl::UpdateColors(csTicks /*current*/, const csColor4* /*colors*/,
+                                                                int /*num_colors*/, uint32 /*version_id*/)
 {
     return parent->colour;
 }

Modified: trunk/src/common/effects/pseffectobjspire.h
===================================================================
--- trunk/src/common/effects/pseffectobjspire.h	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectobjspire.h	2010-12-29 23:31:08 UTC (rev 6629)
@@ -44,9 +44,8 @@
             parent = 0;
         }
 
-        void Update(csTicks current, int num_verts, uint32 version_id)
+        void Update(csTicks /*current*/, int /*num_verts*/, uint32 /*version_id*/)
         {
-            
         }
         
         // genmesh animation control
@@ -56,10 +55,14 @@
         bool AnimatesColors()const { return true; }
       
         
-        const csVector3 * UpdateVertices(csTicks current, const csVector3 * verts, int num_verts, uint32 version_id);
-        const csVector2 * UpdateTexels(csTicks current, const csVector2 * texels, int num_texels, uint32 version_id);
-        const csVector3 * UpdateNormals(csTicks current, const csVector3 * normals, int num_normals, uint32 version_id) { return normals; }
-        const csColor4 * UpdateColors(csTicks current, const csColor4 * colors, int num_colors, uint32 version_id);        
+        const csVector3* UpdateVertices(csTicks current, const csVector3* verts, int num_verts, uint32 version_id);
+        const csVector2* UpdateTexels(csTicks current, const csVector2* texels, int num_texels, uint32 version_id);
+        const csVector3* UpdateNormals(csTicks /*current*/, const csVector3* normals,
+                                       int /*num_normals*/, uint32 /*version_id*/)
+        {
+            return normals;
+        }
+        const csColor4* UpdateColors(csTicks current, const csColor4* colors, int num_colors, uint32 version_id);        
     };
     csRef<MeshAnimControl> meshControl;
     friend struct MeshAnimControl;
@@ -73,7 +76,7 @@
     bool Load(iDocumentNode *node, iLoaderContext* ldr_context);
     bool Render(const csVector3 &up);
     bool Update(csTicks elapsed);
-    psEffectObj *Clone() const;
+    psEffectObj* Clone() const;
 
 
     enum SPI_SHAPE

Modified: trunk/src/common/effects/pseffectobjstar.cpp
===================================================================
--- trunk/src/common/effects/pseffectobjstar.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectobjstar.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -277,12 +277,14 @@
     return true;
 }
 
-const csVector3 * psEffectObjStar::MeshAnimControl::UpdateVertices(csTicks current, const csVector3 * verts, int num_verts, uint32 version_id)
+const csVector3* psEffectObjStar::MeshAnimControl::UpdateVertices(csTicks /*current*/, const csVector3* /*verts*/,
+                                                                  int /*num_verts*/, uint32 /*version_id*/)
 {
     return parent->vert;
 }
 
-const csColor4 * psEffectObjStar::MeshAnimControl::UpdateColors(csTicks current, const csColor4 * colors, int num_colors, uint32 version_id)
+const csColor4* psEffectObjStar::MeshAnimControl::UpdateColors(csTicks /*current*/, const csColor4* /*colors*/,
+                                                               int /*num_colors*/, uint32 /*version_id*/)
 {
     return parent->colour;
 }

Modified: trunk/src/common/effects/pseffectobjstar.h
===================================================================
--- trunk/src/common/effects/pseffectobjstar.h	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectobjstar.h	2010-12-29 23:31:08 UTC (rev 6629)
@@ -49,15 +49,22 @@
             parent = 0;
         }
         
-        void Update(csTicks elapsed, int num_verts, uint32 version_id)
+        void Update(csTicks /*elapsed*/, int /*num_verts*/, uint32 /*version_id*/)
         {
-        
         }
 
-        const csVector3 * UpdateVertices(csTicks current, const csVector3 * verts, int num_verts, uint32 version_id);
-        const csVector2 * UpdateTexels(csTicks current, const csVector2 * texels, int num_texels, uint32 version_id) { return texels; }
-        const csVector3 * UpdateNormals(csTicks current, const csVector3 * normals, int num_normals, uint32 version_id) { return normals; }
-        const csColor4 * UpdateColors(csTicks current, const csColor4 * colors, int num_colors, uint32 version_id);        
+        const csVector3* UpdateVertices(csTicks current, const csVector3* verts, int num_verts, uint32 version_id);
+        const csVector2* UpdateTexels(csTicks /*current*/, const csVector2* texels,
+                                      int /*num_texels*/, uint32 /*version_id*/)
+        {
+            return texels;
+        }
+        const csVector3* UpdateNormals(csTicks /*current*/, const csVector3* normals,
+                                       int /*num_normals*/, uint32 /*version_id*/)
+        {
+            return normals;
+        }
+        const csColor4* UpdateColors(csTicks current, const csColor4* colors, int num_colors, uint32 version_id);        
     };
     csRef<MeshAnimControl> meshControl;
     friend struct MeshAnimControl;

Modified: trunk/src/common/effects/pseffectobjtext2d.cpp
===================================================================
--- trunk/src/common/effects/pseffectobjtext2d.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectobjtext2d.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -320,7 +320,7 @@
     while (elemNodes->HasNext())
     {
         dataNode = elemNodes->Next();
-        psEffectBackgroundElem elem = { EA_NONE, 0, 0, 0, 0, true, 0, 0 };
+        psEffectBackgroundElem elem = { EA_NONE, 0, 0, 0, 0, true, 0, 0, 0 };
 
         // align
         csString alignText = dataNode->GetAttributeValue("align");
@@ -365,12 +365,12 @@
     return PostSetup();
 }
 
-bool psEffectObjText2D::Render(const csVector3 &up)
+bool psEffectObjText2D::Render(const csVector3& /*up*/)
 {
     return true;
 }
 
-bool psEffectObjText2D::AttachToAnchor(psEffectAnchor * newAnchor)
+bool psEffectObjText2D::AttachToAnchor(psEffectAnchor* newAnchor)
 {
     if (newAnchor && newAnchor->GetMesh())
         anchorMesh = newAnchor->GetMesh();

Modified: trunk/src/common/effects/pseffectobjtext2d.h
===================================================================
--- trunk/src/common/effects/pseffectobjtext2d.h	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectobjtext2d.h	2010-12-29 23:31:08 UTC (rev 6629)
@@ -45,7 +45,7 @@
 
     EA_BOTTOM_LEFT,
     EA_BOTTOM,
-    EA_BOTTOM_RIGHT,
+    EA_BOTTOM_RIGHT
 };
 struct psEffectBackgroundElem
 {

Modified: trunk/src/common/effects/pseffectobjtrail.cpp
===================================================================
--- trunk/src/common/effects/pseffectobjtrail.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectobjtrail.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -363,12 +363,14 @@
     return true;
 }
 
-const csVector3 * psEffectObjTrail::MeshAnimControl::UpdateVertices(csTicks current, const csVector3 * verts, int num_verts, uint32 version_id)
+const csVector3* psEffectObjTrail::MeshAnimControl::UpdateVertices(csTicks /*current*/, const csVector3* /*verts*/,
+                                                                   int /*num_verts*/, uint32 /*version_id*/)
 {
     return parent->vert;
 }
 
-const csColor4 * psEffectObjTrail::MeshAnimControl::UpdateColors(csTicks current, const csColor4 * colors, int num_colors, uint32 version_id)
+const csColor4* psEffectObjTrail::MeshAnimControl::UpdateColors(csTicks /*current*/, const csColor4* /*colors*/,
+                                                                int /*num_colors*/, uint32 /*version_id*/)
 {
     return parent->colour;
 }

Modified: trunk/src/common/effects/pseffectobjtrail.h
===================================================================
--- trunk/src/common/effects/pseffectobjtrail.h	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/effects/pseffectobjtrail.h	2010-12-29 23:31:08 UTC (rev 6629)
@@ -50,14 +50,22 @@
             parent = 0;
         }
         
-        void Update(csTicks current, int num_verts, uint32 version_id)
+        void Update(csTicks /*current*/, int /*num_verts*/, uint32 /*version_id*/)
         {
         }
 
-        const csVector3 * UpdateVertices(csTicks current, const csVector3 * verts, int num_verts, uint32 version_id);
-        const csVector2 * UpdateTexels(csTicks current, const csVector2 * texels, int num_texels, uint32 version_id) { return texels; }
-        const csVector3 * UpdateNormals(csTicks current, const csVector3 * normals, int num_normals, uint32 version_id) { return normals; }
-        const csColor4 * UpdateColors(csTicks current, const csColor4 * colors, int num_colors, uint32 version_id);        
+        const csVector3* UpdateVertices(csTicks current, const csVector3* verts, int num_verts, uint32 version_id);
+        const csVector2* UpdateTexels(csTicks /*current*/, const csVector2* texels,
+                                      int /*num_texels*/, uint32 /*version_id*/)
+        {
+            return texels;
+        }
+        const csVector3* UpdateNormals(csTicks /*current*/, const csVector3* normals,
+                                       int /*num_normals*/, uint32 /*version_id*/)
+        {
+            return normals;
+        }
+        const csColor4* UpdateColors(csTicks current, const csColor4* colors, int num_colors, uint32 version_id);        
     };
     csRef<MeshAnimControl> meshControl;
     friend struct MeshAnimControl;

Modified: trunk/src/common/paws/pawscheckbox.cpp
===================================================================
--- trunk/src/common/paws/pawscheckbox.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawscheckbox.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -162,10 +162,10 @@
     return true;
 }
 
-bool pawsCheckBox::OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget )
+bool pawsCheckBox::OnButtonPressed(int mouseButton, int keyModifier, pawsWidget* /*widget*/)
 {
-    if ( parent )
-        return parent->OnButtonPressed( mouseButton, keyModifier, this );
+    if(parent)
+        return parent->OnButtonPressed(mouseButton, keyModifier, this);
     else
         return false;
 }
@@ -192,12 +192,12 @@
     checkBox->SetDownImage( down );
 }
 
-void pawsCheckBox::OnUpdateData(const char *dataname,PAWSData& value)
+void pawsCheckBox::OnUpdateData(const char* /*dataname*/, PAWSData& value)
 {
     // This is called automatically whenever subscribed data is published.
-    if (checkBox)
+    if(checkBox)
     {
-        checkBox->SetState( value.GetBool(), false );
+        checkBox->SetState(value.GetBool(), false);
     }
 }
 

Modified: trunk/src/common/paws/pawscolorpromptwindow.cpp
===================================================================
--- trunk/src/common/paws/pawscolorpromptwindow.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawscolorpromptwindow.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -103,7 +103,7 @@
     return true;
 }
 
-bool pawsColorPromptWindow::OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget )
+bool pawsColorPromptWindow::OnButtonPressed(int /*mouseButton*/, int /*keyModifier*/, pawsWidget* widget)
 {
     if (action == NULL)
         return false;
@@ -133,7 +133,7 @@
     return false;
 }
 
-bool pawsColorPromptWindow::OnKeyDown( utf32_char code, utf32_char key, int modifiers )
+bool pawsColorPromptWindow::OnKeyDown(utf32_char /*code*/, utf32_char key, int /*modifiers*/)
 {
     if ( key==CSKEY_ENTER )
     {
@@ -184,7 +184,7 @@
     }
 }
 
-bool pawsColorPromptWindow::OnScroll( int scrollDirection, pawsScrollBar* widget )
+bool pawsColorPromptWindow::OnScroll(int /*scrollDirection*/, pawsScrollBar* /*widget*/)
 {
     int r,g,b;
     r = (int)scrollBarR->GetCurrentValue();

Modified: trunk/src/common/paws/pawscombo.cpp
===================================================================
--- trunk/src/common/paws/pawscombo.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawscombo.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -174,7 +174,7 @@
     return row;    
 }
 
-bool pawsComboBox::OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget )
+bool pawsComboBox::OnButtonPressed(int /*mouseButton*/, int /*keyModifier*/, pawsWidget* widget)
 {
     switch ( widget->GetID() )
     {

Modified: trunk/src/common/paws/pawscombopromptwindow.cpp
===================================================================
--- trunk/src/common/paws/pawscombopromptwindow.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawscombopromptwindow.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -97,7 +97,7 @@
     wrapper->combo->Select(optionNum);
 }
 
-bool pawsComboPromptWindow::OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget )
+bool pawsComboPromptWindow::OnButtonPressed(int /*mouseButton*/, int /*keyModifier*/, pawsWidget* widget)
 {
     if (action == NULL)
         return false;

Modified: trunk/src/common/paws/pawscrollbar.cpp
===================================================================
--- trunk/src/common/paws/pawscrollbar.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawscrollbar.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -400,7 +400,7 @@
     }
 }
 
-bool pawsScrollBar::OnMouseDown( int button, int modifiers, int x, int y )
+bool pawsScrollBar::OnMouseDown(int button, int /*modifiers*/, int x, int y)
 {
     if (button == csmbWheelUp || button == csmbHWheelLeft)
     {
@@ -431,7 +431,7 @@
     return true;
 }
 
-bool pawsScrollBar::OnMouseUp( int button, int modifiers, int x, int y )
+bool pawsScrollBar::OnMouseUp(int /*button*/, int /*modifiers*/, int /*x*/, int /*y*/)
 {
     mouseIsDraggingThumb = false;
     thumb->SetBackground(thumbStopped);
@@ -448,7 +448,7 @@
     return true;
 }
 
-void pawsScrollBar::OnUpdateData(const char *dataname,PAWSData& value)
+void pawsScrollBar::OnUpdateData(const char* /*dataname*/, PAWSData& value)
 {
     SetCurrentValue(value.GetFloat(), true, false);
 }
@@ -518,7 +518,7 @@
     return false;
 }
 
-bool pawsScrollBar::OnButtonReleased( int button, int keyModifier, pawsWidget* widget )
+bool pawsScrollBar::OnButtonReleased(int /*button*/, int /*keyModifier*/, pawsWidget* /*widget*/)
 {
     mouseDown = false;
     return true;

Modified: trunk/src/common/paws/pawsfilenavigation.cpp
===================================================================
--- trunk/src/common/paws/pawsfilenavigation.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawsfilenavigation.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -118,7 +118,7 @@
     return true;
 }
 
-bool pawsFileNavigation::OnButtonPressed(int mouseButton, int keyModifier, pawsWidget* widget)
+bool pawsFileNavigation::OnButtonPressed(int /*mouseButton*/, int /*keyModifier*/, pawsWidget* widget)
 {
     if (!widget)
         return false;
@@ -153,7 +153,7 @@
     return true;
 }
 
-bool pawsFileNavigation::OnChange(pawsWidget * widget)
+bool pawsFileNavigation::OnChange(pawsWidget* /*widget*/)
 {
     return true;
 }
@@ -671,7 +671,7 @@
 }
 
 
-bool pawsFileNavigation::OnKeyDown( utf32_char keyCode, utf32_char key, int modifiers )
+bool pawsFileNavigation::OnKeyDown(utf32_char /*keyCode*/, utf32_char key, int /*modifiers*/)
 {
     if (key==CSKEY_ENTER)
     {

Modified: trunk/src/common/paws/pawsimagedrawable.cpp
===================================================================
--- trunk/src/common/paws/pawsimagedrawable.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawsimagedrawable.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -194,7 +194,7 @@
     PreparePixmap();
 }
 
-pawsImageDrawable::pawsImageDrawable(const char * file, const char * resource)
+pawsImageDrawable::pawsImageDrawable(const char* file, const char* /*resource*/)
                  : scfImplementationType (this)
 {
     debugImageErrors = false;

Modified: trunk/src/common/paws/pawsimagedrawable.h
===================================================================
--- trunk/src/common/paws/pawsimagedrawable.h	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawsimagedrawable.h	2010-12-29 23:31:08 UTC (rev 6629)
@@ -73,7 +73,7 @@
 
     int GetWidth() const;
     int GetHeight() const;
-    void ExpandClipRect(csRect &clipRect) {};
+    void ExpandClipRect(csRect& /*clipRect*/) {};
 
     int GetDefaultAlpha() const;
 

Modified: trunk/src/common/paws/pawskeyselectbox.cpp
===================================================================
--- trunk/src/common/paws/pawskeyselectbox.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawskeyselectbox.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -36,7 +36,7 @@
 }
 
 
-bool pawsKeySelectBox::Setup(iDocumentNode * node)
+bool pawsKeySelectBox::Setup(iDocumentNode* /*node*/)
 {
     return true;
 }
@@ -47,7 +47,7 @@
     DrawWidgetText((const char *)text, screenFrame.xmin + textX, screenFrame.ymin + textY);   
 }
 
-bool pawsKeySelectBox::OnKeyDown(utf32_char keyCode, utf32_char keyChar, int modifiers)
+bool pawsKeySelectBox::OnKeyDown(utf32_char keyCode, utf32_char /*keyChar*/, int modifiers)
 {
     if (!CSKEY_IS_MODIFIER(keyCode))
         SetKey(keyCode, modifiers);

Modified: trunk/src/common/paws/pawslistbox.cpp
===================================================================
--- trunk/src/common/paws/pawslistbox.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawslistbox.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -802,7 +802,7 @@
 }
 
 
-bool pawsListBox::OnScroll( int direction, pawsScrollBar* widget )
+bool pawsListBox::OnScroll(int /*direction*/, pawsScrollBar* widget)
 {
     if(widget == scrollBar)
     {
@@ -818,7 +818,7 @@
     return true;
 }
 
-bool pawsListBox::OnMouseDown(int button, int modifiers, int x, int y )
+bool pawsListBox::OnMouseDown(int button, int modifiers, int x, int y)
 {
     if (button == csmbWheelUp)
     {
@@ -1311,7 +1311,7 @@
 }
 
 
-bool pawsListBoxRow::OnMouseDown( int button, int modifiers, int x, int y )
+bool pawsListBoxRow::OnMouseDown(int button, int modifiers, int x, int y)
 {
     // Heading rows are not clickable or selectable
     if (isHeading)
@@ -1327,7 +1327,7 @@
     return parentBox->Select( this );
 }
 
-bool pawsListBoxRow::OnDoubleClick(int button, int modifiers, int x, int y)
+bool pawsListBoxRow::OnDoubleClick(int button, int /*modifiers*/, int /*x*/, int /*y*/)
 {
     // Heading rows are not clickable or selectable
     if (isHeading)

Modified: trunk/src/common/paws/pawsmainwidget.cpp
===================================================================
--- trunk/src/common/paws/pawsmainwidget.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawsmainwidget.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -57,7 +57,7 @@
 }
 
 
-bool pawsMainWidget::OnKeyDown( utf32_char keyCode, utf32_char key, int modifiers )
+bool pawsMainWidget::OnKeyDown(utf32_char keyCode, utf32_char /*key*/, int modifiers)
 {
     pawsScriptKey* found = 0;
     
@@ -84,17 +84,17 @@
     return false;
 }
 
-bool pawsMainWidget::OnMouseDown( int button, int keyModifier, int x, int y )
+bool pawsMainWidget::OnMouseDown(int /*button*/, int /*keyModifier*/, int /*x*/, int /*y*/)
 {
     return false;
 }
 
-bool pawsMainWidget::OnMouseUp( int button, int keyModifier, int x, int y )
+bool pawsMainWidget::OnMouseUp(int /*button*/, int /*keyModifier*/, int /*x*/, int /*y*/)
 {
     return false;
 }
 
-bool pawsMainWidget::OnDoubleClick( int button, int keyModifier, int x, int y )
+bool pawsMainWidget::OnDoubleClick(int /*button*/, int /*keyModifier*/, int /*x*/, int /*y*/)
 {
     return false;
 }

Modified: trunk/src/common/paws/pawsmenu.cpp
===================================================================
--- trunk/src/common/paws/pawsmenu.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawsmenu.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -426,7 +426,7 @@
 
 }
 
-bool pawsMenu::OnButtonPressed(int button, int keyModifier, pawsWidget* widget)
+bool pawsMenu::OnButtonPressed(int /*button*/, int /*keyModifier*/, pawsWidget* widget)
 {
     if ((widget == stickyButton) && !sticky)
     {
@@ -563,7 +563,7 @@
                                         GetActualHeight(BORDER_SIZE));
 }
 
-void pawsMenu::OnParentMenuDestroyed(pawsMenuClose reason)
+void pawsMenu::OnParentMenuDestroyed(pawsMenuClose /*reason*/)
 {
     parentMenu = NULL;
     if (!sticky)

Modified: trunk/src/common/paws/pawsmouse.cpp
===================================================================
--- trunk/src/common/paws/pawsmouse.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawsmouse.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -124,6 +124,8 @@
       return;
     }
     else g2d->SetMouseCursor (csmcNone);
+#else
+    (void)drawable; // supress unused variable warning
 #endif
 }
 

Modified: trunk/src/common/paws/pawsnumberpromptwindow.cpp
===================================================================
--- trunk/src/common/paws/pawsnumberpromptwindow.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawsnumberpromptwindow.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -103,7 +103,7 @@
     inputWidget->SetRelativeFramePos(inputWidget->DefaultFrame().xmin, inputWidget->DefaultFrame().ymin-3);
 }
 
-bool pawsNumberPromptWindow::OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget )
+bool pawsNumberPromptWindow::OnButtonPressed(int /*mouseButton*/, int /*keyModifier*/, pawsWidget* widget)
 {
     if (action == NULL)
         return false;
@@ -154,7 +154,7 @@
     }
 }
 
-bool pawsNumberPromptWindow::OnScroll( int scrollDirection, pawsScrollBar* widget )
+bool pawsNumberPromptWindow::OnScroll(int /*scrollDirection*/, pawsScrollBar* /*widget*/)
 {
     lastValidText.Format("%d",(int)scrollBar->GetCurrentValue());
     editBox->SetText(lastValidText);

Modified: trunk/src/common/paws/pawsobjectview.cpp
===================================================================
--- trunk/src/common/paws/pawsobjectview.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawsobjectview.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -330,7 +330,7 @@
     }
 }
 
-void pawsObjectView::Draw3D(iGraphics3D* graphics3D)
+void pawsObjectView::Draw3D(iGraphics3D* /*graphics3D*/)
 {
     if(!meshTarget.IsValid() || !stageTarget.IsValid() || !view || !meshView)
     {
@@ -491,7 +491,7 @@
     }
 }
 
-bool pawsObjectView::OnMouseDown(int button,int mod, int x, int y)
+bool pawsObjectView::OnMouseDown(int button, int /*mod*/, int x, int y)
 {
     if(!mouseControlled)
         return false;
@@ -512,7 +512,7 @@
     return true;
 }
 
-bool pawsObjectView::OnMouseUp(int button,int mod, int x, int y)
+bool pawsObjectView::OnMouseUp(int /*button*/, int /*mod*/, int x, int y)
 {
     if(!mouseControlled)
         return false;

Modified: trunk/src/common/paws/pawsprogressbar.cpp
===================================================================
--- trunk/src/common/paws/pawsprogressbar.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawsprogressbar.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -134,7 +134,8 @@
   graphics3D->DrawSimpleMesh (mesh, csSimpleMeshScreenspace);
 }
 
-void pawsProgressBar::OnUpdateData(const char *dataname,PAWSData& value)
+void pawsProgressBar::OnUpdateData(const char* /*dataname*/, PAWSData& value)
 {
     SetCurrentValue( value.GetFloat() );
 }
+

Modified: trunk/src/common/paws/pawsradio.cpp
===================================================================
--- trunk/src/common/paws/pawsradio.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawsradio.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -40,7 +40,7 @@
 pawsRadioButton::~pawsRadioButton()
 {
 }
-pawsRadioButton* pawsRadioButton::Create(const char * txt, psRadioPos pos , bool state)
+pawsRadioButton* pawsRadioButton::Create(const char* txt, psRadioPos pos , bool /*state*/)
 {
     pawsRadioButtonGroup* rbg = dynamic_cast<pawsRadioButtonGroup*>(parent);
 
@@ -231,10 +231,10 @@
 }
 
 
-bool pawsRadioButton::OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget )
+bool pawsRadioButton::OnButtonPressed(int mouseButton, int keyModifier, pawsWidget* /*widget*/)
 {
-    if ( parent ) 
-        return parent->OnButtonPressed( mouseButton, keyModifier, this );
+    if(parent)
+        return parent->OnButtonPressed(mouseButton, keyModifier, this);
 
     return false;
 }

Modified: trunk/src/common/paws/pawsspinbox.cpp
===================================================================
--- trunk/src/common/paws/pawsspinbox.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawsspinbox.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -66,7 +66,7 @@
 {
 }
 
-bool pawsSpinBox::Perform(iTimerEvent * ev )
+bool pawsSpinBox::Perform(iTimerEvent* /*ev*/)
 {
     if (spinState)
     {

Modified: trunk/src/common/paws/pawsstringpromptwindow.cpp
===================================================================
--- trunk/src/common/paws/pawsstringpromptwindow.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawsstringpromptwindow.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -83,7 +83,7 @@
     this->param  = param;
 }
 
-bool pawsStringPromptWindow::OnButtonReleased(int mouseButton, int keyModifier, pawsWidget* widget)
+bool pawsStringPromptWindow::OnButtonReleased(int /*mouseButton*/, int /*keyModifier*/, pawsWidget* widget)
 {
     if(action == NULL)
         return false;
@@ -119,7 +119,7 @@
     parent->DeleteChild(this);       // destructs itself 
 }
 
-bool pawsStringPromptWindow::OnKeyDown(utf32_char code, utf32_char key, int modifiers)
+bool pawsStringPromptWindow::OnKeyDown(utf32_char /*code*/, utf32_char key, int /*modifiers*/)
 {
     if(key == CSKEY_ENTER)
     {

Modified: trunk/src/common/paws/pawstextbox.cpp
===================================================================
--- trunk/src/common/paws/pawstextbox.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawstextbox.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -316,7 +316,7 @@
     }
 }
 
-void pawsTextBox::OnUpdateData(const char *dataname,PAWSData& value)
+void pawsTextBox::OnUpdateData(const char* /*dataname*/, PAWSData& value)
 {
     // This is called automatically whenever subscribed data is published.
     if (subscription_format == "percent")
@@ -790,7 +790,7 @@
     }
 }
 
-void pawsMessageTextBox::OnUpdateData(const char *dataname,PAWSData& value)
+void pawsMessageTextBox::OnUpdateData(const char* /*dataname*/, PAWSData& value)
 {
     // This is called automatically whenever subscribed data is published.
     if (overwrite_subscription)
@@ -816,7 +816,7 @@
 }
 
 void pawsMessageTextBox::SplitMessage(const char* newText, int colour,
-        int size, MessageLine*& msgLine, int& startPosition)
+        int /*size*/, MessageLine*& msgLine, int& startPosition)
 {
     csString stringBuffer(newText);
 
@@ -925,7 +925,7 @@
     return processedString;
 }
 
-bool pawsMessageTextBox::OnScroll( int direction, pawsScrollBar* widget )
+bool pawsMessageTextBox::OnScroll(int /*direction*/, pawsScrollBar* widget)
 {
     topLine = (int)widget->GetCurrentValue();
     return true;
@@ -1055,7 +1055,7 @@
         cursorPosition = 0;
 }
 
-void pawsEditTextBox::OnUpdateData(const char *dataname,PAWSData& value)
+void pawsEditTextBox::OnUpdateData(const char* /*dataname*/, PAWSData& value)
 {
     // This is called automatically whenever subscribed data is published.
     SetText( value.GetStr(), false );
@@ -1603,7 +1603,7 @@
     text.Replace( str.GetData() );
 }
 
-void pawsMultiLineTextBox::OnUpdateData(const char *dataname,PAWSData& value)
+void pawsMultiLineTextBox::OnUpdateData(const char* /*dataname*/, PAWSData& value)
 {
     // This is called automatically whenever subscribed data is published.
     SetText( value.GetStr() );
@@ -1636,7 +1636,7 @@
 
 }
 
-bool pawsMultiLineTextBox::OnScroll( int direction, pawsScrollBar* widget )
+bool pawsMultiLineTextBox::OnScroll(int /*direction*/, pawsScrollBar* widget)
 {
     startLine = (int)widget->GetCurrentValue();
     return true;

Modified: trunk/src/common/paws/pawstextwrap.cpp
===================================================================
--- trunk/src/common/paws/pawstextwrap.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawstextwrap.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -416,13 +416,13 @@
 }
 
 
-void pawsMultilineEditTextBox::OnUpdateData(const char *dataname,PAWSData& value)
+void pawsMultilineEditTextBox::OnUpdateData(const char* /*dataname*/, PAWSData& value)
 {
     // This is called automatically whenever subscribed data is published.
     SetText(value.GetStr(), false);
 }
 
-bool pawsMultilineEditTextBox::OnScroll(int direction, pawsScrollBar* widget)
+bool pawsMultilineEditTextBox::OnScroll(int /*direction*/, pawsScrollBar* widget)
 {    
     topLine = (int)widget->GetCurrentValue();
     return true;
@@ -688,7 +688,7 @@
     }
 }
 
-int pawsMultilineEditTextBox::GetLineWidth(int lineNumber)
+int pawsMultilineEditTextBox::GetLineWidth(int /*lineNumber*/)
 {
     int width = 0;
     int height = 0;

Modified: trunk/src/common/paws/pawstitle.h
===================================================================
--- trunk/src/common/paws/pawstitle.h	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawstitle.h	2010-12-29 23:31:08 UTC (rev 6629)
@@ -65,8 +65,8 @@
 	void Draw();
 
 	void Resize() {}
-	void MoveDelta(int dx, int dy) {}
-	void MoveTo(int x, int y) {}
+	void MoveDelta(int /*dx*/, int /*dy*/) {}
+	void MoveTo(int /*x*/, int /*y*/) {}
 };
 
 #endif // PAWS_TITLE_HEADER

Modified: trunk/src/common/paws/pawstree.cpp
===================================================================
--- trunk/src/common/paws/pawstree.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawstree.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -127,7 +127,7 @@
     return parent;
 }
 
-void pawsTreeNode::SetParent(pawsTreeNode * _parent)
+void pawsTreeNode::SetParent(pawsTreeNode* _parent)
 {
     parent = _parent;
 }
@@ -137,13 +137,13 @@
     return firstChild;
 }
 
-pawsTreeNode * pawsTreeNode::FindNodeByPath(const csString & path)
+pawsTreeNode * pawsTreeNode::FindNodeByPath(const csString& /*path*/)
 {
     //not implemented yet
     return NULL;
 }
 
-pawsTreeNode * pawsTreeNode::FindChildByName(const csString & name, bool indirectToo)
+pawsTreeNode * pawsTreeNode::FindChildByName(const csString& name, bool indirectToo)
 {
     pawsTreeNode * child, * foundIndirect;
 
@@ -857,7 +857,7 @@
     }
 }
 
-bool pawsStdTreeDecorator::OnMouseDown(int button, int modifiers, int x, int y)
+bool pawsStdTreeDecorator::OnMouseDown(int /*button*/, int /*modifiers*/, int x, int y)
 {
     pawsTreeNode * target, * root;
 
@@ -1193,7 +1193,7 @@
     return false;
 }
 
-bool pawsTree::OnKeyDown( utf32_char keyCode, utf32_char keyChar, int modifiers )
+bool pawsTree::OnKeyDown(utf32_char /*keyCode*/, utf32_char keyChar, int /*modifiers*/)
 {
     pawsTreeNode *node;
 
@@ -1294,7 +1294,7 @@
     notificationTarget = _notificationTarget;
 }
 
-bool pawsTree::OnScroll(int scrollDirection, pawsScrollBar* widget)
+bool pawsTree::OnScroll(int /*scrollDirection*/, pawsScrollBar* widget)
 {
     int scroll;
 
@@ -1426,7 +1426,7 @@
     return false;
 }
 
-void pawsCheckTreeNode::SetCheck(bool ch)
+void pawsCheckTreeNode::SetCheck(bool /*ch*/)
 {
     //checkbox->Set(ch);
 }
@@ -1520,7 +1520,7 @@
 {
 }
 
-void pawsSimpleTreeNode::Set(int mode, bool checked, const csString & imageName, const csString & label)
+void pawsSimpleTreeNode::Set(int mode, bool /*checked*/, const csString& imageName, const csString& label)
 {
     csRect frame;
     int lastX;

Modified: trunk/src/common/paws/pawswidget.cpp
===================================================================
--- trunk/src/common/paws/pawswidget.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawswidget.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -1219,7 +1219,7 @@
     }
 }
 
-csRect pawsWidget::GetWidgetTextRect(const char *text, int x, int y, int style)
+csRect pawsWidget::GetWidgetTextRect(const char* text, int x, int y, int /*style*/)
 {
     csRef<iFont> font = GetFont();
 
@@ -1525,7 +1525,7 @@
     else return true;
 }
 
-bool pawsWidget::OnChildMouseEnter( pawsWidget* widget )
+bool pawsWidget::OnChildMouseEnter(pawsWidget* /*widget*/)
 {
     return true;
 }
@@ -1537,7 +1537,7 @@
     else return true;
 }
 
-bool pawsWidget::OnChildMouseExit( pawsWidget* child )
+bool pawsWidget::OnChildMouseExit(pawsWidget* /*child*/)
 {
     return true;
 }
@@ -2790,7 +2790,7 @@
         script->Execute();
 }
 
-double pawsWidget::GetProperty(MathEnvironment* env, const char* ptr)
+double pawsWidget::GetProperty(MathEnvironment* /*env*/, const char* ptr)
 {
     if (!strcasecmp(ptr, "visible"))
         return visible ? 1.0 : 0.0;
@@ -2799,7 +2799,7 @@
     return 0.0;
 }
 
-double pawsWidget::CalcFunction(MathEnvironment* env, const char* functionName, const double* params)
+double pawsWidget::CalcFunction(MathEnvironment* /*env*/, const char* functionName, const double* params)
 {
     if (!strcasecmp(functionName, "closeparent"))
     {
@@ -2814,7 +2814,7 @@
     return 0.0;
 }
 
-void pawsWidget::SetProperty(const char * ptr, double value)
+void pawsWidget::SetProperty(const char* ptr, double value)
 {
     if (!strcasecmp(ptr, "visible"))
     {

Modified: trunk/src/common/paws/pawswidget.h
===================================================================
--- trunk/src/common/paws/pawswidget.h	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/pawswidget.h	2010-12-29 23:31:08 UTC (rev 6629)
@@ -1342,8 +1342,8 @@
      */
     bool IsConfigurable() { return configurable; }
 
-    virtual void OnUpdateData(const char *dataname,PAWSData& data) {}
-    virtual void NewSubscription(const char *dataname) { subscribedVar = dataname; }
+    virtual void OnUpdateData(const char* /*dataname*/, PAWSData& /*data*/) {}
+    virtual void NewSubscription(const char* dataname) { subscribedVar = dataname; }
 
     /** Sets up the title bar for the widget.
      * 

Modified: trunk/src/common/paws/widgetconfigwindow.cpp
===================================================================
--- trunk/src/common/paws/widgetconfigwindow.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/paws/widgetconfigwindow.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -48,7 +48,7 @@
 /**
  * @brief Handle any events involving one of the scrollbars being "scrolled"
  */
-bool WidgetConfigWindow::OnScroll( int direction, pawsScrollBar* widget )
+bool WidgetConfigWindow::OnScroll(int /*direction*/, pawsScrollBar* widget)
 {
     if (!configWidget)
         return true;
@@ -123,7 +123,7 @@
 /**
  * @brief Handle all button presses.
  */
-bool WidgetConfigWindow::OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget )
+bool WidgetConfigWindow::OnButtonPressed(int /*mouseButton*/, int /*keyModifier*/, pawsWidget* widget)
 {
     if (widget == buttonOK)
     {

Modified: trunk/src/common/recast/recastnavigation/RecastMeshDetail.cpp
===================================================================
--- trunk/src/common/recast/recastnavigation/RecastMeshDetail.cpp	2010-12-29 21:53:26 UTC (rev 6628)
+++ trunk/src/common/recast/recastnavigation/RecastMeshDetail.cpp	2010-12-29 23:31:08 UTC (rev 6629)
@@ -242,7 +242,7 @@
 enum EdgeValues
 {
 	UNDEF = -1,
-	HULL = -2,
+	HULL = -2
 };
 
 static int findEdge(const int* edges, int nedges, int s, int t)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6620
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6620&view=rev
Author:   rlydontknow
Date:     2010-12-26 17:20:35 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
refactored msghandler - patch by mikesflowers with the following modifications:
 - replaced recursive mutex in msghandler with a read-write-mutex
 - removed the need for NetMessageCallback completely and instead managed it in MessageManager

Modified Paths:
--------------
    trunk/src/client/gui/pawsactivemagicwindow.cpp
    trunk/src/client/gui/pawsbankwindow.cpp
    trunk/src/client/gui/pawsbookreadingwindow.cpp
    trunk/src/client/gui/pawschardescription.cpp
    trunk/src/client/gui/pawscontainerdescwindow.cpp
    trunk/src/client/gui/pawscraft.cpp
    trunk/src/client/gui/pawsexchangewindow.cpp
    trunk/src/client/gui/pawsglyphwindow.cpp
    trunk/src/client/gui/pawsgroupwindow.cpp
    trunk/src/client/gui/pawsguildwindow.cpp
    trunk/src/client/gui/pawsinfowindow.cpp
    trunk/src/client/gui/pawsinteractwindow.cpp
    trunk/src/client/gui/pawsitemdescriptionwindow.cpp
    trunk/src/client/gui/pawsloading.cpp
    trunk/src/client/gui/pawsmerchantwindow.cpp
    trunk/src/client/gui/pawspetstatwindow.cpp
    trunk/src/client/gui/pawsskillwindow.cpp
    trunk/src/client/gui/pawsspellbookwindow.cpp
    trunk/src/client/gui/pawsstoragewindow.cpp
    trunk/src/client/psclientchar.cpp
    trunk/src/common/net/msghandler.cpp
    trunk/src/common/net/msghandler.h
    trunk/src/common/net/subscriber.h
    trunk/src/server/actionmanager.cpp
    trunk/src/server/actionmanager.h
    trunk/src/server/adminmanager.cpp
    trunk/src/server/adminmanager.h
    trunk/src/server/advicemanager.cpp
    trunk/src/server/advicemanager.h
    trunk/src/server/authentserver.cpp
    trunk/src/server/authentserver.h
    trunk/src/server/bankmanager.cpp
    trunk/src/server/bankmanager.h
    trunk/src/server/chatmanager.cpp
    trunk/src/server/chatmanager.h
    trunk/src/server/combatmanager.cpp
    trunk/src/server/combatmanager.h
    trunk/src/server/creationmanager.cpp
    trunk/src/server/creationmanager.h
    trunk/src/server/economymanager.cpp
    trunk/src/server/economymanager.h
    trunk/src/server/entitymanager.cpp
    trunk/src/server/entitymanager.h
    trunk/src/server/exchangemanager.cpp
    trunk/src/server/exchangemanager.h
    trunk/src/server/gem.cpp
    trunk/src/server/gem.h
    trunk/src/server/gmeventmanager.cpp
    trunk/src/server/gmeventmanager.h
    trunk/src/server/groupmanager.cpp
    trunk/src/server/groupmanager.h
    trunk/src/server/guildmanager.cpp
    trunk/src/server/guildmanager.h
    trunk/src/server/introductionmanager.cpp
    trunk/src/server/introductionmanager.h
    trunk/src/server/minigamemanager.cpp
    trunk/src/server/minigamemanager.h
    trunk/src/server/msgmanager.cpp
    trunk/src/server/msgmanager.h
    trunk/src/server/npcmanager.cpp
    trunk/src/server/npcmanager.h
    trunk/src/server/progressionmanager.cpp
    trunk/src/server/progressionmanager.h
    trunk/src/server/psserverchar.cpp
    trunk/src/server/psserverchar.h
    trunk/src/server/psserverdr.cpp
    trunk/src/server/psserverdr.h
    trunk/src/server/questionmanager.cpp
    trunk/src/server/questionmanager.h
    trunk/src/server/questmanager.cpp
    trunk/src/server/questmanager.h
    trunk/src/server/slotmanager.cpp
    trunk/src/server/slotmanager.h
    trunk/src/server/spawnmanager.cpp
    trunk/src/server/spawnmanager.h
    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
    trunk/src/server/usermanager.h
    trunk/src/server/workmanager.cpp
    trunk/src/server/workmanager.h

Modified: trunk/src/client/gui/pawsactivemagicwindow.cpp
===================================================================
--- trunk/src/client/gui/pawsactivemagicwindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsactivemagicwindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -59,8 +59,7 @@
     if(!LoadSetting())
         return false;
 
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_ACTIVEMAGIC))
-        return false;
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_ACTIVEMAGIC);
 
     // do something here....
     return true;

Modified: trunk/src/client/gui/pawsbankwindow.cpp
===================================================================
--- trunk/src/client/gui/pawsbankwindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsbankwindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -48,8 +48,7 @@
 
 bool pawsBankWindow::PostSetup()
 {
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_BANKING))
-        return false;
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_BANKING);
 
     Money = (pawsButton*)(FindWidget("MoneyButton"));
     if(!Money)

Modified: trunk/src/client/gui/pawsbookreadingwindow.cpp
===================================================================
--- trunk/src/client/gui/pawsbookreadingwindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsbookreadingwindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -45,8 +45,8 @@
 
 bool pawsBookReadingWindow::PostSetup()
 {
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_READ_BOOK))  return false;
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_CRAFT_INFO)) return false;
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_READ_BOOK);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_CRAFT_INFO);
 
     // Store some of our children for easy access later on.
     name = dynamic_cast<pawsTextBox*> (FindWidget("ItemName"));

Modified: trunk/src/client/gui/pawschardescription.cpp
===================================================================
--- trunk/src/client/gui/pawschardescription.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawschardescription.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -71,11 +71,7 @@
 
 void pawsCharDescription::RequestDetails()
 {
-    if ( !psengine->GetMsgHandler()->Subscribe( this, MSGTYPE_CHARACTERDETAILS ) )
-    {
-        printf("Couldn't subscribe to MSGTYPE_CHARACTERDETAILS (pawsCharDescription)");
-        return;
-    }
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_CHARACTERDETAILS);
 
     psCharacterDetailsRequestMessage requestMsg(true, true, "pawsCharDescription");
     requestMsg.SendMessage();

Modified: trunk/src/client/gui/pawscontainerdescwindow.cpp
===================================================================
--- trunk/src/client/gui/pawscontainerdescwindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawscontainerdescwindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -65,10 +65,8 @@
 
 bool pawsContainerDescWindow::PostSetup()
 {
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_VIEW_CONTAINER))
-        return false;
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_UPDATE_ITEM))
-        return false;
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_VIEW_CONTAINER);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_UPDATE_ITEM);
 
     // Store some of our children for easy access later on.
     name = (pawsTextBox*)FindWidget("ItemName");

Modified: trunk/src/client/gui/pawscraft.cpp
===================================================================
--- trunk/src/client/gui/pawscraft.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawscraft.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -31,7 +31,8 @@
   
 bool pawsCraftWindow::PostSetup()
 {
-    return psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_CRAFT_INFO);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_CRAFT_INFO);
+    return true;
 }
 
 void pawsCraftWindow::Show()

Modified: trunk/src/client/gui/pawsexchangewindow.cpp
===================================================================
--- trunk/src/client/gui/pawsexchangewindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsexchangewindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -76,14 +76,14 @@
 {
     csString slotName;
     
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUIEXCHANGE)) return false;
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_REQUEST)) return false;
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_ADD_ITEM)) return false;
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_REMOVE_ITEM)) return false;
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_ACCEPT)) return false;
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_END)) return false;
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_STATUS)) return false;
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_MONEY)) return false;
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUIEXCHANGE);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_REQUEST);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_ADD_ITEM);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_REMOVE_ITEM);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_ACCEPT);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_END);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_STATUS);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_EXCHANGE_MONEY);
      
     // the two backgrounds for the offering/receiving frame
     offeringBG  = FindWidget("Offering Frame");

Modified: trunk/src/client/gui/pawsglyphwindow.cpp
===================================================================
--- trunk/src/client/gui/pawsglyphwindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsglyphwindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -94,9 +94,9 @@
 bool pawsGlyphWindow::PostSetup()
 {
     // Subscribe our message types that we are interested in.
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GLYPH_REQUEST))  return false;
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GLYPH_ASSEMBLE)) return false;
-    
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GLYPH_REQUEST);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GLYPH_ASSEMBLE);
+
     description = dynamic_cast <pawsMessageTextBox*> (FindWidget("SpellDescription"));
     if ( !description ) return false;
 

Modified: trunk/src/client/gui/pawsgroupwindow.cpp
===================================================================
--- trunk/src/client/gui/pawsgroupwindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsgroupwindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -61,8 +61,7 @@
 
 bool pawsGroupWindow::PostSetup()
 {
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUIGROUP))
-        return false;
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUIGROUP);
 
     memberList = (pawsListBox*)FindWidget("List");
     if ( !memberList ) return false;

Modified: trunk/src/client/gui/pawsguildwindow.cpp
===================================================================
--- trunk/src/client/gui/pawsguildwindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsguildwindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -169,11 +169,8 @@
 
 bool pawsGuildWindow::PostSetup()
 {
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUIGUILD))
-        return false;
-
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_MOTD))
-        return false;
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUIGUILD);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_MOTD);
     //Request a MOTD for the guild
     psMOTDRequestMessage motdReq;
     motdReq.SendMessage();

Modified: trunk/src/client/gui/pawsinfowindow.cpp
===================================================================
--- trunk/src/client/gui/pawsinfowindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsinfowindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -69,8 +69,7 @@
 {
     pawsControlledWindow::PostSetup();
 
-    if (!psengine->GetMsgHandler()->Subscribe(this,MSGTYPE_MODE))
-        return false;
+    psengine->GetMsgHandler()->Subscribe(this,MSGTYPE_MODE);
 
     targetName = (pawsTextBox*)FindWidget( "Targeted" );
     if ( !targetName )

Modified: trunk/src/client/gui/pawsinteractwindow.cpp
===================================================================
--- trunk/src/client/gui/pawsinteractwindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsinteractwindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -158,7 +158,8 @@
 
 bool pawsInteractWindow::PostSetup()
 {
-    return psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUIINTERACT);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUIINTERACT);
+    return true;
 }
 
 void pawsInteractWindow::HandleMessage( MsgEntry* me )

Modified: trunk/src/client/gui/pawsitemdescriptionwindow.cpp
===================================================================
--- trunk/src/client/gui/pawsitemdescriptionwindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsitemdescriptionwindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -50,8 +50,7 @@
 
 bool pawsItemDescriptionWindow::PostSetup()
 {
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_VIEW_ITEM))
-        return false;
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_VIEW_ITEM);
 
     // Store some of our children for easy access later on.
     

Modified: trunk/src/client/gui/pawsloading.cpp
===================================================================
--- trunk/src/client/gui/pawsloading.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsloading.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -48,10 +48,8 @@
 
 bool pawsLoadWindow::PostSetup()
 {
+    psengine->GetMsgHandler()->Subscribe(this,MSGTYPE_MOTD);
 
-    if ( !psengine->GetMsgHandler()->Subscribe(this,MSGTYPE_MOTD))
-        return false;
-
     loadingText = (pawsMessageTextBox*)FindWidget("loadtext");
     
     if ( !loadingText ) 

Modified: trunk/src/client/gui/pawsmerchantwindow.cpp
===================================================================
--- trunk/src/client/gui/pawsmerchantwindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsmerchantwindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -103,8 +103,7 @@
 
 bool pawsMerchantWindow::PostSetup()
 {
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUIMERCHANT))
-        return false;
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUIMERCHANT);
 
     categoryBox = (pawsListBox*)FindWidget("Categories");
     itemsBox    = (pawsListBox*)FindWidget("Items");

Modified: trunk/src/client/gui/pawspetstatwindow.cpp
===================================================================
--- trunk/src/client/gui/pawspetstatwindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawspetstatwindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -77,8 +77,7 @@
 
 bool pawsPetStatWindow::PostSetup()
 {
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_PET_SKILL))
-        return false;
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_PET_SKILL);
 
     xml =  csQueryRegistry<iDocumentSystem > ( PawsManager::GetSingleton().GetObjectRegistry());
 

Modified: trunk/src/client/gui/pawsskillwindow.cpp
===================================================================
--- trunk/src/client/gui/pawsskillwindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsskillwindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -90,14 +90,8 @@
     {
         return false;
     }
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUISKILL))
-    {
-        return false;
-    }
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_FACTION_INFO))
-    {
-        return false;
-    }
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUISKILL);
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_FACTION_INFO);
 
     xml =  csQueryRegistry<iDocumentSystem > ( PawsManager::GetSingleton().GetObjectRegistry());
 

Modified: trunk/src/client/gui/pawsspellbookwindow.cpp
===================================================================
--- trunk/src/client/gui/pawsspellbookwindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsspellbookwindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -53,8 +53,7 @@
 
 bool pawsSpellBookWindow::PostSetup()
 {
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_SPELL_BOOK))
-        return false;
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_SPELL_BOOK);
 
     spellList        = (pawsListBox*)FindWidget("SpellList");
     spellDescription = (pawsMessageTextBox*)FindWidget("Description");

Modified: trunk/src/client/gui/pawsstoragewindow.cpp
===================================================================
--- trunk/src/client/gui/pawsstoragewindow.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/gui/pawsstoragewindow.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -102,8 +102,7 @@
 
 bool pawsStorageWindow::PostSetup()
 {
-    if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUISTORAGE))
-        return false;
+    psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GUISTORAGE);
 
     categoryBox = (pawsListBox*)FindWidget("Categories");
     itemsBox    = (pawsListBox*)FindWidget("Items");

Modified: trunk/src/client/psclientchar.cpp
===================================================================
--- trunk/src/client/psclientchar.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/client/psclientchar.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -205,25 +205,16 @@
     msghandler = msgHandler;
     cel = GEMSupervisor;
 
-    if ( !msghandler->Subscribe(this, MSGTYPE_CHARREJECT) )
-        return false;
-    if ( !msghandler->Subscribe(this, MSGTYPE_EQUIPMENT) )
-        return false;
-    if ( !msghandler->Subscribe(this, MSGTYPE_EFFECT) )
-        return false;
-    if ( !msghandler->Subscribe(this, MSGTYPE_EFFECT_STOP) )
-        return false;
-    if ( !msghandler->Subscribe(this, MSGTYPE_PLAYSOUND) )
-        return false;
-    if (!msghandler->Subscribe(this, MSGTYPE_USERACTION) )
-        return false;
-    if (!msghandler->Subscribe(this, MSGTYPE_GUITARGETUPDATE) )
-        return false;
-    if (!msghandler->Subscribe(this, MSGTYPE_CHANGE_TRAIT) )
-        return false;
+    msghandler->Subscribe(this, MSGTYPE_CHARREJECT);
+    msghandler->Subscribe(this, MSGTYPE_EQUIPMENT);
+    msghandler->Subscribe(this, MSGTYPE_EFFECT);
+    msghandler->Subscribe(this, MSGTYPE_EFFECT_STOP);
+    msghandler->Subscribe(this, MSGTYPE_PLAYSOUND);
+    msghandler->Subscribe(this, MSGTYPE_USERACTION);
+    msghandler->Subscribe(this, MSGTYPE_GUITARGETUPDATE);
+    msghandler->Subscribe(this, MSGTYPE_CHANGE_TRAIT);
     charCreation = new psCreationManager( objectReg );
 
-
     return true;
 }
 

Modified: trunk/src/common/net/msghandler.cpp
===================================================================
--- trunk/src/common/net/msghandler.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/common/net/msghandler.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -54,26 +54,26 @@
 
 void MsgHandler::Publish(MsgEntry* me)
 {
-    CS::Threading::RecursiveMutexScopedLock lock(mutex);
-
+    const int mtype = me->GetType();
+    bool handled = false;
     netbase->LogMessages('R',me);
 
-    bool handled = false;
+    csArray<Subscription> handlers;
+    {
+        CS::Threading::ScopedReadLock lock(mutex);
+        handlers = subscribers.GetAll(mtype);
+    }
 
-    int mtype = me->GetType();
-
-    for ( size_t x = 0; x < subscribers[mtype].GetSize(); x++ )
+    for(size_t i = 0; i < handlers.GetSize(); ++i)
     {
+        Subscription& sub = handlers[i];
         Client *client;
         me->Reset();
-		// Copy the reference so we can modify it in the loop
-		MsgEntry *message = me;
-        if (subscribers[mtype][x]->subscriber->Verify(message,subscribers[mtype][x]->flags,client))
+        // Copy the reference so we can modify it in the loop
+        MsgEntry *message = me;
+        if(sub.subscriber->Verify(message, sub.flags, client))
         {
-            if (subscribers[mtype][x]->callback)
-	            subscribers[mtype][x]->callback->Call(message,client);
-		    else
-			    subscribers[mtype][x]->subscriber->HandleMessage(message,client);
+            sub.subscriber->HandleMessage(message, client);
         }
         handled = true;
     }
@@ -85,73 +85,35 @@
     }
 }
 
-bool MsgHandler::Subscribe(iNetSubscriber *subscriber, msgtype type,uint32_t flags)
+void MsgHandler::Subscribe(iNetSubscriber* subscriber, msgtype type, uint32_t flags)
 {
-    Subscription* p = new Subscription;
+    CS_ASSERT(subscriber);
 
-    p->subscriber = subscriber;
-    p->callback   = NULL; 
-    p->type       = type;
-    p->flags      = flags;
-
-    CS::Threading::RecursiveMutexScopedLock lock(mutex);
-    if ( IsSubscribed(p) )
-        delete p;
-    else
-        subscribers[type].Push(p);
-
-    return true;
+    CS::Threading::ScopedWriteLock lock(mutex);
+    subscribers.Delete(type, subscriber);
+    subscribers.Put(type, Subscription(subscriber, flags));
 }
 
-bool MsgHandler::Subscribe(iNetSubscriber *subscriber, MsgtypeCallback *callback, msgtype type,uint32_t flags)
+bool MsgHandler::Unsubscribe(iNetSubscriber* subscriber, msgtype type)
 {
-    Subscription* p = new Subscription;
-
-    p->subscriber = subscriber;
-    p->callback   = callback;
-    p->type       = type;
-    p->flags      = flags;
-
-    CS::Threading::RecursiveMutexScopedLock lock(mutex);
-    if ( IsSubscribed(p) )
-    {
-        if (p->callback)
-            delete p->callback;
-        delete p;
-    }
-    else
-        subscribers[type].Push(p);
-
-    return true;
+    CS::Threading::ScopedWriteLock lock(mutex);
+    return subscribers.Delete(type, subscriber);
 }
 
-bool MsgHandler::Unsubscribe(iNetSubscriber *subscriber, msgtype type)
+bool MsgHandler::UnsubscribeAll(iNetSubscriber *subscriber)
 {
-    CS::Threading::RecursiveMutexScopedLock lock(mutex);
+    CS::Threading::ScopedWriteLock lock(mutex);
+    bool found = false;
 
-    for ( size_t x = 0; x < subscribers[type].GetSize(); x++ )
+    csHash<Subscription, msgtype>::GlobalIterator iter = subscribers.GetIterator();
+    while(iter.HasNext())
     {
-        if (subscribers[type][x]->subscriber == subscriber)
+        if(iter.Next().subscriber == subscriber)
         {
-            delete subscribers[type][x]->callback; // delete functor if present
-            subscribers[type].DeleteIndex(x);
-            return true;
-        }        
+            subscribers.DeleteElement(iter);
+            found = true;
+        }
     }
-
-    return false;
+    return found;
 }
 
-
-bool MsgHandler::IsSubscribed( Subscription* sub )
-{
-    for ( size_t x = 0; x < subscribers[sub->type].GetSize(); x++ )
-    {
-        if (subscribers[sub->type][x]->subscriber == sub->subscriber)
-        {
-            return true;
-        }        
-    }
-
-    return false;
-}

Modified: trunk/src/common/net/msghandler.h
===================================================================
--- trunk/src/common/net/msghandler.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/common/net/msghandler.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -22,6 +22,7 @@
 #include <csutil/parray.h>
 #include <csutil/refcount.h>
 #include <csutil/threading/thread.h>
+#include <csutil/threading/rwmutex.h>
 
 #include "net/message.h"
 #include "net/netbase.h"
@@ -31,49 +32,35 @@
 class NetBase;
 class Client;
 
-#define  MAX_MESSAGE_TYPES 255   // MSGTYPE enumeration in messages.h has less types than this
-
-/// Functor base class for direct callbacks on Subscriptions
-class MsgtypeCallback
-{
-public:
-    virtual ~MsgtypeCallback() { };
-    virtual void operator()(MsgEntry *message, Client *client) = 0; // call using operator
-    virtual void Call(MsgEntry *message, Client *client)       = 0; // call using function
-};
-
-
 //-----------------------------------------------------------------------------
 
 
-template <class Manager>
-class NetMessageCallback : public MsgtypeCallback
+/** @brief Manages a \ref iNetSubscriber watching a certain message type
+ *
+ * Simple class containing data for subscribes that want to be informed of
+ * messages.
+ */
+struct Subscription
 {
-private:
-    void (Manager::*funcptr)(MsgEntry *message, Client *client);   // pointer to member function
-    Manager *thisPtr;                                              // pointer to object
+    uint32_t flags; /**< Additional flags for detecting if the subscriber should be notified */
+    iNetSubscriber* subscriber; /**< The actual subscriber that wants to be notified */
 
-public:
-    // constructor - takes pointer to an object and pointer to a member and stores
-    // them in two private variables
-    NetMessageCallback(Manager *myObject, void(Manager::*fpt)(MsgEntry *message, Client *client))
-    { 
-        thisPtr = myObject;
-        funcptr = fpt;
-    }
-
-    virtual ~NetMessageCallback() { };
-
-    // override operator "()"
-    virtual void operator()(MsgEntry *message, Client *client)
+    /**@brief Constructor without a callback
+     *
+     * \ref callback is set to NULL
+     * 
+     * @param nSubscriber Sets \ref subscriber
+     * @param nFlags Sets \ref flags
+     */
+    Subscription(iNetSubscriber *nSubscriber, uint32_t nFlags = 0x01/*REQUIRE_READY_CLIENT*/)
+        : flags(nFlags), subscriber(nSubscriber)
     {
-        (*thisPtr.*funcptr)(message,client);
     }
 
-    // override function "Call"
-    virtual void Call(MsgEntry *message, Client *client)
+    // comparison operator required for usage in csHash
+    bool operator<(const Subscription& other) const
     {
-        (*thisPtr.*funcptr)(message,client);
+        return subscriber < other.subscriber;
     }
 };
 
@@ -81,26 +68,6 @@
 //-----------------------------------------------------------------------------
 
 
-/// This little struct tracks who is interested in what.
-struct Subscription
-{
-    /// type of the messages this listener listens to
-    msgtype type;
-
-    /// Flags for central testing
-    uint32_t flags;
-
-    /// pointer to the subscriber
-    iNetSubscriber *subscriber;
-
-    /// pointer to functor class callback as alternative to iNetSubscriber
-    MsgtypeCallback *callback;
-};
-
-
-//-----------------------------------------------------------------------------
-
-
 /**
  * This class holds the structure for guaranteed inbound ordering of certain message
  * types.  We need to track the next sequence number we're expecting (in a range
@@ -126,10 +93,8 @@
     }
 };
 
-
 //-----------------------------------------------------------------------------
 
-
 /**
  * This class is the client's and server's main interface for either sending
  * network messages out or getting notified about inbound ones which have been
@@ -144,15 +109,37 @@
     /** Initializes the Handler */
     bool Initialize(NetBase *nb, int queuelen = 500);
 
-    /** Any subclass of iNetSubscriber can subscribe to incoming network messages
-     * with this function
+    /** @brief Subscribes an \ref iNetSubscriber to a specific message type
+     *
+     * Subclasses of \ref iNetSubscriber subscribe to incoming network messages
+     * using this function. Adds the resulting \ref Subscription to
+     * \ref subscribers.
+     * 
+     * @param subscriber The subscriber that wants to be informed of messages
+     * @param type The type of message to monitor
+     * @param flags Additional flags to determine if the message should be forwarded
      */
-    virtual bool Subscribe(iNetSubscriber *subscriber, msgtype type, uint32_t flags = 0x01/*REQUIRE_READY_CLIENT*/);
-    virtual bool Subscribe(iNetSubscriber *subscriber, MsgtypeCallback *callback, msgtype type, uint32_t flags = 0x01/*REQUIRE_READY_CLIENT*/);
+    virtual void Subscribe(iNetSubscriber *subscriber, msgtype type, uint32_t flags = 0x01/*REQUIRE_READY_CLIENT*/);
 
-    /// Remove subscriber from list
-    virtual bool Unsubscribe(iNetSubscriber *subscriber, msgtype type);
+    /** @brief Unsubscribes a subscriber from a specific message type
+     *
+     * If \ref subscribers contains a \ref Subscription that has the specified
+     * subscriber and the message type key it is removed and true is returned
+     * 
+     * @param subscriber The subscriber to look for in the hash
+     * @param type The type of message to search
+     * @return True if the subscription is found and deleted, false otherwise
+     */
+    virtual bool Unsubscribe(iNetSubscriber *subscriber , msgtype type);
 
+    /**
+     * Searches all message types and deletes any \ref Subscription that has
+     * the specified subscriber.
+     * @param subscriber The subscriber to search for and remove
+     * @return True if at least one Subscription was deleted, false otherwise
+     */
+    virtual bool UnsubscribeAll(iNetSubscriber *subscriber);
+
     /// Distribute message to all subscribers
     void Publish(MsgEntry *msg);
 
@@ -171,9 +158,6 @@
     virtual void Multicast(MsgEntry* msg, csArray<PublishDestination>& multi, int except, float range)
     { netbase->Multicast(msg, multi, except, range); }
 
-    /// Detects multiple subscriptions on the same object
-    bool IsSubscribed (Subscription* p );
-
     void AddToLocalQueue(MsgEntry *me) { netbase->QueueMessage(me); }
 
     csTicks GetPing() { return netbase->GetPing(); }
@@ -186,11 +170,10 @@
     MsgQueue                      *queue;
 
     /** 
-     * Each message type now has an array of subscribers so we can publish 
-     * to them directly instead of searching the entire list of all subscribers.
+     * @brief Stores the hash of all subscribers and the message type they are subscribed to
      */
-    csPDelArray<Subscription>      subscribers[MAX_MESSAGE_TYPES];
-    CS::Threading::RecursiveMutex  mutex;
+    csHash<Subscription, msgtype> subscribers;
+    CS::Threading::ReadWriteMutex mutex; /**< @brief Protects \ref subscribers */
 };
 
 #endif

Modified: trunk/src/common/net/subscriber.h
===================================================================
--- trunk/src/common/net/subscriber.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/common/net/subscriber.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -32,9 +32,9 @@
  */
 struct iNetSubscriber : public virtual csRefCount
 {
-	virtual bool Verify(MsgEntry *msg,unsigned int flags,Client*& client) = 0;
+    virtual bool Verify(MsgEntry *msg,unsigned int flags,Client*& client) = 0;
 
-	/**
+    /**
      *  Interprets a received message and executes the command.
      */
     virtual void HandleMessage(MsgEntry* msg,Client *client) = 0;

Modified: trunk/src/server/actionmanager.cpp
===================================================================
--- trunk/src/server/actionmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/actionmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -118,14 +118,13 @@
     database = db;
 
     // Action Messages from client that need handling
-    psserver->GetEventManager()->Subscribe( this,new NetMessageCallback<ActionManager>(this,&ActionManager::HandleMapAction), MSGTYPE_MAPACTION, REQUIRE_READY_CLIENT );
+    Subscribe(&ActionManager::HandleMapAction, MSGTYPE_MAPACTION, REQUIRE_READY_CLIENT);
 }
 
 
 ActionManager::~ActionManager()
 {
     // Unsubscribe from Messages
-    psserver->GetEventManager()->Unsubscribe( this, MSGTYPE_MAPACTION );
     
     csHash<psActionLocation *>::GlobalIterator it (actionLocationList.GetIterator ());
     while ( it.HasNext () )

Modified: trunk/src/server/actionmanager.h
===================================================================
--- trunk/src/server/actionmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/actionmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -83,7 +83,7 @@
 /** Handles the map interaction system.
   * Used to populate/update/change current action locations.
   */
-class ActionManager : public MessageManager
+class ActionManager : public MessageManager<ActionManager>
 {
 public:
 

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/adminmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -96,7 +96,7 @@
 class AreaTargetConfirm : public PendingQuestion
 {
     public:
-        AreaTargetConfirm(MessageManager* msgmanager, const csString in_msg, csString in_player, const csString & question, Client *in_client)
+        AreaTargetConfirm(AdminManager* msgmanager, const csString in_msg, csString in_player, const csString & question, Client *in_client)
             : PendingQuestion(in_client->GetClientNum(),question, psQuestionMessage::generalConfirm)
         {   //save variables for later use
             this->command = in_msg;
@@ -135,7 +135,7 @@
         csString command;   ///< The complete command sent from the client originally (without any modification)
         Client *client;     ///< Originating client of the command
         csString player;    ///< Normally this should be the area:x:x command extrapolated from the original command
-        MessageManager* msgmanager;
+        AdminManager* msgmanager;
 };
 
 
@@ -143,11 +143,11 @@
 {
     clients = psserver->GetNetManager()->GetConnections();
 
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<AdminManager>(this,&AdminManager::HandleAdminCmdMessage),MSGTYPE_ADMINCMD,REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<AdminManager>(this,&AdminManager::HandlePetitionMessage),MSGTYPE_PETITION_REQUEST,REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<AdminManager>(this,&AdminManager::HandleGMGuiMessage)   ,MSGTYPE_GMGUI,REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<AdminManager>(this,&AdminManager::SendSpawnItems)       ,MSGTYPE_GMSPAWNITEMS,REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<AdminManager>(this,&AdminManager::SpawnItemInv)         ,MSGTYPE_GMSPAWNITEM,REQUIRE_READY_CLIENT);
+    Subscribe(&AdminManager::HandleAdminCmdMessage, MSGTYPE_ADMINCMD, REQUIRE_READY_CLIENT);
+    Subscribe(&AdminManager::HandlePetitionMessage, MSGTYPE_PETITION_REQUEST, REQUIRE_READY_CLIENT);
+    Subscribe(&AdminManager::HandleGMGuiMessage, MSGTYPE_GMGUI, REQUIRE_READY_CLIENT);
+    Subscribe(&AdminManager::SendSpawnItems, MSGTYPE_GMSPAWNITEMS, REQUIRE_READY_CLIENT);
+    Subscribe(&AdminManager::SpawnItemInv, MSGTYPE_GMSPAWNITEM, REQUIRE_READY_CLIENT);
 
 
     // this makes sure that the player dictionary exists on start up.
@@ -162,12 +162,6 @@
 
 AdminManager::~AdminManager()
 {
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_ADMINCMD);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_PETITION_REQUEST);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GMGUI);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GMSPAWNITEMS);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GMSPAWNITEM);
-
     delete npcdlg;
     delete pathNetwork;
 }

Modified: trunk/src/server/adminmanager.h
===================================================================
--- trunk/src/server/adminmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/adminmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -77,7 +77,7 @@
 
 /** Admin manager that handles GM commands and general game control.
  */
-class AdminManager : public MessageManager
+class AdminManager : public MessageManager<AdminManager>
 {
 public:
     AdminManager();

Modified: trunk/src/server/advicemanager.cpp
===================================================================
--- trunk/src/server/advicemanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/advicemanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -326,7 +326,7 @@
 
     database = db;
 
-    psserver->GetEventManager()->Subscribe( this, MSGTYPE_ADVICE,REQUIRE_READY_CLIENT );
+    Subscribe(MSGTYPE_ADVICE,REQUIRE_READY_CLIENT);
 }
 
 AdviceManager::~AdviceManager()
@@ -334,7 +334,6 @@
 	csHash<AdviceSession*>::GlobalIterator iter(AdviseeList.GetIterator());
 	while(iter.HasNext())
 		delete iter.Next();
-    psserver->GetEventManager()->Unsubscribe( this, MSGTYPE_ADVICE );
 }
 
 void AdviceManager::HandleMessage(MsgEntry *me,Client *client)

Modified: trunk/src/server/advicemanager.h
===================================================================
--- trunk/src/server/advicemanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/advicemanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -71,7 +71,7 @@
  * An invitation is pending between the time that the Noob
  * sends the invitation and when an Advisor sends a response.
  */
-class AdviceManager : public MessageManager
+class AdviceManager : public MessageManager<AdviceManager>
 {
 public:
 

Modified: trunk/src/server/authentserver.cpp
===================================================================
--- trunk/src/server/authentserver.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/authentserver.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -80,25 +80,17 @@
     usermanager  = usermgr;
     guildmanager = gm;
 
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<AuthenticationServer>(this,&AuthenticationServer::HandlePreAuthent),MSGTYPE_PREAUTHENTICATE,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<AuthenticationServer>(this,&AuthenticationServer::HandleAuthent),MSGTYPE_AUTHENTICATE,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<AuthenticationServer>(this,&AuthenticationServer::HandleStringsRequest),MSGTYPE_MSGSTRINGS,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<AuthenticationServer>(this,&AuthenticationServer::HandleDisconnect),MSGTYPE_DISCONNECT,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<AuthenticationServer>(this,&AuthenticationServer::HandleAuthCharacter),MSGTYPE_AUTHCHARACTER,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<AuthenticationServer>(this,&AuthenticationServer::HandleStatusUpdate),MSGTYPE_CLIENTSTATUS,REQUIRE_ANY_CLIENT);
+    Subscribe(&AuthenticationServer::HandlePreAuthent, MSGTYPE_PREAUTHENTICATE, REQUIRE_ANY_CLIENT);
+    Subscribe(&AuthenticationServer::HandleAuthent, MSGTYPE_AUTHENTICATE, REQUIRE_ANY_CLIENT);
+    Subscribe(&AuthenticationServer::HandleStringsRequest, MSGTYPE_MSGSTRINGS, REQUIRE_ANY_CLIENT);
+    Subscribe(&AuthenticationServer::HandleDisconnect, MSGTYPE_DISCONNECT, REQUIRE_ANY_CLIENT);
+    Subscribe(&AuthenticationServer::HandleAuthCharacter, MSGTYPE_AUTHCHARACTER, REQUIRE_ANY_CLIENT);
+    Subscribe(&AuthenticationServer::HandleStatusUpdate, MSGTYPE_CLIENTSTATUS, REQUIRE_ANY_CLIENT);
 }
 
 AuthenticationServer::~AuthenticationServer()
 {
-    if (psserver->GetEventManager())
-    {
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_PREAUTHENTICATE);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_AUTHENTICATE);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_MSGSTRINGS);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_DISCONNECT);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_AUTHCHARACTER);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_CLIENTSTATUS);
-    }
+    //do nothing
 }
 
 

Modified: trunk/src/server/authentserver.h
===================================================================
--- trunk/src/server/authentserver.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/authentserver.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -74,7 +74,7 @@
  * "Not Authorized" message.
  *
  */
-class AuthenticationServer : public MessageManager
+class AuthenticationServer : public MessageManager<AuthenticationServer>
 {
 public:
 

Modified: trunk/src/server/bankmanager.cpp
===================================================================
--- trunk/src/server/bankmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/bankmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -50,7 +50,7 @@
 
 BankManager::BankManager()
 {
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<BankManager>(this,&BankManager::HandleBanking),MSGTYPE_BANKING,REQUIRE_READY_CLIENT);
+    Subscribe(&BankManager::HandleBanking, MSGTYPE_BANKING, REQUIRE_READY_CLIENT);
 
     // Load money events.
     Result result(db->Select("select * from money_events"));
@@ -90,7 +90,7 @@
 
 BankManager::~BankManager()
 {
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_BANKING);
+    //do nothing
 }
 
 psMoneyGameEvent::psMoneyGameEvent(int delayTicks, BankManager *bankMan)

Modified: trunk/src/server/bankmanager.h
===================================================================
--- trunk/src/server/bankmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/bankmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -32,7 +32,7 @@
 class psMoneyGameEvent;
 class Client;
 
-class BankManager : public MessageManager
+class BankManager : public MessageManager<BankManager>
 {
 public:
     BankManager();

Modified: trunk/src/server/chatmanager.cpp
===================================================================
--- trunk/src/server/chatmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/chatmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -61,10 +61,10 @@
 
 ChatManager::ChatManager() : nextChannelID(2)
 {
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ChatManager>(this,&ChatManager::HandleChannelJoinMessage),MSGTYPE_CHANNEL_JOIN,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ChatManager>(this,&ChatManager::HandleChannelLeaveMessage),MSGTYPE_CHANNEL_LEAVE,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ChatManager>(this,&ChatManager::HandleChatMessage),MSGTYPE_CHAT,REQUIRE_ALIVE);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ChatManager>(this,&ChatManager::HandleCacheMessage),MSGTYPE_CACHEFILE,REQUIRE_READY_CLIENT);
+    Subscribe(&ChatManager::HandleChannelJoinMessage, MSGTYPE_CHANNEL_JOIN, REQUIRE_ANY_CLIENT);
+    Subscribe(&ChatManager::HandleChannelLeaveMessage, MSGTYPE_CHANNEL_LEAVE, REQUIRE_ANY_CLIENT);
+    Subscribe(&ChatManager::HandleChatMessage, MSGTYPE_CHAT, REQUIRE_ALIVE);
+    Subscribe(&ChatManager::HandleCacheMessage, MSGTYPE_CACHEFILE, REQUIRE_READY_CLIENT);
 
     // Default channel
     channelIDs.PutUnique("gossip", 1);
@@ -73,10 +73,7 @@
 
 ChatManager::~ChatManager()
 {
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_CHANNEL_JOIN);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_CHANNEL_LEAVE);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_CHAT);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_CACHEFILE);
+    //do nothing
 }
 
 

Modified: trunk/src/server/chatmanager.h
===================================================================
--- trunk/src/server/chatmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/chatmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -67,7 +67,7 @@
     }
 };
 
-class ChatManager : public MessageManager
+class ChatManager : public MessageManager<ChatManager>
 {
 public:
 

Modified: trunk/src/server/combatmanager.cpp
===================================================================
--- trunk/src/server/combatmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/combatmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -167,12 +167,11 @@
 
     staminacombat = psserver->GetMathScriptEngine()->FindScript("StaminaCombat");
 
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<CombatManager>(this,&CombatManager::HandleDeathEvent),MSGTYPE_DEATH_EVENT,NO_VALIDATION);
+    Subscribe(&CombatManager::HandleDeathEvent, MSGTYPE_DEATH_EVENT, NO_VALIDATION);
 }
 
 CombatManager::~CombatManager()
 {
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_DEATH_EVENT);
     if (pvp_region) 
     {
         delete pvp_region;

Modified: trunk/src/server/combatmanager.h
===================================================================
--- trunk/src/server/combatmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/combatmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -51,7 +51,7 @@
  *  and information from the pspccharacterinfo Prop Classes for both
  *  the attacker and the target.
  */
-class CombatManager: public MessageManager
+class CombatManager: public MessageManager<CombatManager>
 {
 public:
 

Modified: trunk/src/server/creationmanager.cpp
===================================================================
--- trunk/src/server/creationmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/creationmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -76,18 +76,6 @@
 
 CharCreationManager::~CharCreationManager()
 {
-    if (psserver->GetEventManager())
-    {
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_CHAR_CREATE_UPLOAD);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_CHAR_CREATE_CP);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_CHAR_CREATE_PARENTS);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_CHAR_CREATE_CHILDHOOD);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_CHAR_CREATE_LIFEEVENTS);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_CHAR_CREATE_TRAITS);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_CHAR_CREATE_NAME);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_CHAR_DELETE);
-    }
-
     delete [] raceCPValues;
 }
 
@@ -98,15 +86,15 @@
             LoadCreationChoices() && 
             LoadLifeEvents()) )
         return false;
-        
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<CharCreationManager>(this,&CharCreationManager::HandleUploadMessage), MSGTYPE_CHAR_CREATE_UPLOAD,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<CharCreationManager>(this,&CharCreationManager::HandleCharCreateCP), MSGTYPE_CHAR_CREATE_CP,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<CharCreationManager>(this,&CharCreationManager::HandleParents), MSGTYPE_CHAR_CREATE_PARENTS,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<CharCreationManager>(this,&CharCreationManager::HandleChildhood), MSGTYPE_CHAR_CREATE_CHILDHOOD,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<CharCreationManager>(this,&CharCreationManager::HandleLifeEvents), MSGTYPE_CHAR_CREATE_LIFEEVENTS,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<CharCreationManager>(this,&CharCreationManager::HandleTraits), MSGTYPE_CHAR_CREATE_TRAITS,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<CharCreationManager>(this,&CharCreationManager::HandleName), MSGTYPE_CHAR_CREATE_NAME,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<CharCreationManager>(this,&CharCreationManager::HandleCharDelete), MSGTYPE_CHAR_DELETE,REQUIRE_ANY_CLIENT);
+
+    Subscribe(&CharCreationManager::HandleUploadMessage, MSGTYPE_CHAR_CREATE_UPLOAD, REQUIRE_ANY_CLIENT);
+    Subscribe(&CharCreationManager::HandleCharCreateCP, MSGTYPE_CHAR_CREATE_CP, REQUIRE_ANY_CLIENT);
+    Subscribe(&CharCreationManager::HandleParents, MSGTYPE_CHAR_CREATE_PARENTS, REQUIRE_ANY_CLIENT);
+    Subscribe(&CharCreationManager::HandleChildhood, MSGTYPE_CHAR_CREATE_CHILDHOOD, REQUIRE_ANY_CLIENT);
+    Subscribe(&CharCreationManager::HandleLifeEvents, MSGTYPE_CHAR_CREATE_LIFEEVENTS, REQUIRE_ANY_CLIENT);
+    Subscribe(&CharCreationManager::HandleTraits, MSGTYPE_CHAR_CREATE_TRAITS, REQUIRE_ANY_CLIENT);
+    Subscribe(&CharCreationManager::HandleName, MSGTYPE_CHAR_CREATE_NAME, REQUIRE_ANY_CLIENT);
+    Subscribe(&CharCreationManager::HandleCharDelete, MSGTYPE_CHAR_DELETE, REQUIRE_ANY_CLIENT);
    
     // Other loaders are here.        
     return true;

Modified: trunk/src/server/creationmanager.h
===================================================================
--- trunk/src/server/creationmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/creationmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -44,7 +44,7 @@
  *   character_creation
  *
  */
-class CharCreationManager : MessageManager
+class CharCreationManager : MessageManager<CharCreationManager>
 {
 public:        
     CharCreationManager(GEMSupervisor* gemsupervisor, CacheManager* cachemanager, EntityManager* entitymanager);

Modified: trunk/src/server/economymanager.cpp
===================================================================
--- trunk/src/server/economymanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/economymanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -64,25 +64,18 @@
 
 EconomyManager::EconomyManager()
 {
-    psserver->GetEventManager()->Subscribe(this,MSGTYPE_BUY_EVENT,NO_VALIDATION);
-    psserver->GetEventManager()->Subscribe(this,MSGTYPE_SELL_EVENT,NO_VALIDATION);
-    psserver->GetEventManager()->Subscribe(this,MSGTYPE_PICKUP_EVENT,NO_VALIDATION);
-    psserver->GetEventManager()->Subscribe(this,MSGTYPE_DROP_EVENT,NO_VALIDATION);
-    psserver->GetEventManager()->Subscribe(this,MSGTYPE_LOOT_EVENT,NO_VALIDATION);
+    Subscribe(MSGTYPE_BUY_EVENT, NO_VALIDATION);
+    Subscribe(MSGTYPE_SELL_EVENT, NO_VALIDATION);
+    Subscribe(MSGTYPE_PICKUP_EVENT, NO_VALIDATION);
+    Subscribe(MSGTYPE_DROP_EVENT, NO_VALIDATION);
+    Subscribe(MSGTYPE_LOOT_EVENT, NO_VALIDATION);
 
 };
 
 
 EconomyManager::~EconomyManager()
 {
-    if(psserver->GetEventManager())
-    {
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_BUY_EVENT);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_SELL_EVENT);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_PICKUP_EVENT);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_DROP_EVENT);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_LOOT_EVENT);
-    }
+    //do nothing
 }
 
 void EconomyManager::AddTransaction(TransactionEntity* trans,bool moneyIn, const char* type)

Modified: trunk/src/server/economymanager.h
===================================================================
--- trunk/src/server/economymanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/economymanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -71,7 +71,7 @@
     unsigned int sold;
 };
 
-class EconomyManager : public MessageManager
+class EconomyManager : public MessageManager<EconomyManager>
 {
 public:
     EconomyManager();

Modified: trunk/src/server/entitymanager.cpp
===================================================================
--- trunk/src/server/entitymanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/entitymanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -93,17 +93,7 @@
 {
     delete serverdr;
 
-    if (psserver->GetEventManager())
     {
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_CELPERSIST);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_USERACTION);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_PERSIST_WORLD_REQUEST);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_PERSIST_ACTOR_REQUEST);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_PERSIST_ALL);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_REQUESTMOVEMENTS);
-    }
-
-    {
         csHash<psAffinityAttribute *>::GlobalIterator it(affinityAttributeList.GetIterator ());
         while (it.HasNext ())
         {
@@ -139,11 +129,11 @@
 
     usermanager = umanager;
 
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<EntityManager>(this,&EntityManager::HandleUserAction), MSGTYPE_USERACTION,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<EntityManager>(this,&EntityManager::HandleWorld)     , MSGTYPE_PERSIST_WORLD_REQUEST,REQUIRE_ANY_CLIENT );
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<EntityManager>(this,&EntityManager::HandleActor)     , MSGTYPE_PERSIST_ACTOR_REQUEST,REQUIRE_ANY_CLIENT );    
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<EntityManager>(this,&EntityManager::HandleAllRequest), MSGTYPE_PERSIST_ALL,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<EntityManager>(this,&EntityManager::SendMovementInfo), MSGTYPE_REQUESTMOVEMENTS,REQUIRE_ANY_CLIENT);
+    Subscribe(&EntityManager::HandleUserAction, MSGTYPE_USERACTION, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);
+    Subscribe(&EntityManager::HandleWorld, MSGTYPE_PERSIST_WORLD_REQUEST, REQUIRE_ANY_CLIENT );
+    Subscribe(&EntityManager::HandleActor, MSGTYPE_PERSIST_ACTOR_REQUEST, REQUIRE_ANY_CLIENT );
+    Subscribe(&EntityManager::HandleAllRequest, MSGTYPE_PERSIST_ALL, REQUIRE_ANY_CLIENT);
+    Subscribe(&EntityManager::SendMovementInfo, MSGTYPE_REQUESTMOVEMENTS, REQUIRE_ANY_CLIENT);
 
     EntityManager::clients = clients;
 

Modified: trunk/src/server/entitymanager.h
===================================================================
--- trunk/src/server/entitymanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/entitymanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -73,10 +73,8 @@
     csString MagicalAffinity;
 };
 
-
-
 /// Manages CEL entities on the server
-class EntityManager : public MessageManager, public Singleton<EntityManager>
+class EntityManager : public MessageManager<EntityManager>, public Singleton<EntityManager>
 {
 public:
     EntityManager();

Modified: trunk/src/server/exchangemanager.cpp
===================================================================
--- trunk/src/server/exchangemanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/exchangemanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -1348,21 +1348,15 @@
 {
     clients      = pClnts;
 
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<ExchangeManager>(this,&ExchangeManager::HandleExchangeRequest),MSGTYPE_EXCHANGE_REQUEST,  REQUIRE_READY_CLIENT|REQUIRE_ALIVE|REQUIRE_TARGETACTOR);
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<ExchangeManager>(this,&ExchangeManager::HandleExchangeAccept) ,MSGTYPE_EXCHANGE_ACCEPT,   REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<ExchangeManager>(this,&ExchangeManager::HandleExchangeEnd)    ,MSGTYPE_EXCHANGE_END,      REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<ExchangeManager>(this,&ExchangeManager::HandleAutoGive)       ,MSGTYPE_EXCHANGE_AUTOGIVE, REQUIRE_READY_CLIENT|REQUIRE_ALIVE|REQUIRE_TARGETACTOR);
+    Subscribe(&ExchangeManager::HandleExchangeRequest, MSGTYPE_EXCHANGE_REQUEST, REQUIRE_READY_CLIENT | REQUIRE_ALIVE | REQUIRE_TARGETACTOR);
+    Subscribe(&ExchangeManager::HandleExchangeAccept, MSGTYPE_EXCHANGE_ACCEPT, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);
+    Subscribe(&ExchangeManager::HandleExchangeEnd, MSGTYPE_EXCHANGE_END, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);
+    Subscribe(&ExchangeManager::HandleAutoGive, MSGTYPE_EXCHANGE_AUTOGIVE, REQUIRE_READY_CLIENT | REQUIRE_ALIVE | REQUIRE_TARGETACTOR);
 }
 
 ExchangeManager::~ExchangeManager()
 {
-    if (psserver->GetEventManager())
-    {
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_EXCHANGE_REQUEST);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_EXCHANGE_ACCEPT);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_EXCHANGE_END);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_EXCHANGE_AUTOGIVE);
-    }
+    //do nothing
 }
 void ExchangeManager::StartExchange( Client* client, bool withPlayer, bool automaticExchange )
 {

Modified: trunk/src/server/exchangemanager.h
===================================================================
--- trunk/src/server/exchangemanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/exchangemanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -335,7 +335,7 @@
 
 /* Maintains a list of all the exchanges that are ongoing.
  */
-class ExchangeManager : public MessageManager
+class ExchangeManager : public MessageManager<ExchangeManager>
 {
 public:
 

Modified: trunk/src/server/gem.cpp
===================================================================
--- trunk/src/server/gem.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/gem.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -140,9 +140,9 @@
     // 90000 enties another scope should be added to cel
     nextEID = 10000;
 
-    psserver->GetEventManager()->Subscribe(this,MSGTYPE_DAMAGE_EVENT,NO_VALIDATION);
-    psserver->GetEventManager()->Subscribe(this,MSGTYPE_STATDRUPDATE, REQUIRE_READY_CLIENT );
-    psserver->GetEventManager()->Subscribe(this,MSGTYPE_STATS, REQUIRE_READY_CLIENT);
+    Subscribe(MSGTYPE_DAMAGE_EVENT,NO_VALIDATION);
+    Subscribe(MSGTYPE_STATDRUPDATE, REQUIRE_READY_CLIENT );
+    Subscribe(MSGTYPE_STATS, REQUIRE_READY_CLIENT);
 
     engine = csQueryRegistry<iEngine> (psserver->GetObjectReg());
 }
@@ -163,12 +163,6 @@
         count = entities_by_eid.GetSize();
         continue;
     }
-    if (psserver->GetEventManager())
-    {
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_DAMAGE_EVENT);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_STATDRUPDATE);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_STATS);
-    }
 }
 
 void GEMSupervisor::HandleMessage(MsgEntry *me,Client *client)

Modified: trunk/src/server/gem.h
===================================================================
--- trunk/src/server/gem.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/gem.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -130,7 +130,7 @@
 /**
 * This class holds the refs to the core factories, etc in CEL.
 */
-class GEMSupervisor : public MessageManager
+class GEMSupervisor : public MessageManager<GEMSupervisor>
 {
     EntityManager *entityManager;
     CacheManager *cacheManager;

Modified: trunk/src/server/gmeventmanager.cpp
===================================================================
--- trunk/src/server/gmeventmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/gmeventmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -49,13 +49,11 @@
     // initialise gmEvents
     gmEvents.DeleteAll();
 
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<GMEventManager>(this,&GMEventManager::HandleGMEventCommand), MSGTYPE_GMEVENT_INFO, REQUIRE_READY_CLIENT);
+    Subscribe(&GMEventManager::HandleGMEventCommand, MSGTYPE_GMEVENT_INFO, REQUIRE_READY_CLIENT);
 }
 
 GMEventManager::~GMEventManager()
 {
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GMEVENT_INFO);
-
     for (size_t e = 0; e < gmEvents.GetSize(); e++)
     {
         gmEvents[e]->Player.DeleteAll();

Modified: trunk/src/server/gmeventmanager.h
===================================================================
--- trunk/src/server/gmeventmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/gmeventmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -63,7 +63,7 @@
 
 /** GameMaster Events manager class.
  */
-class GMEventManager : public MessageManager
+class GMEventManager : public MessageManager<GMEventManager>
 {
 public:
     GMEventManager();

Modified: trunk/src/server/groupmanager.cpp
===================================================================
--- trunk/src/server/groupmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/groupmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -338,13 +338,12 @@
     chatserver = chat;  // Needed to GROUPSAY things.
 
     eventmanager = psserver->GetEventManager();
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<GroupManager>(this,&GroupManager::HandleGroupCommand),MSGTYPE_GROUPCMD,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
+    Subscribe(&GroupManager::HandleGroupCommand, MSGTYPE_GROUPCMD, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);
 }
 
 GroupManager::~GroupManager()
 {
-    if (psserver->GetEventManager())
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GROUPCMD);
+    //do nothing
 }
 
 void GroupManager::HandleGroupCommand(MsgEntry *me, Client *client)

Modified: trunk/src/server/groupmanager.h
===================================================================
--- trunk/src/server/groupmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/groupmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -53,7 +53,7 @@
  * This maintains all the groups on the servers and is responsible for all 
  * the group functions.
  */
-class GroupManager : public MessageManager
+class GroupManager : public MessageManager<GroupManager>
 {
 public:
 

Modified: trunk/src/server/guildmanager.cpp
===================================================================
--- trunk/src/server/guildmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/guildmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -192,22 +192,16 @@
     xml = csPtr<iDocumentSystem>(new csTinyDocumentSystem);
     CS_ASSERT( xml );
 
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<GuildManager>(this,&GuildManager::HandleCmdMessage),MSGTYPE_GUILDCMD,REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<GuildManager>(this,&GuildManager::HandleGUIMessage),MSGTYPE_GUIGUILD,REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<GuildManager>(this,&GuildManager::HandleMOTDSet),MSGTYPE_GUILDMOTDSET,REQUIRE_ANY_CLIENT);
+    Subscribe(&GuildManager::HandleCmdMessage,MSGTYPE_GUILDCMD,REQUIRE_READY_CLIENT);
+    Subscribe(&GuildManager::HandleGUIMessage,MSGTYPE_GUIGUILD,REQUIRE_READY_CLIENT);
+    Subscribe(&GuildManager::HandleMOTDSet,MSGTYPE_GUILDMOTDSET,REQUIRE_ANY_CLIENT);
 }
 
 GuildManager::~GuildManager()
 {
-    size_t i;
-
-    for (i=0; i < notifySubscr.GetSize(); i++)
+    for(size_t i = 0; i < notifySubscr.GetSize(); i++)
         delete notifySubscr[i];
     notifySubscr.DeleteAll();
-
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GUILDCMD);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GUIGUILD);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GUILDMOTDSET);
 }
 
 

Modified: trunk/src/server/guildmanager.h
===================================================================
--- trunk/src/server/guildmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/guildmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -58,7 +58,7 @@
 };
 
 
-class GuildManager : public MessageManager
+class GuildManager : public MessageManager<GuildManager>
 {
 friend class PendingAllianceInvite;
 public:

Modified: trunk/src/server/introductionmanager.cpp
===================================================================
--- trunk/src/server/introductionmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/introductionmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -48,12 +48,12 @@
 
 IntroductionManager::IntroductionManager()
 {
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<IntroductionManager>(this,&IntroductionManager::HandleIntroduction),MSGTYPE_INTRODUCTION,REQUIRE_READY_CLIENT);
+    Subscribe(&IntroductionManager::HandleIntroduction, MSGTYPE_INTRODUCTION, REQUIRE_READY_CLIENT);
 }
 
 IntroductionManager::~IntroductionManager()
 {
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_INTRODUCTION);
+    //do nothing
 }
 
 void IntroductionManager::HandleIntroduction(MsgEntry *me, Client *client)

Modified: trunk/src/server/introductionmanager.h
===================================================================
--- trunk/src/server/introductionmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/introductionmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -34,7 +34,7 @@
 //=============================================================================
 #include "msgmanager.h"             // Parent class
 
-class IntroductionManager : public MessageManager
+class IntroductionManager : public MessageManager<IntroductionManager>
 {
 public:
     IntroductionManager();

Modified: trunk/src/server/minigamemanager.cpp
===================================================================
--- trunk/src/server/minigamemanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/minigamemanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -97,8 +97,8 @@
 
 MiniGameManager::MiniGameManager()
 {
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<MiniGameManager>(this,&MiniGameManager::HandleStartStop), MSGTYPE_MINIGAME_STARTSTOP, REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<MiniGameManager>(this,&MiniGameManager::HandleGameUpdate), MSGTYPE_MINIGAME_UPDATE, REQUIRE_READY_CLIENT);
+    Subscribe(&MiniGameManager::HandleStartStop, MSGTYPE_MINIGAME_STARTSTOP, REQUIRE_READY_CLIENT);
+    Subscribe(&MiniGameManager::HandleGameUpdate, MSGTYPE_MINIGAME_UPDATE, REQUIRE_READY_CLIENT);
 
     MiniGameManagerTick *tick = new MiniGameManagerTick(MINIGAME_TICK_INTERVAL, this);
     psserver->GetEventManager()->Push(tick);
@@ -106,9 +106,6 @@
 
 MiniGameManager::~MiniGameManager()
 {
-    psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_MINIGAME_STARTSTOP);
-    psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_MINIGAME_UPDATE);
-
     csHash<psMiniGameBoardDef *, csString>::GlobalIterator iter(gameBoardDef.GetIterator());
     while(iter.HasNext())
         delete iter.Next();

Modified: trunk/src/server/minigamemanager.h
===================================================================
--- trunk/src/server/minigamemanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/minigamemanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -230,7 +230,7 @@
  * This is the manager class of mini-games, handling overall mini-game definitions,
  * action-location gameboards and game sessions.
  */
-class MiniGameManager : public MessageManager
+class MiniGameManager : public MessageManager<MiniGameManager>
 {
 
 public:

Modified: trunk/src/server/msgmanager.cpp
===================================================================
--- trunk/src/server/msgmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/msgmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -35,12 +35,9 @@
 #include "msgmanager.h"
 #include "gem.h"
 #include "clients.h"
-#include "globals.h"
 #include "entitymanager.h"
-#include "net/msghandler.h"
 
-
-bool MessageManager::Verify(MsgEntry *pMsg,unsigned int flags,Client*& client)
+bool MessageManagerBase::Verify(MsgEntry *pMsg,unsigned int flags,Client*& client)
 {
     client = NULL;
 
@@ -104,8 +101,7 @@
     return true;
 }
 
-
-Client *MessageManager::FindPlayerClient(const char *name)
+Client *MessageManagerBase::FindPlayerClient(const char *name)
 {
     if (!name || strlen(name)==0)
     {
@@ -119,7 +115,7 @@
     return player;
 }
 
-csArray<csString> MessageManager::DecodeCommandArea(Client *client, csString target)
+csArray<csString> MessageManagerBase::DecodeCommandArea(Client *client, csString target)
 {
     csArray<csString> result;
 
@@ -263,7 +259,7 @@
     return result;
 }
 
-gemObject* MessageManager::FindObjectByString(const csString& str, gemActor * me) const
+gemObject* MessageManagerBase::FindObjectByString(const csString& str, gemActor * me) const
 {
     gemObject* found = NULL;
 

Modified: trunk/src/server/msgmanager.h
===================================================================
--- trunk/src/server/msgmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/msgmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -27,6 +27,9 @@
 // Project Includes
 //=============================================================================
 #include "net/subscriber.h"         // Subscriber class
+#include "net/message.h"            // For msgtype typedef
+#include "util/eventmanager.h"
+#include "globals.h"
 
 //=============================================================================
 // Local Includes
@@ -49,14 +52,17 @@
 class MsgEntry;
 class GEMSupervisor;
 
-class MessageManager : public iNetSubscriber
+/** @brief Base server-side class for subscriptions
+ *
+ * Contains non-templated functions for classes that need to be able to subscribe
+ * to messages.
+ */
+class MessageManagerBase : public iNetSubscriber
 {
-public:	
-    virtual ~MessageManager() {}
+public:
+    
+    virtual bool Verify(MsgEntry *pMsg, unsigned int flags, Client* &client);
 
-
-    virtual bool Verify(MsgEntry *pMsg,unsigned int flags,Client*& client);
-
     /** Finds Client* of character with given name. */
     Client * FindPlayerClient(const char *name);
     
@@ -78,4 +84,148 @@
     gemObject* FindObjectByString(const csString& str, gemActor * me) const;
 };
 
+/** @brief Provides a manager to facilitate subscriptions
+ *
+ * Any server-side class that needs to be informed of incoming messages should
+ * derive from this class. To use, simply inherit from this class with the
+ * template name being your class name.
+ */
+template <class SubClass>
+class MessageManager : public MessageManagerBase
+{
+    public:
+        typedef void(SubClass::*FunctionPointer)(MsgEntry*, Client*);
+
+        /** @brief Unsubscribes all messages then destroys this object */
+        virtual ~MessageManager()
+        {
+            UnsubscribeAll();
+        }
+
+        /** @brief Subscribes this manager to a specific message type
+         *
+         * Any time a message with the specified type (and flags are met) is
+         * received \ref SubClass::HandleMessage(MsgEntry *me, Client *client)
+         * is called.
+         * @param type The type of message to be notified of
+         * @param flags Optional flags to check <i>Default: 0x01</i>
+         */
+        inline void Subscribe(msgtype type, uint32_t flags = 0x01)
+        {
+            CS::Threading::RecursiveMutexScopedLock lock(mutex);
+            if(!handlers.Contains(type))
+            {
+                GetEventManager()->Subscribe(this, type, flags);
+            }
+            handlers.Put(type, &SubClass::HandleMessage);
+        }
+
+        /** @brief Subscribes this manager to a specific message type with a custom callback
+         *
+         * Any time a message with the specified type (and flags are met) is
+         * received the specified function is called
+         * @param fpt The function to call
+         * @param type The type of message to be notified of
+         * @param Optional flags to check <i>Default: 0x01</i>
+         */
+        inline void Subscribe(FunctionPointer fpt, msgtype type, uint32_t flags = 0x01)
+        {
+            CS::Threading::RecursiveMutexScopedLock lock(mutex);
+            if(!handlers.Contains(type))
+            {
+                GetEventManager()->Subscribe(this, type, flags);
+            }
+            handlers.Put(type, fpt);
+        }
+
+        /** @brief Unsubscribes this manager from a specific message type
+         *
+         * @param type The type of message to unsubscribe from
+         * @return True if a subscription was removed, false if this was not subscribed
+         */
+        inline bool Unsubscribe(msgtype type)
+        {
+            CS::Threading::RecursiveMutexScopedLock lock(mutex);
+            if(handlers.Contains(type))
+            {
+                handlers.DeleteAll(type);
+                return GetEventManager()->Unsubscribe(this, type);
+            }
+        }
+
+        /** @brief Unsubscribes a specific handler from a specific message type
+         *
+         * @param handler The handler to unsubscribe
+         * @param type The type of message to unsubscribe from
+         * @return True if a subscription was removed, false if this was not subscribed
+         */
+        inline bool Unsubscribe(FunctionPointer handler, msgtype type)
+        {
+            CS::Threading::RecursiveMutexScopedLock lock(mutex);
+            if(handlers.Contains(type))
+            {
+                handlers.Delete(type, handler);
+                if(!handlers.Contains(type))
+                {
+                    return GetEventManager()->Unsubscribe(this, type);
+                }
+                else
+                {
+                    return true;
+                }
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /** @brief Unsubscribes this manager from all message types
+         *
+         * @return True if a subscription was removed, false if this was not subscribed
+         */
+        inline bool UnsubscribeAll()
+        {
+            CS::Threading::RecursiveMutexScopedLock lock(mutex);
+            handlers.Empty();
+            return GetEventManager()->UnsubscribeAll(this);
+        }
+        
+        void HandleMessage(MsgEntry* msg, Client* client)
+        {
+            csArray<FunctionPointer> msgHandlers;
+            {
+                CS::Threading::RecursiveMutexScopedLock lock(mutex);
+                msgHandlers = handlers.GetAll(msg->GetType());
+            }
+            SubClass* self = dynamic_cast<SubClass*>(this);
+            if(!self)
+            {
+                // fatal error, we aren't a base of our subclass!
+                return;
+            }
+
+            for(size_t i = 0; i < msgHandlers.GetSize(); ++i)
+            {
+                (self->*msgHandlers[i])(msg, client);
+            }
+        }
+
+    private:
+        CS::Threading::RecursiveMutex mutex;
+        csHash<FunctionPointer, msgtype> handlers;
+        /** @brief Gets the event manager from the server
+         *
+         * Asserts if the retrieved manager is valid
+         *
+         * @return The event manager
+         */
+        inline EventManager* GetEventManager() const
+        {
+            EventManager* eventManager = psserver->GetEventManager();
+            CS_ASSERT(eventManager);
+            return eventManager;
+        }
+};
+
 #endif

Modified: trunk/src/server/npcmanager.cpp
===================================================================
--- trunk/src/server/npcmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/npcmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -341,15 +341,15 @@
     cacheManager = cachemanager;
     entityManager = entitymanager;
 
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<NPCManager>(this,&NPCManager::HandleAuthentRequest),MSGTYPE_NPCAUTHENT,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<NPCManager>(this,&NPCManager::HandleCommandList)   ,MSGTYPE_NPCOMMANDLIST,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<NPCManager>(this,&NPCManager::HandleConsoleCommand),MSGTYPE_NPC_COMMAND,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<NPCManager>(this,&NPCManager::HandleNPCReady)   ,MSGTYPE_NPCREADY, REQUIRE_ANY_CLIENT);
+    Subscribe(&NPCManager::HandleAuthentRequest,MSGTYPE_NPCAUTHENT,REQUIRE_ANY_CLIENT);
+    Subscribe(&NPCManager::HandleCommandList,MSGTYPE_NPCOMMANDLIST,REQUIRE_ANY_CLIENT);
+    Subscribe(&NPCManager::HandleConsoleCommand,MSGTYPE_NPC_COMMAND,REQUIRE_ANY_CLIENT);
+    Subscribe(&NPCManager::HandleNPCReady,MSGTYPE_NPCREADY, REQUIRE_ANY_CLIENT);
 
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<NPCManager>(this,&NPCManager::HandleDamageEvent),MSGTYPE_DAMAGE_EVENT,NO_VALIDATION);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<NPCManager>(this,&NPCManager::HandleDeathEvent) ,MSGTYPE_DEATH_EVENT,NO_VALIDATION);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<NPCManager>(this,&NPCManager::HandlePetCommand) ,MSGTYPE_PET_COMMAND,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<NPCManager>(this,&NPCManager::HandlePetSkill)   ,MSGTYPE_PET_SKILL,REQUIRE_ANY_CLIENT);
+    Subscribe(&NPCManager::HandleDamageEvent,MSGTYPE_DAMAGE_EVENT,NO_VALIDATION);
+    Subscribe(&NPCManager::HandleDeathEvent,MSGTYPE_DEATH_EVENT,NO_VALIDATION);
+    Subscribe(&NPCManager::HandlePetCommand,MSGTYPE_PET_COMMAND,REQUIRE_ANY_CLIENT);
+    Subscribe(&NPCManager::HandlePetSkill,MSGTYPE_PET_SKILL,REQUIRE_ANY_CLIENT);
 
     PrepareMessage();
 
@@ -382,17 +382,9 @@
 
 NPCManager::~NPCManager()
 {
-	csHash<PetOwnerSession*, PID>::GlobalIterator iter(OwnerPetList.GetIterator());
-	while(iter.HasNext())
-		delete iter.Next();
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_NPCAUTHENT);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_NPCOMMANDLIST);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_NPCREADY);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_NPC_COMMAND);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_DAMAGE_EVENT);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_DEATH_EVENT);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_PET_COMMAND);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_PET_SKILL);
+    csHash<PetOwnerSession*, PID>::GlobalIterator iter(OwnerPetList.GetIterator());
+    while(iter.HasNext())
+        delete iter.Next();
     delete outbound;
 }
 

Modified: trunk/src/server/npcmanager.h
===================================================================
--- trunk/src/server/npcmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/npcmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -51,7 +51,7 @@
 class gemNPC;
 class PetOwnerSession;
 
-class NPCManager : public MessageManager
+class NPCManager : public MessageManager<NPCManager>
 {
 public:
     NPCManager(ClientConnectionSet *pCCS,

Modified: trunk/src/server/progressionmanager.cpp
===================================================================
--- trunk/src/server/progressionmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/progressionmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -93,16 +93,14 @@
 
 ProgressionManager::~ProgressionManager()
 {
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GUISKILL);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_DEATH_EVENT);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_ZPOINT_EVENT);
+    //do nothing
 }
 
 bool ProgressionManager::Initialize()
 {
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ProgressionManager>(this,&ProgressionManager::HandleSkill)      ,MSGTYPE_GUISKILL,    REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ProgressionManager>(this,&ProgressionManager::HandleDeathEvent) ,MSGTYPE_DEATH_EVENT, NO_VALIDATION);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ProgressionManager>(this,&ProgressionManager::HandleZPointEvent),MSGTYPE_ZPOINT_EVENT,REQUIRE_READY_CLIENT);
+    Subscribe(&ProgressionManager::HandleSkill, MSGTYPE_GUISKILL, REQUIRE_READY_CLIENT);
+    Subscribe(&ProgressionManager::HandleDeathEvent, MSGTYPE_DEATH_EVENT, NO_VALIDATION);
+    Subscribe(&ProgressionManager::HandleZPointEvent, MSGTYPE_ZPOINT_EVENT, REQUIRE_READY_CLIENT);
 
     Result result_affinitycategories(db->Select("SELECT * from char_create_affinity"));
 

Modified: trunk/src/server/progressionmanager.h
===================================================================
--- trunk/src/server/progressionmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/progressionmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -42,7 +42,7 @@
 class psCharacter;
 class ProgressionScript;
 
-class ProgressionManager : public MessageManager
+class ProgressionManager : public MessageManager<ProgressionManager>
 {
 public:
 

Modified: trunk/src/server/psserverchar.cpp
===================================================================
--- trunk/src/server/psserverchar.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/psserverchar.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -96,17 +96,6 @@
 
 ServerCharManager::~ServerCharManager()
 {
-    if (psserver->GetEventManager())
-    {
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_GUIINVENTORY);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_GUIMERCHANT);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_GUISTORAGE);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_VIEW_ITEM);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_VIEW_SKETCH);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_WRITE_BOOK);
-        psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_FACTION_INFO);
-    }
-
     delete slotManager;
     slotManager = NULL;
 }
@@ -115,13 +104,13 @@
 {
 //    clients = ccs;
 
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ServerCharManager>(this,&ServerCharManager::HandleInventoryMessage), MSGTYPE_GUIINVENTORY,REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ServerCharManager>(this,&ServerCharManager::HandleMerchantMessage),  MSGTYPE_GUIMERCHANT,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ServerCharManager>(this,&ServerCharManager::HandleStorageMessage),  MSGTYPE_GUISTORAGE,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ServerCharManager>(this,&ServerCharManager::ViewItem),               MSGTYPE_VIEW_ITEM,REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ServerCharManager>(this,&ServerCharManager::UpdateSketch),           MSGTYPE_VIEW_SKETCH,REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ServerCharManager>(this,&ServerCharManager::HandleBookWrite),        MSGTYPE_WRITE_BOOK, REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<ServerCharManager>(this,&ServerCharManager::HandleFaction),          MSGTYPE_FACTION_INFO, REQUIRE_READY_CLIENT);
+    Subscribe(&ServerCharManager::HandleInventoryMessage, MSGTYPE_GUIINVENTORY, REQUIRE_READY_CLIENT);
+    Subscribe(&ServerCharManager::HandleMerchantMessage, MSGTYPE_GUIMERCHANT, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);
+    Subscribe(&ServerCharManager::HandleStorageMessage, MSGTYPE_GUISTORAGE, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);
+    Subscribe(&ServerCharManager::ViewItem, MSGTYPE_VIEW_ITEM, REQUIRE_READY_CLIENT);
+    Subscribe(&ServerCharManager::UpdateSketch, MSGTYPE_VIEW_SKETCH, REQUIRE_READY_CLIENT);
+    Subscribe(&ServerCharManager::HandleBookWrite, MSGTYPE_WRITE_BOOK, REQUIRE_READY_CLIENT);
+    Subscribe(&ServerCharManager::HandleFaction, MSGTYPE_FACTION_INFO, REQUIRE_READY_CLIENT);
 
     slotManager = new SlotManager(gemSupervisor, cacheManager);
     if ( !(slotManager && slotManager->Initialize()) )

Modified: trunk/src/server/psserverchar.h
===================================================================
--- trunk/src/server/psserverchar.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/psserverchar.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -55,7 +55,7 @@
  * is an all or nothing sort of thing. By using this we can make
  * more efficient use of the net traffic
  */
-class ServerCharManager : public MessageManager
+class ServerCharManager : public MessageManager<ServerCharManager>
 {
 public:
 

Modified: trunk/src/server/psserverdr.cpp
===================================================================
--- trunk/src/server/psserverdr.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/psserverdr.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -71,16 +71,12 @@
 
 psServerDR::~psServerDR()
 {
-    if (psserver->GetEventManager())
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_DEAD_RECKONING);
-    
     delete paladin;
 }
 
 bool psServerDR::Initialize()
 {
-    if (!psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<psServerDR>(this,&psServerDR::HandleDeadReckoning),MSGTYPE_DEAD_RECKONING,REQUIRE_READY_CLIENT))
-        return false;
+    Subscribe(&psServerDR::HandleDeadReckoning, MSGTYPE_DEAD_RECKONING, REQUIRE_READY_CLIENT);
 
     calc_damage   = psserver->GetMathScriptEngine()->FindScript("Calculate Fall Damage");
     if(!calc_damage)

Modified: trunk/src/server/psserverdr.h
===================================================================
--- trunk/src/server/psserverdr.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/psserverdr.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -39,7 +39,7 @@
 class CacheManager;
 class EntityManager;
 
-class psServerDR : public MessageManager
+class psServerDR : public MessageManager<psServerDR>
 {
 public:    
     psServerDR(CacheManager* cachemanager, EntityManager* entitymanager);

Modified: trunk/src/server/questionmanager.cpp
===================================================================
--- trunk/src/server/questionmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/questionmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -97,7 +97,7 @@
 
 QuestionManager::QuestionManager()
 {
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<QuestionManager>(this,&QuestionManager::HandleQuestionResponse),MSGTYPE_QUESTIONRESPONSE,REQUIRE_READY_CLIENT);
+    Subscribe(&QuestionManager::HandleQuestionResponse, MSGTYPE_QUESTIONRESPONSE, REQUIRE_READY_CLIENT);
 }
 
 QuestionManager::~QuestionManager()
@@ -105,7 +105,6 @@
 	csHash<PendingQuestion*>::GlobalIterator iter(questions.GetIterator());
 	while(iter.HasNext())
 		delete iter.Next();
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_QUESTIONRESPONSE);
 }
 
 void QuestionManager::HandleQuestionResponse(MsgEntry *me,Client *client)

Modified: trunk/src/server/questionmanager.h
===================================================================
--- trunk/src/server/questionmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/questionmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -99,7 +99,7 @@
  * QuestionManager keeps track of all the questions of any kind
  * that are pending
  */
-class QuestionManager : public MessageManager
+class QuestionManager : public MessageManager<QuestionManager>
 {
 public:
 

Modified: trunk/src/server/questmanager.cpp
===================================================================
--- trunk/src/server/questmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/questmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -61,15 +61,14 @@
 QuestManager::QuestManager(CacheManager* cachemanager)
 {
 	cacheManager = cachemanager;
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<QuestManager>(this,&QuestManager::HandleQuestInfo),  MSGTYPE_QUESTINFO,REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<QuestManager>(this,&QuestManager::HandleQuestReward),MSGTYPE_QUESTREWARD,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
+    Subscribe(&QuestManager::HandleQuestInfo, MSGTYPE_QUESTINFO, REQUIRE_READY_CLIENT);
+    Subscribe(&QuestManager::HandleQuestReward, MSGTYPE_QUESTREWARD, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);
 }
 
 QuestManager::~QuestManager()
 {
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_QUESTINFO);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_QUESTREWARD);
-    if (dict) delete dict;
+    if(dict)
+        delete dict;
 }
 
 

Modified: trunk/src/server/questmanager.h
===================================================================
--- trunk/src/server/questmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/questmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -53,7 +53,7 @@
  * This class handles quest management for the player,
  * tracking who has what quests assigned, etc.
  */
-class QuestManager : public MessageManager
+class QuestManager : public MessageManager<QuestManager>
 {
 protected:
     csArray<QuestRewardOffer*>  offers;

Modified: trunk/src/server/slotmanager.cpp
===================================================================
--- trunk/src/server/slotmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/slotmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -54,15 +54,14 @@
 
 SlotManager::~SlotManager()
 {
-    psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_SLOT_MOVEMENT);
-    psserver->GetEventManager()->Unsubscribe(this, MSGTYPE_CMDDROP);
+    //do nothing
 }
 
 bool SlotManager::Initialize()
 {
     worldContainer = NULL;
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<SlotManager>(this,&SlotManager::HandleSlotMovement),MSGTYPE_SLOT_MOVEMENT, REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this, new NetMessageCallback<SlotManager>(this,&SlotManager::HandleDropCommand),MSGTYPE_CMDDROP, REQUIRE_READY_CLIENT);
+    Subscribe(&SlotManager::HandleSlotMovement, MSGTYPE_SLOT_MOVEMENT, REQUIRE_READY_CLIENT);
+    Subscribe(&SlotManager::HandleDropCommand, MSGTYPE_CMDDROP, REQUIRE_READY_CLIENT);
     return true;
 }
 

Modified: trunk/src/server/slotmanager.h
===================================================================
--- trunk/src/server/slotmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/slotmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -39,7 +39,7 @@
  *  holding slot.  It then looks for the destination slot and sees if it can be placed
  *  there.  If not it will Replace the holding item back to where it came from.
  */
-class SlotManager : public MessageManager
+class SlotManager : public MessageManager<SlotManager>
 {
 public:
     virtual ~SlotManager();

Modified: trunk/src/server/spawnmanager.cpp
===================================================================
--- trunk/src/server/spawnmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/spawnmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -199,14 +199,12 @@
 
     PreloadDatabase();
 
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<SpawnManager>(this,&SpawnManager::HandleLootItem),MSGTYPE_LOOTITEM,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<SpawnManager>(this,&SpawnManager::HandleDeathEvent),MSGTYPE_DEATH_EVENT,NO_VALIDATION);
+    Subscribe(&SpawnManager::HandleLootItem, MSGTYPE_LOOTITEM, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);
+    Subscribe(&SpawnManager::HandleDeathEvent, MSGTYPE_DEATH_EVENT, NO_VALIDATION);
 }
 
 SpawnManager::~SpawnManager()
 {
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_LOOTITEM);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_DEATH_EVENT);
 
     csHash<LootEntrySet *>::GlobalIterator it(looting.GetIterator ());
     while (it.HasNext ())

Modified: trunk/src/server/spawnmanager.h
===================================================================
--- trunk/src/server/spawnmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/spawnmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -237,7 +237,7 @@
  *  This class is periodically called by the engine to ensure that
  *  monsters (and other NPCs) are respawned appropriately.
  */
-class SpawnManager : public MessageManager
+class SpawnManager : public MessageManager<SpawnManager>
 {
 protected:
     psDatabase             *database;

Modified: trunk/src/server/spellmanager.cpp
===================================================================
--- trunk/src/server/spellmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/spellmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -80,25 +80,17 @@
     this->object_reg = object_reg;
     cacheManager = cachemanager;
 
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<SpellManager>(this,&SpellManager::HandleGlyphRequest),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);      
+    Subscribe(&SpellManager::HandleGlyphRequest, MSGTYPE_GLYPH_REQUEST, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);  
+    Subscribe(&SpellManager::HandleAssembler, MSGTYPE_GLYPH_ASSEMBLE, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);  
+    Subscribe(&SpellManager::Cast, MSGTYPE_SPELL_CAST, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);  
+    Subscribe(&SpellManager::StartPurifying, MSGTYPE_PURIFY_GLYPH, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);  
+    Subscribe(&SpellManager::SendSpellBook, MSGTYPE_SPELL_BOOK, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);  
+    Subscribe(&SpellManager::HandleCancelSpell, MSGTYPE_SPELL_CANCEL, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);      
 }
 
 SpellManager::~SpellManager()
 {
-    if (psserver->GetEventManager())
-    {
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GLYPH_REQUEST);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GLYPH_ASSEMBLE);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_SPELL_CAST);  
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_PURIFY_GLYPH);  
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_SPELL_BOOK);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_SPELL_CANCEL);
-    }
+    //do nothing
 }
 
 

Modified: trunk/src/server/spellmanager.h
===================================================================
--- trunk/src/server/spellmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/spellmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -46,7 +46,7 @@
 /** Manager class that handles loading/searching/casting spells. 
   * This class also manages a number of psSpell Events.  
   */
-class SpellManager : public MessageManager
+class SpellManager : public MessageManager<SpellManager>
 {
 public:
 

Modified: trunk/src/server/tutorialmanager.cpp
===================================================================
--- trunk/src/server/tutorialmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/tutorialmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -49,23 +49,18 @@
 TutorialManager::TutorialManager(ClientConnectionSet *pCCS)
 {
     clients = pCCS;
-    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);
+    Subscribe(&TutorialManager::HandleConnect, MSGTYPE_CONNECT_EVENT, REQUIRE_ANY_CLIENT);
+    Subscribe(&TutorialManager::HandleMovement, MSGTYPE_MOVEMENT_EVENT, REQUIRE_ANY_CLIENT);
+    Subscribe(&TutorialManager::HandleTarget, MSGTYPE_TARGET_EVENT, NO_VALIDATION);
+    Subscribe(&TutorialManager::HandleGeneric, MSGTYPE_GENERIC_EVENT, REQUIRE_ANY_CLIENT);
+    Subscribe(&TutorialManager::HandleDamage, MSGTYPE_DAMAGE_EVENT, NO_VALIDATION);
+    Subscribe(&TutorialManager::HandleDeath, MSGTYPE_DEATH_EVENT, NO_VALIDATION);
     LoadTutorialStrings();
 }
 
 TutorialManager::~TutorialManager()
 {
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_CONNECT_EVENT);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_MOVEMENT_EVENT);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_TARGET_EVENT);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_GENERIC_EVENT);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_DAMAGE_EVENT);
-    psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_DEATH_EVENT);
+    //do nothing
 }
 
 bool TutorialManager::LoadTutorialStrings()

Modified: trunk/src/server/tutorialmanager.h
===================================================================
--- trunk/src/server/tutorialmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/tutorialmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -38,7 +38,7 @@
  * and decides whether each client needs to be notified about
  * them, in order to show a tutorial page about that event.
  */
-class TutorialManager : public MessageManager
+class TutorialManager : public MessageManager<TutorialManager>
 {
 public:
 

Modified: trunk/src/server/usermanager.cpp
===================================================================
--- trunk/src/server/usermanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/usermanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -154,13 +154,13 @@
     bankManager = bankmanager;
     entityManager = entitymanager;
 
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<UserManager>(this,&UserManager::HandleUserCommand),    MSGTYPE_USERCMD,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<UserManager>(this,&UserManager::HandleMOTDRequest),    MSGTYPE_MOTDREQUEST,REQUIRE_ANY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<UserManager>(this,&UserManager::HandleCharDetailsRequest),MSGTYPE_CHARDETAILSREQUEST,REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<UserManager>(this,&UserManager::HandleCharDescUpdate), MSGTYPE_CHARDESCUPDATE,REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<UserManager>(this,&UserManager::HandleTargetEvent),    MSGTYPE_TARGET_EVENT,NO_VALIDATION);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<UserManager>(this,&UserManager::HandleEntranceMessage),MSGTYPE_ENTRANCE,REQUIRE_READY_CLIENT);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<UserManager>(this,&UserManager::HandleClientReady),    MSGTYPE_CONNECT_EVENT, REQUIRE_ANY_CLIENT);
+    Subscribe(&UserManager::HandleUserCommand, MSGTYPE_USERCMD, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);
+    Subscribe(&UserManager::HandleMOTDRequest, MSGTYPE_MOTDREQUEST, REQUIRE_ANY_CLIENT);
+    Subscribe(&UserManager::HandleCharDetailsRequest, MSGTYPE_CHARDETAILSREQUEST, REQUIRE_READY_CLIENT);
+    Subscribe(&UserManager::HandleCharDescUpdate, MSGTYPE_CHARDESCUPDATE, REQUIRE_READY_CLIENT);
+    Subscribe(&UserManager::HandleTargetEvent, MSGTYPE_TARGET_EVENT, NO_VALIDATION);
+    Subscribe(&UserManager::HandleEntranceMessage, MSGTYPE_ENTRANCE, REQUIRE_READY_CLIENT);
+    Subscribe(&UserManager::HandleClientReady, MSGTYPE_CONNECT_EVENT, REQUIRE_ANY_CLIENT);
 
     userCommandHash.Put("/admin",        &UserManager::HandleAdminCommand);
     userCommandHash.Put("/assist",       &UserManager::Assist);
@@ -196,17 +196,6 @@
 
 UserManager::~UserManager()
 {
-    if (psserver->GetEventManager())
-    {
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_USERCMD);
-        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);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_CONNECT_EVENT);
-    }
-    
     csHash<EMOTE *, csString>::GlobalIterator it(emoteHash.GetIterator ());
     while (it.HasNext ())
     {

Modified: trunk/src/server/usermanager.h
===================================================================
--- trunk/src/server/usermanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/usermanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -49,7 +49,7 @@
 /** Used to manage incoming user commands from a client. Most commands are in
  * the format of /command param1 param2 ... paramN
  */
-class UserManager : public MessageManager
+class UserManager : public MessageManager<UserManager>
 {
 public:
 

Modified: trunk/src/server/workmanager.cpp
===================================================================
--- trunk/src/server/workmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/workmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
@@ -125,9 +125,9 @@
 	entityManager = entitymanager;
     currentQuality = 1.00;
 
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<WorkManager>(this,&WorkManager::HandleWorkCommand),MSGTYPE_WORKCMD,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<WorkManager>(this,&WorkManager::HandleLockPick),MSGTYPE_LOCKPICK,REQUIRE_READY_CLIENT|REQUIRE_ALIVE|REQUIRE_TARGET);
-    psserver->GetEventManager()->Subscribe(this,new NetMessageCallback<WorkManager>(this,&WorkManager::StopUseWork),MSGTYPE_CRAFT_CANCEL,REQUIRE_READY_CLIENT|REQUIRE_ALIVE);
+    Subscribe(&WorkManager::HandleWorkCommand, MSGTYPE_WORKCMD, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);
+    Subscribe(&WorkManager::HandleLockPick, MSGTYPE_LOCKPICK, REQUIRE_READY_CLIENT | REQUIRE_ALIVE | REQUIRE_TARGET);
+    Subscribe(&WorkManager::StopUseWork, MSGTYPE_CRAFT_CANCEL, REQUIRE_READY_CLIENT | REQUIRE_ALIVE);
 
     calc_repair_rank            = psserver->GetMathScriptEngine()->FindScript("Calculate Repair Rank");
     calc_repair_time            = psserver->GetMathScriptEngine()->FindScript("Calculate Repair Time");
@@ -160,12 +160,7 @@
 
 WorkManager::~WorkManager()
 {
-    if (psserver->GetEventManager())
-    {
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_WORKCMD);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_LOCKPICK);
-        psserver->GetEventManager()->Unsubscribe(this,MSGTYPE_CRAFT_CANCEL);
-    }
+    //do nothing
 }
 
 void WorkManager::Initialize()

Modified: trunk/src/server/workmanager.h
===================================================================
--- trunk/src/server/workmanager.h	2010-12-26 15:53:17 UTC (rev 6619)
+++ trunk/src/server/workmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
@@ -151,7 +151,7 @@
 *  and information from the pspccharacterinfo Prop Classes for both
 *  the worker and the target.
 */
-class WorkManager : public MessageManager
+class WorkManager : public MessageManager<WorkManager>
 {
 public:
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6617
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6617&view=rev
Author:   rlydontknow
Date:     2010-12-26 15:20:49 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
let GetObject check whether the threaded call is done and was successful
also let it first validate the object is actually valid before querying the desired interface

Modified Paths:
--------------
    trunk/src/common/bgloader/loader.h

Modified: trunk/src/common/bgloader/loader.h
===================================================================
--- trunk/src/common/bgloader/loader.h	2010-12-26 15:15:07 UTC (rev 6616)
+++ trunk/src/common/bgloader/loader.h	2010-12-26 15:20:49 UTC (rev 6617)
@@ -668,15 +668,17 @@
 
         csPtr<T> GetObject()
         {
-            if(status.IsValid())
+            if(status.IsValid() && status->IsFinished() && status->WasSuccessful())
             {
-                csRef<T> obj = scfQueryInterface<T>(status->GetResultRefPtr());
-                return csPtr<T>(obj);
+                csRef<iBase> rawObj = status->GetResultRefPtr();
+                if(rawObj.IsValid())
+                {
+                    csRef<T> obj = scfQueryInterface<T>(status->GetResultRefPtr());
+                    return csPtr<T>(obj);
+                }
             }
-            else
-            {
-                return csPtr<T>(0);
-            }
+
+            return csPtr<T>(0);
         }
 
     protected:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6624
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6624&view=rev
Author:   weltall2
Date:     2010-12-27 21:39:41 +0000 (Mon, 27 Dec 2010)

Log Message:
-----------
removed some weird tabs being put in config files. patch by mikesflowers

Modified Paths:
--------------
    trunk/src/client/gui/pawsconfigchatbubbles.cpp

Modified: trunk/src/client/gui/pawsconfigchatbubbles.cpp
===================================================================
--- trunk/src/client/gui/pawsconfigchatbubbles.cpp	2010-12-27 19:38:01 UTC (rev 6623)
+++ trunk/src/client/gui/pawsconfigchatbubbles.cpp	2010-12-27 21:39:41 UTC (rev 6624)
@@ -542,21 +542,21 @@
 
     size_t lenPawsBubbleChatTypes = pawsBubbleChatTypes.GetSize();
     for (size_t c = 0; c < lenPawsBubbleChatTypes; ++c) {
-        xml.AppendFmt("\t<chat type=\"%s\"\t", pawsBubbleChatTypes[c].type.GetData());
+        xml.AppendFmt("    <chat type=\"%s\" ", pawsBubbleChatTypes[c].type.GetData());
 
-        xml.AppendFmt("enabled=\"%s\"\t", pawsBubbleChatTypes[c].enabled->GetState() ? "yes" : "no");
+        xml.AppendFmt("enabled=\"%s\" ", pawsBubbleChatTypes[c].enabled->GetState() ? "yes" : "no");
 
-        xml.AppendFmt("colourR=\"%s\"\t", pawsBubbleChatTypes[c].TextR->GetText());
-        xml.AppendFmt("colourG=\"%s\"\t", pawsBubbleChatTypes[c].TextG->GetText());
-        xml.AppendFmt("colourB=\"%s\"\t", pawsBubbleChatTypes[c].TextB->GetText());
+        xml.AppendFmt("colourR=\"%s\" ", pawsBubbleChatTypes[c].TextR->GetText());
+        xml.AppendFmt("colourG=\"%s\" ", pawsBubbleChatTypes[c].TextG->GetText());
+        xml.AppendFmt("colourB=\"%s\" ", pawsBubbleChatTypes[c].TextB->GetText());
 
-        xml.AppendFmt("shadowR=\"%s\"\t", pawsBubbleChatTypes[c].ShadowR->GetText());
-        xml.AppendFmt("shadowG=\"%s\"\t", pawsBubbleChatTypes[c].ShadowG->GetText());
-        xml.AppendFmt("shadowB=\"%s\"\t", pawsBubbleChatTypes[c].ShadowB->GetText());
+        xml.AppendFmt("shadowR=\"%s\" ", pawsBubbleChatTypes[c].ShadowR->GetText());
+        xml.AppendFmt("shadowG=\"%s\" ", pawsBubbleChatTypes[c].ShadowG->GetText());
+        xml.AppendFmt("shadowB=\"%s\" ", pawsBubbleChatTypes[c].ShadowB->GetText());
 
-        xml.AppendFmt("outlineR=\"%s\"\t", pawsBubbleChatTypes[c].OutlineR->GetText());
-        xml.AppendFmt("outlineG=\"%s\"\t", pawsBubbleChatTypes[c].OutlineG->GetText());
-        xml.AppendFmt("outlineB=\"%s\"\t", pawsBubbleChatTypes[c].OutlineB->GetText());
+        xml.AppendFmt("outlineR=\"%s\" ", pawsBubbleChatTypes[c].OutlineR->GetText());
+        xml.AppendFmt("outlineG=\"%s\" ", pawsBubbleChatTypes[c].OutlineG->GetText());
+        xml.AppendFmt("outlineB=\"%s\" ", pawsBubbleChatTypes[c].OutlineB->GetText());
 
         csString align;
         if (pawsBubbleChatTypes[c].Align->GetSelectedRowNum() == 2)
@@ -565,7 +565,7 @@
             align = "center";
         else
             align = "left";
-        xml.AppendFmt("align=\"%s\"\t", align.GetData());
+        xml.AppendFmt("align=\"%s\" ", align.GetData());
 
         xml += "effectPrefix=\"chatbubble_\" />\n";
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6623
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6623&view=rev
Author:   weltall2
Date:     2010-12-27 19:38:01 +0000 (Mon, 27 Dec 2010)

Log Message:
-----------
fixed creation manager

Modified Paths:
--------------
    trunk/src/server/creationmanager.h

Modified: trunk/src/server/creationmanager.h
===================================================================
--- trunk/src/server/creationmanager.h	2010-12-27 11:43:24 UTC (rev 6622)
+++ trunk/src/server/creationmanager.h	2010-12-27 19:38:01 UTC (rev 6623)
@@ -44,7 +44,7 @@
  *   character_creation
  *
  */
-class CharCreationManager : MessageManager<CharCreationManager>
+class CharCreationManager : public MessageManager<CharCreationManager>
 {
 public:        
     CharCreationManager(GEMSupervisor* gemsupervisor, CacheManager* cachemanager, EntityManager* entitymanager);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6622
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6622&view=rev
Author:   weltall2
Date:     2010-12-27 11:43:24 +0000 (Mon, 27 Dec 2010)

Log Message:
-----------
Visual-C++ project files: Automated Visual-C++ project file repair.

Modified Paths:
--------------
    trunk/mk/msvc10/libplaneshift_staticplugins.vcxproj
    trunk/mk/msvc10/plgbgloader.vcxproj
    trunk/mk/msvc8/libplaneshift_staticplugins.vcproj
    trunk/mk/msvc8/plgbgloader.vcproj
    trunk/mk/msvc9/libplaneshift_staticplugins.vcproj
    trunk/mk/msvc9/plgbgloader.vcproj

Modified: trunk/mk/msvc10/libplaneshift_staticplugins.vcxproj
===================================================================
--- trunk/mk/msvc10/libplaneshift_staticplugins.vcxproj	2010-12-27 11:19:29 UTC (rev 6621)
+++ trunk/mk/msvc10/libplaneshift_staticplugins.vcxproj	2010-12-27 11:43:24 UTC (rev 6622)
@@ -1314,6 +1314,7 @@
     <ClCompile Include="..\..\mk\msvc\libcelgraph_staticreg.cpp" />
     <ClCompile Include="..\..\mk\msvc\librecast_staticreg.cpp" />
     <ClCompile Include="..\..\src\common\bgloader\loader.cpp" />
+    <ClCompile Include="..\..\src\common\bgloader\loader_objects.cpp" />
     <ClCompile Include="..\..\src\common\bgloader\manipulate.cpp" />
     <ClCompile Include="..\..\src\common\bgloader\parser.cpp" />
     <ClCompile Include="..\..\src\common\bgloader\parser_mesh.cpp" />

Modified: trunk/mk/msvc10/plgbgloader.vcxproj
===================================================================
--- trunk/mk/msvc10/plgbgloader.vcxproj	2010-12-27 11:19:29 UTC (rev 6621)
+++ trunk/mk/msvc10/plgbgloader.vcxproj	2010-12-27 11:43:24 UTC (rev 6622)
@@ -1410,6 +1410,7 @@
   <ItemGroup>
     <ClCompile Include="..\..\mk\msvc\plugin_impl.cpp" />
     <ClCompile Include="..\..\src\common\bgloader\loader.cpp" />
+    <ClCompile Include="..\..\src\common\bgloader\loader_objects.cpp" />
     <ClCompile Include="..\..\src\common\bgloader\manipulate.cpp" />
     <ClCompile Include="..\..\src\common\bgloader\parser.cpp" />
     <ClCompile Include="..\..\src\common\bgloader\parser_mesh.cpp" />

Modified: trunk/mk/msvc8/libplaneshift_staticplugins.vcproj
===================================================================
--- trunk/mk/msvc8/libplaneshift_staticplugins.vcproj	2010-12-27 11:19:29 UTC (rev 6621)
+++ trunk/mk/msvc8/libplaneshift_staticplugins.vcproj	2010-12-27 11:43:24 UTC (rev 6622)
@@ -1741,6 +1741,9 @@
 				RelativePath="..\..\src\common\bgloader\loader.cpp">
 			</File>
 			<File
+				RelativePath="..\..\src\common\bgloader\loader_objects.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\common\bgloader\manipulate.cpp">
 			</File>
 			<File

Modified: trunk/mk/msvc8/plgbgloader.vcproj
===================================================================
--- trunk/mk/msvc8/plgbgloader.vcproj	2010-12-27 11:19:29 UTC (rev 6621)
+++ trunk/mk/msvc8/plgbgloader.vcproj	2010-12-27 11:43:24 UTC (rev 6622)
@@ -1835,6 +1835,9 @@
 				RelativePath="..\..\src\common\bgloader\loader.cpp">
 			</File>
 			<File
+				RelativePath="..\..\src\common\bgloader\loader_objects.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\common\bgloader\manipulate.cpp">
 			</File>
 			<File

Modified: trunk/mk/msvc9/libplaneshift_staticplugins.vcproj
===================================================================
--- trunk/mk/msvc9/libplaneshift_staticplugins.vcproj	2010-12-27 11:19:29 UTC (rev 6621)
+++ trunk/mk/msvc9/libplaneshift_staticplugins.vcproj	2010-12-27 11:43:24 UTC (rev 6622)
@@ -1741,6 +1741,9 @@
 				RelativePath="..\..\src\common\bgloader\loader.cpp">
 			</File>
 			<File
+				RelativePath="..\..\src\common\bgloader\loader_objects.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\common\bgloader\manipulate.cpp">
 			</File>
 			<File

Modified: trunk/mk/msvc9/plgbgloader.vcproj
===================================================================
--- trunk/mk/msvc9/plgbgloader.vcproj	2010-12-27 11:19:29 UTC (rev 6621)
+++ trunk/mk/msvc9/plgbgloader.vcproj	2010-12-27 11:43:24 UTC (rev 6622)
@@ -1835,6 +1835,9 @@
 				RelativePath="..\..\src\common\bgloader\loader.cpp">
 			</File>
 			<File
+				RelativePath="..\..\src\common\bgloader\loader_objects.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\common\bgloader\manipulate.cpp">
 			</File>
 			<File


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6621
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6621&view=rev
Author:   weltall2
Date:     2010-12-27 11:19:29 +0000 (Mon, 27 Dec 2010)

Log Message:
-----------
fixes to previous patch about msghandler  by mikesflowers

Modified Paths:
--------------
    trunk/src/server/actionmanager.cpp
    trunk/src/server/actionmanager.h
    trunk/src/server/adminmanager.h
    trunk/src/server/advicemanager.cpp
    trunk/src/server/advicemanager.h
    trunk/src/server/authentserver.h
    trunk/src/server/bankmanager.h
    trunk/src/server/chatmanager.h
    trunk/src/server/combatmanager.h
    trunk/src/server/creationmanager.h
    trunk/src/server/economymanager.cpp
    trunk/src/server/economymanager.h
    trunk/src/server/entitymanager.h
    trunk/src/server/exchangemanager.cpp
    trunk/src/server/exchangemanager.h
    trunk/src/server/gem.cpp
    trunk/src/server/gem.h
    trunk/src/server/gmeventmanager.h
    trunk/src/server/groupmanager.h
    trunk/src/server/guildmanager.h
    trunk/src/server/introductionmanager.h
    trunk/src/server/minigamemanager.h
    trunk/src/server/msgmanager.h
    trunk/src/server/npcmanager.h
    trunk/src/server/progressionmanager.h
    trunk/src/server/psserverchar.h
    trunk/src/server/psserverdr.h
    trunk/src/server/questionmanager.h
    trunk/src/server/questmanager.h
    trunk/src/server/slotmanager.h
    trunk/src/server/spawnmanager.h
    trunk/src/server/spellmanager.h
    trunk/src/server/tutorialmanager.h
    trunk/src/server/usermanager.h
    trunk/src/server/workmanager.cpp
    trunk/src/server/workmanager.h

Modified: trunk/src/server/actionmanager.cpp
===================================================================
--- trunk/src/server/actionmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/actionmanager.cpp	2010-12-27 11:19:29 UTC (rev 6621)
@@ -136,11 +136,6 @@
     database = NULL;
 }
 
-void ActionManager::HandleMessage( MsgEntry *me, Client *client )
-{
-    // here for backwards compatibility.  no longer used
-}
-
 void ActionManager::HandleMapAction(MsgEntry *me, Client *client )
 {
     psMapActionMessage msg( me );

Modified: trunk/src/server/actionmanager.h
===================================================================
--- trunk/src/server/actionmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/actionmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -101,13 +101,6 @@
       */
     bool CacheActionLocation(psActionLocation* action);
 
-    /** Delegates MsgEntry to correct MessageHandler
-      *
-      * @param pMsg            The MsgEntry to crack.
-      * @param client      The client that sent the message.
-      */
-    void HandleMessage( MsgEntry *pMsg, Client *client );
-
     /** Processes psMapActionMessages
       *
       * @param msg            The message to process

Modified: trunk/src/server/adminmanager.h
===================================================================
--- trunk/src/server/adminmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/adminmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -83,8 +83,6 @@
     AdminManager();
     virtual ~AdminManager();
 
-	virtual void HandleMessage(MsgEntry *pMsg,Client *client) {};
-
     /** This is called when a player does /admin.
       * This builds up the list of commands that are available to the player
       * at their current GM rank. This commands allows player to check the commands

Modified: trunk/src/server/advicemanager.cpp
===================================================================
--- trunk/src/server/advicemanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/advicemanager.cpp	2010-12-27 11:19:29 UTC (rev 6621)
@@ -326,7 +326,7 @@
 
     database = db;
 
-    Subscribe(MSGTYPE_ADVICE,REQUIRE_READY_CLIENT);
+    Subscribe(&AdviceManager::HandleAdviceMessage,MSGTYPE_ADVICE,REQUIRE_READY_CLIENT);
 }
 
 AdviceManager::~AdviceManager()
@@ -336,7 +336,7 @@
 		delete iter.Next();
 }
 
-void AdviceManager::HandleMessage(MsgEntry *me,Client *client)
+void AdviceManager::HandleAdviceMessage(MsgEntry *me,Client *client)
 {
     psAdviceMessage msg(me);
     if (!msg.valid)

Modified: trunk/src/server/advicemanager.h
===================================================================
--- trunk/src/server/advicemanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/advicemanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -78,7 +78,7 @@
     AdviceManager(psDatabase *db);
     virtual ~AdviceManager();
 
-    virtual void HandleMessage(MsgEntry *pMsg,Client *client);
+    void HandleAdviceMessage(MsgEntry *pMsg,Client *client);
 
     /** Adds a new advisor available to answer questions.
       *

Modified: trunk/src/server/authentserver.h
===================================================================
--- trunk/src/server/authentserver.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/authentserver.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -85,14 +85,13 @@
      *     - MSGTYPE_AUTHENTICATE
      *     - MSGTYPE_DISCONNECT
      *     .
-     * When eithre of these messages appear on the message queue, the function
-     * HandleMessage() is called with the message as the argument. 
+     * When either of these messages appear on the message queue, the corresponding
+     * function is called with the message as the argument. 
      *
      * @param pCCS: Reference to the client connection set.
      * @param usermgr: Reference to the user manager.
      * @param netpersist: Reference to the network persistance manager.
      * @param gm: Reference to the guild manager.
-     * @see HandleMessage() , MsgHandler::Subscribe()
      */
     AuthenticationServer(ClientConnectionSet *pCCS,
                            UserManager *usermgr,
@@ -105,17 +104,6 @@
      */
     virtual ~AuthenticationServer();
 
-    /** Handles a subscribed message.
-     * This function handles the messages we subscribed to:
-     *     - MSGTYPE_AUTHENTICATE
-     *     - MSGTYPE_DISCONNECT
-     *     .
-     * For these two messages will check to see if it is a valid message, and
-     * then call the appropiate function of eithre: HandleAuthent() or
-     * HandleDisconnect() .
-     */
-    virtual void HandleMessage(MsgEntry *me,Client *client) {}
-
     /** Sends a disconnect message to the given client. 
      * This will send a disconnect to the given client. Before doing that it
      * makes sure that no other clients have a reference to it before removing
@@ -160,11 +148,10 @@
     bool CheckAuthenticationPreCondition(int clientnum, bool netversionok, const char* sUser);
     
     /** Handles an authenticate message from the message queue.
-     * This method recieves a authenticate message which is passed from the
-     * HandleMessage() method. uses the following steps to atuthenticate a
-     * client. Sends a psAuthMessageApproved message back to the client if it
-     * was successfully authenticated and adds the client to the current
-     * client list.
+     * This method recieves a authenticate message. Uses the following steps to
+     * authenticate a client. Sends a psAuthMessageApproved message back to the
+     * client if it was successfully authenticated and adds the client to the
+     * current client list.
      *
      * @param me: Is a message entry that contains the authenticate message.
      * @see psAuthMessageApproved 

Modified: trunk/src/server/bankmanager.h
===================================================================
--- trunk/src/server/bankmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/bankmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -38,7 +38,6 @@
     BankManager();
     ~BankManager();
     inline void StartBanking(Client* client, bool guild) { SendBankWindow(client, guild, true); }
-    void HandleMessage(MsgEntry *me, Client *client) { }
     void ProcessTax();
 
 protected:

Modified: trunk/src/server/chatmanager.h
===================================================================
--- trunk/src/server/chatmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/chatmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -74,7 +74,6 @@
     ChatManager();
     virtual ~ChatManager();
 
-    virtual void HandleMessage(MsgEntry *pMsg,Client *client) { }
     void HandleChatMessage (MsgEntry *me, Client *client);
     void HandleCacheMessage(MsgEntry *me, Client *client);
     void HandleChannelJoinMessage(MsgEntry *me, Client *client);

Modified: trunk/src/server/combatmanager.h
===================================================================
--- trunk/src/server/combatmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/combatmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -60,8 +60,6 @@
 
     virtual ~CombatManager();
 
-    void HandleMessage(MsgEntry *me, Client *client) { }
-
     /// This is how you start an attack sequence
     void AttackSomeone(gemActor *attacker, gemObject *target, Stance stance);
 

Modified: trunk/src/server/creationmanager.h
===================================================================
--- trunk/src/server/creationmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/creationmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -53,13 +53,7 @@
     /** Caches the data from the database needed for character creation.
      */
     bool Initialize();
-          
-    /** Handles incoming net messages.
-     * Have to add what messages it is subscribed to.
-     */    
-    virtual void HandleMessage(MsgEntry *pMsg,Client *client) { }
     
-    
     bool Validate( psCharUploadMessage& mesg, csString& errorMsg );
 
     /** Check to see a name is unique in the characters table.

Modified: trunk/src/server/economymanager.cpp
===================================================================
--- trunk/src/server/economymanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/economymanager.cpp	2010-12-27 11:19:29 UTC (rev 6621)
@@ -64,11 +64,11 @@
 
 EconomyManager::EconomyManager()
 {
-    Subscribe(MSGTYPE_BUY_EVENT, NO_VALIDATION);
-    Subscribe(MSGTYPE_SELL_EVENT, NO_VALIDATION);
-    Subscribe(MSGTYPE_PICKUP_EVENT, NO_VALIDATION);
-    Subscribe(MSGTYPE_DROP_EVENT, NO_VALIDATION);
-    Subscribe(MSGTYPE_LOOT_EVENT, NO_VALIDATION);
+    Subscribe(&EconomyManager::HandleBuyMessage,MSGTYPE_BUY_EVENT, NO_VALIDATION);
+    Subscribe(&EconomyManager::HandleSellMessage,MSGTYPE_SELL_EVENT, NO_VALIDATION);
+    Subscribe(&EconomyManager::HandlePickupMessage,MSGTYPE_PICKUP_EVENT, NO_VALIDATION);
+    Subscribe(&EconomyManager::HandleDropMessage,MSGTYPE_DROP_EVENT, NO_VALIDATION);
+    Subscribe(&EconomyManager::HandleLootMessage,MSGTYPE_LOOT_EVENT, NO_VALIDATION);
 
 };
 
@@ -124,48 +124,41 @@
 
 }
 
-void EconomyManager::HandleMessage(MsgEntry* me,Client* client)
+void EconomyManager::HandleBuyMessage(MsgEntry* me,Client* client)
 {
-    switch(me->GetType())
-    {
-        case MSGTYPE_BUY_EVENT:
-        {
-            psBuyEvent event(me);
-            AddTransaction(event.trans,false, "Buy");
-            economy.buyingValue += event.trans->price;
-            break;
-        }
-        case MSGTYPE_SELL_EVENT:
-        {
-            psSellEvent event(me);
-            AddTransaction(event.trans,true, "Sell");
-            economy.sellingValue += event.trans->price;
-            break;
-        }
-        case MSGTYPE_PICKUP_EVENT:
-        {
-            psPickupEvent event(me);
-            AddTransaction(event.trans,true, "Pickup");
-            economy.pickupsValue += event.trans->price;
-            break;
-        }
-        case MSGTYPE_DROP_EVENT:
-        {
-            psDropEvent event(me);
-            AddTransaction(event.trans,false, "Drop");
-            economy.droppedValue += event.trans->price;
-            break;
-        }
-        case MSGTYPE_LOOT_EVENT:
-        {
-            psLootEvent event(me);
-            AddTransaction(event.trans,true, "Loot");
-            economy.lootValue += event.trans->price;
-            break;
-        }
-    }
+    psBuyEvent event(me);
+    AddTransaction(event.trans,false, "Buy");
+    economy.buyingValue += event.trans->price;
 }
 
+void EconomyManager::HandleSellMessage(MsgEntry* me,Client* client)
+{
+    psSellEvent event(me);
+    AddTransaction(event.trans,true, "Sell");
+    economy.sellingValue += event.trans->price;
+}
+
+void EconomyManager::HandlePickupMessage(MsgEntry* me,Client* client)
+{
+    psPickupEvent event(me);
+    AddTransaction(event.trans,true, "Pickup");
+    economy.pickupsValue += event.trans->price;
+}
+
+void EconomyManager::HandleDropMessage(MsgEntry* me,Client* client)
+{
+    psDropEvent event(me);
+    AddTransaction(event.trans,false, "Drop");
+    economy.droppedValue += event.trans->price;
+}
+
+void EconomyManager::HandleLootMessage(MsgEntry* me,Client* client)
+{
+    psLootEvent event(me);
+    AddTransaction(event.trans,true, "Loot");
+    economy.lootValue += event.trans->price;
+}
+
 TransactionEntity* EconomyManager::GetTransaction(int id)
 {
     if((size_t)id > history.GetSize() || id < 0)

Modified: trunk/src/server/economymanager.h
===================================================================
--- trunk/src/server/economymanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/economymanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -77,7 +77,11 @@
     EconomyManager();
     ~EconomyManager();
 
-    void HandleMessage(MsgEntry *me,Client *client);
+    void HandleBuyMessage(MsgEntry *me,Client *client);
+    void HandleSellMessage(MsgEntry *me,Client *client);
+    void HandlePickupMessage(MsgEntry *me,Client *client);
+    void HandleDropMessage(MsgEntry *me,Client *client);
+    void HandleLootMessage(MsgEntry *me,Client *client);
 
     void AddTransaction(TransactionEntity* trans,bool sell, const char* type);
 

Modified: trunk/src/server/entitymanager.h
===================================================================
--- trunk/src/server/entitymanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/entitymanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -124,8 +124,6 @@
                              psCharacter*  owner,
                              bool          transient);
 
-    virtual void HandleMessage(MsgEntry* me,Client *client) {};
-
     bool RemoveActor(gemObject *actor);
 
     bool AddRideRelation(gemActor *rider, gemActor *mount);

Modified: trunk/src/server/exchangemanager.cpp
===================================================================
--- trunk/src/server/exchangemanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/exchangemanager.cpp	2010-12-27 11:19:29 UTC (rev 6621)
@@ -1654,13 +1654,6 @@
     }
 }
 
-void ExchangeManager::HandleMessage(MsgEntry *me,Client *client)
-{
-    // not used anymore
-}
-
-
-
 Exchange * ExchangeManager::GetExchange(int id)
 {
     // TODO:  Make this a hashmap

Modified: trunk/src/server/exchangemanager.h
===================================================================
--- trunk/src/server/exchangemanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/exchangemanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -344,7 +344,6 @@
 
     void StartExchange( Client* client, bool withPlayer, bool automaticExchange = false );
 
-    virtual void HandleMessage(MsgEntry *pMsg,Client *client);
     void HandleExchangeRequest(MsgEntry *me,Client *client);
     void HandleExchangeAccept (MsgEntry *me,Client *client);
     void HandleExchangeEnd    (MsgEntry *me,Client *client);

Modified: trunk/src/server/gem.cpp
===================================================================
--- trunk/src/server/gem.cpp	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/gem.cpp	2010-12-27 11:19:29 UTC (rev 6621)
@@ -140,9 +140,9 @@
     // 90000 enties another scope should be added to cel
     nextEID = 10000;
 
-    Subscribe(MSGTYPE_DAMAGE_EVENT,NO_VALIDATION);
-    Subscribe(MSGTYPE_STATDRUPDATE, REQUIRE_READY_CLIENT );
-    Subscribe(MSGTYPE_STATS, REQUIRE_READY_CLIENT);
+    Subscribe(&GEMSupervisor::HandleDamageMessage,MSGTYPE_DAMAGE_EVENT,NO_VALIDATION);
+    Subscribe(&GEMSupervisor::HandleStatDRUpdateMessage,MSGTYPE_STATDRUPDATE, REQUIRE_READY_CLIENT );
+    Subscribe(&GEMSupervisor::HandleStatsMessage,MSGTYPE_STATS, REQUIRE_READY_CLIENT);
 
     engine = csQueryRegistry<iEngine> (psserver->GetObjectReg());
 }
@@ -165,42 +165,35 @@
     }
 }
 
-void GEMSupervisor::HandleMessage(MsgEntry *me,Client *client)
+void GEMSupervisor::HandleStatsMessage(MsgEntry *me,Client *client)
 {
-    switch ( me->GetType() )
+    if(!client->GetActor())
     {
-        case MSGTYPE_STATS:
-        {
-            if(!client->GetActor())
-             return;
-            psCharacter* psChar = client->GetActor()->GetCharacterData();
+        return;
+    }
+    psCharacter* psChar = client->GetActor()->GetCharacterData();
 
-            psStatsMessage msg(client->GetClientNum(),
-                               psChar->GetMaxHP().Current(),
-                               psChar->GetMaxMana().Current(),
-                               psChar->Inventory().MaxWeight(),
-                               psChar->Inventory().GetCurrentMaxSpace() );
+    psStatsMessage msg(client->GetClientNum(),
+                       psChar->GetMaxHP().Current(),
+                       psChar->GetMaxMana().Current(),
+                       psChar->Inventory().MaxWeight(),
+                       psChar->Inventory().GetCurrentMaxSpace() );
 
-            msg.SendMessage();
-            break;
-        }
+    msg.SendMessage();
+}
 
-        case MSGTYPE_DAMAGE_EVENT:
-        {
-            psDamageEvent evt(me);
-            evt.target->BroadcastTargetStatDR(entityManager->GetClients());
-            break;
-        }
+void GEMSupervisor::HandleDamageMessage(MsgEntry *me,Client *client)
+{
+    psDamageEvent evt(me);
+    evt.target->BroadcastTargetStatDR(entityManager->GetClients());
+}
 
-        case MSGTYPE_STATDRUPDATE:
-        {
-            gemActor *actor = client->GetActor();
-            psCharacter *psChar = actor->GetCharacterData();
+void GEMSupervisor::HandleStatDRUpdateMessage(MsgEntry *me,Client *client)
+{
+    gemActor *actor = client->GetActor();
+    psCharacter *psChar = actor->GetCharacterData();
 
-            psChar->SendStatDRMessage(client->GetClientNum(), actor->GetEID(), DIRTY_VITAL_ALL);
-            break;
-        }
-    }
+    psChar->SendStatDRMessage(client->GetClientNum(), actor->GetEID(), DIRTY_VITAL_ALL);
 }
 
 EID GEMSupervisor::GetNextID()

Modified: trunk/src/server/gem.h
===================================================================
--- trunk/src/server/gem.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/gem.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -213,9 +213,10 @@
      */
     void Teleport( gemObject* object, float x, float y, float z, float rot, const char* sectorname );
 
-    void HandleMessage(MsgEntry *me, Client *client);
+    void HandleStatsMessage(MsgEntry *me, Client *client);
+    void HandleDamageMessage(MsgEntry *me, Client *client);
+    void HandleStatDRUpdateMessage(MsgEntry *me, Client *client);
 
-
    /** @brief Attach a server gemObject to a Crystal Space object.
      *
      * In most cases this will be a mesh wrapper.

Modified: trunk/src/server/gmeventmanager.h
===================================================================
--- trunk/src/server/gmeventmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/gmeventmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -173,8 +173,6 @@
                                           csString& name,
                                           csString& description);
 
-     virtual void HandleMessage(MsgEntry *me, Client *client) { };
-     
      /// handle message from client
      virtual void HandleGMEventCommand(MsgEntry *me, Client *client);
 

Modified: trunk/src/server/groupmanager.h
===================================================================
--- trunk/src/server/groupmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/groupmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -60,7 +60,6 @@
     GroupManager(ClientConnectionSet *pCCS, ChatManager *chat);
     virtual ~GroupManager();
 
-    virtual void HandleMessage(MsgEntry *pMsg,Client *client) { }
     void HandleJoinGroup(PendingGroupInvite *invite);
     
     /** Handles the answer to the request of challenge.

Modified: trunk/src/server/guildmanager.h
===================================================================
--- trunk/src/server/guildmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/guildmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -66,8 +66,6 @@
     GuildManager(ClientConnectionSet *pCCS, ChatManager *chat);
     virtual ~GuildManager();
 
-    virtual void HandleMessage(MsgEntry *pMsg,Client *client) { };
-
     void HandleJoinGuild(PendingGuildInvite *invite);
     void AcceptWar(PendingGuildWarInvite *invite);
 

Modified: trunk/src/server/introductionmanager.h
===================================================================
--- trunk/src/server/introductionmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/introductionmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -40,8 +40,6 @@
     IntroductionManager();
     ~IntroductionManager();
 
-    virtual void HandleMessage(MsgEntry *pMsg,Client *client) { }
-
 protected:
     void HandleIntroduction(MsgEntry *pMsg,Client *client);
 };

Modified: trunk/src/server/minigamemanager.h
===================================================================
--- trunk/src/server/minigamemanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/minigamemanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -239,9 +239,6 @@
 
     ~MiniGameManager();
 
-    /// Handles message from client.
-    virtual void HandleMessage(MsgEntry *me, Client *client) { }
-    
     /// returns session by its id.
     psMiniGameSession *GetSessionByID(uint32_t id);
 

Modified: trunk/src/server/msgmanager.h
===================================================================
--- trunk/src/server/msgmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/msgmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -102,24 +102,6 @@
             UnsubscribeAll();
         }
 
-        /** @brief Subscribes this manager to a specific message type
-         *
-         * Any time a message with the specified type (and flags are met) is
-         * received \ref SubClass::HandleMessage(MsgEntry *me, Client *client)
-         * is called.
-         * @param type The type of message to be notified of
-         * @param flags Optional flags to check <i>Default: 0x01</i>
-         */
-        inline void Subscribe(msgtype type, uint32_t flags = 0x01)
-        {
-            CS::Threading::RecursiveMutexScopedLock lock(mutex);
-            if(!handlers.Contains(type))
-            {
-                GetEventManager()->Subscribe(this, type, flags);
-            }
-            handlers.Put(type, &SubClass::HandleMessage);
-        }
-
         /** @brief Subscribes this manager to a specific message type with a custom callback
          *
          * Any time a message with the specified type (and flags are met) is
@@ -191,6 +173,12 @@
             return GetEventManager()->UnsubscribeAll(this);
         }
         
+        /** @brief Transfers the message to the manager specific function
+         *
+         * @note DO NOT OVERRIDE
+         * @param msg Message that is forwarded to the manager's function
+         * @param client Client that is forwarded to the manager's function
+         */
         void HandleMessage(MsgEntry* msg, Client* client)
         {
             csArray<FunctionPointer> msgHandlers;

Modified: trunk/src/server/npcmanager.h
===================================================================
--- trunk/src/server/npcmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/npcmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -66,9 +66,6 @@
     /// Initialize the npc manager.
     bool Initialize();
 
-    /// Handle incoming messages from the superclients.
-    virtual void HandleMessage(MsgEntry *pMsg,Client *client) { }
-
     /// Send a list of managed NPCs to a newly connecting superclient.
     void SendNPCList(Client *client);
 

Modified: trunk/src/server/progressionmanager.h
===================================================================
--- trunk/src/server/progressionmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/progressionmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -50,8 +50,6 @@
 
     virtual ~ProgressionManager();
 
-    virtual void HandleMessage(MsgEntry *pMsg,Client *client)  {}
-    
     /** Send the skill list to the client. 
       * @param client The client that the message is for.
       * @param forceOpen  If true it will force open the skills screen on the client.

Modified: trunk/src/server/psserverchar.h
===================================================================
--- trunk/src/server/psserverchar.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/psserverchar.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -64,9 +64,6 @@
 
     bool Initialize();
 
-    virtual void HandleMessage( MsgEntry *me, Client *client ) { };
-
-
     /// Sends the client an inventory
     virtual bool SendInventory( int clientNum, bool sendUpdatesOnly=true );
 

Modified: trunk/src/server/psserverdr.h
===================================================================
--- trunk/src/server/psserverdr.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/psserverdr.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -49,8 +49,6 @@
 
     void SendPersist();
 
-    virtual void HandleMessage(MsgEntry* me,Client *client) {}
-
 protected:
 
     void HandleDeadReckoning(MsgEntry* me,Client *client);

Modified: trunk/src/server/questionmanager.h
===================================================================
--- trunk/src/server/questionmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/questionmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -106,8 +106,6 @@
     QuestionManager();
     virtual ~QuestionManager();
 
-    virtual void HandleMessage(MsgEntry *pMsg,Client *client) { }
-
     /** Sends a question to a client */
     void SendQuestion(PendingQuestion *question);
     

Modified: trunk/src/server/questmanager.h
===================================================================
--- trunk/src/server/questmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/questmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -151,8 +151,6 @@
 
     bool Initialize();
 
-    virtual void HandleMessage(MsgEntry *pMsg,Client *client) { }
-
     void Assign(psQuest *quest, Client *who, gemNPC *assigner,csTicks timeDelay=0);
     bool Complete(psQuest *quest, Client *who, csTicks timeDelay = 0);
 

Modified: trunk/src/server/slotmanager.h
===================================================================
--- trunk/src/server/slotmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/slotmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -51,8 +51,6 @@
 
     bool Initialize();
 
-    virtual void HandleMessage(MsgEntry *me, Client *client) { }
-
     psItem* FindItem(Client* client, int containerID, INVENTORY_SLOT_NUMBER slotID);
 
     gemContainer *worldContainer;   ///< Working world GEM container we are using.

Modified: trunk/src/server/spawnmanager.h
===================================================================
--- trunk/src/server/spawnmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/spawnmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -300,11 +300,6 @@
     void RepopulateLive(psSectorInfo *sectorinfo = 0);
 
     /**
-     * This function receives inbound net messages from the client.
-     */
-    void HandleMessage(MsgEntry *me,Client *client) { };
-
-    /**
      * Respawn a NPC given by playerID and find the position
      * from the spawnRule.
      */

Modified: trunk/src/server/spellmanager.h
===================================================================
--- trunk/src/server/spellmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/spellmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -55,14 +55,6 @@
                    CacheManager *cachemanager);
     virtual ~SpellManager();
     
-    /** Handles a network message.  
-      * This is a factory for the different types of message that the manager handles.
-      *
-      * @param me The message entry incoming.
-      * @param client The client that this message came from.
-      */
-    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 
       *  with the new purified glyph.

Modified: trunk/src/server/tutorialmanager.h
===================================================================
--- trunk/src/server/tutorialmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/tutorialmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -62,8 +62,6 @@
     TutorialManager(ClientConnectionSet *pCCS);
     virtual ~TutorialManager();
 
-    virtual void HandleMessage(MsgEntry *pMsg,Client *client) { }
-
 protected:
     /// Specifically handle the Connect event in the tutorial
     void HandleConnect(MsgEntry *pMsg,Client *client);

Modified: trunk/src/server/usermanager.h
===================================================================
--- trunk/src/server/usermanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/usermanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -58,8 +58,6 @@
     
     virtual bool Initialize(GEMSupervisor* gemsupervisor) {gem = gemsupervisor; return true; }
 
-    virtual void HandleMessage(MsgEntry *pMsg,Client *client) { }
-
     /** @brief Send a notification to all clients on a person buddy list if they log on/off.
      *
      *  This does a database hit.

Modified: trunk/src/server/workmanager.cpp
===================================================================
--- trunk/src/server/workmanager.cpp	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/workmanager.cpp	2010-12-27 11:19:29 UTC (rev 6621)
@@ -995,9 +995,9 @@
 *    StartAutoWork - Item moved into container: SlotManager::MoveFromInventory()
 *                  - Item stack split in container: SlotManager::MoveFromWorldContainer()
 *    HandleUse - Client issues /use command from buttons: gemActiveObject::SendBehaviorMessage()
-*              - Workmanager gets /use message: WorkManager::HandleMessage()
+*              - Workmanager gets /use message: WorkManager::HandleWorkCommand()
 *    HandleCombine - Client issues /combine command from buttons: gemActiveObject::SendBehaviorMessage()
-*                  - Workmanager gets /combine message: WorkManager::HandleMessage()
+*                  - Workmanager gets /combine message: WorkManager::HandleWorkCommand()
 *    HandleWorkEvent - Work event triggers: psWorkGameEvent::Trigger()
 *    StopWork - Items removed from containers: SlotManager::MoveFromWorldContainer();
 *

Modified: trunk/src/server/workmanager.h
===================================================================
--- trunk/src/server/workmanager.h	2010-12-26 17:20:35 UTC (rev 6620)
+++ trunk/src/server/workmanager.h	2010-12-27 11:19:29 UTC (rev 6621)
@@ -158,8 +158,6 @@
     WorkManager(CacheManager* cachemanager, EntityManager* entitymanager);
     virtual ~WorkManager();
 
-    virtual void HandleMessage(MsgEntry *me, Client *client)  { }
-
 //-----------------------------------------------------------------------------
 // Entry points
 //-----------------------------------------------------------------------------


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6619
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6619&view=rev
Author:   weltall2
Date:     2010-12-26 15:53:17 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
restored code which went missing

Modified Paths:
--------------
    trunk/src/server/adminmanager.cpp

Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp	2010-12-26 15:49:09 UTC (rev 6618)
+++ trunk/src/server/adminmanager.cpp	2010-12-26 15:53:17 UTC (rev 6619)
@@ -6241,7 +6241,7 @@
     {
         unsigned id = result[i].GetUInt32(0);
         psItemStats* item = psserver->GetCacheManager()->GetBasicItemStatsByID(id);
-        if(item && !item->IsMoney())
+        if(item && !item->IsMoney() && item->IsSpawnable())
         {
             csString name(item->GetName());
             csString mesh(item->GetMeshName());
@@ -6326,11 +6326,11 @@
         return;
     }
 
-    /*if(!stats->IsSpawnable())
+    if(!stats->IsSpawnable())
     {
         psserver->SendSystemError(me->clientnum, "This item cannot be spawned!");
         return;
-    }*/
+    }
 
     psItem* item = stats->InstantiateBasicItem();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6612
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6612&view=rev
Author:   weltall2
Date:     2010-12-26 11:24:30 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
fixed event variable name

Modified Paths:
--------------
    trunk/src/common/paws/pawsmanager.cpp

Modified: trunk/src/common/paws/pawsmanager.cpp
===================================================================
--- trunk/src/common/paws/pawsmanager.cpp	2010-12-26 11:23:51 UTC (rev 6611)
+++ trunk/src/common/paws/pawsmanager.cpp	2010-12-26 11:24:30 UTC (rev 6612)
@@ -317,7 +317,7 @@
     }    
 
 #if defined(CS_PLATFORM_UNIX) && defined(INCLUDE_CLIPBOARD)
-    if (ev.Name == SelectionNotifyEvent)
+    if (event.Name == SelectionNotifyEvent)
     {
       return HandleSelectionNotify (event);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6616
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6616&view=rev
Author:   rlydontknow
Date:     2010-12-26 15:15:07 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
forbid copy-construction as it won't work
made sure "environment" is always defined in the env itself and doesn't change the parent's value
moved environment setting code to an Init function and use that in both constructors

Modified Paths:
--------------
    trunk/src/common/util/mathscript.cpp
    trunk/src/common/util/mathscript.h

Modified: trunk/src/common/util/mathscript.cpp
===================================================================
--- trunk/src/common/util/mathscript.cpp	2010-12-26 15:13:51 UTC (rev 6615)
+++ trunk/src/common/util/mathscript.cpp	2010-12-26 15:15:07 UTC (rev 6616)
@@ -129,6 +129,20 @@
 
 //----------------------------------------------------------------------------
 
+void MathEnvironment::Init()
+{
+    // always define the environment as variable
+    // as that's required to pass the environment to scriptable
+    // objects in custom compound functions
+    MathScriptEngine::IDConverter converter;
+    converter.p = (uintptr_t)this;
+
+    // don't use Define here as it'd check the parent
+    MathVar* env = new MathVar(this);
+    env->SetValue(converter.value);
+    variables.Put("environment", env);
+}
+
 MathEnvironment::~MathEnvironment()
 {
     csHash<MathVar*, csString>::GlobalIterator it(variables.GetIterator());

Modified: trunk/src/common/util/mathscript.h
===================================================================
--- trunk/src/common/util/mathscript.h	2010-12-26 15:13:51 UTC (rev 6615)
+++ trunk/src/common/util/mathscript.h	2010-12-26 15:15:07 UTC (rev 6616)
@@ -177,24 +177,19 @@
     const MathEnvironment *parent;
     csHash<MathVar*, csString> variables;
 
+    void Init();
+
+    // environments mustn't be copy-constructed
+    MathEnvironment(const MathEnvironment&);
+
 public:
     MathEnvironment() : UID(new uint32),parent(NULL)
     {
-        // always define the environment as variable
-        // as that's required to pass the environment to scriptable
-        // objects in custom compound functions
-        MathScriptEngine::IDConverter converter;
-        converter.p = (uintptr_t)this;
-        Define("environment", converter.value);
+        Init();
     }
     MathEnvironment(const MathEnvironment *parent) : UID(parent->UID),parent(parent)
     {
-        // always define the environment as variable
-        // as that's required to pass the environment to scriptable
-        // objects in custom compound functions
-        MathScriptEngine::IDConverter converter;
-        converter.p = (uintptr_t)this;
-        Define("environment", converter.value);
+        Init();
     }
     ~MathEnvironment();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6606
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6606&view=rev
Author:   rlydontknow
Date:     2010-12-26 03:02:53 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
indention fixes

Modified Paths:
--------------
    trunk/src/common/paws/pawsscript.cpp

Modified: trunk/src/common/paws/pawsscript.cpp
===================================================================
--- trunk/src/common/paws/pawsscript.cpp	2010-12-26 02:58:23 UTC (rev 6605)
+++ trunk/src/common/paws/pawsscript.cpp	2010-12-26 03:02:53 UTC (rev 6606)
@@ -74,14 +74,14 @@
 
 pawsWidget * pawsScript::FindWidget(pawsWidget * widget, const char * name)
 {
-	// a better FindWidget that will go back up the parents to really try and find the thing
-	pawsWidget * ret = 0;
-	while (!ret && widget)
-	{
-		ret = widget->FindWidget(name, false);
-		widget = widget->GetParent();
-	}
-	return ret;
+    // a better FindWidget that will go back up the parents to really try and find the thing
+    pawsWidget * ret = 0;
+    while (!ret && widget)
+    {
+        ret = widget->FindWidget(name, false);
+        widget = widget->GetParent();
+    }
+    return ret;
 }
 
 bool pawsScript::Parse(const char * script)
@@ -158,10 +158,10 @@
             if (!isExtraVar)
             {
                 pawsWidget * dep;
-				if (tokens[a-1] == "Me" || tokens[a-1] == "me")
-					dep = widget;
-				else
-					dep = FindWidget(widget, tokens[a-1]);
+                if (tokens[a-1] == "Me" || tokens[a-1] == "me")
+                    dep = widget;
+                else
+                    dep = FindWidget(widget, tokens[a-1]);
                 if (!dep)
                 {
                     Error2("pawsWidget '%s' referenced in a PAWS Script could not be found\n", tokens[a-1].GetData());
@@ -202,27 +202,27 @@
         }
         else if (tokens[a] == ';')
         {
-			if (!onRHS)
-			{ // if we didn't get a rhs then we might have something like 'widget:Blah()', so try to resolve the widget name
-				for (size_t b=a-1; b>0 && tokens[b] != ';'; --b)
-				{
-					if (tokens[b] == ':')
-					{
-						pawsWidget * w;
-						if (tokens[b-1] == "Me" || tokens[b-1] == "me")
-							w = widget;
-						else
-							w = FindWidget(widget, tokens[b-1]);
-						if (w)
-						{
-							tokens[b-1] = "W";
-							tokens[b-1] += (unsigned int)rhsDependencies.GetSize();
-							rhsDependencies.Push(w);
-						}
-						break;
-					}
-				}
-			}
+            if (!onRHS)
+            { // if we didn't get a rhs then we might have something like 'widget:Blah()', so try to resolve the widget name
+                for (size_t b=a-1; b>0 && tokens[b] != ';'; --b)
+                {
+                    if (tokens[b] == ':')
+                    {
+                        pawsWidget * w;
+                        if (tokens[b-1] == "Me" || tokens[b-1] == "me")
+                            w = widget;
+                        else
+                            w = FindWidget(widget, tokens[b-1]);
+                        if (w)
+                        {
+                            tokens[b-1] = "W";
+                            tokens[b-1] += (unsigned int)rhsDependencies.GetSize();
+                            rhsDependencies.Push(w);
+                        }
+                        break;
+                    }
+                }
+            }
 
             onRHS = false;
             startToken = a+1;
@@ -254,8 +254,8 @@
 pawsScript::pawsScript(pawsWidget * widget, const char * script)
           : widget(widget)
 {
-	statement = 0;
-	scriptText = script;
+    statement = 0;
+    scriptText = script;
 }
 
 pawsScript::~pawsScript()
@@ -265,12 +265,12 @@
 
 void pawsScript::Execute()
 {
-	if (!scriptText.IsEmpty())
-	{
-		Parse(scriptText);
-		scriptText.Clear();
-	}
+    if (!scriptText.IsEmpty())
+    {
+        Parse(scriptText);
+        scriptText.Clear();
+    }
 
-	if (statement)
-		statement->Execute();
+    if (statement)
+        statement->Execute();
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6614
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6614&view=rev
Author:   weltall2
Date:     2010-12-26 12:01:28 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
added header entries

Modified Paths:
--------------
    trunk/src/common/paws/pawstextbox.h

Modified: trunk/src/common/paws/pawstextbox.h
===================================================================
--- trunk/src/common/paws/pawstextbox.h	2010-12-26 12:00:14 UTC (rev 6613)
+++ trunk/src/common/paws/pawstextbox.h	2010-12-26 12:01:28 UTC (rev 6614)
@@ -565,6 +565,11 @@
     virtual void OnResize();
     virtual bool OnMouseUp( int button, int modifiers, int x, int y );
     virtual bool OnMouseDown( int button, int modifiers, int x, int y );
+    /** Called as a callback to a request for clipboard content if avaliabe.
+     *
+     * @note Only implemented for unix
+     */
+    virtual bool OnClipboard( const csString& content );
     virtual void OnUpdateData(const char *dataname,PAWSData& data);
     virtual bool OnKeyDown( utf32_char code, utf32_char key, int modifiers );
     virtual void CalcMouseClick( int x, int y, size_t &cursorLine, size_t &cursorChar);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6613
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6613&view=rev
Author:   weltall2
Date:     2010-12-26 12:00:14 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
added clipboard support to multilinedittextbox

Modified Paths:
--------------
    trunk/src/common/paws/pawstextwrap.cpp

Modified: trunk/src/common/paws/pawstextwrap.cpp
===================================================================
--- trunk/src/common/paws/pawstextwrap.cpp	2010-12-26 11:24:30 UTC (rev 6612)
+++ trunk/src/common/paws/pawstextwrap.cpp	2010-12-26 12:00:14 UTC (rev 6613)
@@ -295,9 +295,63 @@
             vScrollBar->SetCurrentValue(vScrollBar->GetCurrentValue() + EDIT_TEXTBOX_MOUSE_SCROLL_AMOUNT);
         return true;
     } 
-    return pawsWidget::OnMouseDown(button, modifiers, x ,y);
+
+
+
+#if defined(CS_PLATFORM_UNIX) && defined(INCLUDE_CLIPBOARD)
+    if (button == csmbMiddle)
+    {
+        // Only included for platforms using Middle button to past.
+
+        // Request Clipboard. Reuslt will be available in OnClipboard
+        PawsManager::GetSingleton().RequestClipboardContent();
+
+        return true;
+    }
+#endif
+
+
+    return pawsWidget::OnMouseDown( button, modifiers, x ,y);
 }
 
+bool pawsMultilineEditTextBox::OnClipboard( const csString& content )
+{
+    printf("Received from clipboard: %s\n", content.GetDataSafe());
+
+    size_t position = GetCursorPosition(cursorLine, cursorLoc);
+    if ( position >= text.Length() )
+    {
+        text.Append( content );
+    }
+    else
+    {
+        text.Insert( position, content );
+    }
+    
+    if(maxLen)
+        text.Truncate( maxLen );
+    position += content.Length();
+
+    LayoutText();
+
+    GetCursorLocation(position, cursorLine, cursorLoc);
+    if(cursorLine >= topLine + canDrawLines)
+        topLine = cursorLine - canDrawLines + 1;
+    else if(cursorLine < topLine)
+        topLine = cursorLine;
+    SetupScrollBar();
+
+
+    if (subscribedVar)
+    {
+        PawsManager::GetSingleton().Publish(subscribedVar, text);
+    }
+
+    parent->OnChange(this);
+
+    return true;
+}
+
 bool pawsMultilineEditTextBox::OnMouseUp(int button, int modifiers, int x, int y)
 {
     if(button == csmbLeft)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6611
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6611&view=rev
Author:   weltall2
Date:     2010-12-26 11:23:51 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
added an additional variable for the script

Modified Paths:
--------------
    trunk/src/server/workmanager.cpp

Modified: trunk/src/server/workmanager.cpp
===================================================================
--- trunk/src/server/workmanager.cpp	2010-12-26 11:23:14 UTC (rev 6610)
+++ trunk/src/server/workmanager.cpp	2010-12-26 11:23:51 UTC (rev 6611)
@@ -3548,6 +3548,7 @@
         env.Define("Worker", worker);
         env.Define("Process", process);
         env.Define("Secure", secure);
+        env.Define("AmountModifier", amountModifier);
         calc_transform_apply_skill->Evaluate(&env);
         currentQuality = env.Lookup("Quality")->GetValue();
         return (currentQuality == 0);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6610
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6610&view=rev
Author:   weltall2
Date:     2010-12-26 11:23:14 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
updated string list

Modified Paths:
--------------
    trunk/lang/italian/stringtable.xml

Modified: trunk/lang/italian/stringtable.xml
===================================================================
--- trunk/lang/italian/stringtable.xml	2010-12-26 09:34:38 UTC (rev 6609)
+++ trunk/lang/italian/stringtable.xml	2010-12-26 11:23:14 UTC (rev 6610)
@@ -168,6 +168,7 @@
   <item orig="Prev" trans="Prec" />
   <item orig="No Petitions" trans="Nessuna Petizione" />
   <item orig="Requesting connection" trans="Richiesta connessione" />
+  <item orig="Lastname:" trans="" />
   <item orig="Guild Alignment" trans="Allineamento Gilda" />
   <item orig="Prv notes" trans="" />
   <item orig="Marriage" trans="" />
@@ -246,6 +247,7 @@
   <item orig="Filter" trans="" />
   <item orig="New" trans="Nuovo" />
   <item orig="Mute sounds on focus loss" trans="" />
+  <item orig="Firstname:" trans="" />
   <item orig="Exchange all items" trans="" />
   <item orig="Add Linked" trans="Aggiungi collegato" />
   <item orig="keyboard" trans="Tastiera" />
@@ -674,6 +676,7 @@
   <item orig="Main chat brackets" trans="" />
   <item orig="Assemble Slot" trans="" />
   <item orig="set givekillexp" trans="" />
+  <item orig="Add Petition" trans="" />
   <item orig="You can not ignore yourself." trans="Non puoi ignorare te stesso.." />
   <item orig="Members" trans="Membri" />
   <item orig="Shout text colour" trans="" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6609
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6609&view=rev
Author:   weltall2
Date:     2010-12-26 09:34:38 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
removed csNaN reimplementation as CS:IsNaN uses bitwise checking for nan

Modified Paths:
--------------
    trunk/src/server/bulkobjects/psitem.cpp

Modified: trunk/src/server/bulkobjects/psitem.cpp
===================================================================
--- trunk/src/server/bulkobjects/psitem.cpp	2010-12-26 09:33:33 UTC (rev 6608)
+++ trunk/src/server/bulkobjects/psitem.cpp	2010-12-26 09:34:38 UTC (rev 6609)
@@ -70,9 +70,6 @@
 #include <csutil/callstack.h>
 #endif
 
-//temporary hack as csNaN,isnan etc seems to not be behaving correctly.
-#define csNaN(x) ((*(int*)&x & 0x7FC00000) == 0x7FC00000)
-
 /**
  * This class handles auto-removal of transient objects
  * (objects placed in the world by players, basically).
@@ -1783,7 +1780,7 @@
 float psItem::GetLatency()
 {
     //we have a modification overlay?
-    if(itemModifiers->active && !csNaN(itemModifiers->latency))
+    if(itemModifiers->active && !CS::IsNaN(itemModifiers->latency))
         return itemModifiers->latency;
     return current_stats->Weapon().Latency();
 }
@@ -1792,7 +1789,7 @@
 float psItem::GetDamage(PSITEMSTATS_DAMAGETYPE dmgtype)
 {
     //we have a modification overlay?
-    if(itemModifiers->active && !csNaN(itemModifiers->damageStats[dmgtype]))
+    if(itemModifiers->active && !CS::IsNaN(itemModifiers->damageStats[dmgtype]))
         return itemModifiers->damageStats[dmgtype];
     return current_stats->Weapon().Damage(dmgtype);
 }
@@ -1836,7 +1833,7 @@
     {
         useNat = false;
         //we have a modification overlay?
-        if(itemModifiers->active && !csNaN(itemModifiers->damageStats[dmgtype]))
+        if(itemModifiers->active && !CS::IsNaN(itemModifiers->damageStats[dmgtype]))
             return itemModifiers->damageStats[dmgtype];
         return current_stats->Armor().Protection(dmgtype);
     }
@@ -1872,7 +1869,7 @@
 float psItem::GetWeight()
 {
     //we have a modification overlay?
-    if(itemModifiers->active && !csNaN(itemModifiers->weight))
+    if(itemModifiers->active && !CS::IsNaN(itemModifiers->weight))
         return (itemModifiers->weight * GetStackCount());
     return (current_stats->GetWeight() * GetStackCount());
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6608
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6608&view=rev
Author:   weltall2
Date:     2010-12-26 09:33:33 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
added some default values

Modified Paths:
--------------
    trunk/src/server/scripting.cpp

Modified: trunk/src/server/scripting.cpp
===================================================================
--- trunk/src/server/scripting.cpp	2010-12-26 08:50:01 UTC (rev 6607)
+++ trunk/src/server/scripting.cpp	2010-12-26 09:33:33 UTC (rev 6608)
@@ -2154,8 +2154,8 @@
 
         //loads data about the randomization status of the item.
         randomize = node->GetAttributeValueAsBool("randomize");
-        randomCost = node->GetAttributeValueAsInt("randomcost");
-        randomLevel = node->GetAttributeValueAsInt("randomlevel");
+        randomCost = node->GetAttributeValueAsInt("randomcost", 1000);
+        randomLevel = node->GetAttributeValueAsInt("randomlevel", 3);
 
         return !name.IsEmpty() && count && Imperative1::Load(node);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6607
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6607&view=rev
Author:   weltall2
Date:     2010-12-26 08:50:01 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
bumping cs as compatibility was broken with the previous version

Modified Paths:
--------------
    trunk/docs/compiling.html

Modified: trunk/docs/compiling.html
===================================================================
--- trunk/docs/compiling.html	2010-12-26 03:02:53 UTC (rev 6606)
+++ trunk/docs/compiling.html	2010-12-26 08:50:01 UTC (rev 6607)
@@ -12,7 +12,7 @@
     // Source versions are listed here and automatically updated in the body.
     // Standard revisions (CSrev) are the ones that are compatible with Laanx.
     // An additional CS revision (CSrev_HEAD) may be specified for the latest version of PS.
-    var CSrev = "35203";  // CS_SOURCE_REV
+    var CSrev = "35550";  // CS_SOURCE_REV
     var CAL3Drev = "507"; // CAL3D_SOURCE_REV
     var CSrev_HEAD = "HEAD";  // CS_SOURCE_REV_HEAD
     var CAL3Drev_HEAD = "507"; // CAL3D_SOURCE_REV_HEAD


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6605
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6605&view=rev
Author:   rlydontknow
Date:     2010-12-26 02:58:23 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
another indention fix

Modified Paths:
--------------
    trunk/src/common/paws/pawsscript.h

Modified: trunk/src/common/paws/pawsscript.h
===================================================================
--- trunk/src/common/paws/pawsscript.h	2010-12-26 02:58:04 UTC (rev 6604)
+++ trunk/src/common/paws/pawsscript.h	2010-12-26 02:58:23 UTC (rev 6605)
@@ -58,7 +58,7 @@
     bool NextChar(const char * script, size_t & currIndex, char & c, char & n);
     bool Parse(const char * script);
 
-	pawsWidget * FindWidget(pawsWidget * widget, const char * name);
+    pawsWidget * FindWidget(pawsWidget * widget, const char * name);
 public:
     pawsScript(pawsWidget * widget, const char * script);
     ~pawsScript();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.