From 967312cb4e6f346d2945acc25cba73b89a4e75c0 Mon Sep 17 00:00:00 2001 From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com> Date: Mon, 27 May 2024 19:39:20 +0530 Subject: [PATCH] fix minor, make unreliable completely unordered --- src/Marble.hx | 8 +++++--- src/net/MoveManager.hx | 8 ++++---- src/net/Net.hx | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Marble.hx b/src/Marble.hx index 0c673bef..1462d8e3 100644 --- a/src/Marble.hx +++ b/src/Marble.hx @@ -360,7 +360,7 @@ class Marble extends GameObject { this.rollSound.volume = 0; this.slipSound.volume = 0; this.helicopterSound = AudioManager.playSound(ResourceLoader.getResource("data/sound/use_gyrocopter.wav", ResourceLoader.getAudio, - this.soundResources), this.getAbsPos().getPosition(), true); + this.soundResources), null, true); this.helicopterSound.pause = true; } @@ -2197,11 +2197,13 @@ class Marble extends GameObject { if (isHelicopterEnabled(timeState)) { this.helicopter.setPosition(x, y, z); this.helicopter.setRotationQuat(this.level.getOrientationQuat(timeState.currentAttemptTime)); - this.helicopterSound.pause = false; + if (this.controllable) + this.helicopterSound.pause = false; this.helicopter.setScale(this._renderScale); } else { this.helicopter.setPosition(1e8, 1e8, 1e8); - this.helicopterSound.pause = true; + if (this.controllable) + this.helicopterSound.pause = true; } if (this.blastUseTime > timeState.currentAttemptTime) { diff --git a/src/net/MoveManager.hx b/src/net/MoveManager.hx index 80b93aac..be0e7817 100644 --- a/src/net/MoveManager.hx +++ b/src/net/MoveManager.hx @@ -47,12 +47,12 @@ class MoveManager { var maxMoves = 45; var maxSendMoveListSize = 30; - var serverTargetMoveListSize = 4; - var serverMaxMoveListSize = 16; - var serverAvgMoveListSize = 4.0; + var serverTargetMoveListSize = 3; + var serverMaxMoveListSize = 8; + var serverAvgMoveListSize = 3.0; var serverSmoothMoveAvg = 0.15; var serverMoveListSizeSlack = 1.5; - var serverDefaultMinTargetMoveListSize = 4; + var serverDefaultMinTargetMoveListSize = 3; var serverAbnormalMoveCount = 0; var serverLastRecvMove = 0; var serverLastAckMove = 0; diff --git a/src/net/Net.hx b/src/net/Net.hx index 868f31cb..66719de2 100644 --- a/src/net/Net.hx +++ b/src/net/Net.hx @@ -246,7 +246,7 @@ class Net { }, 5000); clientDatachannel = client.createDatachannel("mp"); - clientDatachannelUnreliable = client.createDatachannelWithOptions("unreliable", false, null, 600); + clientDatachannelUnreliable = client.createDatachannelWithOptions("unreliable", true, null, 600); var closing = false; var openFlags = 0;