Subversion Repositories eoserv

Compare Revisions

Ignore whitespace Rev 365 → Rev 366

/trunk/src/npc.cpp
248,7 → 248,7
if (home)
home->innkeeper_vend = this->Data().vendor_id;
else
Console::Wrn("innkeeper set on non-existent home");
Console::Wrn("NPC #%i's innkeeper set on non-existent home: %s", id, this->citizenship->home.c_str());
 
goto restart_loop;
}
258,7 → 258,7
 
if (index < 0 || index >= 3)
{
Console::Wrn("Exactly 3 questions must be specified");
Console::Wrn("Exactly 3 questions must be specified for %s innkeeper NPC #%i", std::string(hc.second).c_str(), id);
}
 
this->citizenship->questions[index] = static_cast<std::string>(hc.second);
269,7 → 269,7
 
if (index < 0 || index >= 3)
{
Console::Wrn("Exactly 3 answers must be specified");
Console::Wrn("Exactly 3 answers must be specified for %s innkeeper NPC #%i", std::string(hc.second).c_str(), id);
}
 
this->citizenship->answers[index] = static_cast<std::string>(hc.second);
/trunk/src/world.cpp
320,6 → 320,9
Console::Wrn(e.what());
}
 
this->UpdateConfig();
this->LoadHome();
 
this->eif = new EIF(this->config["EIF"]);
this->enf = new ENF(this->config["ENF"]);
this->esf = new ESF(this->config["ESF"]);
412,9 → 415,6
}
 
this->guildmanager = new GuildManager(this);
 
this->UpdateConfig();
this->LoadHome();
}
 
void World::BeginDB()