telyn / c2ephp

sprites/S16Frame.php

Braces +1 added lines, -2 removed lines

@@ -89,8 +89,7 @@
                     $red   = ($pixel & 0xF800) >> 8;
                     $green = ($pixel & 0x07E0) >> 3;
                     $blue  = ($pixel & 0x001F) << 3;
-                }
-                else if ($this->encoding == "555")
+                } else if ($this->encoding == "555")
                 {
                     $red   = ($pixel & 0x7C00) >> 7;
                     $green = ($pixel & 0x03E0) >> 2;

sprites/C16Frame.php

Braces +9 added lines, -8 removed lines

@@ -75,10 +75,11 @@ 
             for ($x = 0; $x < $this->GetWidth();)
             {
                 $run = $this->reader->ReadInt(2);
-                if (($run & 0x0001) > 0)
-                    $run_type = "colour";
-                else
-                    $run_type = "black";
+                if (($run & 0x0001) > 0) {
+                                    $run_type = "colour";
+                } else {
+                                    $run_type = "black";
+                }
                 $run_length = ($run & 0x7FFF) >> 1;
                 if ($run_type == "black")
                 {
@@ -98,8 +99,7 @@ 
                             $red   = ($pixel & 0xF800) >> 8;
                             $green = ($pixel & 0x07E0) >> 3;
                             $blue  = ($pixel & 0x001F) << 3;
-                        }
-                        else if ($this->encoding == "555")
+                        } else if ($this->encoding == "555")
                         {
                             $red   = ($pixel & 0x7C00) >> 7;
                             $green = ($pixel & 0x03E0) >> 2;
@@ -109,8 +109,9 @@ 
                         imagesetpixel($image, $x, $y, $colour);
                     }
                 }
-                if ($x == $this->GetWidth())
-                    $this->reader->Skip(2);
+                if ($x == $this->GetWidth()) {
+                                    $this->reader->Skip(2);
+                }
             }
         }
         $this->gdImage = $image;

sprites/SpriteFile.php

Indentation +95 added lines, -95 removed lines

@@ -3,113 +3,113 @@
 /// @brief Superclass for all SpriteFile types
 abstract class SpriteFile {
 
-  /// @cond INTERNAL_DOCS
+    /// @cond INTERNAL_DOCS
     
-  private $frames = array();
-  private $spritefiletype;
-  /// @endcond
+    private $frames = array();
+    private $spritefiletype;
+    /// @endcond
 
-  /// @cond INTERNAL_DOCS
+    /// @cond INTERNAL_DOCS
   
-  /**
-   * @param string $filetype
-   */
-  public function SpriteFile($filetype) {
+    /**
+     * @param string $filetype
+     */
+    public function SpriteFile($filetype) {
     $this->spritefiletype = $filetype;
-  }
-  /// @endcond
+    }
+    /// @endcond
 
-  /// @brief Gets a SpriteFrame from the SpriteFile.
-  /**
-   * @param $frame The 0-based index of the frame to get.
-   * @return A SpriteFrame
-   */
-  public function GetFrame($frame) {
-      return $this->frames[$frame];
-  }
-  /// @brief Gets the entire frame array.
-  /**
-   * @return An array of SpriteFrames
-   */
-  public function GetFrames() {
-      return $this->frames;
-  }
+    /// @brief Gets a SpriteFrame from the SpriteFile.
+    /**
+     * @param $frame The 0-based index of the frame to get.
+     * @return A SpriteFrame
+     */
+    public function GetFrame($frame) {
+        return $this->frames[$frame];
+    }
+    /// @brief Gets the entire frame array.
+    /**
+     * @return An array of SpriteFrames
+     */
+    public function GetFrames() {
+        return $this->frames;
+    }
 
-  /// @brief Compiles the SpriteFile into a binary string
-  /**
-   * @return A binary string containing the SpriteFile's data and frames.
-   */
-  public abstract function Compile();
+    /// @brief Compiles the SpriteFile into a binary string
+    /**
+     * @return A binary string containing the SpriteFile's data and frames.
+     */
+    public abstract function Compile();
 
-  /// @brief Adds a SpriteFrame to the SpriteFile
-  /**
-   * If necessary, this function converts the SpriteFrame to the
-   * correct format.
-   * At the moment, this can only add a SpriteFrame to the end of the
-   * SpriteFile. TODO: I aim to fix this by the CCSF 2011.
-   * @internal
-   * This process uses some magic which require all types of
-   * SpriteFile and SpriteFrame to use 3-character identifiers.
-   * This means that if you want to make your own sprite formats
-   * you'll need to override this function and provide all our magic
-   * plus your own.
-   * @endinternal
-   * @param $frame A SpriteFrame
-   * @param $position Where to put the frame. Currently un-used.
-   */
-  public function AddFrame(SpriteFrame $frame, $position = false) {
-      /*
+    /// @brief Adds a SpriteFrame to the SpriteFile
+    /**
+     * If necessary, this function converts the SpriteFrame to the
+     * correct format.
+     * At the moment, this can only add a SpriteFrame to the end of the
+     * SpriteFile. TODO: I aim to fix this by the CCSF 2011.
+     * @internal
+     * This process uses some magic which require all types of
+     * SpriteFile and SpriteFrame to use 3-character identifiers.
+     * This means that if you want to make your own sprite formats
+     * you'll need to override this function and provide all our magic
+     * plus your own.
+     * @endinternal
+     * @param $frame A SpriteFrame
+     * @param $position Where to put the frame. Currently un-used.
+     */
+    public function AddFrame(SpriteFrame $frame, $position = false) {
+        /*
       if($position === false) {
           $position = sizeof($this->frames);
       } else if($position < 0) {
           $position = sizeof($this->frames) - $position;
       }
       */
-      if ($this->spritefiletype == substr(get_class($frame), 0, 3)) {
-          //$this->frames[$position] = $frame;
-          $this->frames[] = $frame;
-      } else {
-          //$this->frames[$position] = $frame->ToSpriteFrame($this->spritefiletype);
-          $this->frames[] = $frame->ToSpriteFrame($this->spritefiletype);
-      }
-  }
-  /// @brief Replaces a frame in the SpriteFile
-  /**
-   * Replaces the frame in the given position
-   * Uses the same magic as AddFrame
-   * @param $frame A SpriteFrame of any type.
-   * @param $position Which frame to replace. If negative, counts
-   * backwards from the end of the frames array.
-   */
-  public function ReplaceFrame(SpriteFrame $frame, $position) {
-      if ($position < 0) {
-          $position = sizeof($this->frames)-$position;
-      }
-      $this->frames[$position] = $frame->ToSpriteFrame($this->spritefiletype);
-  }
-  /// @brief Gets the number of frames currently stored in this SpriteFile.
-  /**
-   * @return The number of frames
-   */
-  public function GetFrameCount() {
-      return sizeof($this->frames);
-  }
-  /// @brief Deletes the frame in the given position.
-  /**
-   * @param $frame The 0-based index of the frame to delete.
-   */
-  public function DeleteFrame($frame) {
-      unset($this->frames[$frame]);
-  }
-  /// @brief Converts the given frame to PNG. <strong>Deprecated.</strong>
-  /**
-   * May be removed in a future release.
-   * Use GetFrame($frame)->ToPNG() instead.
-   * @param integer $frame The 0-based index of the frame to delete.
-   * @return A binary string containing a PNG.
-   */
-  public function ToPNG($frame) {
-      return $this->frames[$frame]->ToPNG();
-  }
+        if ($this->spritefiletype == substr(get_class($frame), 0, 3)) {
+            //$this->frames[$position] = $frame;
+            $this->frames[] = $frame;
+        } else {
+            //$this->frames[$position] = $frame->ToSpriteFrame($this->spritefiletype);
+            $this->frames[] = $frame->ToSpriteFrame($this->spritefiletype);
+        }
+    }
+    /// @brief Replaces a frame in the SpriteFile
+    /**
+     * Replaces the frame in the given position
+     * Uses the same magic as AddFrame
+     * @param $frame A SpriteFrame of any type.
+     * @param $position Which frame to replace. If negative, counts
+     * backwards from the end of the frames array.
+     */
+    public function ReplaceFrame(SpriteFrame $frame, $position) {
+        if ($position < 0) {
+            $position = sizeof($this->frames)-$position;
+        }
+        $this->frames[$position] = $frame->ToSpriteFrame($this->spritefiletype);
+    }
+    /// @brief Gets the number of frames currently stored in this SpriteFile.
+    /**
+     * @return The number of frames
+     */
+    public function GetFrameCount() {
+        return sizeof($this->frames);
+    }
+    /// @brief Deletes the frame in the given position.
+    /**
+     * @param $frame The 0-based index of the frame to delete.
+     */
+    public function DeleteFrame($frame) {
+        unset($this->frames[$frame]);
+    }
+    /// @brief Converts the given frame to PNG. <strong>Deprecated.</strong>
+    /**
+     * May be removed in a future release.
+     * Use GetFrame($frame)->ToPNG() instead.
+     * @param integer $frame The 0-based index of the frame to delete.
+     * @return A binary string containing a PNG.
+     */
+    public function ToPNG($frame) {
+        return $this->frames[$frame]->ToPNG();
+    }
 }
 ?>

sprites/SPRFile.php

Spacing +7 added lines, -7 removed lines

@@ -19,24 +19,24 @@
         parent::SpriteFile('SPR');
         $frameCount = $reader->ReadInt(2);
 		
-        for($i=0;$i<$frameCount;$i++) {
+        for ($i = 0; $i < $frameCount; $i++) {
             $offset = $reader->ReadInt(4);
             $width = $reader->ReadInt(2);
             $height = $reader->ReadInt(2);
-            $this->AddFrame(new SPRFrame($reader,$width,$height,$offset));
+            $this->AddFrame(new SPRFrame($reader, $width, $height, $offset));
         }
     }
 
     /// @brief Compiles the SPR file into a binary string
     public function Compile() {
-        $data = pack('v',$this->GetFrameCount());
+        $data = pack('v', $this->GetFrameCount());
         $offset = 2+(8*$this->GetFrameCount());
-        foreach($this->GetFrames() as $frame) {
-        $data .= pack('V',$offset);
-        $data .= pack('vv',$frame->GetWidth(),$frame->GetHeight());
+        foreach ($this->GetFrames() as $frame) {
+        $data .= pack('V', $offset);
+        $data .= pack('vv', $frame->GetWidth(), $frame->GetHeight());
         $offset += $frame->GetWidth()*$frame->GetHeight();
         }
-        foreach($this->GetFrames() as $frame) {
+        foreach ($this->GetFrames() as $frame) {
         $data .= $frame->Encode();
         }
         return $data;

sprites/C16File.php

Braces +3 added lines, -2 removed lines

@@ -34,8 +34,9 @@
             }
 
             $buffer = $reader->ReadInt(2);
-            if ($buffer < 1)
-                throw new Exception('Sprite file appears to contain less than 1 frame.');
+            if ($buffer < 1) {
+                            throw new Exception('Sprite file appears to contain less than 1 frame.');
+            }
             $frameCount = $buffer;
             for ($x = 0; $x < $frameCount; $x++)
             {

unit-tests/PRAYFileTest.php

Spacing +14 added lines, -14 removed lines

@@ -7,56 +7,56 @@
      * @dataProvider createAgentFiles
      */
     public function testCreatePRAYFile(PRAYFile $prayfile) {
-        $this->assertInstanceOf('PRAYFile',$prayfile);
+        $this->assertInstanceOf('PRAYFile', $prayfile);
         $this->assertNotNull($prayfile);
     }
     
     /**
      * @dataProvider createAgentFiles
      */
-    public function testNumberOfBlocks(PRAYFile $prayfile,$fixtureInfo) {
+    public function testNumberOfBlocks(PRAYFile $prayfile, $fixtureInfo) {
         $this->assertNotNull($prayfile);
-        $this->assertEquals($fixtureInfo['block count'],sizeof($prayfile->GetBlocks()));
+        $this->assertEquals($fixtureInfo['block count'], sizeof($prayfile->GetBlocks()));
     }
 
     /**
      * @dataProvider createAgentFiles
      */
-    public function testFirstAgentDescription(PRAYFile $prayfile,$info) {
+    public function testFirstAgentDescription(PRAYFile $prayfile, $info) {
         $this->assertNotNull($prayfile);
         $blocks = $prayfile->GetBlocks(PRAY_BLOCK_AGNT);
-        $this->assertEquals($info['first agent desc'],$blocks[0]->GetAgentDescription());
+        $this->assertEquals($info['first agent desc'], $blocks[0]->GetAgentDescription());
     }
 
     /**
      * @dataProvider createAgentFiles
      */ 
-    public function testChangeAGNTAndRecompile(PRAYFile $prayfile,$info) {
+    public function testChangeAGNTAndRecompile(PRAYFile $prayfile, $info) {
         $this->assertNotNull($prayfile);
         $blocks = $prayfile->GetBlocks(PRAY_BLOCK_AGNT);
-        $blocks[0]->SetTag('Agent Description','Testing');
-        $this->assertEquals('Testing',$blocks[0]->GetAgentDescription());
+        $blocks[0]->SetTag('Agent Description', 'Testing');
+        $this->assertEquals('Testing', $blocks[0]->GetAgentDescription());
         $data = $prayfile->Compile();
         $newfile = new PRAYFile(new StringReader($data));
-        $this->assertEquals($info['block count'],sizeof($newfile->GetBlocks()));
+        $this->assertEquals($info['block count'], sizeof($newfile->GetBlocks()));
         $newfile->GetBlocks('AGNT');
-        $this->assertEquals('Testing',$blocks[0]->GetAgentDescription());
+        $this->assertEquals('Testing', $blocks[0]->GetAgentDescription());
     }
 
     /**
      * @dataProvider createCreatureFiles
      */ 
-    public function testChangeGLSTAndRecompile(PRAYFILE $prayfile,$info) {
+    public function testChangeGLSTAndRecompile(PRAYFILE $prayfile, $info) {
         $this->assertNotNull($prayfile);
         $blocks = $prayfile->GetBlocks(PRAY_BLOCK_GLST);
-        $this->assertEquals($info['events count'],$blocks[0]->GetHistory()->CountEvents());
+        $this->assertEquals($info['events count'], $blocks[0]->GetHistory()->CountEvents());
         $blocks[0]->GetHistory()->RemoveEvent(0);
-        $this->assertEquals($info['events count']-1,$blocks[0]->GetHistory()->CountEvents());
+        $this->assertEquals($info['events count']-1, $blocks[0]->GetHistory()->CountEvents());
         
         $data = $prayfile->Compile();
         $newfile = new PRAYFile(new StringReader($data));
         $blocks = $newfile->GetBlocks(PRAY_BLOCK_GLST);
-        $this->assertEquals($info['events count']-1,$blocks[0]->GetHistory()->CountEvents());
+        $this->assertEquals($info['events count']-1, $blocks[0]->GetHistory()->CountEvents());
 
     }
 }

caos/highlight/C3/FlowControls.php

Spacing +1 added lines, -2 removed lines

@@ -6,8 +6,7 @@
 class C3CAOSFlowControls {
     /// @brief Returns an array of tokens.
     public static function GetTokens() {
-        return array
-        (
+        return array(
 		
             'doif',
             'econ',

caos/highlight/C3/Variables.php

Spacing +1 added lines, -2 removed lines

@@ -9,8 +9,7 @@
 class C3CAOSVariables {
     /// @brief Returns an array of tokens.
     public static function GetTokens() {
-        return array
-        (
+        return array(
             //agents
             'abba',
             'carr',

caos/highlight/C3/Commands.php

Spacing +1 added lines, -2 removed lines

@@ -6,8 +6,7 @@
 class C3CAOSCommands {
     /// @brief Returns an array of tokens.
     public static function GetTokens() {
-        return array
-        (
+        return array(
             'alph',
             'anim',
             'amms',