Skip to content

Commit

Permalink
lil order fixes & indent
Browse files Browse the repository at this point in the history
  • Loading branch information
wopox1337 committed Mar 10, 2022
1 parent cf39535 commit f8ff803
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@ This means that plugins that do binary code analysis (Orpheu for example) probab
| mp_ct_default_weapons_secondary | "usp" | "" | - | The default secondary (pistol) weapon that the CTs will spawn with. |
| mp_give_player_c4 | 1 | 0 | 1 | Whether this map should spawn a C4 bomb for a player or not.<br/> `0` disabled<br/>`1` enabled |
| mp_weapons_allow_map_placed | 1 | 0 | 1 | When set, map weapons (located on the floor by map) will be shown.<br/> `0` hide all map weapons.<br/>`1` enabled<br/>`NOTE`: Effect will work after round restart. |
| mp_dying_time | 3.0 | 0.0 | - | Time for switch to free observing after death.<br/>`0` disabled (instant view switch).<br/>`>0.00001` - time delay to start spectate.<br/>`NOTE`: The countdown starts when the player’s death animation is finished.|
| mp_free_armor | 0 | 0 | 2 | Give free armor on player spawn.<br/>`0` disabled <br/>`1` Give Kevlar <br/>`2` Give Kevlar + Helmet |
| mp_fadetoblack | 0 | 0 | 2 | Observer's screen will fade to black on kill event or permanent.<br/> `0` No fade.<br/>`1` Fade to black and won't be able to watch anybody.<br/>`2` fade to black only on kill moment. |
| mp_falldamage | 1 | 0 | 1 | Damage from falling.<br/>`0` disabled <br/>`1` enabled |
| sv_allchat | 1 | 0 | 1 | Players can receive all other players text chat, team restrictions apply<br/>`0` disabled <br/>`1` enabled |
| sv_autobunnyhopping | 0 | 0 | 1 | Players automatically re-jump while holding jump button.<br/>`0` disabled <br/>`1` enabled |
| sv_enablebunnyhopping | 0 | 0 | 1 | Allow player speed to exceed maximum running speed.<br/>`0` disabled <br/>`1` enabled |
| mp_plant_c4_anywhere | 0 | 0 | 1 | When set, players can plant anywhere, not only in bombsites.<br/>`0` disabled <br/>`1` enabled |
| mp_dying_time | 3.0 | 0.0 | - | Time for switch to free observing after death.<br/>`0` disabled (instant view switch).<br/>`>0.00001` - time delay to start spectate.<br/>`NOTE`: The countdown starts when the player’s death animation is finished.|
</details>

## How to install zBot for CS 1.6?
Expand Down
16 changes: 8 additions & 8 deletions dist/game.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -385,14 +385,6 @@ mp_give_player_c4 1
// Default value: "1"
mp_weapons_allow_map_placed 1
// Time for switch to free observing after death.
// NOTE: The countdown starts when the player’s death animation is finished.
// 0 - disabled (instant view switch)
// >0.00001 - time delay to start spectate
//
// Default value: "3.0"
mp_dying_time 3.0
// Observer's screen will fade to black on kill event or permanent.
// 0 - No fade
// 1 - Fade to black and won't be able to watch anybody
Expand Down Expand Up @@ -491,3 +483,11 @@ sv_enablebunnyhopping 0
//
// Default value: "0"
mp_plant_c4_anywhere 0
// Time for switch to free observing after death.
// NOTE: The countdown starts when the player’s death animation is finished.
// 0 - disabled (instant view switch)
// >0.00001 - time delay to start spectate
//
// Default value: "3.0"
mp_dying_time 3.0
2 changes: 1 addition & 1 deletion regamedll/dlls/game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ cvar_t sv_autobunnyhopping = { "sv_autobunnyhopping", "0", 0, 0.0f
cvar_t sv_enablebunnyhopping = { "sv_enablebunnyhopping", "0", 0, 0.0f, nullptr };
cvar_t plant_c4_anywhere = { "mp_plant_c4_anywhere", "0", 0, 0.0f, nullptr };

cvar_t dying_time = { "mp_dying_time", "3.0", FCVAR_SERVER, 3.0f, nullptr };
cvar_t dying_time = { "mp_dying_time", "3.0", 0, 3.0f, nullptr };

void GameDLL_Version_f()
{
Expand Down
3 changes: 2 additions & 1 deletion regamedll/dlls/game.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ extern cvar_t ff_damage_reduction_grenade_self;
extern cvar_t ff_damage_reduction_other;
extern cvar_t radio_timeout;
extern cvar_t radio_maxinround;
extern cvar_t dying_time;
extern cvar_t falldamage;

extern cvar_t ct_default_grenades;
Expand All @@ -190,6 +189,8 @@ extern cvar_t sv_autobunnyhopping;
extern cvar_t sv_enablebunnyhopping;
extern cvar_t plant_c4_anywhere;

extern cvar_t dying_time;

#endif

extern cvar_t scoreboard_showmoney;
Expand Down
4 changes: 2 additions & 2 deletions regamedll/dlls/gamerules.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const float ROUND_RESPAWN_TIME = 20.0f;
const float ROUND_BEGIN_DELAY = 5.0f; // delay before beginning new round
const float ITEM_KILL_DELAY = 300.0f;
const float RADIO_TIMEOUT = 1.5f;
const float DYING_TIME = 3.0f;
const float DYING_TIME = 3.0f;

const int MAX_INTERMISSION_TIME = 120; // longest the intermission can last, in seconds

Expand Down Expand Up @@ -203,7 +203,7 @@ enum
SCENARIO_BLOCK_PRISON_ESCAPE_TIME = BIT(8), // flag "i"
SCENARIO_BLOCK_BOMB_TIME = BIT(9), // flag "j"
SCENARIO_BLOCK_HOSTAGE_RESCUE_TIME = BIT(10), // flag "k"

};

// Player relationship return codes
Expand Down

0 comments on commit f8ff803

Please sign in to comment.