[Planeshift-cvs] SF.net SVN: planeshift: [608] trunk/src/client

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

Revision: 608
          http://planeshift.svn.sourceforge.net/planeshift/?rev=608&view=rev
Author:   acraig
Date:     2008-01-04 15:09:18 -0800 (Fri, 04 Jan 2008)

Log Message:
-----------
Code cleanups.

Modified Paths:
--------------
    trunk/src/client/gui/pawsloading.h
    trunk/src/client/zonehandler.cpp
    trunk/src/client/zonehandler.h

Modified: trunk/src/client/gui/pawsloading.h
===================================================================
--- trunk/src/client/gui/pawsloading.h	2008-01-04 23:07:28 UTC (rev 607)
+++ trunk/src/client/gui/pawsloading.h	2008-01-04 23:09:18 UTC (rev 608)
@@ -19,9 +19,23 @@
  
 #ifndef PAWS_LOAD_WINDOW_HEADER
 #define PAWS_LOAD_WINDOW_HEADER
+//=============================================================================
+// Crystal Space Includes
+//=============================================================================
 
+//=============================================================================
+// Project Includes
+//=============================================================================
 #include "paws/pawswidget.h"
+#include "net/cmdbase.h"
 
+//=============================================================================
+// Local Includes
+//=============================================================================
+
+//-----------------------------------------------------------------------------
+// Forward Declarations
+//-----------------------------------------------------------------------------
 class pawsMessageTextBox;
 
 

Modified: trunk/src/client/zonehandler.cpp
===================================================================
--- trunk/src/client/zonehandler.cpp	2008-01-04 23:07:28 UTC (rev 607)
+++ trunk/src/client/zonehandler.cpp	2008-01-04 23:09:18 UTC (rev 608)
@@ -17,7 +17,9 @@
  *
  */
 #include <psconfig.h>
-
+//=============================================================================
+// Crystal Space Includes
+//=============================================================================
 #include <csutil/objreg.h>
 #include <iutil/object.h>
 #include <iengine/engine.h>
@@ -33,24 +35,33 @@
 #include <csutil/sysfunc.h>
 #include <ivaria/engseq.h>
 
-#include "globals.h"
-#include "engine/psworld.h"
-#include "zonehandler.h"
-#include "pscamera.h"
-#include "globals.h"
-
-#include "iclient/isoundmngr.h"
+//=============================================================================
+// Project Includes
+//=============================================================================
 #include "net/messages.h"
 #include "net/msghandler.h"
-#include "pscelclient.h"
-#include "modehandler.h"
+
 #include "util/psscf.h"
 #include "util/log.h"
 
 #include "paws/pawsmanager.h"
 #include "paws/pawsprogressbar.h"
+
 #include "gui/pawsloading.h"
+
+#include "engine/psworld.h"
+
+#include "iclient/isoundmngr.h"
+
+//=============================================================================
+// Local Includes
+//=============================================================================
+#include "zonehandler.h"
+#include "pscamera.h"
+#include "pscelclient.h"
+#include "modehandler.h"
 #include "pscharcontrol.h"
+#include "globals.h"
 
 ZoneHandler::ZoneHandler(MsgHandler* mh,iObjectRegistry* obj_reg, psCelClient *cc)
 {
@@ -110,6 +121,7 @@
     iVFS* vfs = psengine->GetVFS ();
     if (!vfs)
         return false;
+        
     iDocumentSystem* xml = psengine->GetXMLParser ();
     csRef<iDocument> doc = xml->CreateDocument();
 

Modified: trunk/src/client/zonehandler.h
===================================================================
--- trunk/src/client/zonehandler.h	2008-01-04 23:07:28 UTC (rev 607)
+++ trunk/src/client/zonehandler.h	2008-01-04 23:09:18 UTC (rev 608)
@@ -18,13 +18,28 @@
  */
 #ifndef ZONEHANDLER_H
 #define ZONEHANDLER_H
+//=============================================================================
+// Crystal Space Includes
+//=============================================================================
+#include <csutil/ref.h>
 
-#include <csutil/ref.h>
+//=============================================================================
+// Project Includes
+//=============================================================================
 #include "net/cmdbase.h"
+
 #include "util/prb.h"
 #include "util/psxmlparser.h"
+
 #include "engine/psworld.h"
 
+//=============================================================================
+// Local Includes
+//=============================================================================
+
+//-----------------------------------------------------------------------------
+// Forward Declarations
+//-----------------------------------------------------------------------------
 class MsgHandler;
 class psWorld;
 class PawsManager;
@@ -44,9 +59,10 @@
 class ZoneLoadInfo
 {
 public:
-    csString     inSector;
+    csString    inSector;
     csString    loadImage;
-    bool     transitional;
+    bool        transitional;
+    
     csPDelArray<csString> regions;
 
     ZoneLoadInfo(iDocumentNode *node);
@@ -62,6 +78,7 @@
     }
 };
 
+
 /**
  *  This class listens for crossing sector boundaries
  *  and makes sure that we have all the right stuff
@@ -69,6 +86,26 @@
  */
 class ZoneHandler : public psClientNetSubscriber
 {
+public:
+    ZoneHandler(MsgHandler* mh,iObjectRegistry* object_reg, psCelClient *cc);
+    virtual ~ZoneHandler();
+
+    void HandleMessage(MsgEntry* me);
+
+    void SetWorld(psWorld *psworld) { world = psworld; }
+
+    void LoadZone(const char* sector);
+
+    /** Call this after drawing on screen finished.
+        It checks if player just crossed boundary between sectors and loads/unloads needed maps */
+    void OnDrawingFinished();
+
+    /** Moves player to given location */
+    void MovePlayerTo(const csVector3 & newPos, const csString & newSector);
+
+    void SetLoadAllMaps(bool v) { loadAllMaps = v; }
+    void SetKeepMapsLoaded(bool v) { keepMapsLoaded = v; }
+    
 protected:
     BinaryRBTree<ZoneLoadInfo> zonelist;
     csArray<csString>       alllist;
@@ -97,26 +134,6 @@
 
     /** Tells "world" to (un)load flagged maps, then hides LoadingWindow */
     bool ExecuteFlaggedRegions(const csString & sector);
-
-public:
-    ZoneHandler(MsgHandler* mh,iObjectRegistry* object_reg, psCelClient *cc);
-    virtual ~ZoneHandler();
-
-    void HandleMessage(MsgEntry* me);
-
-    void SetWorld(psWorld *psworld) { world = psworld; }
-
-    void LoadZone(const char* sector);
-
-    /** Call this after drawing on screen finished.
-        It checks if player just crossed boundary between sectors and loads/unloads needed maps */
-    void OnDrawingFinished();
-
-    /** Moves player to given location */
-    void MovePlayerTo(const csVector3 & newPos, const csString & newSector);
-
-    void SetLoadAllMaps(bool v) { loadAllMaps = v; }
-    void SetKeepMapsLoaded(bool v) { keepMapsLoaded = v; }
 };
 
 


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