Wirlaburla/P3NG0
2
1
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closed #1

Browse Source
This commit is contained in:
Downforce Agent 2024-01-29 04:11:53 -06:00
parent 89096df226
commit 9b09fb22fd
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main.cpp
View File

@ -781,17 +781,17 @@ bool handleGroups(char* buffer, std::string from, std::string message) {
// teleport using a markEntry loaded from the database // teleport using a markEntry loaded from the database
void handleTeleportRequest(internalTypes::markEntry details) { void handleTeleportRequest(internalTypes::markEntry details) {
std::cout << "info: requesting to join room \"" + details.room + "\""; std::cout << "info: requesting to join room \"" + details.room + "\"\n";
roomIDReq(&roomsock, details.room); roomIDReq(&roomsock, details.room);
std::cout << "info: updating goto destination"; std::cout << "info: updating goto destination\n";
realLocation = details.url; realLocation = details.url;
std::cout << "info: setting position at " + std::cout << "info: setting position at " +
std::to_string(details.position.x) + ", " + std::to_string(details.position.x) + ", " +
std::to_string(details.position.y) + ", " + std::to_string(details.position.y) + ", " +
std::to_string(details.position.z) + ", " + std::to_string(details.position.z) + ", " +
std::to_string(details.position.yaw); std::to_string(details.position.yaw) + "\n";
teleport(&roomsock, teleport(&roomsock,
details.position.x, details.position.x,
details.position.y, details.position.y,
@ -816,7 +816,7 @@ void lookUpWorldName(std::string alias, char* buffer/*replies*/) {
std::cout << "info: found world \"" + alias + "\" in database, commencing teleport.\n"; std::cout << "info: found world \"" + alias + "\" in database, commencing teleport.\n";
internalTypes::markEntry details; internalTypes::markEntry details;
json failsafe = { json failsafe = { // leftovers
{"name", "FALLBACK"}, {"name", "FALLBACK"},
{"url", "rel:GroundZero/GroundZero.world"}, {"url", "rel:GroundZero/GroundZero.world"},
{"room", "GroundZero#Reception"}, {"room", "GroundZero#Reception"},
@ -824,27 +824,22 @@ void lookUpWorldName(std::string alias, char* buffer/*replies*/) {
{"blacklist", true} {"blacklist", true}
}; };
if (
typeid((*key)["position"][0]).name() != "int" ||
typeid((*key)["position"][1]).name() != "int" ||
typeid((*key)["position"][2]).name() != "int" ||
typeid((*key)["position"][3]).name() != "int") {
std::cout << "ERROR: expected type int when reading position. PLEASE CHECK your marks.json!!!\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");
//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];
details.name = (*key)["name"].get<std::string>(); details.name = (*key)["name"].get<std::string>();
details.url = (*key)["url"].get<std::string>(); details.url = (*key)["url"].get<std::string>();
details.room = (*key)["room"].get<std::string>(); details.room = (*key)["room"].get<std::string>();
std::cout << "debug: retrieving position"; //found bug
details.position.x = (*key)["position"][0]; details.position.x = (*key)["position"][0];
details.position.y = (*key)["position"][1]; details.position.y = (*key)["position"][1];
details.position.z = (*key)["position"][2]; details.position.z = (*key)["position"][2];
details.position.yaw = (*key)["position"][3]; details.position.yaw = (*key)["position"][3];
sprintf(buffer, mainConf->getValue("world_not_found_msg", "Taking you there now, teleport to me!").c_str()); sprintf(buffer, mainConf->getValue("world_not_found_msg", "Taking you there now, teleport to me!").c_str());
handleTeleportRequest(details); handleTeleportRequest(details);
} }