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/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++)
             {

sprites/SpriteFrame.php

Braces +3 added lines, -2 removed lines

@@ -105,8 +105,9 @@
      * if it does't already.
      */
     protected function EnsureDecoded() {
-        if (!$this->decoded)
-            $this->Decode();
+        if (!$this->decoded) {
+                    $this->Decode();
+        }
 
         $this->decoded = true;
     }

support/FileReader.php

Braces +12 added lines, -8 removed lines

@@ -21,12 +21,15 @@ 
      */
     public function FileReader($filename)
     {
-        if (!file_exists($filename))
-            throw new Exception("File does not exist: ".$filename);
-        if (!is_file($filename))
-            throw new Exception("Target is not a file.");
-        if (!is_readable($filename))
-            throw new Exception("File exists, but is not readable.");
+        if (!file_exists($filename)) {
+                    throw new Exception("File does not exist: ".$filename);
+        }
+        if (!is_file($filename)) {
+                    throw new Exception("Target is not a file.");
+        }
+        if (!is_readable($filename)) {
+                    throw new Exception("File exists, but is not readable.");
+        }
 
         $this->fp = fopen($filename, 'rb');
     }
@@ -51,8 +54,9 @@ 
         for ($x = 0; $x < $count; $x++)
         {
             $buffer = (ord(fgetc($this->fp)) << ($x*8));
-            if ($buffer === false)
-                throw new Exception("Read failure");
+            if ($buffer === false) {
+                            throw new Exception("Read failure");
+            }
             $int += $buffer;
         }
         return $int;

agents/PRAY/DFAMBlock.php

Indentation +8 added lines, -8 removed lines

@@ -13,14 +13,14 @@
     /**
      * If $prayfile is not null, all the data for this block
      * will be read from the PRAYFile.
-	 * @param PRAYFile $prayfile The PRAYFile that this DFAM block belongs to.
-	 * @param $name The block's name.
-	 * @param $content The binary data of this block. May be null.
-	 * @param $flags The block's flags
-	 */
-	public function DFAMBlock($prayfile, $name, $content, $flags) {
-		parent::TagBlock($prayfile, $name, $content, $flags, PRAY_BLOCK_DFAM);
+     * @param PRAYFile $prayfile The PRAYFile that this DFAM block belongs to.
+     * @param $name The block's name.
+     * @param $content The binary data of this block. May be null.
+     * @param $flags The block's flags
+     */
+    public function DFAMBlock($prayfile, $name, $content, $flags) {
+        parent::TagBlock($prayfile, $name, $content, $flags, PRAY_BLOCK_DFAM);
 
-	}
+    }
 }
 ?>

agents/PRAY/BinaryBlock.php

Indentation +6 added lines, -6 removed lines

@@ -22,17 +22,17 @@
      * @param $name The block's name.
      * @param $content The content of the block as a binary string.
      */
-	public function BinaryBlock($type, $name, $content) {
-		parent::PrayBlock(null, $name, '', 0, $type);
-		$this->binarydata = $content;
+    public function BinaryBlock($type, $name, $content) {
+        parent::PrayBlock(null, $name, '', 0, $type);
+        $this->binarydata = $content;
     }
     /// @brief Compile the BinaryBlock
     /**
      * @return string compiled BinaryBlock as a binary string.
      */
-	public function Compile() {
-		return $this->EncodeBlockHeader(strlen($this->binarydata)).$this->binarydata;
-	}
+    public function Compile() {
+        return $this->EncodeBlockHeader(strlen($this->binarydata)).$this->binarydata;
+    }
 }
 
 ?>

agents/PRAY/SFAMBlock.php

Indentation +9 added lines, -9 removed lines

@@ -10,18 +10,18 @@
  */
 class SFAMBlock extends EXPCBlock {
 
-	/// @brief Instantiates a new SFAMBlock
+    /// @brief Instantiates a new SFAMBlock
     /**
      * If $prayfile is not null, all the data for this block
      * will be read from the PRAYFile.
-	 * @param PRAYFile $prayfile The PRAYFile that this DFAM block belongs to.
-	 * @param $name The block's name.
-	 * @param $content The binary data of this block. May be null.
-	 * @param $flags The block's flags
-	 */
-	public function SFAMBlock($prayfile, $name, $content, $flags) {
-		parent::TagBlock($prayfile, $name, $content, $flags, PRAY_BLOCK_SFAM);
+     * @param PRAYFile $prayfile The PRAYFile that this DFAM block belongs to.
+     * @param $name The block's name.
+     * @param $content The binary data of this block. May be null.
+     * @param $flags The block's flags
+     */
+    public function SFAMBlock($prayfile, $name, $content, $flags) {
+        parent::TagBlock($prayfile, $name, $content, $flags, PRAY_BLOCK_SFAM);
 
-	}
+    }
 }
 ?>