cherry-pick from github.com/minetest/minetest_game> Tnt: Fix bug in dropped item counting

master
Foz 2016-05-02 22:36:29 -04:00 committed by tchncs
parent 75aa611aa2
commit c47d026950
5 changed files with 6 additions and 6 deletions

View File

@ -87,7 +87,6 @@ InfinityProject (WTFPL):
Splizard (CC BY-SA 3.0):
default_snow.png
default_snow_side.png
default_pine_sapling.png
Zeg9 (CC BY-SA 3.0):
@ -98,7 +97,7 @@ Zeg9 (CC BY-SA 3.0):
default_gold_block.png
paramat (CC BY-SA 3.0):
wieldhand.png copied from character.png by Jordach (CC BY-SA 3.0)
wieldhand.png -- Copied from character.png by Jordach (CC BY-SA 3.0)
default_pinetree.png
default_pinetree_top.png
default_pinewood.png
@ -121,6 +120,7 @@ paramat (CC BY-SA 3.0):
default_dry_grass_*.png
default_grass.png
default_grass_side.png
default_snow_side.png
brunob.santos (CC BY-SA 4.0):
default_desert_cobble.png
@ -182,6 +182,9 @@ Gambit (WTFPL):
asl97 (WTFPL):
default_ice.png
KevDoy (CC BY-SA 3.0)
heart.png
Glass breaking sounds (CC BY 3.0):
1: http://www.freesound.org/people/cmusounddesign/sounds/71947/
2: http://www.freesound.org/people/Tomlija/sounds/97669/
@ -221,6 +224,3 @@ Mito551 (sounds) (CC BY-SA):
default_dirt_footstep.1.ogg
default_dirt_footstep.2.ogg
default_glass_footstep.ogg
KevDoy (CC BY-SA 3.0)
heart.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 890 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 771 B

After

Width:  |  Height:  |  Size: 779 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 360 B

After

Width:  |  Height:  |  Size: 376 B

View File

@ -45,7 +45,7 @@ local function eject_drops(drops, pos, radius)
local count = item:get_count()
while count > 0 do
local take = math.max(1,math.min(radius * radius,
item:get_count(),
count,
item:get_stack_max()))
rand_pos(pos, drop_pos, radius)
local dropitem = ItemStack(item)