diff options
| author | James Haley | 2010-09-05 23:28:16 +0000 |
|---|---|---|
| committer | James Haley | 2010-09-05 23:28:16 +0000 |
| commit | f7768ad7dcfbefce525d846ce2f565dacf99f546 (patch) | |
| tree | 8e5e071d261338984f90d901ff63cb10cf684f4e /src/strife/g_game.c | |
| parent | cb79caae119fe361d0c5835ae91a9a1f0bf8147f (diff) | |
| download | chocolate-doom-f7768ad7dcfbefce525d846ce2f565dacf99f546.tar.gz chocolate-doom-f7768ad7dcfbefce525d846ce2f565dacf99f546.tar.bz2 chocolate-doom-f7768ad7dcfbefce525d846ce2f565dacf99f546.zip | |
Corrections to some of Kaiser's previous commits. Also, significant work
on dialog engine, p_enemy code, and support for all new mapthing_t flag
values in P_SpawnMapThing.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2015
Diffstat (limited to 'src/strife/g_game.c')
| -rw-r--r-- | src/strife/g_game.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/strife/g_game.c b/src/strife/g_game.c index 2b7c2cb0..49c4ef24 100644 --- a/src/strife/g_game.c +++ b/src/strife/g_game.c @@ -493,7 +493,6 @@ void G_BuildTiccmd (ticcmd_t* cmd) cmd->buttons |= BT_ATTACK; else --mouse_fire_countdown; - } if (gamekeydown[key_use] @@ -816,9 +815,7 @@ boolean G_Responder (event_t* ev) return false; } - - - + // // G_Ticker // Make ticcmd_ts for the players. @@ -828,7 +825,7 @@ void G_Ticker (void) int i; int buf; ticcmd_t* cmd; - + // do player reborns if needed for (i=0 ; i<MAXPLAYERS ; i++) if (playeringame[i] && players[i].playerstate == PST_REBORN) @@ -885,9 +882,9 @@ void G_Ticker (void) memcpy (cmd, &netcmds[i][buf], sizeof(ticcmd_t)); - if (demoplayback) + if (demoplayback) G_ReadDemoTiccmd (cmd); - if (demorecording) + if (demorecording) G_WriteDemoTiccmd (cmd); // check for turbo cheats |