Merge pull request s1lentq#1 from s1lentq/master

update

README.md

@@ -19,40 +19,46 @@ Archive's bin directory contains 2 subdirectories, 'bugfixed' and 'pure'
 <b>Warning!</b> ReGameDLL_CS is not binary compatible with original hlds since it's compiled with compilers other than ones used for original mod CS. This means that plugins that do binary code analysis (Orpheu for example) probably will not work with ReGameDLL_CS.
 
 ## Configuration (cvars)
-| CVar                          | Default | Min | Max          | Description                                    |
-| :---------------------------- | :-----: | :-: | :----------: | :--------------------------------------------- |
-| mp_freeforall                 | 0       | 0   | 1            | The style of gameplay where there aren't any teams (FFA mode)<br/>`0` disabled <br/>`1` enabled |
-| mp_autoteambalance            | 1       | 0   | 2            | Auto balancing of teams.<br/>`0` disabled <br/>`1` on after next round<br/>`2` on next round |
-| mp_buytime                    | 1.5     | 0.0 | -            | Designate the desired amount of buy time for each round. (in minutes)<br />`-1` means no time limit<br />`0` disable buy |
-| mp_maxmoney                   | 16000   | 0   | `999999`     | The maximum allowable amount of money in the game |
-| mp_round_infinite             | 0       | 0   | 1            | Flags for fine grained control (choose as many as needed)<br/>`0` disabled<br/>`1` enabled<br/><br/>or flags<br/>`a` block round time round end check<br/>`b` block needed players round end check<br/>`c` block VIP assassination/success round end check<br/>`d` block prison escape round end check<br/>`e` block bomb round end check<br/>`f` block team extermination round end check<br/>`g` block hostage rescue round end check<br/><br/>`Example setting:` "ae" blocks round time and bomb round end checks |
-| mp_roundover                  | 0       | -   | -            | The round by expired time will be over, if on a map it does not have the scenario of the game.<br/>`0` disabled<br/>`1` enabled |
-| mp_round_restart_delay        | 5       | -   | -            | Number of seconds to delay before restarting a round after a win. |
-| mp_hegrenade_penetration      | 0       | 0   | 1            | Disable grenade damage through walls.<br/>`0` disabled<br/>`1` enabled |
-| mp_nadedrops                  | 0       | 0   | 2            | Drop a grenade after player death.<br/>`0` disabled<br/>`1` drop one the grenade<br/>`2` drop an everyone grenades |
-| mp_roundrespawn_time          | 20      | 0   | -            | Player cannot respawn until next round if more than N seconds has elapsed since the beginning round |
-| mp_auto_reload_weapons        | 0       | 0   | 1            | Automatically reload each weapon on player spawn.<br/>`0` disabled<br/>`1` enabled |
-| mp_refill_bpammo_weapons      | 0       | 0   | 3            | Refill amount of backpack ammo up to the max.<br/>`0` disabled<br/>`1` refill backpack ammo on player spawn<br/>`2` refill backpack ammo on player spawn and on the purchase of the item<br/>`3` refill backpack ammo on each weapon reload |
-| mp_auto_join_team             | 0       | 0   | 1            | Automatically joins the team.<br/>`0` disabled<br/>`1` enable (Use in conjunction with the cvar humans_join_team any/CT/T) |
-| mp_max_teamkills              | 3       | 0   | -            | Maximum number of allowed teamkills before autokick. Used when enabled mp_autokick. |
-| mp_fragsleft                  | -       | -   | -            | Is the number of frags left, if you have set mp_fraglimit. You just type mp_fragsleft in server console, and it tells you the number of frags left depending of mp_fraglimit. |
-| mp_fraglimit                  | 0       | 0   | -            | If set to something other than 0, when anybody’s scored reaches mp_fraglimit the server changes map.<br />`0` means no limit |
-| mp_timeleft                   | -       | -   | -            | Is the number of time left before the map changes, if you have set mp_timelimit. You just type mp_timeleft in server console, and it tells you the number of time left depending of mp_timelimit. |
-| mp_timelimit                  | 0       | -   | -            | Period between map rotations.<br />`0` means no limit |
-| mp_forcerespawn               | 0       | 0   | -            | Players will automatically respawn when killed.<br/>`0` disabled<br/>`>0.00001` time delay to respawn |
-| mp_hostage_hurtable           | 1       | 0   | 1            | The hostages can take damage.<br/>`0` disabled<br/>`1` from any team<br/>`2` only from `CT`<br/>`3` only from `T` |
-| mp_show_radioicon             | 1       | 0   | 1            | Show radio icon.<br/>`0` disabled<br/>`1` enabled |
-| mp_old_bomb_defused_sound     | 1       | 0   | 1            | Play "Bomb has been defused" sound instead of "Counter-Terrorists win" when bomb was defused<br/>`0` disabled<br/>`1` enabled |
-| showtriggers                  | 0       | 0   | 1            | Debug cvar shows triggers. |
-| sv_alltalk                    | 0       | 0   | 4            | When players can hear each other ([further explanation](../../wiki/sv_alltalk)).<br/>`0` dead don't hear alive<br/>`1` no restrictions<br/>`2` teammates hear each other<br/>`3` Same as 2, but spectators hear everybody<br/>`4` alive hear alive, dead hear dead and alive.
-| bot_deathmatch                | 0       | 0   | 1            | Set's the mode for the zBot.<br/>`0` disabled<br/>`1` enable mode Deathmatch and not allow to do the scenario |
-| bot_quota_mode                | normal  | -   | -            | Determines the type of quota.<br/>`normal` default behaviour<br/>`fill` the server will adjust bots to keep `N` players in the game, where `N` is bot_quota |
-| mp_item_staytime              | 300     | -   | -            | Time to remove item that have been dropped from the players. |
-| mp_legacy_bombtarget_touch    | 1       | 0   | 1            | Legacy func_bomb_target touch. New one is more strict. <br/>`0` New behavior<br/>`1` Legacy behavior|
-| mp_respawn_immunitytime       | 0       | 0   | -            | Specifies the players defense time after respawn. (in seconds).<br/>`0` disabled<br/>`>0.00001` time delay to remove protection |
-| mp_kill_filled_spawn          | 1       | 0   | 1            | Kill the player in filled spawn before spawning some one else (Prevents players stucking in each other).<br />Only disable this if you have semiclip or other plugins that prevents stucking.<br/>`0` disabled<br/>`1` enabled |
-| mp_allow_point_servercommand  | 0       | 0   | 1            | Allow use of point_servercommand entities in map.<br/>`0` disallow<br/>`1` allow<br/>`NOTE`: Potentially dangerous for untrusted maps.|
-| mp_hullbounds_sets            | 1       | 0   | 1            | Sets mins/maxs hull bounds for the player.<br/>`0` disabled<br/>`1` enabled |
+| CVar                               | Default | Min | Max          | Description                                    |
+| :--------------------------------- | :-----: | :-: | :----------: | :--------------------------------------------- |
+| mp_freeforall                      | 0       | 0   | 1            | The style of gameplay where there aren't any teams (FFA mode)<br/>`0` disabled <br/>`1` enabled |
+| mp_autoteambalance                 | 1       | 0   | 2            | Auto balancing of teams.<br/>`0` disabled <br/>`1` on after next round<br/>`2` on next round |
+| mp_buytime                         | 1.5     | 0.0 | -            | Designate the desired amount of buy time for each round. (in minutes)<br />`-1` means no time limit<br />`0` disable buy |
+| mp_maxmoney                        | 16000   | 0   | `999999`     | The maximum allowable amount of money in the game |
+| mp_round_infinite                  | 0       | 0   | 1            | Flags for fine grained control (choose as many as needed)<br/>`0` disabled<br/>`1` enabled<br/><br/>or flags<br/>`a` block round time round end check<br/>`b` block needed players round end check<br/>`c` block VIP assassination/success round end check<br/>`d` block prison escape round end check<br/>`e` block bomb round end check<br/>`f` block team extermination round end check<br/>`g` block hostage rescue round end check<br/><br/>`Example setting:` "ae" blocks round time and bomb round end checks |
+| mp_roundover                       | 0       | -   | -            | The round by expired time will be over, if on a map it does not have the scenario of the game.<br/>`0` disabled<br/>`1` enabled |
+| mp_round_restart_delay             | 5       | -   | -            | Number of seconds to delay before restarting a round after a win. |
+| mp_hegrenade_penetration           | 0       | 0   | 1            | Disable grenade damage through walls.<br/>`0` disabled<br/>`1` enabled |
+| mp_nadedrops                       | 0       | 0   | 2            | Drop a grenade after player death.<br/>`0` disabled<br/>`1` drop one the grenade<br/>`2` drop an everyone grenades |
+| mp_roundrespawn_time               | 20      | 0   | -            | Player cannot respawn until next round if more than N seconds has elapsed since the beginning round |
+| mp_auto_reload_weapons             | 0       | 0   | 1            | Automatically reload each weapon on player spawn.<br/>`0` disabled<br/>`1` enabled |
+| mp_refill_bpammo_weapons           | 0       | 0   | 3            | Refill amount of backpack ammo up to the max.<br/>`0` disabled<br/>`1` refill backpack ammo on player spawn<br/>`2` refill backpack ammo on player spawn and on the purchase of the item<br/>`3` refill backpack ammo on each weapon reload |
+| mp_auto_join_team                  | 0       | 0   | 1            | Automatically joins the team.<br/>`0` disabled<br/>`1` enable (Use in conjunction with the cvar humans_join_team any/CT/T) |
+| mp_max_teamkills                   | 3       | 0   | -            | Maximum number of allowed teamkills before autokick. Used when enabled mp_autokick. |
+| mp_fragsleft                       | -       | -   | -            | Is the number of frags left, if you have set mp_fraglimit. You just type mp_fragsleft in server console, and it tells you the number of frags left depending of mp_fraglimit. |
+| mp_fraglimit                       | 0       | 0   | -            | If set to something other than 0, when anybody’s scored reaches mp_fraglimit the server changes map.<br />`0` means no limit |
+| mp_timeleft                        | -       | -   | -            | Is the number of time left before the map changes, if you have set mp_timelimit. You just type mp_timeleft in server console, and it tells you the number of time left depending of mp_timelimit. |
+| mp_timelimit                       | 0       | -   | -            | Period between map rotations.<br />`0` means no limit |
+| mp_forcerespawn                    | 0       | 0   | -            | Players will automatically respawn when killed.<br/>`0` disabled<br/>`>0.00001` time delay to respawn |
+| mp_hostage_hurtable                | 1       | 0   | 1            | The hostages can take damage.<br/>`0` disabled<br/>`1` from any team<br/>`2` only from `CT`<br/>`3` only from `T` |
+| mp_show_radioicon                  | 1       | 0   | 1            | Show radio icon.<br/>`0` disabled<br/>`1` enabled |
+| mp_old_bomb_defused_sound          | 1       | 0   | 1            | Play "Bomb has been defused" sound instead of "Counter-Terrorists win" when bomb was defused<br/>`0` disabled<br/>`1` enabled |
+| showtriggers                       | 0       | 0   | 1            | Debug cvar shows triggers. |
+| sv_alltalk                         | 0       | 0   | 4            | When players can hear each other ([further explanation](../../wiki/sv_alltalk)).<br/>`0` dead don't hear alive<br/>`1` no restrictions<br/>`2` teammates hear each other<br/>`3` Same as 2, but spectators hear everybody<br/>`4` alive hear alive, dead hear dead and alive.
+| bot_deathmatch                     | 0       | 0   | 1            | Set's the mode for the zBot.<br/>`0` disabled<br/>`1` enable mode Deathmatch and not allow to do the scenario |
+| bot_quota_mode                     | normal  | -   | -            | Determines the type of quota.<br/>`normal` default behaviour<br/>`fill` the server will adjust bots to keep `N` players in the game, where `N` is bot_quota |
+| mp_item_staytime                   | 300     | -   | -            | Time to remove item that have been dropped from the players. |
+| mp_legacy_bombtarget_touch         | 1       | 0   | 1            | Legacy func_bomb_target touch. New one is more strict. <br/>`0` New behavior<br/>`1` Legacy behavior|
+| mp_respawn_immunitytime            | 0       | 0   | -            | Specifies the players defense time after respawn. (in seconds).<br/>`0` disabled<br/>`>0.00001` time delay to remove protection |
+| mp_kill_filled_spawn               | 1       | 0   | 1            | Kill the player in filled spawn before spawning some one else (Prevents players stucking in each other).<br />Only disable this if you have semiclip or other plugins that prevents stucking.<br/>`0` disabled<br/>`1` enabled |
+| mp_allow_point_servercommand       | 0       | 0   | 1            | Allow use of point_servercommand entities in map.<br/>`0` disallow<br/>`1` allow<br/>`NOTE`: Potentially dangerous for untrusted maps.|
+| mp_hullbounds_sets                 | 1       | 0   | 1            | Sets mins/maxs hull bounds for the player.<br/>`0` disabled<br/>`1` enabled |
+| mp_scoreboard_showhealth           | 3       | 0   | 5            | Show `HP` field into a scoreboard.<br/>`0` don't send any update for `HP` field to any clients<br/>`1` show only Terrorist `HP` field to all clients<br/>`2` show only CT `HP` field to all clients<br/>`3` show `HP` field to teammates<br/>`4` show `HP` field to all clients<br/>`5` show `HP` field to teammates and spectators |
+| mp_scoreboard_showmoney            | 3       | 0   | 5            | Show `Money` field into a scoreboard.<br/>`0` don't send any update for `Money` field to any clients<br/>`1` show only Terrorist `Money` field to all clients<br/>`2` show only CT `Money` field to all clients<br/>`3` show `Money` field to teammates<br/>`4` show `Money` field to all clients<br/>`5` show `Money` field to teammates and spectators |
+| ff_damage_reduction_bullets        | 0.35    | 0.0 | 1.0          | How much to reduce damage done to teammates when shot.<br/> Range is from `0` - `1` (with 1 being damage equal to what is done to an enemy) |
+| ff_damage_reduction_grenade        | 0.25    | 0.0 | 1.0          | How much to reduce damage done to teammates by a thrown grenade.<br/> Range is from `0` - `1` (with 1 being damage equal to what is done to an enemy) |
+| ff_damage_reduction_grenade_self   | 1.0     | 0.0 | 1.0          | How much to damage a player does to himself with his own grenade.<br/> Range is from `0` - `1` (with 1 being damage equal to what is done to an enemy) |
+| ff_damage_reduction_other          | 0.35    | 0.0 | 1.0          | How much to reduce damage done to teammates by things other than bullets and grenades.<br/> Range is from `0` - `1` (with 1 being damage equal to what is done to an enemy) |
 
 ## How to install zBot for CS 1.6?
 * Extract all the files from an [archive](regamedll/extra/zBot/bot_profiles.zip?raw=true)

dist/game.cfg

@@ -1,3 +1,5 @@
+echo Executing ReGameDLL Configuration File
+
 // The style of gameplay where there aren't any teams (FFA mode)
 // 0 - disabled (default behaviour)
 // 1 - enabled
@@ -208,8 +210,46 @@ mp_kill_filled_spawn "1"
 // Default value: "0"
 mp_allow_point_servercommand "0"
 
-// Sets mins/maxs hull bounds for the player.
-// 0 - disabled (default behaviour, sets engine)
-// 1 - enabled  (sets gamedll)
-// Default value: "1"
-mp_hullbounds_sets "1"
+// Show 'HP' field into a scoreboard
+// 0 - don't send any update for 'HP' field to any clients
+// 1 - show only Terrorist 'HP' field to all clients
+// 2 - show only CT 'HP' field to all clients
+// 3 - show 'HP' field to teammates
+// 4 - show 'HP' field to all clients
+// 5 - show 'HP' field to teammates and spectators
+// Default value: "3"
+mp_scoreboard_showhealth "3"
+
+// Show 'Money' field into a scoreboard
+// 0 - don't send any update for 'Money' field to any clients
+// 1 - show only Terrorist 'Money' field to all clients
+// 2 - show only CT 'Money' field to all clients
+// 3 - show 'Money' field to teammates
+// 4 - show 'Money' field to all clients
+// 5 - show 'Money' field to teammates and spectators
+// Default value: "3"
+mp_scoreboard_showmoney "3"
+
+// How much to reduce damage done to teammates when shot.
+// Range is from 0 - 1 (with 1 being damage equal to what is done to an enemy)
+//
+// Default value: "0.35"
+ff_damage_reduction_bullets "0.35"
+
+// How much to reduce damage done to teammates by a thrown grenade.
+// Range is from 0 - 1 (with 1 being damage equal to what is done to an enemy)
+//
+// Default value: "0.25"
+ff_damage_reduction_grenade "0.25"
+
+// How much to damage a player does to himself with his own grenade
+// Range is from 0 - 1 (with 1 being damage equal to what is done to an enemy)
+//
+// Default value: "1.0"
+ff_damage_reduction_grenade_self "1.0"
+
+// How much to reduce damage done to teammates by things other than bullets and grenades.
+// Range is from 0 - 1 (with 1 being damage equal to what is done to an enemy)
+//
+// Default value: "0.35"
+ff_damage_reduction_other "0.35"

dist/game_init.cfg

@@ -0,0 +1,5 @@
+// Sets mins/maxs hull bounds for the player.
+// 0 - disabled (default behaviour, sets engine)
+// 1 - enabled  (sets gamedll)
+// Default value: "1"
+mp_hullbounds_sets "1"

gradle.properties

@@ -1,3 +1,3 @@
 majorVersion=5
-minorVersion=7
+minorVersion=9
 maintenanceVersion=0

publish.gradle

@@ -44,7 +44,12 @@ task publishPrepareFiles {
 		// copy files from folder dist
 		copy {
 			from('dist')
-			into 'publish/publishRoot'
+			into 'publish/publishRoot/bin/win32/cstrike'
+		}
+
+		copy {
+			from('dist')
+			into 'publish/publishRoot/bin/linux32/cstrike'
 		}
 
 		// cssdk

regamedll/build.gradle

@@ -179,7 +179,7 @@ void setupToolchain(NativeBinarySpec b)
 	}
 
 	if (regamedllFixes) {
-		cfg.singleDefines 'REGAMEDLL_FIXES', 'REGAMEDLL_CHECKS', 'REGAMEDLL_ADD', 'UNICODE_FIXES', 'NDEBUG'
+		cfg.singleDefines 'REGAMEDLL_FIXES', 'BUILD_LATEST', 'BUILD_LATEST_FIXES', 'REGAMEDLL_CHECKS', 'REGAMEDLL_ADD', 'UNICODE_FIXES', 'NDEBUG'
 	} else {
 		cfg.singleDefines 'PLAY_GAMEDLL'
 	}

regamedll/dlls/API/CAPI_Impl.cpp

@@ -160,6 +160,7 @@ GAMEHOOK_REGISTRY(PlantBomb);
 GAMEHOOK_REGISTRY(CBasePlayer_SetSpawnProtection);
 GAMEHOOK_REGISTRY(CBasePlayer_RemoveSpawnProtection);
 GAMEHOOK_REGISTRY(IsPenetrableEntity);
+GAMEHOOK_REGISTRY(CBasePlayer_HintMessageEx);
 
 int CReGameApi::GetMajorVersion() {
 	return REGAMEDLL_API_VERSION_MAJOR;