OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-10-31 00:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

implemented saving BatteryN and BatteryW

Browse Source
This commit is contained in:
kamilprzyb
2020-09-14 23:01:57 +02:00
parent 4d21410980
commit 10dc5721c0
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Database.cpp
View File

@@ -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;

2
src/Database.hpp
View File

@@ -62,6 +62,8 @@ namespace Database {
int z_coordinates;
int angle;
short int PCState;
int BatteryW;
int BatteryN;
std::vector<char> QuestFlag;
};

2
src/PlayerManager.cpp
View File

@@ -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;