Skip to content
This repository was archived by the owner on Oct 10, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gui/tabs/settings_tab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace SettingsTab {
ImGui::Dummy(ImVec2(4, 4));
ImGui::Text("Change Theme Color:");
ImGui::Dummy(ImVec2(4, 4));
ImGui::PushItemWidth(ImGui::GetWindowWidth() / 3.5);
ImGui::PushItemWidth(ImGui::GetWindowWidth() / 3.5f);
ImGui::ColorPicker4("##picker", (float*)&State.SelectedColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_NoLabel | ImGuiColorEditFlags_PickerHueWheel);
ImGui::PopItemWidth();

Expand Down
4 changes: 2 additions & 2 deletions gui/theme.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ ImVec4 HI(float v) {

ImVec4 MED(float v) {
ImVec4 vec = State.SelectedColor;
return ImVec4(vec.x / 1.5, vec.y / 1.5, vec.z / 1.5, v);
return ImVec4(vec.x / 1.5f, vec.y / 1.5f, vec.z / 1.5f, v);
}

ImVec4 LOW(float v) {
ImVec4 vec = State.SelectedColor;
return ImVec4(vec.x / 2, vec.y / 2, vec.z / 2, v);
return ImVec4(vec.x / 2.0f, vec.y / 2.0f, vec.z / 2.0f, v);
}

#define BG(v) ImVec4(0.200f, 0.220f, 0.270f, v)
Expand Down
8 changes: 4 additions & 4 deletions hooks/HudManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ using namespace app;
void dHudManager_ShowMap(HudManager* __this, Action_1_MapBehaviour_* mapAction, MethodInfo* method) {
HudManager_ShowMap(__this, mapAction, method);

if (State.ChatAlwaysActive)
ChatController_SetVisible(__this->fields.Chat, true, NULL);
else
ChatController_SetVisible(__this->fields.Chat, false, NULL);
//if (State.ChatAlwaysActive)
// ChatController_SetVisible(__this->fields.Chat, true, NULL);
//else
// ChatController_SetVisible(__this->fields.Chat, false, NULL);
}

void dHudManager_Update(HudManager* __this, MethodInfo* method) {
Expand Down
1 change: 1 addition & 0 deletions user/state.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class Settings {

std::vector<PlayerControl*> impostors = { nullptr, nullptr, nullptr };
int map = -1;
ShipStatus_MapType__Enum previousMap = (ShipStatus_MapType__Enum) 0;
int impostors_amount = 0;

bool Wallhack = false;
Expand Down