Include CNStructs.hpp in settings.cpp for the ACADEMY define

This fixes the spawn point being wrong.
This commit is contained in:
dongresource 2021-01-06 12:29:39 +01:00
parent 2bf3fd0975
commit 46b6d9fcc7

View File

@ -1,6 +1,7 @@
#include <iostream> #include <iostream>
#include "settings.hpp" #include "settings.hpp"
#include "contrib/INIReader.hpp" #include "contrib/INIReader.hpp"
#include "CNStructs.hpp" // for ACADEMY
// defaults :) // defaults :)
int settings::VERBOSITY = 1; int settings::VERBOSITY = 1;
@ -17,11 +18,12 @@ bool settings::SIMULATEMOBS = true;
// default spawn point // default spawn point
#ifndef ACADEMY #ifndef ACADEMY
// Sector V (future) // Sector V (The Future)
int settings::SPAWN_X = 632032; int settings::SPAWN_X = 632032;
int settings::SPAWN_Y = 187177; int settings::SPAWN_Y = 187177;
int settings::SPAWN_Z = -5500; int settings::SPAWN_Z = -5500;
#else #else
// Null Void (Training Area)
int settings::SPAWN_X = 19835; int settings::SPAWN_X = 19835;
int settings::SPAWN_Y = 108682; int settings::SPAWN_Y = 108682;
int settings::SPAWN_Z = 8450; int settings::SPAWN_Z = 8450;