From cb81ec3e1c34f3c732b9d093eba6d7f62a48d231 Mon Sep 17 00:00:00 2001
From: Attila Uygun <auygun@opera.com>
Date: Thu, 10 Nov 2022 21:03:15 +0100
Subject: [PATCH] Fix for weapon position

---
 .vscode/launch.json | 2 +-
 src/demo/player.cc  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index b508809..f8a5095 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -8,7 +8,7 @@
       "name": "(gdb) Launch",
       "type": "cppdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/build/linux/gltest_x86_64_debug",
+      "program": "${workspaceFolder}/build/linux/demo_x86_64_debug",
       "args": [],
       "stopAtEntry": false,
       "cwd": "${workspaceFolder}/build/linux",
diff --git a/src/demo/player.cc b/src/demo/player.cc
index fa82fa4..d19a162 100644
--- a/src/demo/player.cc
+++ b/src/demo/player.cc
@@ -171,7 +171,7 @@ void Player::Reset() {
 Vector2f Player::GetWeaponPos(DamageType type) const {
   return Engine::Get().GetScreenSize() /
              Vector2f(type == kDamageType_Green ? 3.5f : -3.5f, -2) +
-         Vector2f(0, weapon_[type].GetSize().y * 0.7f);
+         Vector2f(0, weapon_[type].GetSize().y * 0.95f);
 }
 
 Vector2f Player::GetWeaponScale() const {
@@ -256,13 +256,12 @@ void Player::SetupWeapons() {
     drag_sign_[i].SetZOrder(21);
     drag_sign_[i].SetFrame(i * 8);
 
-    Vector2f pos = GetWeaponPos((DamageType)i);
-
     // Setup weapon.
     weapon_[i].Create("weapon_tex", {8, 2});
     weapon_[i].SetZOrder(24);
     weapon_[i].SetVisible(true);
     weapon_[i].SetFrame(wepon_warmup_frame[i]);
+    Vector2f pos = GetWeaponPos((DamageType)i);
     weapon_[i].SetPosition(pos);
 
     // Setup beam.