summary refs log tree commit diff
diff options
context:
space:
mode:
authorNguyễn Gia Phong <mcsinyx@disroot.org>2022-02-17 11:23:33 +0700
committerNguyễn Gia Phong <mcsinyx@disroot.org>2022-02-17 11:28:07 +0700
commit2149e0da4f91002095f34174baaf1c1118d99a52 (patch)
treeb0b2a09e9743557260b4531c4840f77cea3cc94c
parent20aa002424b27724ffd149b74540b5bcc4cbc655 (diff)
downloadblackshades-2.4.8.tar.gz
Fix shotgun laser aim 2.4.8
-rw-r--r--CHANGES8
-rw-r--r--src/GameTick.cpp7
2 files changed, 9 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index 7ac9861..97febb3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+Tag:	2.4.8
+Date:	2022-02-17
+
+	Laser sight improvements
+
+	* Fix aim for shotgun
+	* Remove from sniper rifle
+
 Tag:	2.4.7
 Date:	2022-01-15
 
diff --git a/src/GameTick.cpp b/src/GameTick.cpp
index 28d3ef3..7ecab8e 100644
--- a/src/GameTick.cpp
+++ b/src/GameTick.cpp
@@ -755,17 +755,12 @@ void renderLaser(Game* game)
 	auto& rotation = player.playerrotation;
 	switch (player.whichgun) {
 	case assaultrifle:
+	case shotgun:
 		aim = DoRotation(joints[lefthand].position
 			- joints[righthand].position,
 			0.0f, rotation - 2.5f, 0.0f);
 		coeff = 0.15f;
 		break;
-	case shotgun:
-		aim = DoRotation(joints[lefthand].position
-			- joints[righthand].position,
-			0.0f, rotation + 4.0f, 0.0f);
-		coeff = 0.4f;
-		break;
 	case handgun1:
 	case handgun2:
 		coeff = thirdperson ? 0.35f : 0.65f;