Merge branch 'master' of git.raylu.net:pathery

Conflicts:
	globe.php
	pages/login.php

1 files changed, 11 insertions, 2 deletions

diff --git a/globe.php b/globe.php
index dda0fd2..7a3d472 100644
--- a/globe.php
+++ b/globe.php
@@ -7,9 +7,10 @@ if (!session_id())
 //Database login:

 //include_once 'sqlEmbedded.php';

 

-//TODO: CONFIRM THIS DOMAIN BEFORE TRANSFER

+//!! CONFIRM THIS DOMAIN BEFORE TRANSFER

 //$mydomain = "http://www.mazetd.4xg.net/";

-$mydomain = "http://www.blue.4xg.net/";

+//$mydomain = "http://www.blue.4xg.net/

+$mydomain = "http://www.pathery.com/";

 

 function LogError($error) {

 	

@@ -19,6 +20,12 @@ function LogError($error) {
 	fclose($fd);

 }

 

+function linkEmblem($emblem, $orientation) {

+	$orientation = $orientation - 0;

+	$url = 'images/marks/';

+	if ($orientation == 0) return $url.$emblem;

+	return $url.'rotate.php?r='.$orientation.'&emblem='.$emblem;

+}

 

 function soundManager1() {

 	return '

@@ -49,6 +56,8 @@ soundManager.setup({
 		soundManager.createSound({id: 'click',url: '/sounds/click.mp3'});

 		soundManager.createSound({id: 'sc',url: '/sounds/transmission.mp3'});

 		soundManager.createSound({id: 'hologram',url: '/sounds/hologram.mp3'});

+		soundManager.createSound({id: 'pit',url: '/sounds/pit.mp3'});

+		soundManager.createSound({id: 'select',url: '/sounds/select.mp3'});

 	}

 });

 </script>