From 69db2c0734c38ee1b27f0c972946cb2442375246 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Thu, 3 Mar 2016 20:53:24 +0100 Subject: [PATCH] Rename stuff --- deps/protobuf | 2 +- src/Components/Modules/Dedicated.cpp | 2 +- src/Game/Functions.cpp | 2 +- src/Game/Functions.hpp | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deps/protobuf b/deps/protobuf index 584233bd..78105897 160000 --- a/deps/protobuf +++ b/deps/protobuf @@ -1 +1 @@ -Subproject commit 584233bd043a80b2172a598039113d4fe14dc326 +Subproject commit 78105897a8f01c7be9cf8502b6c58d47eb1ccdd7 diff --git a/src/Components/Modules/Dedicated.cpp b/src/Components/Modules/Dedicated.cpp index 08be4fec..5fa1eaa6 100644 --- a/src/Components/Modules/Dedicated.cpp +++ b/src/Components/Modules/Dedicated.cpp @@ -24,7 +24,7 @@ namespace Components }; memcpy(reinterpret_cast(0x66E1CB0), &fastfiles, sizeof(fastfiles)); - Game::LoadInitialFF(); + Game::R_LoadGraphicsAssets(); Utils::Hook::Call(0x4F84C0)(); } diff --git a/src/Game/Functions.cpp b/src/Game/Functions.cpp index c1d796c4..9aa3437e 100644 --- a/src/Game/Functions.cpp +++ b/src/Game/Functions.cpp @@ -95,7 +95,6 @@ namespace Game Live_MPAcceptInvite_t Live_MPAcceptInvite = (Live_MPAcceptInvite_t)0x420A6D; Live_ParsePlaylists_t Live_ParsePlaylists = (Live_ParsePlaylists_t)0x4295A0; - LoadInitialFF_t LoadInitialFF = (LoadInitialFF_t)0x506AC0; LoadModdableRawfile_t LoadModdableRawfile = (LoadModdableRawfile_t)0x61ABC0; LocalizeString_t LocalizeString = (LocalizeString_t)0x4FB010; @@ -115,6 +114,7 @@ namespace Game R_AddCmdDrawStretchPic_t R_AddCmdDrawStretchPic = (R_AddCmdDrawStretchPic_t)0x509770; R_RegisterFont_t R_RegisterFont = (R_RegisterFont_t)0x505670; R_AddCmdDrawText_t R_AddCmdDrawText = (R_AddCmdDrawText_t)0x509D80; + R_LoadGraphicsAssets_t R_LoadGraphicsAssets = (R_LoadGraphicsAssets_t)0x506AC0; R_TextWidth_t R_TextWidth = (R_TextWidth_t)0x5056C0; R_TextHeight_t R_TextHeight = (R_TextHeight_t)0x505770; diff --git a/src/Game/Functions.hpp b/src/Game/Functions.hpp index a415f3c7..45a1bd26 100644 --- a/src/Game/Functions.hpp +++ b/src/Game/Functions.hpp @@ -227,9 +227,6 @@ namespace Game typedef void(__cdecl * Live_ParsePlaylists_t)(const char* data); extern Live_ParsePlaylists_t Live_ParsePlaylists; - typedef void(*LoadInitialFF_t)(void); - extern LoadInitialFF_t LoadInitialFF; - typedef void* (__cdecl * LoadModdableRawfile_t)(int a1, const char* filename); extern LoadModdableRawfile_t LoadModdableRawfile; @@ -272,6 +269,9 @@ namespace Game typedef void(_cdecl * R_AddCmdDrawStretchPic_t)(float x, float y, float w, float h, float xScale, float yScale, float xay, float yay, const float *color, void* material); extern R_AddCmdDrawStretchPic_t R_AddCmdDrawStretchPic; + typedef void(__cdecl * R_LoadGraphicsAssets_t)(); + extern R_LoadGraphicsAssets_t R_LoadGraphicsAssets; + typedef int(__cdecl * R_TextWidth_t)(const char* text, int maxlength, Font* font); extern R_TextWidth_t R_TextWidth;