diff options
author | James Haley | 2011-06-30 04:07:25 +0000 |
---|---|---|
committer | James Haley | 2011-06-30 04:07:25 +0000 |
commit | 5674a4e6f31616c3cd4ce725ef54086689245ebc (patch) | |
tree | b25af7278d59c8d978263b9a50839b7d5846e3e6 /src/strife/d_net.c | |
parent | 788892b95805a7d54e2b8ed92ed8262a7b9c6d47 (diff) | |
download | chocolate-doom-5674a4e6f31616c3cd4ce725ef54086689245ebc.tar.gz chocolate-doom-5674a4e6f31616c3cd4ce725ef54086689245ebc.tar.bz2 chocolate-doom-5674a4e6f31616c3cd4ce725ef54086689245ebc.zip |
Two changes:
* Be vanilla-compatible with callpoint to M_Ticker.
* Use a temporary screen buffer for screen wipes to avoid overdrawing
the screen during the fade process. This didn't happen in vanilla due
to its refresh system.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2352
Diffstat (limited to 'src/strife/d_net.c')
-rw-r--r-- | src/strife/d_net.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/strife/d_net.c b/src/strife/d_net.c index 7e1644e8..39a89e28 100644 --- a/src/strife/d_net.c +++ b/src/strife/d_net.c @@ -165,10 +165,13 @@ void NetUpdate (void) I_StartTic (); D_ProcessEvents (); +#if 0 // Always run the menu + // - jhaley 20110629 [CHOCOFIX] - sure, if you want to cause serious + // problems. See TryRunTics for where the call to M_Ticker belongs. M_Ticker (); - +#endif if (drone) { // In drone mode, do not generate any ticcmds. @@ -608,6 +611,11 @@ void TryRunTics (void) if (advancedemo) D_DoAdvanceDemo (); + // [STRIFE]/[CHOCOFIX] jhaley 20110629 Chocolate compatibility problem! + // *Somebody* moved M_Ticker to NetUpdate where it specifically does not + // belong. It *must* be here. All it ever does is animate the cursor + // anyway so there is absolutely no reason to run it from NetUpdate. + M_Ticker (); G_Ticker (); gametic++; |