Skip to content

Commit

Permalink
Release clean-up
Browse files Browse the repository at this point in the history
  • Loading branch information
@acidicoala
acidicoala committed Aug 30, 2020
1 parent bb11905 commit c9eb3c2
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 30 deletions.
7 changes: 4 additions & 3 deletions Overlay/src/achievement_manager_ui.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Achievements* achievements = nullptr;
UnlockAchievementFunction* unlockAchievement = nullptr;

ImFont* bigFont = nullptr;
const float mainFontSize = 17.0f;

void init(Achievements& achievements, UnlockAchievementFunction* unlockAchievement){
AchievementManagerUI::achievements = &achievements;
Expand All @@ -20,7 +21,7 @@ void initImGui(void* pWindow, ID3D11Device* pD3D11Device, ID3D11DeviceContext* p
auto fontPath = "C:\\Windows\\Fonts\\calibri.ttf";

auto io = ImGui::GetIO();
io.Fonts->AddFontFromFileTTF(fontPath, 16.0f);
io.Fonts->AddFontFromFileTTF(fontPath, mainFontSize);
io.IniFilename = NULL;

{// Init big font
Expand Down Expand Up @@ -65,7 +66,7 @@ void renderOverlay(){
FitTextToWindow(ImVec4(0, 1, 0, 1), "ScreamAPI Achievement Manager");

ImGui::BeginChild("AchievementList", ImVec2(0, 0), false);
for(int i = 0; i < achievements->size(); i++){
for(unsigned int i = 0; i < achievements->size(); i++){
auto&& achievement = achievements->at(i);

ImGui::PushID(i);
Expand All @@ -80,7 +81,7 @@ void renderOverlay(){
ImGui::NextColumn();
}
{// Title & description
ImGui::SetColumnWidth(1, 225);
ImGui::SetColumnWidth(1, 220);
ImGui::TextColored(ImVec4(1, 1, 1, 1), achievement.UnlockedDisplayName);
ImGui::Spacing();
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(.75, .75, .75, 1));
Expand Down
27 changes: 8 additions & 19 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,18 @@
Welcome to the ScreamAPI repository.

## Readme
Readme can be found on the [official ScreamAPI forum thread](https://cs.rin.ru/forum/viewtopic.php?f=29&t=106474)

## TODO
1. Font 18?
Readme can be found on the [official ScreamAPI forum topic](https://cs.rin.ru/forum/viewtopic.php?f=29&t=106474)

## Acknowledgements

https://github.com/nothings/stb/blob/master/stb_image.h

https://github.com/curl/curl

https://github.com/Rebzzel/kiero

https://github.com/ocornut/imgui

https://github.com/TsudaKageyu/minhook

https://github.com/benhoyt/inih
This project makes use of several open-source libraries listed below:

* [inih](https://github.com/benhoyt/inih)
* [stb](https://github.com/nothings/stb/blob/master/stb_image.h)
* [curl](https://github.com/curl/curl)
* [kiero](https://github.com/Rebzzel/kiero)
* [imgui](https://github.com/ocornut/imgui)
* [minhook](https://github.com/TsudaKageyu/minhook)

## License
This software is licensed under [Zero Clause BSD](https://en.wikipedia.org/wiki/BSD_licenses#0-clause_license_(%22Zero_Clause_BSD%22)) license, terms of which are available in [LICENSE.txt](LICENSE.txt)

This software makes use of [inih](https://github.com/benhoyt/inih)
by [benhoyt](https://github.com/benhoyt),
licensed under [BSD](https://github.com/benhoyt/inih/blob/master/LICENSE.txt).
1 change: 1 addition & 0 deletions ScreamAPI/ScreamAPI.ini
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
; ScreamAPI Config File v1.7.1-2
; Everything in the Config file is optional. If some entry is missing,
; ScreamAPI will use the defaul value specified in the corresponding comment
; Official ScreamAPI forum topic: https://cs.rin.ru/forum/viewtopic.php?f=29&t=106474

[ScreamAPI]
EnableItemUnlocker = True ; Enable DLC Item unlocking by ScreamAPI? Default: True
Expand Down
16 changes: 8 additions & 8 deletions ScreamAPI/src/LinkerExports/LinkerExports32.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#pragma comment(linker, "/export:_EOS_Achievements_AddNotifyAchievementsUnlocked@16=EOSSDK-Win32-Shipping_o._EOS_Achievements_AddNotifyAchievementsUnlocked@16")
// #pragma comment(linker, "/export:_EOS_Achievements_AddNotifyAchievementsUnlockedV2@16=EOSSDK-Win32-Shipping_o._EOS_Achievements_AddNotifyAchievementsUnlockedV2@16")
#pragma comment(linker, "/export:_EOS_Achievements_AddNotifyAchievementsUnlockedV2@16=EOSSDK-Win32-Shipping_o._EOS_Achievements_AddNotifyAchievementsUnlockedV2@16")
#pragma comment(linker, "/export:_EOS_Achievements_CopyAchievementDefinitionByAchievementId@12=EOSSDK-Win32-Shipping_o._EOS_Achievements_CopyAchievementDefinitionByAchievementId@12")
#pragma comment(linker, "/export:_EOS_Achievements_CopyAchievementDefinitionByIndex@12=EOSSDK-Win32-Shipping_o._EOS_Achievements_CopyAchievementDefinitionByIndex@12")
// #pragma comment(linker, "/export:_EOS_Achievements_CopyAchievementDefinitionV2ByAchievementId@12=EOSSDK-Win32-Shipping_o._EOS_Achievements_CopyAchievementDefinitionV2ByAchievementId@12")
Expand All @@ -15,10 +15,10 @@
// #pragma comment(linker, "/export:_EOS_Achievements_GetAchievementDefinitionCount@8=EOSSDK-Win32-Shipping_o._EOS_Achievements_GetAchievementDefinitionCount@8")
// #pragma comment(linker, "/export:_EOS_Achievements_GetPlayerAchievementCount@8=EOSSDK-Win32-Shipping_o._EOS_Achievements_GetPlayerAchievementCount@8")
#pragma comment(linker, "/export:_EOS_Achievements_GetUnlockedAchievementCount@8=EOSSDK-Win32-Shipping_o._EOS_Achievements_GetUnlockedAchievementCount@8")
#pragma comment(linker, "/export:_EOS_Achievements_PlayerAchievement_Release@4=EOSSDK-Win32-Shipping_o._EOS_Achievements_PlayerAchievement_Release@4")
// #pragma comment(linker, "/export:_EOS_Achievements_PlayerAchievement_Release@4=EOSSDK-Win32-Shipping_o._EOS_Achievements_PlayerAchievement_Release@4")
// #pragma comment(linker, "/export:_EOS_Achievements_QueryDefinitions@16=EOSSDK-Win32-Shipping_o._EOS_Achievements_QueryDefinitions@16")
// #pragma comment(linker, "/export:_EOS_Achievements_QueryPlayerAchievements@16=EOSSDK-Win32-Shipping_o._EOS_Achievements_QueryPlayerAchievements@16")
// #pragma comment(linker, "/export:_EOS_Achievements_RemoveNotifyAchievementsUnlocked@12=EOSSDK-Win32-Shipping_o._EOS_Achievements_RemoveNotifyAchievementsUnlocked@12")
#pragma comment(linker, "/export:_EOS_Achievements_RemoveNotifyAchievementsUnlocked@12=EOSSDK-Win32-Shipping_o._EOS_Achievements_RemoveNotifyAchievementsUnlocked@12")
// #pragma comment(linker, "/export:_EOS_Achievements_UnlockAchievements@16=EOSSDK-Win32-Shipping_o._EOS_Achievements_UnlockAchievements@16")
#pragma comment(linker, "/export:_EOS_Achievements_UnlockedAchievement_Release@4=EOSSDK-Win32-Shipping_o._EOS_Achievements_UnlockedAchievement_Release@4")
#pragma comment(linker, "/export:_EOS_ActiveSession_CopyInfo@12=EOSSDK-Win32-Shipping_o._EOS_ActiveSession_CopyInfo@12")
Expand All @@ -32,7 +32,7 @@
// #pragma comment(linker, "/export:_EOS_Auth_GetLoggedInAccountByIndex@8=EOSSDK-Win32-Shipping_o._EOS_Auth_GetLoggedInAccountByIndex@8")
#pragma comment(linker, "/export:_EOS_Auth_GetLoggedInAccountsCount@4=EOSSDK-Win32-Shipping_o._EOS_Auth_GetLoggedInAccountsCount@4")
#pragma comment(linker, "/export:_EOS_Auth_GetLoginStatus@8=EOSSDK-Win32-Shipping_o._EOS_Auth_GetLoginStatus@8")
#pragma comment(linker, "/export:_EOS_Auth_Login@16=EOSSDK-Win32-Shipping_o._EOS_Auth_Login@16")
// #pragma comment(linker, "/export:_EOS_Auth_Login@16=EOSSDK-Win32-Shipping_o._EOS_Auth_Login@16")
#pragma comment(linker, "/export:_EOS_Auth_Logout@16=EOSSDK-Win32-Shipping_o._EOS_Auth_Logout@16")
#pragma comment(linker, "/export:_EOS_Auth_RemoveNotifyLoginStatusChanged@12=EOSSDK-Win32-Shipping_o._EOS_Auth_RemoveNotifyLoginStatusChanged@12")
#pragma comment(linker, "/export:_EOS_Auth_Token_Release@4=EOSSDK-Win32-Shipping_o._EOS_Auth_Token_Release@4")
Expand All @@ -49,7 +49,7 @@
#pragma comment(linker, "/export:_EOS_Connect_DeleteDeviceId@16=EOSSDK-Win32-Shipping_o._EOS_Connect_DeleteDeviceId@16")
#pragma comment(linker, "/export:_EOS_Connect_ExternalAccountInfo_Release@4=EOSSDK-Win32-Shipping_o._EOS_Connect_ExternalAccountInfo_Release@4")
#pragma comment(linker, "/export:_EOS_Connect_GetExternalAccountMapping@8=EOSSDK-Win32-Shipping_o._EOS_Connect_GetExternalAccountMapping@8")
#pragma comment(linker, "/export:_EOS_Connect_GetLoggedInUserByIndex@8=EOSSDK-Win32-Shipping_o._EOS_Connect_GetLoggedInUserByIndex@8")
// #pragma comment(linker, "/export:_EOS_Connect_GetLoggedInUserByIndex@8=EOSSDK-Win32-Shipping_o._EOS_Connect_GetLoggedInUserByIndex@8")
#pragma comment(linker, "/export:_EOS_Connect_GetLoggedInUsersCount@4=EOSSDK-Win32-Shipping_o._EOS_Connect_GetLoggedInUsersCount@4")
#pragma comment(linker, "/export:_EOS_Connect_GetLoginStatus@8=EOSSDK-Win32-Shipping_o._EOS_Connect_GetLoginStatus@8")
#pragma comment(linker, "/export:_EOS_Connect_GetProductUserExternalAccountCount@8=EOSSDK-Win32-Shipping_o._EOS_Connect_GetProductUserExternalAccountCount@8")
Expand Down Expand Up @@ -98,7 +98,7 @@
#pragma comment(linker, "/export:_EOS_Ecom_Transaction_GetTransactionId@12=EOSSDK-Win32-Shipping_o._EOS_Ecom_Transaction_GetTransactionId@12")
#pragma comment(linker, "/export:_EOS_Ecom_Transaction_Release@4=EOSSDK-Win32-Shipping_o._EOS_Ecom_Transaction_Release@4")
#pragma comment(linker, "/export:_EOS_EpicAccountId_FromString@4=EOSSDK-Win32-Shipping_o._EOS_EpicAccountId_FromString@4")
#pragma comment(linker, "/export:_EOS_EpicAccountId_IsValid@4=EOSSDK-Win32-Shipping_o._EOS_EpicAccountId_IsValid@4")
// #pragma comment(linker, "/export:_EOS_EpicAccountId_IsValid@4=EOSSDK-Win32-Shipping_o._EOS_EpicAccountId_IsValid@4")
#pragma comment(linker, "/export:_EOS_EpicAccountId_ToString@12=EOSSDK-Win32-Shipping_o._EOS_EpicAccountId_ToString@12")
#pragma comment(linker, "/export:_EOS_Friends_AcceptInvite@16=EOSSDK-Win32-Shipping_o._EOS_Friends_AcceptInvite@16")
#pragma comment(linker, "/export:_EOS_Friends_AddNotifyFriendsUpdate@16=EOSSDK-Win32-Shipping_o._EOS_Friends_AddNotifyFriendsUpdate@16")
Expand Down Expand Up @@ -210,8 +210,8 @@
// #pragma comment(linker, "/export:_EOS_Platform_GetAchievementsInterface@4=EOSSDK-Win32-Shipping_o._EOS_Platform_GetAchievementsInterface@4")
#pragma comment(linker, "/export:_EOS_Platform_GetActiveCountryCode@16=EOSSDK-Win32-Shipping_o._EOS_Platform_GetActiveCountryCode@16")
#pragma comment(linker, "/export:_EOS_Platform_GetActiveLocaleCode@16=EOSSDK-Win32-Shipping_o._EOS_Platform_GetActiveLocaleCode@16")
#pragma comment(linker, "/export:_EOS_Platform_GetAuthInterface@4=EOSSDK-Win32-Shipping_o._EOS_Platform_GetAuthInterface@4")
#pragma comment(linker, "/export:_EOS_Platform_GetConnectInterface@4=EOSSDK-Win32-Shipping_o._EOS_Platform_GetConnectInterface@4")
// #pragma comment(linker, "/export:_EOS_Platform_GetAuthInterface@4=EOSSDK-Win32-Shipping_o._EOS_Platform_GetAuthInterface@4")
// #pragma comment(linker, "/export:_EOS_Platform_GetConnectInterface@4=EOSSDK-Win32-Shipping_o._EOS_Platform_GetConnectInterface@4")
#pragma comment(linker, "/export:_EOS_Platform_GetEcomInterface@4=EOSSDK-Win32-Shipping_o._EOS_Platform_GetEcomInterface@4")
#pragma comment(linker, "/export:_EOS_Platform_GetFriendsInterface@4=EOSSDK-Win32-Shipping_o._EOS_Platform_GetFriendsInterface@4")
#pragma comment(linker, "/export:_EOS_Platform_GetLeaderboardsInterface@4=EOSSDK-Win32-Shipping_o._EOS_Platform_GetLeaderboardsInterface@4")
Expand Down

0 comments on commit c9eb3c2

Please sign in to comment.