CubeWorld
/
Cube-World-Commands-Mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove dependency on main.h

This commit is contained in:
ChrisMiuchiz 2019-01-03 14:30:03 -05:00 committed by GitHub
parent da43ba373c
commit 89bb6f30e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.cpp
View File

@ -1,5 +1,5 @@
#undef __STRICT_ANSI__ #undef __STRICT_ANSI__
#include "main.h" #include <windows.h>
#include <iostream> #include <iostream>
@ -25,7 +25,7 @@ DWORD defaultMessagePtr = (DWORD)&defaultMessage;
char msgObject[255]; char msgObject[255];
DWORD msgObjectPtr = (DWORD)&msgObject; DWORD msgObjectPtr = (DWORD)&msgObject;
void DLL_EXPORT ASMPrintMessage(){ void __declspec(dllexport) ASMPrintMessage(){
asm("push [_defaultMessagePtr]"); asm("push [_defaultMessagePtr]");
asm("mov ecx, [_msgObjectPtr]"); asm("mov ecx, [_msgObjectPtr]");
@ -54,7 +54,7 @@ void DLL_EXPORT ASMPrintMessage(){
} }
void DLL_EXPORT PrintMessage(wchar_t message[]){ void __declspec(dllexport) PrintMessage(wchar_t message[]){
wcsncpy(defaultMessage, message, 255); wcsncpy(defaultMessage, message, 255);
defaultColor.red = 1.0; defaultColor.red = 1.0;
@ -63,7 +63,7 @@ void DLL_EXPORT PrintMessage(wchar_t message[]){
defaultColor.alpha = 1.0; defaultColor.alpha = 1.0;
ASMPrintMessage(); ASMPrintMessage();
} }
void DLL_EXPORT PrintMessage(wchar_t message[], int r, int g, int b){ void __declspec(dllexport) PrintMessage(wchar_t message[], int r, int g, int b){
wcsncpy(defaultMessage, message, 255); wcsncpy(defaultMessage, message, 255);
defaultColor.red = r / 255.0; defaultColor.red = r / 255.0;
defaultColor.green = g / 255.0; defaultColor.green = g / 255.0;
@ -94,7 +94,7 @@ void CommandHelpMessage(wchar_t* command, wchar_t* details){
PrintMessage(L"\n"); PrintMessage(L"\n");
} }
bool __stdcall DLL_EXPORT HandleMessage(wchar_t msg[], unsigned int msg_size){ bool __stdcall __declspec(dllexport) HandleMessage(wchar_t msg[], unsigned int msg_size){
wchar_t response[255]; wchar_t response[255];
DWORD entityaddr = (DWORD)(base + 0x36b1c8); DWORD entityaddr = (DWORD)(base + 0x36b1c8);
@ -194,7 +194,7 @@ void WriteJMP(BYTE* location, BYTE* newFunction){
typedef bool (__stdcall *ChatEventCallback)(wchar_t buf[], unsigned int msg_size); typedef bool (__stdcall *ChatEventCallback)(wchar_t buf[], unsigned int msg_size);
typedef void (*RegisterChatEventCallback_t)(ChatEventCallback cb); typedef void (*RegisterChatEventCallback_t)(ChatEventCallback cb);
DWORD WINAPI DLL_EXPORT RegisterCallbacks(){ DWORD WINAPI __declspec(dllexport) RegisterCallbacks(){
HMODULE modManagerDLL = LoadLibraryA("CallbackManager.dll"); HMODULE modManagerDLL = LoadLibraryA("CallbackManager.dll");
auto RegisterChatEventCallback = (RegisterChatEventCallback_t)GetProcAddress(modManagerDLL, "RegisterChatEventCallback"); auto RegisterChatEventCallback = (RegisterChatEventCallback_t)GetProcAddress(modManagerDLL, "RegisterChatEventCallback");
RegisterChatEventCallback((ChatEventCallback)HandleMessage); RegisterChatEventCallback((ChatEventCallback)HandleMessage);
@ -202,7 +202,7 @@ DWORD WINAPI DLL_EXPORT RegisterCallbacks(){
} }
extern "C" DLL_EXPORT BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) extern "C" __declspec(dllexport) BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
base = (UINT_PTR)GetModuleHandle(NULL); base = (UINT_PTR)GetModuleHandle(NULL);
switch (fdwReason) switch (fdwReason)