[Planeshift-cvs] CVS: planeshift/src/client zonehandler.cpp, 1.63, 1.64

[Xordan <mg...@us...>]

Update of /cvsroot/planeshift/planeshift/src/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26625

Modified Files:
	zonehandler.cpp 
Log Message:
- Cleanups.

Index: zonehandler.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/zonehandler.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** zonehandler.cpp	1 Oct 2007 01:18:29 -0000	1.63
--- zonehandler.cpp	1 Oct 2007 01:26:23 -0000	1.64
***************
*** 70,74 ****
      valid = LoadZoneInfo();
      needsToLoadMaps = false;
!     
      loadWindow = NULL;
      loadProgressBar = NULL;
--- 70,74 ----
      valid = LoadZoneInfo();
      needsToLoadMaps = false;
! 
      loadWindow = NULL;
      loadProgressBar = NULL;
***************
*** 95,99 ****
      if (loadProgressBar == NULL)
          return false;
!         
      return true;
  }
--- 95,99 ----
      if (loadProgressBar == NULL)
          return false;
! 
      return true;
  }
***************
*** 141,145 ****
              csRef<iDocumentNode> regionNode = regionIter->Next();
              csString mapname = regionNode->GetAttributeValue("map");
!             
              bool found = false;
              for(size_t i =0;i<alllist.GetSize();i++)
--- 141,145 ----
              csRef<iDocumentNode> regionNode = regionIter->Next();
              csString mapname = regionNode->GetAttributeValue("map");
! 
              bool found = false;
              for(size_t i =0;i<alllist.GetSize();i++)
***************
*** 185,189 ****
          return;
      }
!     
      FlagRegions(zone);
  
--- 185,189 ----
          return;
      }
! 
      FlagRegions(zone);
  
***************
*** 196,200 ****
  
          psengine->GetCharControl()->GetMovementManager()->StopAllMovement();
!         
          if (FindLoadWindow())
          {
--- 196,200 ----
  
          psengine->GetCharControl()->GetMovementManager()->StopAllMovement();
! 
          if (FindLoadWindow())
          {
***************
*** 247,263 ****
      {
          //Error1("Going to load and unload maps");
!         if (ExecuteFlaggedRegions(sectorToLoad))
!         {
!             needsToLoadMaps = false;
  
!             psengine->SetLoadedMap(true);
!             psengine->GetModeHandler()->ClearLightFadeSettings();  // make sure new map gets relit for time of day
  
!             if (haveNewPos) 
!             {
!                 MovePlayerTo(newPos, sectorToLoad);
!                 psengine->GetPSCamera()->ResetCameraPositioning();
!             }
!         } 
  
          if (FindLoadWindow())
--- 247,261 ----
      {
          //Error1("Going to load and unload maps");
!         ExecuteFlaggedRegions(sectorToLoad);
!         needsToLoadMaps = false;
  
!         psengine->SetLoadedMap(true);
!         psengine->GetModeHandler()->ClearLightFadeSettings();  // make sure new map gets relit for time of day
  
!         if (haveNewPos) 
!         {
!             MovePlayerTo(newPos, sectorToLoad);
!             psengine->GetPSCamera()->ResetCameraPositioning();
!         }
  
          if (FindLoadWindow())
***************
*** 332,336 ****
  }
  
! inline bool ZoneHandler::ExecuteFlaggedRegions(const csString & sector)
  {
      ZoneLoadInfo* found = FindZone(sector);
--- 330,334 ----
  }
  
! void ZoneHandler::ExecuteFlaggedRegions(const csString & sector)
  {
      ZoneLoadInfo* found = FindZone(sector);
***************
*** 354,361 ****
  
          int executed = world->ExecuteFlaggedRegions(found->transitional);
! 		if(executed == 0)
! 		{
! 			psengine->FatalError("Loading region failed!");
! 		}
  
  
--- 352,359 ----
  
          int executed = world->ExecuteFlaggedRegions(found->transitional);
!         if(executed == 0)
!         {
!             psengine->FatalError("Loading region failed!");
!         }
  
  
***************
*** 374,379 ****
          }
      }
-     
-     return true;
  }
  
--- 372,375 ----
***************
*** 391,395 ****
      loadImage = node->GetAttributeValue("loadimage");
      trans = node->GetAttributeValue("transitional");
!     
      transitional = (trans=="yes");
  
--- 387,391 ----
      loadImage = node->GetAttributeValue("loadimage");
      trans = node->GetAttributeValue("transitional");
! 
      transitional = (trans=="yes");