[III | VC] Clear errors in log

This commit is contained in:
Grinch_ 2022-10-01 14:07:16 +06:00
parent 24c9564928
commit ad334f4120
6 changed files with 18 additions and 6 deletions

View File

@ -212,10 +212,10 @@ VehCustmzrMgr& VehCustmzr = VehCustmzrMgr::Get();
VehCustmzrMgr::VehCustmzrMgr() VehCustmzrMgr::VehCustmzrMgr()
{ {
m_CustomizeData.m_bAllowRemoveAll = true;
FileHandler::FetchColorData(m_ColorData); FileHandler::FetchColorData(m_ColorData);
#ifdef GTASA #ifdef GTASA
m_CustomizeData.m_bAllowRemoveAll = true;
FileHandler::FetchHandlingID(m_VehicleIDE); FileHandler::FetchHandlingID(m_VehicleIDE);
Events::processScriptsEvent += [this] Events::processScriptsEvent += [this]

View File

@ -8,8 +8,11 @@
class VehCustmzrMgr : public IFeature<VehCustmzrMgr> class VehCustmzrMgr : public IFeature<VehCustmzrMgr>
{ {
private: private:
#ifdef GTASA
ResourceStore m_TuneData { "components", eResourceType::TYPE_IMAGE_TEXT, ImVec2(100, 80) }; ResourceStore m_TuneData { "components", eResourceType::TYPE_IMAGE_TEXT, ImVec2(100, 80) };
ResourceStore m_CustomizeData { "customizations", eResourceType::TYPE_TEXT }; ResourceStore m_CustomizeData { "customizations", eResourceType::TYPE_TEXT };
#endif
std::vector<std::vector<float>> m_ColorData; // vehicle color data from carcols.dat std::vector<std::vector<float>> m_ColorData; // vehicle color data from carcols.dat
std::map<int, std::string> m_VehicleIDE; std::map<int, std::string> m_VehicleIDE;
char m_nLabel[32] {"Untitled"}; char m_nLabel[32] {"Untitled"};

View File

@ -4,9 +4,13 @@
LONG WINAPI CrashHandler(PEXCEPTION_POINTERS pInfo) LONG WINAPI CrashHandler(PEXCEPTION_POINTERS pInfo)
{ {
Log::Print<eLogLevel::None>(""); DWORD code = pInfo->ExceptionRecord->ExceptionCode;
Log::Print<eLogLevel::Error>("Unhandled exception at {} (0x{:x})", if (code > 0x80000000)
pInfo->ExceptionRecord->ExceptionAddress, pInfo->ExceptionRecord->ExceptionCode); {
Log::Print<eLogLevel::None>("");
Log::Print<eLogLevel::Error>("Unhandled exception at {} (0x{:x})", pInfo->ExceptionRecord->ExceptionAddress, code);
}
return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_CONTINUE_SEARCH;
} }

View File

@ -2,7 +2,9 @@
eRenderer gRenderer = eRenderer::Unknown; eRenderer gRenderer = eRenderer::Unknown;
DataStore gConfig = DataStore(FILE_NAME, true); DataStore gConfig = DataStore(FILE_NAME, true);
#ifdef GTASA
ResourceStore gTextureList { "misc", eResourceType::TYPE_IMAGE, ImVec2(100, 80) }; ResourceStore gTextureList { "misc", eResourceType::TYPE_IMAGE, ImVec2(100, 80) };
#endif
Hotkey aimSkinChanger {VK_RETURN, VK_RETURN, "AimSkinChanger"}; Hotkey aimSkinChanger {VK_RETURN, VK_RETURN, "AimSkinChanger"};
Hotkey freeCam {VK_F6, VK_F6, "Freecam.Toggle"}; Hotkey freeCam {VK_F6, VK_F6, "Freecam.Toggle"};
Hotkey freeCamForward {VK_KEY_I, VK_KEY_I, "Freecam.Forward"};; Hotkey freeCamForward {VK_KEY_I, VK_KEY_I, "Freecam.Forward"};;

View File

@ -111,4 +111,7 @@ extern Hotkey teleportMarker;
extern Hotkey vehEngine; extern Hotkey vehEngine;
extern Hotkey vehInstantStart; extern Hotkey vehInstantStart;
extern Hotkey vehInstantStop; extern Hotkey vehInstantStop;
extern ResourceStore gTextureList;
#ifdef GTASA
extern ResourceStore gTextureList;
#endif

View File

@ -273,7 +273,7 @@ static bool RoundedImageButton(ImTextureID textureID, ImVec2& size, const char*
void DrawClippedImages(ResourceStore& data, ImVec2 imgSz, size_t imagesInRow, bool showImages, void DrawClippedImages(ResourceStore& data, ImVec2 imgSz, size_t imagesInRow, bool showImages,
bool favourites, fArg1_t clickFunc, fRtnArg1_t getNameFunc, fRtnBoolArg1_t verifyFunc) bool favourites, fArg1_t clickFunc, fRtnArg1_t getNameFunc, fRtnBoolArg1_t verifyFunc)
{ {
static IDirect3DTexture9 **pDefaultTex = gTextureList.FindTextureByName("placeholder"); static IDirect3DTexture9 **pDefaultTex = BY_GAME(gTextureList.FindTextureByName("placeholder"), nullptr, nullptr);
ImGuiStyle &style = ImGui::GetStyle(); ImGuiStyle &style = ImGui::GetStyle();
// Category box // Category box