Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix jittering sounds on entities (fixes #2974) #3040

Merged
merged 1 commit into from Oct 26, 2015

Conversation

Projects
None yet
5 participants
@BlockMen
Copy link
Contributor

commented Aug 12, 2015

As title says and some codestyle fixes.

@PilzAdam

This comment has been minimized.

Copy link
Contributor

commented Aug 12, 2015

Is this a proper fix? This doesn't seem to fix the jittering of touching_ground, which also causes other problems (e.g. jumping on top of entities randomly doesn't work due to this).

Also don't mix code style fixes with other commits.

@BlockMen

This comment has been minimized.

Copy link
Contributor Author

commented Aug 12, 2015

@PilzAdam Yes and no. Yes, since it should never play a sound. And even if it should, then not the sound of the node the entity is located.
No, since there seems to be something wrong in general with object collision, but that the PR is not claiming to fix ;)

Do we have a rule for that? But even if not, I will seperate it when someone else claims it has to be done.

@est31

View changes

src/collision.cpp Outdated
if(is_step_up[boxindex])
{
if (cbox.MaxEdge.X - d > box.MinEdge.X && cbox.MinEdge.X + d < box.MaxEdge.X &&
cbox.MaxEdge.Z - d > box.MinEdge.Z &&cbox.MinEdge.Z + d < box.MaxEdge.Z) {

This comment has been minimized.

Copy link
@est31

est31 Aug 13, 2015

Contributor

This line is too long, it has 91 chars.

This comment has been minimized.

Copy link
@est31

est31 Aug 13, 2015

Contributor

And there is a space needed after the &&.

@rubenwardy

View changes

src/collision.cpp Outdated
is_collision = false;

if(is_collision){
if (is_collision){

This comment has been minimized.

Copy link
@rubenwardy

rubenwardy Aug 13, 2015

Member

missed brace here

@BlockMen BlockMen force-pushed the BlockMen:fix_jitter_sounds branch Aug 13, 2015

@BlockMen BlockMen force-pushed the BlockMen:fix_jitter_sounds branch to 8a6e921 Oct 26, 2015

@BlockMen BlockMen merged commit 8a6e921 into minetest:master Oct 26, 2015

3 of 4 checks passed

continuous-integration/travis-ci/push The Travis CI build is in progress
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins-ci/android-nrz Build finished. No test results found.
Details
jenkins-ci/freebsd-nrz Build finished. No test results found.
Details
@HybridDog

This comment has been minimized.

Copy link
Contributor

commented on 8a6e921 Oct 31, 2015

If you stand on an object and it suddenly moves up, you fall through it, don't you?
Maybe you could assign the player to it if he/she is standing on it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.