libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 00:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TONY: Replace stubs for TakeOwnership/ReleaseOwnership with actual implementation

Browse Source
This commit is contained in:
Paul Gilbert 2012-05-14 21:06:03 +10:00
parent 9eb66a2324
commit 47ddb2ff33
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/tony/custom.cpp
View File

@ -2134,15 +2134,12 @@ DECLARE_CUSTOM_FUNCTION(StartDialog)(CORO_PARAM, uint32 nDialog, uint32 nStartGr
*/
DECLARE_CUSTOM_FUNCTION(TakeOwnership)(CORO_PARAM, uint32 num, uint32, uint32, uint32) {
// EnterCriticalSection(&cs[num]);
// WaitForSingleObject(mut[num],CORO_INFINITE);
warning("TODO: TakeOwnership");
CoroScheduler.waitForSingleObject(coroParam, GLOBALS.mut[num], CORO_INFINITE);
}
DECLARE_CUSTOM_FUNCTION(ReleaseOwnership)(CORO_PARAM, uint32 num, uint32, uint32, uint32) {
// LeaveCriticalSection(&cs[num]);
// g_system->unlockMutex(mut[num]);
warning("TODO: ReleaseOwnership");
CoroScheduler.pulseEvent(GLOBALS.mut[num]);
warning("TODO: Validate that the use of events in TakeOwnership/ReleaseOwnership match original");
}
@ -2646,11 +2643,9 @@ void SetupGlobalVars(RMTony *tony, RMPointer *ptr, RMGameBoxes *box, RMLocation
GLOBALS.bAlwaysDisplay = false;
int i;
/* for (i = 0;i < 10; i++)
cs[i] = g_system->createMutex();
for (i = 0;i < 10; i++)
mut[i] = CreateMutex(NULL, false, NULL);
*/
GLOBALS.mut[i] = CoroScheduler.createEvent(false, false);
for (i = 0; i < 200; i++)
GLOBALS.tappeti[i] = 0;

3
engines/tony/globals.cpp
View File

@ -83,9 +83,8 @@ Globals::Globals() {
curSonoriz = 0;
bFadeOutStop = false;
// OSystem::MutexRef cs[10];
// OSystem::MutexRef vdb;
Common::fill(&mut[0], &mut[10], (HANDLE)NULL);
Common::fill(&mut[0], &mut[10], 0);
bSkipIdle = false;
hSkipIdle = 0;
lastMusic = 0;

2
engines/tony/globals.h
View File

@ -241,7 +241,7 @@ public:
RMPoint StartLocPos[256];
OSystem::MutexRef cs[10];
OSystem::MutexRef vdb;
HANDLE mut[10];
uint32 mut[10];
bool bSkipIdle;
uint32 hSkipIdle;