telyn / c2ephp

support/Archiver.php

Spacing +6 added lines, -6 removed lines

@@ -1,19 +1,19 @@
 <?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);
+	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)) {
+	} else if (is_resource($data)) {
 		return false; //coming soon
 	}	
 }
-function Archive($data,$filehandle=null) {
-	if(is_resource($filehandle)) {
+function Archive($data, $filehandle = null) {
+	if (is_resource($filehandle)) {
 		return false;
 	}
 	$data = gzcompress($data);

support/FileReader.php

Spacing +17 added lines, -17 removed lines

@@ -21,11 +21,11 @@ 
      */
     public function FileReader($filename)
     {
-        if(!file_exists($filename))
+        if (!file_exists($filename))
             throw new Exception("File does not exist: ".$filename);
-        if(!is_file($filename))
+        if (!is_file($filename))
             throw new Exception("Target is not a file.");
-        if(!is_readable($filename))
+        if (!is_readable($filename))
             throw new Exception("File exists, but is not readable.");
 
         $this->fp = fopen($filename, 'rb');
@@ -33,7 +33,7 @@ 
 
     public function Read($count)
     {
-        if($count > 0) {
+        if ($count > 0) {
             return fread($this->fp, $count);
         }
         return '';
@@ -42,10 +42,10 @@ 
     public function ReadInt($count)
     {
         $int = 0;
-        for($x = 0; $x < $count; $x++)
+        for ($x = 0; $x < $count; $x++)
         {
-            $buffer = (ord(fgetc($this->fp)) << ($x * 8));
-            if($buffer === false)
+            $buffer = (ord(fgetc($this->fp)) << ($x*8));
+            if ($buffer === false)
                 throw new Exception("Read failure");
             $int += $buffer;
         }
@@ -57,31 +57,31 @@ 
         return ftell($this->fp);
     }
 
-    public function GetSubString($start,$length = FALSE)
+    public function GetSubString($start, $length = FALSE)
     {
         $oldpos = ftell($this->fp);
-        fseek($this->fp,$start);
+        fseek($this->fp, $start);
         $data = '';
-        if($length === false) {
-            while($newdata = $this->Read(4096)) {
-                if(strlen($newdata) == 0) {
+        if ($length === false) {
+            while ($newdata = $this->Read(4096)) {
+                if (strlen($newdata) == 0) {
                     break;
                 }
                 $data .= $newdata;
             }
         } else {
-            $data = fread($this->fp,$length);
+            $data = fread($this->fp, $length);
         }
-        fseek($this->fp,$oldpos);
+        fseek($this->fp, $oldpos);
         return $data;
     }
     public function ReadCString() {
         $string = '';
-        while(($char = $this->Read(1)) !== false) {
-            if(ord($char) == 0) {
+        while (($char = $this->Read(1)) !== false) {
+            if (ord($char) == 0) {
                 break;
             }
-            $string.=$char;
+            $string .= $char;
         }
         return $string;
     }

support/IReader.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
      * tend to get big enough to make this inefficiency a concern on
      * any reasonably modern hardware.
      */
-    public function GetSubString($start,$length=FALSE);
+    public function GetSubString($start, $length = FALSE);
     /// @brief Gets the position of the cursor
     /**
      * This is analagous to ftell in C or PHP.

support/StringReader.php

Spacing +13 added lines, -13 removed lines

@@ -23,11 +23,11 @@ 
         $this->position = 0;
     }
     public function Read($characters) {
-        if($characters > 0) {
-            if($this->position+$characters > strlen($this->string)) {
+        if ($characters > 0) {
+            if ($this->position+$characters > strlen($this->string)) {
                 return false;
             }
-            $str = substr($this->string,$this->position,$characters);
+            $str = substr($this->string, $this->position, $characters);
 
             $this->position += $characters;
             return $str;
@@ -36,13 +36,13 @@ 
     }
     public function ReadCString() {
         $string = '';
-        while(($char = $this->Read(1)) !== false) {
-            $string.=$char;
-            if($char == "\0") {
+        while (($char = $this->Read(1)) !== false) {
+            $string .= $char;
+            if ($char == "\0") {
                 break;
             }           
         }
-        return substr($string,0,-1);
+        return substr($string, 0, -1);
     }
     public function Seek($position) {
         $this->position = $position;
@@ -56,23 +56,23 @@ 
     public function GetPosition() {
         return $this->position;
     }
-    public function GetSubString($start,$length = FALSE) {
-        if($length == FALSE) {
+    public function GetSubString($start, $length = FALSE) {
+        if ($length == FALSE) {
             $length = strlen($this->string)-$start;
         }
-        $str = substr($this->string,$start,$length);         
+        $str = substr($this->string, $start, $length);         
         return $str;
     }
 }
 
 function BytesToIntLilEnd($string) { //little endian
-    if($string == "") {
+    if ($string == "") {
         return false;
     }
     $length = strlen($string);
     $int = 0;
-    for($i=0;$i<$length;$i++) {
-        $int += ord($string{$i})<<($i*8);
+    for ($i = 0; $i < $length; $i++) {
+        $int += ord($string{$i}) << ($i*8);
     }
     return $int;
 }

unit-tests/ReaderTest.php

Spacing +10 added lines, -10 removed lines

@@ -1,7 +1,7 @@ 
 <?php
-require_once(dirname(__FILE__) . '/AbstractTestCase.php');
-require_once(dirname(__FILE__) . '/../support/FileReader.php');
-require_once(dirname(__FILE__) . '/../support/StringReader.php');
+require_once(dirname(__FILE__).'/AbstractTestCase.php');
+require_once(dirname(__FILE__).'/../support/FileReader.php');
+require_once(dirname(__FILE__).'/../support/StringReader.php');
 
 class ReaderTest extends c2ephpAbstractTestCase {
 
@@ -10,19 +10,19 @@ 
      */
     public function testStringReader($string) {
         $stringReader = new StringReader($string);
-        $this->assertEquals($string[0],$stringReader->Read(1));
-        $this->assertEquals($string[1],$stringReader->Read(1));
+        $this->assertEquals($string[0], $stringReader->Read(1));
+        $this->assertEquals($string[1], $stringReader->Read(1));
         $stringReader->skip(2);
-        $this->assertEquals($string[4],$stringReader->Read(1));
-        $this->assertEquals(substr($string,3,8),$stringReader->GetSubString(3,8));
-        $this->assertEquals($string[5],$stringReader->Read(1));
+        $this->assertEquals($string[4], $stringReader->Read(1));
+        $this->assertEquals(substr($string, 3, 8), $stringReader->GetSubString(3, 8));
+        $this->assertEquals($string[5], $stringReader->Read(1));
 
-        $this->assertEquals($string,$stringReader->GetSubString(0));
+        $this->assertEquals($string, $stringReader->GetSubString(0));
     }
     
     public function generateStrings() {
         return array(
-            array('striiing','blimp!!!!!!!'),
+            array('striiing', 'blimp!!!!!!!'),
         );
     }
 }

unit-tests/AbstractTestCase.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-require_once(dirname(__FILE__) . '/../agents/PRAYFile.php');
-require_once(dirname(__FILE__) . '/../support/FileReader.php');
+require_once(dirname(__FILE__).'/../agents/PRAYFile.php');
+require_once(dirname(__FILE__).'/../support/FileReader.php');
 
 abstract class c2ephpAbstractTestCase extends PHPUnit_Framework_TestCase {
     /// @brief Agent Files fixture
@@ -27,7 +27,7 @@ 
         );
 
         $prayfiles = array();
-        foreach($files as $info) {
+        foreach ($files as $info) {
 
             $prayfiles[] = array(new PRAYFile(new FileReader($info['path'])), $info);
         }
@@ -44,7 +44,7 @@ 
 
 
         $prayfiles = array();
-        foreach($files as $info) {
+        foreach ($files as $info) {
 
             $prayfiles[] = array(new PRAYFile(new FileReader($info['path'])), $info);
         }

unit-tests/PRAYFileTest.php

Spacing +15 added lines, -15 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once(dirname(__FILE__) . '/AbstractTestCase.php');
+require_once(dirname(__FILE__).'/AbstractTestCase.php');
 
 class PRAYFileTest extends c2ephpAbstractTestCase {
     
@@ -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());
 
     }
 }

sprites/C16File.php

Spacing +18 added lines, -18 removed lines

@@ -16,30 +16,30 @@ 
      * If $reader is null, creates an empty C16File ready to add sprites to.
      * @param $reader The reader to read the sprites from. Can be null.
      */
-    public function C16File(IReader $reader=null)
+    public function C16File(IReader $reader = null)
     {
-        if($reader != null) {
+        if ($reader != null) {
             parent::SpriteFile('C16');
             $buffer = $reader->ReadInt(4);
-            if(($buffer & 1) == 1) {
+            if (($buffer & 1) == 1) {
                 $this->encoding = '565';
             } else {
                 $this->encoding = '555';
             }
 
-            if(($buffer & 2) == 0) { //buffer & 2 == 2 => RLE. buffer & 2 == 0 => non-RLE (same as s16 but not supported here because it's complex dude.
+            if (($buffer & 2) == 0) { //buffer & 2 == 2 => RLE. buffer & 2 == 0 => non-RLE (same as s16 but not supported here because it's complex dude.
                 throw new Exception('This file is probably a S16 masquerading as a C16!');
-            } else if($buffer > 3) {
+            } else if ($buffer > 3) {
                 throw new Exception('File encoding not recognised. ('.$buffer.')');
             }
 
             $buffer = $reader->ReadInt(2);
-            if($buffer < 1)
+            if ($buffer < 1)
                 throw new Exception('Sprite file appears to contain less than 1 frame.');
             $frameCount = $buffer;
-            for($x=0; $x < $frameCount; $x++)
+            for ($x = 0; $x < $frameCount; $x++)
             {
-                $this->AddFrame(new C16Frame($reader,$this->encoding));
+                $this->AddFrame(new C16Frame($reader, $this->encoding));
             }
         }
     }
@@ -58,30 +58,30 @@ 
     public function Compile() {
         $data = ''; 
         $flags = 2; // 0b00 => 555 S16, 0b01 => 565 S16, 0b10 => 555 C16, 0b11 => 565 C16
-        if($this->encoding == '565') {
+        if ($this->encoding == '565') {
             $flags = $flags | 1;
         }
-        $data .= pack('V',$flags);
-        $data .= pack('v',$this->GetFrameCount());
+        $data .= pack('V', $flags);
+        $data .= pack('v', $this->GetFrameCount());
         $idata = '';
         $offset = 6+(8*$this->GetFrameCount());
-        foreach($this->GetFrames() as $frame) {
+        foreach ($this->GetFrames() as $frame) {
             $offset += ($frame->GetHeight()-1)*4;
         }
 
-        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());
 
             $framedata = $frame->Encode();
             $framebin = $framedata['data'];
-            foreach($framedata['lineoffsets'] as $lineoffset) {
-                $data .= pack('V',$lineoffset+$offset);
+            foreach ($framedata['lineoffsets'] as $lineoffset) {
+                $data .= pack('V', $lineoffset+$offset);
             }
             $offset += strlen($framebin); 
             $idata .= $framebin;
         }
-        return $data . $idata;
+        return $data.$idata;
     }
 
 }

sprites/SPRFrame.php

Spacing +23 added lines, -23 removed lines

@@ -25,26 +25,26 @@ 
      * @param $height Ignored when creating an SPRFrame from a GD image.
      * @param $offset How far through the IReader the SPRFrame is. May not ever be used.
      */
-    public function SPRFrame($reader,$width=0,$height=0,$offset=false) {
-        if($reader instanceof IReader) {
+    public function SPRFrame($reader, $width = 0, $height = 0, $offset = false) {
+        if ($reader instanceof IReader) {
             $this->reader = $reader;
-            parent::SpriteFrame($width,$height);
-            if($offset !== false) {
+            parent::SpriteFrame($width, $height);
+            if ($offset !== false) {
                 $this->offset = $offset;
             } else {
                 $this->offset = $this->reader->GetPosition();
             }
 
             //initialise palette if necessary.
-            if(empty(self::$sprToRGB)) {
+            if (empty(self::$sprToRGB)) {
                 $paletteReader = new FileReader(dirname(__FILE__).'/palette.dta');
-                for($i = 0;$i<256;$i++) {
-                    self::$sprToRGB[$i] = array('r'=>$paletteReader->ReadInt(1)*4,'g'=>$paletteReader->ReadInt(1)*4,'b'=>$paletteReader->ReadInt(1)*4);
+                for ($i = 0; $i < 256; $i++) {
+                    self::$sprToRGB[$i] = array('r'=>$paletteReader->ReadInt(1)*4, 'g'=>$paletteReader->ReadInt(1)*4, 'b'=>$paletteReader->ReadInt(1)*4);
                 }
                 unset($paletteReader);
             }
-        } else if(get_resource_type($reader) == 'gd') {
-            parent::SpriteFrame(imagesx($reader),imagesy($reader),true);
+        } else if (get_resource_type($reader) == 'gd') {
+            parent::SpriteFrame(imagesx($reader), imagesy($reader), true);
             $this->gdImage = $reader;
         } else {
             throw new Exception('$reader was not an IReader or a gd image.');
@@ -58,13 +58,13 @@ 
      * feel free to use it yourself, it's not going anywhere.
      */
     public function Flip() {
-        if($this->HasBeenDecoded()) {
+        if ($this->HasBeenDecoded()) {
             throw new Exception('Too late!');
             return;
         }
         $tempData = '';
-        for($i=($this->GetHeight()-1);$i>-1;$i--) {
-            $tempData .= $this->reader->GetSubString($this->offset+($this->GetWidth())*$i,($this->GetWidth()));
+        for ($i = ($this->GetHeight()-1); $i > -1; $i--) {
+            $tempData .= $this->reader->GetSubString($this->offset+($this->GetWidth())*$i, ($this->GetWidth()));
         }
         $this->reader = new StringReader($tempData);
         $this->offset = 0;
@@ -78,12 +78,12 @@ 
     protected function Decode() {    
         $image = imagecreatetruecolor($this->GetWidth(), $this->GetHeight());
         $this->reader->Seek($this->offset);
-        for($y = 0; $y < $this->GetHeight(); $y++)
+        for ($y = 0; $y < $this->GetHeight(); $y++)
         {
-            for($x = 0; $x < $this->GetWidth(); $x++)
+            for ($x = 0; $x < $this->GetWidth(); $x++)
             {
                 $colour = self::$sprToRGB[$this->reader->ReadInt(1)];
-                imagesetpixel($image,$x,$y,imagecolorallocate($image,$colour['r'],$colour['g'],$colour['b']));
+                imagesetpixel($image, $x, $y, imagecolorallocate($image, $colour['r'], $colour['g'], $colour['b']));
             }
         }
         $this->gdImage = $image;
@@ -101,10 +101,10 @@ 
      */
     public function Encode() {
         $data = '';
-        for($y = 0; $y < $this->GetHeight(); $y++ ) {
-            for($x = 0; $x < $this->GetWidth(); $x++ ) {
+        for ($y = 0; $y < $this->GetHeight(); $y++) {
+            for ($x = 0; $x < $this->GetWidth(); $x++) {
                 $color = $this->GetPixel($x, $y);
-                $data .= pack('C',$this->RGBToSPR($color['red'], $color['green'], $color['blue']));
+                $data .= pack('C', $this->RGBToSPR($color['red'], $color['green'], $color['blue']));
             }
         }
         return $data;
@@ -117,13 +117,13 @@ 
      * Runs in O(n) time.
      */
 
-    private function RGBToSPR($r,$g,$b) {
+    private function RGBToSPR($r, $g, $b) {
         //start out with the maximum distance.
-        $minDistance = ($r^2) + ($g^2) + ($b^2);
+        $minDistance = ($r ^ 2)+($g ^ 2)+($b ^ 2);
         $minKey = 0;
-        foreach(self::$sprToRGB as $key => $colour) {
-            $distance = pow(($r-$colour['r']),2) +  pow(($g-$colour['g']),2) +  pow(($b-$colour['b']),2);
-            if($distance == 0) {
+        foreach (self::$sprToRGB as $key => $colour) {
+            $distance = pow(($r-$colour['r']), 2)+pow(($g-$colour['g']), 2)+pow(($b-$colour['b']), 2);
+            if ($distance == 0) {
                 return $key;
             } else if ($distance < $minDistance) {
                 $minKey = $key;