From 10dc5721c04ce82fb1e847b486ff72a0e2f9e312 Mon Sep 17 00:00:00 2001
From: kamilprzyb <kamilprzybspam@wp.pl>
Date: Mon, 14 Sep 2020 23:01:57 +0200
Subject: [PATCH] implemented saving BatteryN and BatteryW

---
 src/Database.cpp      | 8 +++++++-
 src/Database.hpp      | 2 ++
 src/PlayerManager.cpp | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Database.cpp b/src/Database.cpp
index 878774f..f474ae7 100644
--- a/src/Database.cpp
+++ b/src/Database.cpp
@@ -51,7 +51,9 @@ auto db = make_storage("database.db",
         make_column("isGM", &Database::DbPlayer::isGM),
         make_column("FusionMatter", &Database::DbPlayer::FusionMatter),
         make_column("Taros", &Database::DbPlayer::Taros),
-        make_column("Quests", &Database::DbPlayer::QuestFlag)
+        make_column("Quests", &Database::DbPlayer::QuestFlag),
+        make_column("BatteryW", &Database::DbPlayer::BatteryW),
+        make_column("BatteryN", &Database::DbPlayer::BatteryN)
     ),
     make_table("Inventory",
         make_column("PlayerId", &Database::Inventory::playerId),
@@ -318,6 +320,8 @@ Database::DbPlayer Database::playerToDb(Player *player)
     result.Nano1 = player->equippedNanos[0];
     result.Nano2 = player->equippedNanos[1];
     result.Nano3 = player->equippedNanos[2];
+    result.BatteryN = player->batteryN;
+    result.BatteryW = player->batteryW;
 
     // quests
     result.QuestFlag = std::vector<char>();
@@ -370,6 +374,8 @@ Player Database::DbToPlayer(DbPlayer player) {
     result.angle = player.angle;
     result.money = player.Taros;
     result.fusionmatter = player.FusionMatter;
+    result.batteryN = player.BatteryN;
+    result.batteryW = player.BatteryW;
 
     result.equippedNanos[0] = player.Nano1;
     result.equippedNanos[1] = player.Nano2;
diff --git a/src/Database.hpp b/src/Database.hpp
index e319e36..6aca7a6 100644
--- a/src/Database.hpp
+++ b/src/Database.hpp
@@ -62,6 +62,8 @@ namespace Database {
         int z_coordinates;
         int angle;
         short int PCState;
+        int BatteryW;
+        int BatteryN;
         std::vector<char> QuestFlag;
     };
 
diff --git a/src/PlayerManager.cpp b/src/PlayerManager.cpp
index e96094c..968824d 100644
--- a/src/PlayerManager.cpp
+++ b/src/PlayerManager.cpp
@@ -215,6 +215,8 @@ void PlayerManager::enterPlayer(CNSocket* sock, CNPacketData* data) {
     response.PCLoadData2CL.iY = plr.y;
     response.PCLoadData2CL.iZ = plr.z;
     response.PCLoadData2CL.iAngle = plr.angle;
+    response.PCLoadData2CL.iBatteryN = plr.batteryN;
+    response.PCLoadData2CL.iBatteryW = plr.batteryW;
 
     response.PCLoadData2CL.iActiveNanoSlotNum = -1;
     response.PCLoadData2CL.iFatigue = 50;