[Command] Optimize setviewpos command

This commit is contained in:
momo5502 2016-11-24 08:28:33 +01:00
parent e8a5e164fc
commit 04c696a9d5

View File

@ -213,32 +213,31 @@ namespace Components
return; return;
} }
if (params.length() < 4 || params.length() > 6) if (params.length() != 4 && params.length() != 6)
{ {
Logger::Print("Invalid coordinate specified!\n"); Logger::Print("Invalid coordinate specified!\n");
Toast::Show("cardicon_stop", "Error", "Invalid coordinate specified!", 3000); Toast::Show("cardicon_stop", "Error", "Invalid coordinate specified!", 3000);
return; return;
} }
float pos[3]; float pos[3] = { 0.0f, 0.0f, 0.0f };
float orientation[3]; float orientation[3] = { 0.0f, 0.0f, 0.0f };
for (unsigned int i = 0; i < (params.length() - 1); i++) pos[0] = strtof(params[1], NULL);
pos[1] = strtof(params[2], NULL);
pos[2] = strtof(params[3], NULL);
if(params.length() == 6)
{ {
if (i < 3) orientation[0] = strtof(params[4], NULL);
{ orientation[1] = strtof(params[5], NULL);
pos[i] = strtof(params[i + 1], NULL);
}
else
{
orientation[i - 3] = strtof(params[i + 1], NULL);
}
} }
Game::TeleportPlayer(&Game::g_entities[clientNum], pos, orientation); Game::TeleportPlayer(&Game::g_entities[clientNum], pos, orientation);
Logger::Print("Successfully teleported player!\n"); // Logging that will spam the console and screen if people use cinematics
Toast::Show("cardicon_abduction", "Success", "You have been teleported!", 3000); //Logger::Print("Successfully teleported player!\n");
//Toast::Show("cardicon_abduction", "Success", "You have been teleported!", 3000);
}); });
} }