Fix for tutorial button kicking client when re-entering tutorial (return home button for RoF/RoF2 issue still at large)

This commit is contained in:
Uleat 2015-02-22 22:27:58 -05:00
parent a0ea6066ed
commit 2bed129037

View File

@ -741,12 +741,15 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) {
bool home_enabled = false;
for (auto row = tgh_results.begin(); row != tgh_results.end(); ++row) {
if (strcasecmp(row[1], char_name) == 0) {
if (RuleB(World, EnableTutorialButton) && ((uint8)atoi(row[2]) <= RuleI(World, MaxLevelForTutorial))) {
if (RuleB(World, EnableReturnHomeButton)) {
int now = time(nullptr);
if ((now - atoi(row[3])) >= RuleI(World, MinOfflineTimeToReturnHome)) {
home_enabled = true;
break;
}
}
}
}
if (home_enabled) {
zoneID = database.MoveCharacterToBind(charid, 4);
@ -764,15 +767,12 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) {
bool tutorial_enabled = false;
for (auto row = tgh_results.begin(); row != tgh_results.end(); ++row) {
if (strcasecmp(row[1], char_name) == 0) {
if (RuleB(World, EnableReturnHomeButton)) {
int now = time(nullptr);
if ((now - atoi(row[3])) >= RuleI(World, MinOfflineTimeToReturnHome)) {
if (RuleB(World, EnableTutorialButton) && ((uint8)atoi(row[2]) <= RuleI(World, MaxLevelForTutorial))) {
tutorial_enabled = true;
break;
}
}
}
}
if (tutorial_enabled) {
zoneID = RuleI(World, TutorialZoneID);