Wall orientation achievements - huge commit.

1 files changed, 5 insertions, 4 deletions

diff --git a/includes/header.php b/includes/header.php
index 3965357..71c2a5c 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -153,7 +153,7 @@ function htmlFooter() {
 }

 

 function topbar($links) {

-	global $accepted, $wallColor, $wallEmblem, $request;

+	global $accepted, $wallColor, $wallEmblem, $wallOrientation, $request;

 	

 	

 	

@@ -191,7 +191,7 @@ function topbar($links) {
 			echo "		<a href='cp' title='change name'>Update your name</a> | ";

 		echo "		<a href='logout'>Logout</a>";

 		echo "	</div>";

-	echo "<div id='topbarBadge' style='background-color: $wallColor; background-image: url(images/marks/$wallEmblem);'>

+	echo "<div id='topbarBadge' style='background-color: $wallColor; background-image: url(".linkEmblem($wallEmblem, $wallOrientation).");'>

 		<a href='achievements'><div></div></a>

 	</div>";

 	

@@ -207,9 +207,9 @@ function topbar($links) {
 }

 

 function userDataToJS() {

-	global $wallColor, $wallEmblem, $accepted;

+	global $wallColor, $wallEmblem, $wallOrientation, $accepted;

 	if (!$accepted) {

-		$r = 'var userObj = {"wallColor":false,"wallEmblem":false,';

+		$r = 'var userObj = {"wallColor":false,"wallEmblem":false,"wallOrientation":false,';

 		$r .= '"ID":"-1","accepted":false,"hasInsaneSpeed":false};';

 	} else {

 		$userID = $_SESSION['userID'];

@@ -220,6 +220,7 @@ function userDataToJS() {
 		$json['ID'] = $userID;

 		$json['wallColor'] = $wallColor;

 		$json['wallEmblem'] = $wallEmblem;

+		$json['wallOrientation'] = $wallOrientation;

 		$json['hasInsaneSpeed'] = $hasInsaneSpeed;

 		$json['accepted'] = 'true';