id-software/Quake_4_Alpha
1
0
Fork 0
mirror of https://github.com/jmarshall23/Quake_4_Alpha.git synced 2026-08-12 04:01:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with notime breaking ui flow.

Browse Source
This commit is contained in:
Justin Marshall
2026-08-08 00:04:28 -07:00
parent 1f81fe28cd
commit fec8fb2314
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/guiscript.cpp
+4
View File
@@ -222,6 +222,10 @@ void Script_ResetTime(idWindow *window, idList<idGSWinVar> *src) {
drawWin_t *win = NULL; drawWin_t *win = NULL;
if (parm && src->Num() > 1) { if (parm && src->Num() > 1) {
win = window->GetGui()->GetDesktop()->FindChildByName(*parm); win = window->GetGui()->GetDesktop()->FindChildByName(*parm);
if ( !idStr::Icmp( parm->c_str(), "anim_in" ) || !idStr::Icmp( parm->c_str(), "anim_newIn" ) ) {
common->DPrintf( "Q4 menu trace: resetTime requested '%s', resolved '%s'\n",
parm->c_str(), ( win && win->win ) ? win->win->GetName() : "<not found>" );
}
parm = dynamic_cast<idWinStr*>((*src)[1].var); parm = dynamic_cast<idWinStr*>((*src)[1].var);
} }
if (win && win->win) { if (win && win->win) {
src/ui/window.cpp
+8 -1
View File
@@ -1080,6 +1080,10 @@ idWindow::Time
*/ */
void idWindow::Time() { void idWindow::Time() {
if ( !idStr::Icmp( name, "anim_newIn" ) && !noTime ) {
common->DPrintf( "Q4 menu trace: anim_newIn unexpectedly active at guiTime=%d epoch=%d\n", gui->GetTime(), timeLine );
}
if ( noTime ) { if ( noTime ) {
return; return;
} }
@@ -2642,6 +2646,9 @@ bool idWindow::Parse( idParser *src, bool rebuild) {
SetupFromState(); SetupFromState();
PostParse(); PostParse();
if ( !idStr::Icmp( name, "anim_newIn" ) ) {
common->DPrintf( "Q4 menu trace: parsed anim_newIn notime=%d events=%d\n", noTime ? 1 : 0, timeLineEvents.Num() );
}
// hook into the main window parsing for the gui editor // hook into the main window parsing for the gui editor
// If we are in the gui editor then add the internal var to the // If we are in the gui editor then add the internal var to the
@@ -2765,7 +2772,7 @@ idWindow::ResetTime
================ ================
*/ */
void idWindow::ResetTime(int t) { void idWindow::ResetTime(int t) {
if ( !idStr::Icmp( name, "anim_in" ) || !idStr::Icmp( name, "video_bethsoft" ) ) { if ( !idStr::Icmp( name, "anim_in" ) || !idStr::Icmp( name, "anim_newIn" ) || !idStr::Icmp( name, "video_bethsoft" ) ) {
common->DPrintf( "Q4 menu trace: ResetTime '%s' t=%d guiTime=%d\n", name.c_str(), t, gui->GetTime() ); common->DPrintf( "Q4 menu trace: ResetTime '%s' t=%d guiTime=%d\n", name.c_str(), t, gui->GetTime() );
} }