SF.net SVN: bzflag:[18459] branches/trepan/src/bzflag

[<tr...@us...>]

Revision: 18459
          http://bzflag.svn.sourceforge.net/bzflag/?rev=18459&view=rev
Author:   trepan
Date:     2008-08-23 21:50:07 +0000 (Sat, 23 Aug 2008)

Log Message:
-----------

* only initialize roaming mode when required

Modified Paths:
--------------
    branches/trepan/src/bzflag/Roaming.cxx
    branches/trepan/src/bzflag/playing.cxx

Modified: branches/trepan/src/bzflag/Roaming.cxx
===================================================================
--- branches/trepan/src/bzflag/Roaming.cxx	2008-08-23 20:00:05 UTC (rev 18458)
+++ branches/trepan/src/bzflag/Roaming.cxx	2008-08-23 21:50:07 UTC (rev 18459)
@@ -24,10 +24,12 @@
 template <>
 Roaming* Singleton<Roaming>::_instance = (Roaming*)0;
 
-Roaming::Roaming() : view(roamViewDisabled),
-		     targetManual(-1),
-		     targetWinner(-1),
-		     targetFlag(-1) {
+Roaming::Roaming()
+: view(roamViewDisabled)
+, targetManual(-1)
+, targetWinner(-1)
+, targetFlag(-1)
+{
   resetCamera();
 }
 

Modified: branches/trepan/src/bzflag/playing.cxx
===================================================================
--- branches/trepan/src/bzflag/playing.cxx	2008-08-23 20:00:05 UTC (rev 18458)
+++ branches/trepan/src/bzflag/playing.cxx	2008-08-23 21:50:07 UTC (rev 18459)
@@ -4718,11 +4718,14 @@
   controlPanel->setControlColor(borderColor);
   radar->setControlColor(borderColor);
 
-  if ((myTank->getTeam() == ObserverTeam) || devDriving)
-    ROAM.setMode(Roaming::roamViewFP);
-  //    ROAM.resetCamera();
-  else
+  if ((myTank->getTeam() == ObserverTeam) || devDriving) {
+    if (ROAM.getMode() == Roaming::roamViewDisabled) {
+      ROAM.setMode(Roaming::roamViewFP);
+    }
+  }
+  else {
     ROAM.setMode(Roaming::roamViewDisabled);
+  }
 
   setTankFlags();
 
@@ -4762,10 +4765,10 @@
   fireButton = false;
   firstLife = true;
 
-  BZDB.setBool("displayMainFlags", true);
+  BZDB.setBool("displayMainFlags",  true);
   BZDB.setBool("displayRadarFlags", true);
-  BZDB.setBool("displayRadar", true);
-  BZDB.setBool("displayConsole", true);
+  BZDB.setBool("displayRadar",      true);
+  BZDB.setBool("displayConsole",    true);
 
   entered = true;
 }


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