Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Consistently use "health points" (#10868)
  • Loading branch information
Zughy committed Jan 27, 2021
1 parent 8dae7b4 commit 44a9510
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions doc/lua_api.txt
Expand Up @@ -6221,8 +6221,8 @@ object you are working with still exists.
* `time_from_last_punch` = time since last punch action of the puncher
* `direction`: can be `nil`
* `right_click(clicker)`; `clicker` is another `ObjectRef`
* `get_hp()`: returns number of hitpoints (2 * number of hearts)
* `set_hp(hp, reason)`: set number of hitpoints (2 * number of hearts).
* `get_hp()`: returns number of health points
* `set_hp(hp, reason)`: set number of health points
* See reason in register_on_player_hpchange
* Is limited to the range of 0 ... 65535 (2^16 - 1)
* For players: HP are also limited by `hp_max` specified in the player's
Expand Down
2 changes: 1 addition & 1 deletion src/constants.h
Expand Up @@ -89,7 +89,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
// Size of player's main inventory
#define PLAYER_INVENTORY_SIZE (8 * 4)

// Default maximum hit points of a player
// Default maximum health points of a player
#define PLAYER_MAX_HP_DEFAULT 20

// Default maximal breath of a player
Expand Down
2 changes: 1 addition & 1 deletion util/wireshark/minetest.lua
Expand Up @@ -873,7 +873,7 @@ end
-- TOCLIENT_HP

do
local f_hp = ProtoField.uint16("minetest.server.hp", "Hitpoints", base.DEC)
local f_hp = ProtoField.uint16("minetest.server.hp", "Health points", base.DEC)

minetest_server_commands[0x33] = {
"HP", 4,
Expand Down

0 comments on commit 44a9510

Please sign in to comment.