telyn / c2ephp

support/Archiver.php

Indentation +17 added lines, -17 removed lines

@@ -1,24 +1,24 @@
 <?php
 function DeArchive($data) {
-	if(is_string($data)) {
-		if(substr($data,0,55) == "Creatures Evolution Engine - Archived information file.") {
-			$data = substr($data,strpos($data,chr(0x1A).chr(0x04))+2);
-			$data = gzuncompress($data);
-			return $data;
-		}
-		die('Couldn\'t dearchive -- Probably invalid file');
-		return false;
-	} else if(is_resource($data)) {
-		return false; //coming soon
-	}	
+    if(is_string($data)) {
+        if(substr($data,0,55) == "Creatures Evolution Engine - Archived information file.") {
+            $data = substr($data,strpos($data,chr(0x1A).chr(0x04))+2);
+            $data = gzuncompress($data);
+            return $data;
+        }
+        die('Couldn\'t dearchive -- Probably invalid file');
+        return false;
+    } else if(is_resource($data)) {
+        return false; //coming soon
+    }	
 }
 function Archive($data,$filehandle=null) {
-	if(is_resource($filehandle)) {
-		return false;
-	}
-	$data = gzcompress($data);
-	$data = "Creatures Evolution Engine - Archived information file. zLib 1.13 compressed.".chr(0x1A).chr(0x04).$data;
-	return $data;
+    if(is_resource($filehandle)) {
+        return false;
+    }
+    $data = gzcompress($data);
+    $data = "Creatures Evolution Engine - Archived information file. zLib 1.13 compressed.".chr(0x1A).chr(0x04).$data;
+    return $data;
 	
 }
 ?>
\ No newline at end of file

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');
     }
@@ -45,8 +48,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;

unit-tests/PRAYFileTest.php

Indentation +4 added lines, -4 removed lines

@@ -4,16 +4,16 @@
 class PRAYFileTest extends c2ephpAbstractTestCase {
     
     /**
-      * @dataProvider createAgentFiles
-      */
+     * @dataProvider createAgentFiles
+     */
     public function testCreatePRAYFile(PRAYFile $prayfile) {
         $this->assertInstanceOf('PRAYFile',$prayfile);
         $this->assertNotNull($prayfile);
     }
     
     /**
-      * @dataProvider createAgentFiles
-      */
+     * @dataProvider createAgentFiles
+     */
     public function testNumberOfBlocks(PRAYFile $prayfile,$fixtureInfo) {
         $this->assertNotNull($prayfile);
         $this->assertEquals($fixtureInfo['block count'],sizeof($prayfile->GetBlocks()));

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/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 +10 added lines, -10 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")
                 {
@@ -87,8 +88,7 @@ 
                     {
                         imagesetpixel($image, $x, $y, imagecolorallocate($image, 0, 0, 0));
                     }
-                }
-                else //colour run
+                } else //colour run
                 {
                     $z = $x + $run_length;
                     for(;$x < $z; $x++)
@@ -99,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;
@@ -110,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/SPRFile.php

Indentation +23 added lines, -23 removed lines

@@ -15,31 +15,31 @@
      * Reads in the IReader and creates SPRFrames as required.
      * @param $reader An IReader to read from.
      */
-	public function SPRFile(IReader $reader) {
-		parent::SpriteFile('SPR');
-		$frameCount = $reader->ReadInt(2);
+    public function SPRFile(IReader $reader) {
+        parent::SpriteFile('SPR');
+        $frameCount = $reader->ReadInt(2);
 		
-		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));
-		}
-	}
+        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));
+        }
+    }
 
     /// @brief Compiles the SPR file into a binary string
-	public function Compile() {
-	  $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());
-	    $offset += $frame->GetWidth()*$frame->GetHeight();
-	  }
-	  foreach($this->GetFrames() as $frame) {
-	    $data .= $frame->Encode();
-	  }
-	  return $data;
-	}
+    public function Compile() {
+        $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());
+        $offset += $frame->GetWidth()*$frame->GetHeight();
+        }
+        foreach($this->GetFrames() as $frame) {
+        $data .= $frame->Encode();
+        }
+        return $data;
+    }
 }
 ?>

sprites/SpriteFile.php

Indentation +92 added lines, -92 removed lines

@@ -3,110 +3,110 @@
 /// @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
   
-  public function SpriteFile($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 $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 $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/SpriteFrame.php

Braces +3 added lines, -2 removed lines

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