OpenPunk
/
OpenFusion
mirror of https://github.com/OpenFusionProject/OpenFusion.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #102 from darkredtitan/LoadisGMfromConfig.ini 

Respect config.ini GM settings
Upon character creation, the GM value from the config will now be used instead of always being set to false. The default in Settings.cpp has also been changed to be consistent with the config.ini in the repo.
This commit is contained in:
CakeLancelot 2020-09-20 14:04:33 -05:00 committed by GitHub
parent 77df7b7160 ff7c78d545
commit 94583e534b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Database.cpp
View File

@ -159,7 +159,7 @@ int Database::createCharacter(sP_CL2LS_REQ_SAVE_CHAR_NAME* save, int AccountID)
create.Height = 0;
create.Level = 1;
create.SkinColor = 1;
create.isGM = false;
create.isGM = settings::GM;
create.x_coordinates = settings::SPAWN_X;
create.y_coordinates = settings::SPAWN_Y;
create.z_coordinates = settings::SPAWN_Z;

2
src/settings.cpp
View File

@ -24,7 +24,7 @@ std::string settings::NPCJSON = "tdata/NPCs.json";
std::string settings::XDTJSON = "tdata/xdt.json";
std::string settings::MOBJSON = "tdata/mobs.json";
std::string settings::MOTDSTRING = "Welcome to OpenFusion!";
bool settings::GM = false;
bool settings::GM = true;
void settings::init() {
INIReader reader("config.ini");