Fixed potential crash when whispering via friendlistwindow

Added relative speed figure to info window
gwdevhub · Mar 14, 2021 · fba1176 · fba1176
1 parent 9734895
commit fba1176
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/GWToolboxdll/Windows/FriendListWindow.cpp b/GWToolboxdll/Windows/FriendListWindow.cpp
@@ -477,6 +477,8 @@ void FriendListWindow::OnOutgoingWhisper(GW::HookStatus *, int channel, wchar_t
     if (instance.is_redirecting_whisper || static_cast<GW::Chat::Channel>(channel) != GW::Chat::CHANNEL_WHISPER)
         return;
     wchar_t* separator_pos = wcschr(message, ',');
+    if (!separator_pos)
+        return;
     instance.pending_whisper.reset(std::wstring(message, separator_pos), std::wstring(&separator_pos[1]));
 }
 

diff --git a/GWToolboxdll/Windows/InfoWindow.cpp b/GWToolboxdll/Windows/InfoWindow.cpp
@@ -231,7 +231,8 @@ void InfoWindow::DrawAgentInfo(GW::Agent* agent) {
     ImGui::ShowHelp("Agent ID is unique for each agent in the instance,\nIt's generated on spawn and will change in different instances.");
     InfoField("X pos", "%.2f", agent->pos.x);
     InfoField("Y pos", "%.2f", agent->pos.y);
-    InfoField("Speed", "%.3f", sqrtf(agent->move_x * agent->move_x + agent->move_y * agent->move_y));
+    float speed = sqrtf(agent->move_x * agent->move_x + agent->move_y * agent->move_y);
+    InfoField("Speed (Relative)", "%.2f (%.2f) ", speed, speed > 0.f ? speed / 288.0f : 0.f);
     if (living) {
         InfoField(living->IsPlayer() ? "Player ID" : "Model ID", "%d", living->player_number);
         ImGui::ShowHelp("Model ID is unique for each kind of agent.\n"