games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Portability fix for „Win64”. 32-bit DLLs (bink, smack) cannot be loaded, so an empty player-placeholder is used to capture calls we can't properly handle.

Browse Source 
Probably some fixes for Linux will be needed. (I guess the whole thing could use some refactoring to unify more code)
This commit is contained in:
Michał W. Urbańczyk
2011-08-08 07:12:18 +00:00
parent b05a0c7c83
commit 05f166f751
4 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/CVideoHandler.cpp
View File

@@ -67,7 +67,7 @@ void DLLHandler::Instantiate(const char *filename)
if(!dll)
{
tlog1 << "Failed loading " << filename << std::endl;
checkForError();
checkForError(true);
}
#else
dll = dlopen(filename,RTLD_LOCAL | RTLD_LAZY);
@@ -78,6 +78,11 @@ void *DLLHandler::FindAddress(const char *symbol)
{
void *ret;
#ifdef _WIN32
if(!dll)
{
tlog1 << "Cannot look for " << symbol << " because DLL hasn't been appropriately loaded!\n";
return NULL;
}
ret = (void*) GetProcAddress(dll,symbol);
if(!ret)
{
@@ -114,7 +119,6 @@ DLLHandler::DLLHandler()
CBIKHandler::CBIKHandler()
{
Instantiate("BINKW32.DLL");
//binkGetError = FindAddress("_BinkGetError@0");
binkOpen = (BinkOpen)FindAddress("_BinkOpen@8");
binkSetSoundSystem = (BinkSetSoundSystem)FindAddress("_BinkSetSoundSystem@8");
@@ -125,6 +129,7 @@ CBIKHandler::CBIKHandler()
binkWait = (BinkWait)FindAddress("_BinkWait@4");
binkClose = (BinkClose)FindAddress("_BinkClose@4");
hBinkFile = NULL;
hBink = NULL;
@@ -274,10 +279,9 @@ bool CSmackPlayer::wait()
return ptrSmackWait(data);
}
CSmackPlayer::CSmackPlayer()
CSmackPlayer::CSmackPlayer() : data(NULL)
{
Instantiate("smackw32.dll");
ptrSmackNextFrame = (SmackNextFrame)FindAddress("_SmackNextFrame@4");
ptrSmackWait = (SmackWait)FindAddress("_SmackWait@4");
ptrSmackDoFrame = (SmackDoFrame)FindAddress("_SmackDoFrame@4");
@@ -983,4 +987,4 @@ CVideoPlayer::~CVideoPlayer()
close();
}
#endif
#endif