From a36d16e5cb37fb2d69d0ee2322bf4f04ef52aa96 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 2 Apr 2019 19:18:09 +0800
Subject: [PATCH] smoke ok

---
 server/gameserver/player.cc |  5 +++++
 server/gameserver/smoke.cc  | 26 ++++++++++++++++++++++++++
 server/gameserver/smoke.h   | 27 +++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)

diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 4527c0e..ee9fe6f 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -310,6 +310,11 @@ void Player::LootInteraction(Loot* entity)
             if (item_meta->i->_inventory_slot() >= 0 &&
                 item_meta->i->_inventory_slot() < MAX_INVENTORY_NUM) {
                 inventory[item_meta->i->_inventory_slot()] += entity->count;
+                if (item_meta->i->_inventory_slot() > 12) {
+                    if (item_meta->i->_inventory_slot() - 12 > curr_scope_idx) {
+                        curr_scope_idx = item_meta->i->_inventory_slot() - 12;
+                    }
+                }
                 need_sync_active_player = true;
             }
         }
diff --git a/server/gameserver/smoke.cc b/server/gameserver/smoke.cc
index e69de29..9b41bf6 100644
--- a/server/gameserver/smoke.cc
+++ b/server/gameserver/smoke.cc
@@ -0,0 +1,26 @@
+#include "precompile.h"
+
+#include "smoke.h"
+#include "metamgr.h"
+#include "movement.h"
+#include "room.h"
+#include "collider.h"
+#include "obstacle.h"
+#include "player.h"
+
+Smoke::Smoke():Entity()
+{
+    entity_type = ET_Smoke;
+}
+
+Smoke::~Smoke()
+{
+}
+
+void Smoke::Initialize()
+{
+}
+
+void Smoke::Update(int delta_time)
+{
+}
diff --git a/server/gameserver/smoke.h b/server/gameserver/smoke.h
index e69de29..e80c46e 100644
--- a/server/gameserver/smoke.h
+++ b/server/gameserver/smoke.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "entity.h"
+
+namespace MetaData
+{
+    struct Player;
+    struct Equip;
+}
+
+class Human;
+class Smoke : public Entity
+{
+ public:
+    MetaData::Equip* gun_meta = nullptr;
+    MetaData::Equip* meta = nullptr;
+    Human* player = nullptr;
+    Vector2D dir;
+    Vector2D born_pos;
+    Vector2D born_dir;
+
+    Smoke();
+    virtual ~Smoke() override;
+    virtual void Initialize() override;
+    virtual void Update(int delta_time) override;
+
+};