Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

gameinterface additions (#306)

Browse Source 
* -add waittill_any_timeout to _integration_t6.gsc
- thread event handler calls in monitorEvents

* - add WaitTillAnyTimeout to iw5
- remove unneeded thread from event handlers
- change WaitTillAnyTimeout in t6 to use a wrapper
This commit is contained in:
INSANEMODE 2023-06-04 19:07:52 -05:00 committed by GitHub
parent e7f5e6a841
commit 2340e30c2d
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
GameFiles/GameInterface/_integration_iw5.gsc
View File

@ -20,7 +20,7 @@ Setup()
level.overrideMethods[level.commonFunctions.waittillNotifyOrTimeout] = ::WaitillNotifyOrTimeoutWrapper; level.overrideMethods[level.commonFunctions.waittillNotifyOrTimeout] = ::WaitillNotifyOrTimeoutWrapper;
level.overrideMethods[level.commonFunctions.isBot] = ::IsBotWrapper; level.overrideMethods[level.commonFunctions.isBot] = ::IsBotWrapper;
level.overrideMethods[level.commonFunctions.getXuid] = ::GetXuidWrapper; level.overrideMethods[level.commonFunctions.getXuid] = ::GetXuidWrapper;
level.overrideMethods[level.commonFunctions.waitTillAnyTimeout] = ::WaitTillAnyTimeout;
RegisterClientCommands(); RegisterClientCommands();
level notify( level.notifyTypes.gameFunctionsInitialized ); level notify( level.notifyTypes.gameFunctionsInitialized );
@ -71,6 +71,11 @@ GetXuidWrapper()
return self GetXUID(); return self GetXUID();
} }
WaitTillAnyTimeout( timeOut, string1, string2, string3, string4, string5 )
{
return common_scripts\utility::waittill_any_timeout( timeOut, string1, string2, string3, string4, string5 );
}
////////////////////////////////// //////////////////////////////////
// Command Implementations // Command Implementations
///////////////////////////////// /////////////////////////////////

6
GameFiles/GameInterface/_integration_t6.gsc
View File

@ -27,6 +27,7 @@ Setup()
level.overrideMethods[level.commonFunctions.waittillNotifyOrTimeout] = ::WaitillNotifyOrTimeoutWrapper; level.overrideMethods[level.commonFunctions.waittillNotifyOrTimeout] = ::WaitillNotifyOrTimeoutWrapper;
level.overrideMethods[level.commonFunctions.isBot] = ::IsBotWrapper; level.overrideMethods[level.commonFunctions.isBot] = ::IsBotWrapper;
level.overrideMethods[level.commonFunctions.getXuid] = ::GetXuidWrapper; level.overrideMethods[level.commonFunctions.getXuid] = ::GetXuidWrapper;
level.overrideMethods[level.commonFunctions.waitTillAnyTimeout] = ::WaitTillAnyTimeout;
RegisterClientCommands(); RegisterClientCommands();
@ -98,6 +99,11 @@ GetXuidWrapper()
return self GetXUID(); return self GetXUID();
} }
WaitTillAnyTimeout( timeOut, string1, string2, string3, string4, string5 )
{
return common_scripts\utility::waittill_any_timeout( timeOut, string1, string2, string3, string4, string5 );
}
////////////////////////////////// //////////////////////////////////
// Command Implementations // Command Implementations
///////////////////////////////// /////////////////////////////////