corrected comment

This commit is contained in:
ricardocampos23 2015-01-15 21:03:06 +00:00
parent 8f3ffe4e6e
commit 75501fbb5d

View File

@ -282,8 +282,6 @@ int WorldDatabase::MoveCharacterToBind(int CharID, uint8 bindnum) {
return zone_id; return zone_id;
} }
bool WorldDatabase::GetStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc,bool isTitanium) bool WorldDatabase::GetStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc,bool isTitanium)
{ {
// SoF doesn't send the player_choice field in character creation, it now sends the real zoneID instead. // SoF doesn't send the player_choice field in character creation, it now sends the real zoneID instead.
@ -298,8 +296,7 @@ bool WorldDatabase::GetStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct*
in_pp->x = in_pp->y = in_pp->z = in_pp->heading = in_pp->zone_id = 0; in_pp->x = in_pp->y = in_pp->z = in_pp->heading = in_pp->zone_id = 0;
in_pp->binds[0].x = in_pp->binds[0].y = in_pp->binds[0].z = in_pp->binds[0].zoneId = in_pp->binds[0].instance_id = 0; in_pp->binds[0].x = in_pp->binds[0].y = in_pp->binds[0].z = in_pp->binds[0].zoneId = in_pp->binds[0].instance_id = 0;
// see if we have an entry for start_zone. We can support both titanium & SOF+ by having two entries per class/race/deity combo with different zone_ids
//this is wrong. if start_zone is set we should use that id
std::string query = StringFormat("SELECT x, y, z, heading, start_zone, bind_id FROM start_zones WHERE zone_id = %i " std::string query = StringFormat("SELECT x, y, z, heading, start_zone, bind_id FROM start_zones WHERE zone_id = %i "
"AND player_class = %i AND player_deity = %i AND player_race = %i", "AND player_class = %i AND player_deity = %i AND player_race = %i",
in_cc->start_zone, in_cc->class_, in_cc->deity, in_cc->race); in_cc->start_zone, in_cc->class_, in_cc->deity, in_cc->race);
@ -335,8 +332,9 @@ bool WorldDatabase::GetStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct*
return true; return true;
} }
void WorldDatabase::SetSoFDefaultStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc){ void WorldDatabase::SetSoFDefaultStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc){
if (in_cc->start_zone == RuleI(World, TutorialZoneID)) if (in_cc->start_zone == RuleI(World, TutorialZoneID)) {
in_pp->zone_id = in_cc->start_zone; in_pp->zone_id = in_cc->start_zone;
}
else { else {
in_pp->x = in_pp->binds[0].x = -51; in_pp->x = in_pp->binds[0].x = -51;
in_pp->y = in_pp->binds[0].y = -20; in_pp->y = in_pp->binds[0].y = -20;
@ -344,6 +342,7 @@ void WorldDatabase::SetSoFDefaultStartZone(PlayerProfile_Struct* in_pp, CharCrea
in_pp->zone_id = in_pp->binds[0].zoneId = 394; // Crescent Reach. in_pp->zone_id = in_pp->binds[0].zoneId = 394; // Crescent Reach.
} }
} }
void WorldDatabase::SetTitaniumDefaultStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc) void WorldDatabase::SetTitaniumDefaultStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc)
{ {
switch (in_cc->start_zone) switch (in_cc->start_zone)