diff --git a/mojotrollz/api/char/charcreation.php b/mojotrollz/api/char/charcreation.php index d5654e4..c5ed73a 100644 --- a/mojotrollz/api/char/charcreation.php +++ b/mojotrollz/api/char/charcreation.php @@ -39,7 +39,7 @@ class charcreation { public static function checkClassRace($class,$race){ switch($race){ case player_races::HUMAN : return in_array($class, array(player_classes::WARRIOR, player_classes::ROGUE, player_classes::PRIEST, player_classes::MAGE, player_classes::WARLOCK, player_classes::PALADIN)); - case player_races::ORK: return in_array($class, array(player_classes::WARRIOR, player_classes::HUNTER, player_classes::SHAMAN, player_classes::ROGUE, player_classes::WARLOCK)); + case player_races::ORC: return in_array($class, array(player_classes::WARRIOR, player_classes::HUNTER, player_classes::SHAMAN, player_classes::ROGUE, player_classes::WARLOCK)); case player_races::DWARF: return in_array($class, array(player_classes::WARRIOR, player_classes::HUNTER, player_classes::ROGUE, player_classes::PRIEST, player_classes::PALADIN)); case player_races::SCOURGE: return in_array($class, array(player_classes::WARRIOR, player_classes::ROGUE, player_classes::PRIEST, player_classes::MAGE, player_classes::WARLOCK)); case player_races::NIGHTELF: return in_array($class,array(player_classes::WARRIOR, player_classes::HUNTER, player_classes::ROGUE, player_classes::PRIEST, player_classes::DRUID)); diff --git a/mojotrollz/page/wizard_details/js/wizard_details.js b/mojotrollz/page/wizard_details/js/wizard_details.js index 692c5e4..bcd5844 100644 --- a/mojotrollz/page/wizard_details/js/wizard_details.js +++ b/mojotrollz/page/wizard_details/js/wizard_details.js @@ -13,7 +13,8 @@ function init_wizard_details (){ $('#info_content').load('./?page=default_info&id='+info); }); - $('#details_gender a').click(function(){ + $('#details_gender a').click(function(e){ + e.preventDefault(); $('#details_gender a').removeClass('selected'); $('#details_race a').removeClass('selected'); $('#details_race a').removeClass('fadein'); diff --git a/mojotrollz/page/wizard_visuals/wizard_visuals.php b/mojotrollz/page/wizard_visuals/wizard_visuals.php index 3e94acf..aaadcd7 100644 --- a/mojotrollz/page/wizard_visuals/wizard_visuals.php +++ b/mojotrollz/page/wizard_visuals/wizard_visuals.php @@ -9,7 +9,7 @@ class wizard_visuals extends SYSTEM\PAGE\Page { return array( \SYSTEM\WEBPATH(new PAPI(),'char/css/equipment.css'));} private static function select($race,$type,$value){ - $res = \DBD\RACE_VISUALS::QQ(array($race,$type)); + $res = \DBD\RACE_VISUALS_BY_TYPE::QQ(array($race,$type)); $options = ''; while($row = $res->next()){ $row['selected'] = ''; @@ -34,8 +34,7 @@ class wizard_visuals extends SYSTEM\PAGE\Page { $vars['visual_facial_hair'] = self::select($vars['char_race'], race_visuals::VISUAL_FACIAL_HAIR, $vars['char_facial_hair']); $vars['visual_facial_hair_color'] = self::select($vars['char_race'], race_visuals::VISUAL_FACIAL_HAIR_COLOR, $vars['char_facial_hair_color']); if($vars['char_gender'] == 'default'){ - return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_visuals/tpl/wizard_visuals_norace.tpl'), array()); - } + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_visuals/tpl/wizard_visuals_norace.tpl'), array());} return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'wizard_visuals/tpl/wizard_visuals.tpl'), $vars); } } \ No newline at end of file