mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-31 15:30:17 -05:00
Code Issues Projects Releases Wiki Activity

Makes data in OverlayCommand private.

Browse Source
This commit is contained in:
Kenix3 2022-08-16 22:26:17 -04:00
parent b43eb2d0bd
commit ea92a2e123
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libultraship/libultraship/GameOverlay.cpp
View File

@ -9,7 +9,7 @@
#include "Utils/StringHelper.h" #include "Utils/StringHelper.h"
namespace Ship { namespace Ship {
bool OverlayCommand(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args) { bool GameOverlay::OverlayCommand(std::shared_ptr<Console> Console, const std::vector<std::string>& args) {
if (args.size() < 3) { if (args.size() < 3) {
return CMD_FAILED; return CMD_FAILED;
} }

11
libultraship/libultraship/GameOverlay.h
View File

@ -1,7 +1,9 @@
#pragma once #pragma once
#include <string> #include <string>
#include <vector> #include <vector>
#include <memory>
#include "Console.h"
#include "Lib/ImGui/imgui.h" #include "Lib/ImGui/imgui.h"
#include <unordered_map> #include <unordered_map>
@ -20,9 +22,8 @@ namespace Ship {
class GameOverlay { class GameOverlay {
public: public:
std::unordered_map<std::string, Overlay*> RegisteredOverlays; static bool OverlayCommand(std::shared_ptr<Console> Console, const std::vector<std::string>& args);
std::unordered_map<std::string, ImFont*> Fonts;
std::string CurrentFont = "Default";
void Init(); void Init();
void Draw(); void Draw();
void DrawSettings(); void DrawSettings();
@ -33,7 +34,11 @@ namespace Ship {
void TextDraw(float x, float y, bool shadow, ImVec4 color, const char* text, ...); void TextDraw(float x, float y, bool shadow, ImVec4 color, const char* text, ...);
void TextDrawNotification(float duration, bool shadow, const char* fmt, ...); void TextDrawNotification(float duration, bool shadow, const char* fmt, ...);
private: private:
std::unordered_map<std::string, ImFont*> Fonts;
std::unordered_map<std::string, Overlay*> RegisteredOverlays;
std::string CurrentFont = "Default";
bool NeedsCleanup = false; bool NeedsCleanup = false;
void CleanupNotifications(); void CleanupNotifications();
void LoadFont(const std::string& name, const std::string& path, float fontSize); void LoadFont(const std::string& name, const std::string& path, float fontSize);
}; };