| リビジョン | 7b270e6b23b72b5fe1c7bf6303ed6425c89638dc (tree) |
|---|---|
| 日時 | 2016-02-11 00:13:26 |
| 作者 | Teemu Piippo <crimsondusk64@gmai...> |
| コミッター | Teemu Piippo |
Dropping is now allowed by default even in non-cooperative gamemodes, also addresses 2528
docs/zandronum-history.txt (diff)
src/cl_commands.cpp (diff)| @@ -48,6 +48,7 @@ | ||
| 48 | 48 | ! - Since the only purpose of the CVAR sv_useticbuffer is to debug problems with the client movement buffer, it is now restricted to testing binaries. [Torr Samaho] |
| 49 | 49 | ! - 'SR50 + turning' movement commands are now clamped to 'SR50' on client and server. [Circunei Z] |
| 50 | 50 | ! - Joypad strafing movements are now capped at SR40 speed. [Leonard] |
| 51 | +! - Dropping is now allowed in competitive gamemodes, unless sv_nodrop explicitly disallows it. [Dusk] | |
| 51 | 52 | |
| 52 | 53 | |
| 53 | 54 | 2.1.2 |
| @@ -525,19 +525,10 @@ | ||
| 525 | 525 | // |
| 526 | 526 | void CLIENTCOMMANDS_RequestInventoryDrop( AInventory *pItem ) |
| 527 | 527 | { |
| 528 | - if ( sv_limitcommands ) | |
| 528 | + if ( sv_limitcommands && ( g_ulLastDropTime > 0 ) && ( (ULONG)gametic < g_ulLastDropTime + TICRATE )) | |
| 529 | 529 | { |
| 530 | - if ( !(GAMEMODE_GetFlags( GAMEMODE_GetCurrentMode( )) & GMF_COOPERATIVE) ) | |
| 531 | - { | |
| 532 | - Printf( "Dropping is not allowed in non-cooperative game modes.\n" ); | |
| 533 | - return; | |
| 534 | - } | |
| 535 | - | |
| 536 | - if (( g_ulLastDropTime > 0 ) && ( (ULONG)gametic < ( g_ulLastDropTime + ( TICRATE )))) | |
| 537 | - { | |
| 538 | - Printf( "You must wait at least one second before using drop again.\n" ); | |
| 539 | - return; | |
| 540 | - } | |
| 530 | + Printf( "You must wait at least one second before using drop again.\n" ); | |
| 531 | + return; | |
| 541 | 532 | } |
| 542 | 533 | |
| 543 | 534 | if ( pItem == NULL ) |
Fork