misc: improved 'wait' command handling

ec- · Sep 6, 2024 · 054904d · 054904d
1 parent b6e7ce4
commit 054904d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/code/qcommon/cmd.c b/code/qcommon/cmd.c
@@ -260,7 +260,6 @@ void Cbuf_Execute( void )
 
  if ( cmd_wait > 0 ) {
  // delay command buffer execution
- cmd_wait--;
  return;
  }
 
@@ -357,9 +356,11 @@ void Cbuf_Execute( void )
 Cbuf_Wait
 ============
 */
-qboolean Cbuf_Wait( void )
+void Cbuf_Wait( void )
 {
- return (cmd_wait > 0) ? qtrue : qfalse;
+ if ( cmd_wait > 0 ) {
+ --cmd_wait;
+ }
 }
 
 

diff --git a/code/qcommon/common.c b/code/qcommon/common.c
@@ -4371,9 +4371,7 @@ void Com_Frame( qboolean noDelay ) {
  }
  Com_EventLoop();
 
- if ( !Cbuf_Wait() ) {
- Cbuf_Execute();
- }
+ Cbuf_Execute();
 
  //
  // client side
@@ -4392,6 +4390,8 @@ void Com_Frame( qboolean noDelay ) {
 
  NET_FlushPacketQueue( 0 );
 
+ Cbuf_Wait();
+
  //
  // report timing information
  //