Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery

Conflicts:
	css/challenge.css

1 files changed, 3 insertions, 3 deletions

diff --git a/pages/achievements.php b/pages/achievements.php
index ac7aded..6dbabe7 100644
--- a/pages/achievements.php
+++ b/pages/achievements.php
@@ -7,7 +7,7 @@ htmlHeader(array('profile'), 'Pathery Achievements');
 <?php

 topbar($Links);

 

-include_once('./includes/db.inc.php');

+include_once('./includes/sqlEmbedded.php');

 include_once('./includes/datas.php');

 

 //Get UserID

@@ -499,13 +499,13 @@ foreach($achievements as $aType => $a) {
 	$aTypeNames[1] = "<img src='../images/Achievement_PathCareer.png' style='width:36px;height:36px;vertical-align:middle'>Path Career Level $aLevel!";

 	$aTypeNames[2] = "<img src='../images/Achievement_MazeCareer.png' style='width:36px;height:36px;vertical-align:middle'>Mazes Career Level $aLevel!";

 	$aTypeNames[3] = "<img src='../images/MedalSilverCAR.png' style='width:36px;height:36px;vertical-align:middle'>Maze Mastery Level $aLevel!";

-	$aTypeNames[4] = "<img src='../images/MedalGoldCAR.png' style='width:36px;height:36px;vertical-align:middle'>Champion Level $aLevel!";

+	$aTypeNames[4] = "<img src='../images/championpoints.png' style='width:36px;height:36px;vertical-align:middle'>Champion Level $aLevel!";

 	$aTypeNames[32] = 'Tutorial Complete!';

 	

 	$aTypeCurrency[1] = "total moves mazed";

 	$aTypeCurrency[2] = "mazes played";

 	$aTypeCurrency[3] = "mazes with (tied) top score";

-	$aTypeCurrency[4] = "maze wins";

+	$aTypeCurrency[4] = "champion points";

 	

 	$name = $aTypeNames[$aType];

 	$currency = $aTypeCurrency[$aType];