The scary chat-app in working form!

3 files changed, 28 insertions, 29 deletions

diff --git a/css/challenge.css b/css/challenge.css
index a7f7465..15a94ab 100644
--- a/css/challenge.css
+++ b/css/challenge.css
@@ -40,7 +40,6 @@
 	display: none;
 }
 
-<<<<<<< HEAD
 .challengelist_map {
 	float:left;
 	padding: 15px;
@@ -56,8 +55,6 @@
 	border-width: 0px 0px 1px 1px;
 }
 
-=======
->>>>>>> origin/HEAD
 /** Challenge listing page **/
 #challengelist_wrapper #challengelist {}
 #challengelist_wrapper #challengelist .challengelist_tier {
diff --git a/includes/mapclass.php b/includes/mapclass.php
index ddf08cd..03bbedd 100644
--- a/includes/mapclass.php
+++ b/includes/mapclass.php
@@ -8,6 +8,7 @@
 define("TileType", 0);
 define("TileValue", 1);
 
+define("TileWall", 'w'); //User-placed-wall.
 define("TileEmpty", 'o');
 define("TileStart", 's');
 define("TileFinish", 'f');
@@ -74,35 +75,32 @@ class map {
 					switch ($type) {
 						case 'S':
 						$this->isMultiPath = true;
-						$value = 1;
-						$type = 's';
-						break;
-						case 'R':
-						$value = 1;
-						$type = 'r';
-						break;
-						case 'q':
 						$value = 2;
-						$type = 'r';
+						$type = TileStart;
 						break;
+						case 'w': $value = ''; $type = Tilewall; break;
+						
+						case 'r': $value = ''; $type = TileRock; break;
+						case 'R': $value = 2; $type = TileRock; break;
+						case 'q': $value = 3; $type = TileRock; break;
 						//Probably a more intelligent way to do this; but it works:
-						case 'a': $value = ''; $type = 'c'; break;
-						case 'b': $value = 2; $type = 'c'; break;
-						case 'c': $value = 3; $type = 'c'; break;
-						case 'd': $value = 4; $type = 'c'; break;
-						case 'e': $value = 5; $type = 'c'; break;	
-
-						case 't': $value = ''; $type = 't'; break;
-						case 'm': $value = 2; $type = 't'; break;
-						case 'g': $value = 3; $type = 't'; break;
-						case 'i': $value = 4; $type = 't'; break;
-						case 'k': $value = 5; $type = 't'; break;
+						case 'a': $value = ''; $type = TileCheckpoint; break;
+						case 'b': $value = 2; $type = TileCheckpoint; break;
+						case 'c': $value = 3; $type = TileCheckpoint; break;
+						case 'd': $value = 4; $type = TileCheckpoint; break;
+						case 'e': $value = 5; $type = TileCheckpoint; break;	
+
+						case 't': $value = ''; $type = TileTeleportIn; break;
+						case 'm': $value = 2; $type = TileTeleportIn; break;
+						case 'g': $value = 3; $type = TileTeleportIn; break;
+						case 'i': $value = 4; $type = TileTeleportIn; break;
+						case 'k': $value = 5; $type = TileTeleportIn; break;
 						
-						case 'u': $value = ''; $type = 'u'; break;
-						case 'n': $value = 2; $type = 'u'; break;
-						case 'h': $value = 3; $type = 'u'; break;
-						case 'j': $value = 4; $type = 'u'; break;
-						case 'l': $value = 5; $type = 'u'; break;
+						case 'u': $value = ''; $type = TileTeleportOut; break;
+						case 'n': $value = 2; $type = TileTeleportOut; break;
+						case 'h': $value = 3; $type = TileTeleportOut; break;
+						case 'j': $value = 4; $type = TileTeleportOut; break;
+						case 'l': $value = 5; $type = TileTeleportOut; break;
 					}
 					
 					$this->tiles[$y][$x][TileType] = $type;
@@ -112,7 +110,7 @@ class map {
 					$t = -1;
 
 				} else {
-					$this->tiles[$y][$x][TileType] = 'o';	//Empty Tile
+					$this->tiles[$y][$x][TileType] = TileEmpty;
 				}
 			}
 		}
diff --git a/index.php b/index.php
index 88172e3..6117d9f 100644
--- a/index.php
+++ b/index.php
@@ -173,6 +173,10 @@ switch ($request) {
 	require 'pages/challengelist.php';

    break;

 	

+	case "chat":

+	require 'pages/chat.php';

+   break;

+	

 	

 	case "admin":

 	if ($_SESSION['isAdmin'] == true)