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

TONY: Fix Take/ReleaseOwnership.

Browse Source
This commit is contained in:
Alyssa Milburn 2012-08-25 13:15:28 +02:00
parent 659436739f
commit 8b0dca3862
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engines/tony/custom.cpp
View File

@ -2052,25 +2052,12 @@ DECLARE_CUSTOM_FUNCTION(StartDialog)(CORO_PARAM, uint32 nDialog, uint32 nStartGr
*/
DECLARE_CUSTOM_FUNCTION(TakeOwnership)(CORO_PARAM, uint32 num, uint32, uint32, uint32) {
CORO_BEGIN_CONTEXT;
bool expired;
CORO_END_CONTEXT(_ctx);
CORO_BEGIN_CODE(_ctx);
// The event is operating as a mutex, so if the event is already set, wait until it's reset
do {
CORO_INVOKE_3(CoroScheduler.waitForSingleObject, GLOBALS._mut[num], 0, &_ctx->expired);
} while (!_ctx->expired);
// Set the event to flag ownership
CoroScheduler.setEvent(GLOBALS._mut[num]);
CORO_END_CODE;
CoroScheduler.waitForSingleObject(coroParam, GLOBALS._mut[num], CORO_INFINITE);
}
DECLARE_CUSTOM_FUNCTION(ReleaseOwnership)(CORO_PARAM, uint32 num, uint32, uint32, uint32) {
CoroScheduler.resetEvent(GLOBALS._mut[num]);
CoroScheduler.setEvent(GLOBALS._mut[num]);
}
/*
@ -2563,7 +2550,7 @@ void setupGlobalVars(RMTony *tony, RMPointer *ptr, RMGameBoxes *box, RMLocation
int i;
for (i = 0; i < 10; i++)
GLOBALS._mut[i] = CoroScheduler.createEvent(false, false);
GLOBALS._mut[i] = CoroScheduler.createEvent(false, true);
for (i = 0; i < 200; i++)
GLOBALS._ambiance[i] = 0;