OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

"Created" meta column + cleanup

Browse Source
This commit is contained in:
Kamil 2020-12-07 21:10:19 +01:00 committed by Gent S
parent 04112377ea
commit 05f4746af4
5 changed files with 456 additions and 501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.ini
View File

@ -42,6 +42,10 @@ pathdata=tdata/paths.json
dropdata=tdata/drops.json dropdata=tdata/drops.json
# gruntwork output (this is what you submit) # gruntwork output (this is what you submit)
gruntwork=tdata/gruntwork.json gruntwork=tdata/gruntwork.json
# location of the database
dbpath=database.db
# should tutorial flags be disabled off the bat?
disablefirstuseflag=true
# account permission level that will be set upon character creation # account permission level that will be set upon character creation
# 1 = default, will allow *all* commands # 1 = default, will allow *all* commands

4
src/CNLoginServer.cpp
View File

@ -346,8 +346,8 @@ void CNLoginServer::characterCreate(CNSocket* sock, CNPacketData* data) {
} }
if (!Database::finishCharacter(character, loginSessions[sock].userID)) if (!Database::finishCharacter(character, loginSessions[sock].userID))
{ {
std::cout << "[WARN] Login Server: Database failed to finish character creation!" << std::endl; std::cout << "[WARN] Login Server: Database failed to finish character creation!" << std::endl;
return invalidCharacter(sock); return invalidCharacter(sock);
} }
Player player = {}; Player player = {};

944
src/Database.cpp
View File

File diff suppressed because it is too large Load Diff

3
src/Database.hpp
View File

@ -3,7 +3,6 @@
#include "Player.hpp" #include "Player.hpp"
#include <string> #include <string>
#include <vector> #include <vector>
#include <map>
#define DATABASE_VERSION 1 #define DATABASE_VERSION 1
@ -67,7 +66,6 @@ namespace Database {
// getting players // getting players
void getPlayer(Player* plr, int id); void getPlayer(Player* plr, int id);
void updatePlayer(Player *player); void updatePlayer(Player *player);
void updateBuddies(Player* player);
void removeExpiredVehicles(Player* player); void removeExpiredVehicles(Player* player);
// buddies // buddies
@ -89,5 +87,4 @@ namespace Database {
void deleteEmails(int playerID, int64_t* indices); void deleteEmails(int playerID, int64_t* indices);
int getNextEmailIndex(int playerID); int getNextEmailIndex(int playerID);
void sendEmail(EmailData* data, std::vector<sItemBase> attachments); void sendEmail(EmailData* data, std::vector<sItemBase> attachments);
} }

2
src/settings.cpp
View File

@ -81,5 +81,5 @@ void settings::init() {
DISABLEFIRSTUSEFLAG = reader.GetInteger("shard", "disablefirstuseflag", DISABLEFIRSTUSEFLAG); DISABLEFIRSTUSEFLAG = reader.GetInteger("shard", "disablefirstuseflag", DISABLEFIRSTUSEFLAG);
MONITORENABLED = reader.GetBoolean("monitor", "enabled", MONITORENABLED); MONITORENABLED = reader.GetBoolean("monitor", "enabled", MONITORENABLED);
MONITORPORT = reader.GetInteger("monitor", "port", MONITORPORT); MONITORPORT = reader.GetInteger("monitor", "port", MONITORPORT);
MONITORINTERVAL = reader.GetInteger("monitor", "interval", MONITORINTERVAL); MONITORINTERVAL = reader.GetInteger("monitor", "interval", MONITORINTERVAL);
} }