[Planeshift-cvs] SF.net SVN: planeshift: [336] trunk/src/server/bulkobjects/psquestprereqops .cpp

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

Revision: 336
          http://planeshift.svn.sourceforge.net/planeshift/?rev=336&view=rev
Author:   acraig
Date:     2007-12-01 22:15:47 -0800 (Sat, 01 Dec 2007)

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

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

Modified: trunk/src/server/bulkobjects/psquestprereqops.cpp
===================================================================
--- trunk/src/server/bulkobjects/psquestprereqops.cpp	2007-12-02 04:18:05 UTC (rev 335)
+++ trunk/src/server/bulkobjects/psquestprereqops.cpp	2007-12-02 06:15:47 UTC (rev 336)
@@ -44,7 +44,9 @@
 psQuestPrereqOpList::~psQuestPrereqOpList()
 {
     while (prereqlist.GetSize())
+    {
         delete prereqlist.Pop();
+    }        
 }
 
 
@@ -65,7 +67,10 @@
     // Check if all prereqs are valid
     for (size_t i = 0; i < prereqlist.GetSize(); i++)
     {
-        if (!prereqlist[i]->Check(character)) return false;
+        if (!prereqlist[i]->Check(character)) 
+        {
+            return false;
+        }            
     }
 
     return true;
@@ -100,7 +105,10 @@
     // Check if any of the prereqs are valid
     for (size_t i = 0; i < prereqlist.GetSize(); i++)
     {
-        if (prereqlist[i]->Check(character)) return true;
+        if (prereqlist[i]->Check(character)) 
+        {
+            return true;
+        }            
     }
 
     return false;
@@ -112,7 +120,7 @@
     script.Append("<or>");
     for (size_t i = 0; i < prereqlist.GetSize(); i++)
     {
-    script.Append(prereqlist[i]->GetScriptOp());
+        script.Append(prereqlist[i]->GetScriptOp());
     }
     script.Append("</or>");
     return script;
@@ -142,7 +150,10 @@
     int count=0;
     for (size_t i = 0; i < prereqlist.GetSize(); i++)
     {
-        if (prereqlist[i]->Check(character)) count++;
+        if (prereqlist[i]->Check(character)) 
+        {
+            count++;
+        }            
     }
     // Verify that the appropiate numbers of prereqs was counted. 
     return ((min == -1 || count >= min) && (max == -1 || count <= max));
@@ -152,8 +163,16 @@
 {
     csString script;
     script.Append("<require");
-    if (min != -1) script.AppendFmt(" min=\"%d\"",min);
-    if (max != -1) script.AppendFmt(" max=\"%d\"",max);
+    if (min != -1)
+    {
+        script.AppendFmt(" min=\"%d\"",min);
+    }
+            
+    if (max != -1)
+    {
+        script.AppendFmt(" max=\"%d\"",max);
+    }
+            
     script.Append(">");
     for (size_t i = 0; i < prereqlist.GetSize(); i++)
     {
@@ -185,7 +204,9 @@
     csString script;
     script.Append("<not>");
     if (prereqlist.GetSize())
+    {
         script.Append(prereqlist[0]->GetScriptOp());
+    }        
     script.Append("</not>");
     return script;
 }
@@ -259,8 +280,15 @@
     csString script;
     
     script.AppendFmt("<completed category=\"%s\"",category.GetDataSafe());
-    if (min != -1) script.AppendFmt(" min=\"%d\"",min);
-    if (max != -1) script.AppendFmt(" max=\"%d\"",max);
+    if (min != -1)
+    {
+        script.AppendFmt(" min=\"%d\"",min);
+    }
+            
+    if (max != -1)
+    {
+        script.AppendFmt(" max=\"%d\"",max);
+    }        
     script.Append("/>");
 
     return script;
@@ -277,8 +305,11 @@
 
 bool psQuestPrereqOpFaction::Check(psCharacter * character)
 {
-    if(max) // If value is max, make sure we're below it
+    if(max)
+    { 
+        // If value is max, make sure we're below it        
         return !character->CheckFaction(faction,value);
+    }        
     return character->CheckFaction(faction,value);
 }
 
@@ -302,7 +333,9 @@
 bool psQuestPrereqOpActiveMagic::Check(psCharacter * character)
 {
     if (character->GetActor())
+    {
         return character->GetActor()->IsMagicCategoryActive(activeMagic);
+    }        
     return false;
 }
 
@@ -328,7 +361,9 @@
     int currTime = psserver->GetWeatherManager()->GetCurrentTime();
 
     if (minTime <= maxTime) 
+    {
         return (currTime <= maxTime) && (currTime >= minTime); // quests during the day
+    }        
 
     return (currTime >= maxTime) || (currTime <= minTime); // quests overnight
 }
@@ -368,7 +403,7 @@
     script.Append("<xor>");
     for (size_t i = 0; i < prereqlist.GetSize(); i++)
     {
-    script.Append(prereqlist[i]->GetScriptOp());
+        script.Append(prereqlist[i]->GetScriptOp());
     }
     script.Append("</xor>");
     return script;
@@ -382,4 +417,4 @@
         copy->Push(prereqlist[i]->Copy());
     }    
     return copy;
-}
\ No newline at end of file
+}


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