forked from Wirlaburla/P3NG0
attempting fix for #1
This commit is contained in:
parent
cb388b85d6
commit
0dd148f462
22
src/main.cpp
22
src/main.cpp
|
@ -814,7 +814,28 @@ void lookUpWorldName(std::string alias, char* buffer/*replies*/) {
|
|||
auto key = worldsmarks.find(alias);
|
||||
if (key != worldsmarks.end()) {
|
||||
std::cout << "info: found world \"" + alias + "\" in database, commencing teleport.\n";
|
||||
|
||||
internalTypes::markEntry details;
|
||||
json failsafe = {
|
||||
{"name", "FALLBACK"},
|
||||
{"url", "rel:GroundZero/GroundZero.world"},
|
||||
{"room", "GroundZero#Reception"},
|
||||
{"position", {0, 0, 0, 0}},
|
||||
{"blacklist", true}
|
||||
};
|
||||
std::cout << "info: found world \"" + alias + "\" in database, commencing teleport.\n";
|
||||
|
||||
details.name = worldsmarks.value(alias, failsafe).value("name", "null");
|
||||
details.url = worldsmarks.value(alias, failsafe).value("url", "null");
|
||||
details.room = worldsmarks.value(alias, failsafe).value("room", "null");
|
||||
std::cout << "info: found world \"" + alias + "\" in database, commencing teleport.\n";
|
||||
details.position.x = worldsmarks.value(alias, failsafe).value("position", "null")[0];
|
||||
details.position.y = worldsmarks.value(alias, failsafe).value("position", "null")[1];
|
||||
details.position.z = worldsmarks.value(alias, failsafe).value("position", "null")[2];
|
||||
details.position.yaw = worldsmarks.value(alias, failsafe).value("position", "null")[3];
|
||||
std::cout << "info: found world \"" + alias + "\" in database, commencing teleport.\n";
|
||||
|
||||
/*
|
||||
details.name = (*key)["name"].get<std::string>();
|
||||
details.url = (*key)["url"].get<std::string>();
|
||||
details.room = (*key)["room"].get<std::string>();
|
||||
|
@ -822,6 +843,7 @@ void lookUpWorldName(std::string alias, char* buffer/*replies*/) {
|
|||
details.position.y = (*key)["position"][1];
|
||||
details.position.z = (*key)["position"][2];
|
||||
details.position.yaw = (*key)["position"][3];
|
||||
*/
|
||||
|
||||
sprintf(buffer, mainConf->getValue("world_not_found_msg", "Taking you there now, teleport to me!").c_str());
|
||||
handleTeleportRequest(details);
|
||||
|
|
Loading…
Reference in New Issue
Block a user