dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2024-11-24 05:21:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make Sys_SetInteractiveIngameGuiActive() work better

Browse source 
it could happen that UIs are added to the internal list twice,
and also that the last UI wasn't removed from the list when a new one
was focused fast enough.

That should work better now, I hope I didn't break anything..
This commit is contained in:
Daniel Gibson 2024-03-17 04:03:27 +01:00
parent b3558f550d
commit bad9c08c3f
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
d3xp/Player.cpp
View file

@ -5526,6 +5526,11 @@ void idPlayer::UpdateFocus( void ) {
if ( focusGUIent && focusUI ) { if ( focusGUIent && focusUI ) {
if ( !oldFocus || oldFocus != focusGUIent ) { if ( !oldFocus || oldFocus != focusGUIent ) {
// DG: tell the old UI it isn't focused anymore
if ( oldFocus != NULL && oldUI != NULL ) {
command = oldUI->Activate( false, gameLocal.time );
// TODO: HandleGuiCommands( oldFocus, command ); ?
} // DG end
command = focusUI->Activate( true, gameLocal.time ); command = focusUI->Activate( true, gameLocal.time );
HandleGuiCommands( focusGUIent, command ); HandleGuiCommands( focusGUIent, command );
StartSound( "snd_guienter", SND_CHANNEL_ANY, 0, false, NULL ); StartSound( "snd_guienter", SND_CHANNEL_ANY, 0, false, NULL );

5
game/Player.cpp
View file

@ -4545,6 +4545,11 @@ void idPlayer::UpdateFocus( void ) {
if ( focusGUIent && focusUI ) { if ( focusGUIent && focusUI ) {
if ( !oldFocus || oldFocus != focusGUIent ) { if ( !oldFocus || oldFocus != focusGUIent ) {
// DG: tell the old UI it isn't focused anymore
if ( oldFocus != NULL && oldUI != NULL ) {
command = oldUI->Activate( false, gameLocal.time );
// TODO: HandleGuiCommands( oldFocus, command ); ?
} // DG end
command = focusUI->Activate( true, gameLocal.time ); command = focusUI->Activate( true, gameLocal.time );
HandleGuiCommands( focusGUIent, command ); HandleGuiCommands( focusGUIent, command );
StartSound( "snd_guienter", SND_CHANNEL_ANY, 0, false, NULL ); StartSound( "snd_guienter", SND_CHANNEL_ANY, 0, false, NULL );