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

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/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();
+    }
 }
 ?>

caos/highlight/CAOSHighlighter.php

Switch Indentation +3 added lines, -3 removed lines

@@ -443,9 +443,9 @@
         case 'untl':
         case 'next':
         case 'ever':
-            case 'repe';
-            $this->currentIndent--;
-            break;
+        case 'repe';
+        $this->currentIndent--;
+        break;
         }
     }
 

caos/highlight/DS/CommandVariables.php

Indentation +72 added lines, -72 removed lines

@@ -5,93 +5,93 @@
 /// @brief DS CAOS dictionary of tokens that can act like commands or variables
 class DSCAOSCommandVariables {
     /// @brief Returns an array of tokens.
-	public static function GetTokens() {
-		return array(
-			'attr',
-			'base',
-			'bhvr',
-			'clik', //I have no experience using this, but I think this is right.
-			'gall',
-			'hand',
-			'mira',
-			'paus',
-			'plne',
-			'pose',
-			'rnge',
-			'targ',
-			'tick',
+    public static function GetTokens() {
+        return array(
+            'attr',
+            'base',
+            'bhvr',
+            'clik', //I have no experience using this, but I think this is right.
+            'gall',
+            'hand',
+            'mira',
+            'paus',
+            'plne',
+            'pose',
+            'rnge',
+            'targ',
+            'tick',
 		
-			//camera
-			'meta',
-			'trck',
-			'wdow',
+            //camera
+            'meta',
+            'trck',
+            'wdow',
 		
-			//compound
-			'page',
-			'ptxt',
+            //compound
+            'page',
+            'ptxt',
 		
-			//creatures
-			'aslp',
-			'dead',
-			'dirn',
-			'drea',
-			'face',
-			'ins#',
-			'mind',
-			'motr',
-			'norn',
-			'uncs',
-			'zomb',
+            //creatures
+            'aslp',
+            'dead',
+            'dirn',
+            'drea',
+            'face',
+            'ins#',
+            'mind',
+            'motr',
+            'norn',
+            'uncs',
+            'zomb',
 		
-			//files
+            //files
 			
-			//input
-			'pure',
+            //input
+            'pure',
 		
-			//map
-			'perm',
+            //map
+            'perm',
 			
-			//motion
-			'accg',
-			'admp',
-			'aero',
-			'avel',
-			'elas',
-			'fdmp',
-			'fric',
-			'fvel',
-			'sdmp',
-			'spin',
-			'svel',
-			'varc',
+            //motion
+            'accg',
+            'admp',
+            'aero',
+            'avel',
+            'elas',
+            'fdmp',
+            'fric',
+            'fvel',
+            'sdmp',
+            'spin',
+            'svel',
+            'varc',
 			
-			//ports
+            //ports
 			
-			//resources
+            //resources
 			
-			//caos
+            //caos
 			
-			//sounds
-			'vois',
+            //sounds
+            'vois',
 			
-			//time
-			'buzz',
-			'wpau',
-			'targ',
+            //time
+            'buzz',
+            'wpau',
+            'targ',
 			
-			//vehicles
-			'cabp',
-			'cabv',
+            //vehicles
+            'cabp',
+            'cabv',
 			
-			//world
-			'delw',
-			'load',
+            //world
+            'delw',
+            'load',
 		
-			//net
-			'net: line',
-			'net: pass'
-		);
-	}
+            //net
+            'net: line',
+            'net: pass'
+        );
+    }
 }
 
 /// @endcond

caos/highlight/DS/Operators.php

Indentation +16 added lines, -16 removed lines

@@ -4,22 +4,22 @@
 /// @brief Valid operators for DS CAOS */
 class DSCAOSOperators {
     /// @brief Returns an array of tokens.
-	public static function GetTokens() {
-		return array(
-			'=',
-			'<>',
-			'<',
-			'<=',
-			'>',
-			'>=',
-			'eq',
-			'gt',
-			'lt',
-			'ne',
-			'and',
-			'or'
-		);
-	}
+    public static function GetTokens() {
+        return array(
+            '=',
+            '<>',
+            '<',
+            '<=',
+            '>',
+            '>=',
+            'eq',
+            'gt',
+            'lt',
+            'ne',
+            'and',
+            'or'
+        );
+    }
 }
 
 /// @endcond

caos/highlight/DS/FlowControls.php

Indentation +30 added lines, -30 removed lines

@@ -5,36 +5,36 @@
 /// @brief DS CAOS flow control (doif, else, loop, etc) dictionary
 class DSCAOSFlowControls {
     /// @brief Returns an array of tokens.
-	public static function GetTokens() {
-		return array(
-			'doif',
-			'econ',
-			'elif',
-			'else',
-			'enum',
-			'endi',
-			'endm',
-			'epas',
-			'esee',
-			'etch',
-			'ever',
-			'goto',
-			'gsub',
-			'inst',
-			'iscr',
-			'loop',
-			'next',
-			'over', //wait until current agent anim is over...sounds like a flow control to me.
-			'repe',
-			'reps',
-			'retn',
-			'rscr',
-			'scrp',
-			'slow',
-			'subr',
-			'untl',
-		);
-	}
+    public static function GetTokens() {
+        return array(
+            'doif',
+            'econ',
+            'elif',
+            'else',
+            'enum',
+            'endi',
+            'endm',
+            'epas',
+            'esee',
+            'etch',
+            'ever',
+            'goto',
+            'gsub',
+            'inst',
+            'iscr',
+            'loop',
+            'next',
+            'over', //wait until current agent anim is over...sounds like a flow control to me.
+            'repe',
+            'reps',
+            'retn',
+            'rscr',
+            'scrp',
+            'slow',
+            'subr',
+            'untl',
+        );
+    }
 }
 /// @endcond
 ?>

caos/highlight/DS/Variables.php

Indentation +143 added lines, -143 removed lines

@@ -7,165 +7,165 @@
  */
 class DSCAOSVariables {
     /// @brief Returns an array of tokens.
-	public static function GetTokens() {
-		return array(
-			//agents
-			'abba',
-			'carr',
-			'cata',
-			'clac',
-			'fltx',
-			'flty',
-			'fmly',
-			'from',
-			'gnus',
-			'held',
-			'hght',
-			'iitt',
-			'imsk',
-			'mows',
-			'mthx',
-			'mthy',
-			'null',
-			'ownr',
-			'pnts',
-			'posb',
-			'posl',
-			'posr',
-			'post',
-			'posx',
-			'posy',
-			'spcs',
-			'wdth',
-			'_it_',
+    public static function GetTokens() {
+        return array(
+            //agents
+            'abba',
+            'carr',
+            'cata',
+            'clac',
+            'fltx',
+            'flty',
+            'fmly',
+            'from',
+            'gnus',
+            'held',
+            'hght',
+            'iitt',
+            'imsk',
+            'mows',
+            'mthx',
+            'mthy',
+            'null',
+            'ownr',
+            'pnts',
+            'posb',
+            'posl',
+            'posr',
+            'post',
+            'posx',
+            'posy',
+            'spcs',
+            'wdth',
+            '_it_',
 			
-			//camera
-			'cmrx',
-			'cmry',
-			'wndb',
-			'wndh',
-			'wndl',
-			'wndr',
-			'wndt',
-			'wndw',
+            //camera
+            'cmrx',
+            'cmry',
+            'wndb',
+            'wndh',
+            'wndl',
+            'wndr',
+            'wndt',
+            'wndw',
 		
-			//cd player
-			'_cd_ frqh',
-			'_cd_ frql',
-			'_cd_ frqm',
+            //cd player
+            '_cd_ frqh',
+            '_cd_ frql',
+            '_cd_ frqm',
 		
-			//compound
-			'npgs',
+            //compound
+            'npgs',
 			
-			//creatures
-			'attn',
-			'bvar',
-			'byit',
-			'cage',
-			'decn',
-			'dftx',
-			'dfty',
-			'drv!',
-			'expr',
-			'hhld',
-			'orgn',
-			'tage',
-			'uftx',
-			'ufty',
+            //creatures
+            'attn',
+            'bvar',
+            'byit',
+            'cage',
+            'decn',
+            'dftx',
+            'dfty',
+            'drv!',
+            'expr',
+            'hhld',
+            'orgn',
+            'tage',
+            'uftx',
+            'ufty',
 		
-			//debug
-			'code',
-			'codf',
-			'codg',
-			'codp',
-			'cods',
-			'paws',
-			'tack',
-			'unid',
+            //debug
+            'code',
+            'codf',
+            'codg',
+            'codp',
+            'cods',
+            'paws',
+            'tack',
+            'unid',
 		
-			//files
-			'innf',
-			'inni',
-			'innl',
-			'inok',
+            //files
+            'innf',
+            'inni',
+            'innl',
+            'inok',
 			
-			//input
-			'hotp',
-			'hots',
-			'mopx',
-			'mopy',
-			'movx',
-			'movy',
-			'down',
-			'emid',
-			'left',
-			'maph',
-			'mapw',
-			'mloc',
-			'rght',
-			'_up_',
+            //input
+            'hotp',
+            'hots',
+            'mopx',
+            'mopy',
+            'movx',
+            'movy',
+            'down',
+            'emid',
+            'left',
+            'maph',
+            'mapw',
+            'mloc',
+            'rght',
+            '_up_',
 			
-			//motion
-			'fall',
-			'movs',
-			'velx',
-			'vely',
-			'wall',
+            //motion
+            'fall',
+            'movs',
+            'velx',
+            'vely',
+            'wall',
 			
-			//ports
-			'prt: itot',
-			'prt: otot',
+            //ports
+            'prt: itot',
+            'prt: otot',
 			
-			//resources
+            //resources
 			
-			//scripts
+            //scripts
 			
-			//time
-			'date',
-			'dayt',
-			'etik',
-			'mont',
-			'msec',
-			'pace',
-			'race',
-			'rtim',
-			'sean',
-			'time',
-			'wtik',
-			'year',
+            //time
+            'date',
+            'dayt',
+            'etik',
+            'mont',
+            'msec',
+            'pace',
+            'race',
+            'rtim',
+            'sean',
+            'time',
+            'wtik',
+            'year',
 		
-			//variables
-			'gnam',
-			'modu',
-			'eame',
-			'name',
-			'game',
-			'ufos',
-			'vmjr',
-			'vmnr',
-			'_p1_',
-			'_p2_',
-			'null',
+            //variables
+            'gnam',
+            'modu',
+            'eame',
+            'name',
+            'game',
+            'ufos',
+            'vmjr',
+            'vmnr',
+            '_p1_',
+            '_p2_',
+            'null',
 			
-			//vehicles
-			'cabb',
-			'cabl',
-			'cabr',
-			'cabt',
+            //vehicles
+            'cabb',
+            'cabl',
+            'cabr',
+            'cabt',
 			
-			//world
-			'nwld',
-			'wnam',
-			'wuid',
+            //world
+            'nwld',
+            'wnam',
+            'wuid',
 			
-			//net
-			'net: erra',
-			'net: host',
-			'net: rawe',
-			'net: user',
-			'net: what'
-		);
-	}
+            //net
+            'net: erra',
+            'net: host',
+            'net: rawe',
+            'net: user',
+            'net: what'
+        );
+    }
 }
 
 /// @endcond