Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix up all config file paths

Browse Source
This commit is contained in:
scatterflower 2020-09-02 08:51:14 -05:00
parent a474787c4d
commit 619b42e1bb
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/aoclient.cpp
View File

@ -76,7 +76,7 @@ void AOClient::handlePacket(AOPacket packet)
sendPacket("ID", {"271828", "akashi", QCoreApplication::applicationVersion()}); sendPacket("ID", {"271828", "akashi", QCoreApplication::applicationVersion()});
} }
else if (packet.header == "ID") { else if (packet.header == "ID") {
QSettings config("config.ini", QSettings::IniFormat); QSettings config("config/config.ini", QSettings::IniFormat);
config.beginGroup("Options"); config.beginGroup("Options");
QString max_players = config.value("max_players").toString(); QString max_players = config.value("max_players").toString();
config.endGroup(); config.endGroup();
@ -114,10 +114,7 @@ void AOClient::handlePacket(AOPacket packet)
fullArup(); // Give client all the area data fullArup(); // Give client all the area data
arup(ARUPType::PLAYER_COUNT, true); // Tell everyone there is a new player arup(ARUPType::PLAYER_COUNT, true); // Tell everyone there is a new player
QSettings areas_ini("areas.ini", QSettings::IniFormat); sendPacket("FA", server->area_names);
QStringList areas = areas_ini.childGroups();
sendPacket("FA", areas);
sendPacket("OPPASS", {"DEADBEEF"}); sendPacket("OPPASS", {"DEADBEEF"});
sendPacket("DONE"); sendPacket("DONE");
} }

2
src/server.cpp
View File

@ -60,7 +60,7 @@ void Server::start()
music_list.insert(0, "Music"); music_list.insert(0, "Music");
// TODO: add verification that this exists // TODO: add verification that this exists
QSettings areas_ini("areas.ini", QSettings::IniFormat); QSettings areas_ini("config/areas.ini", QSettings::IniFormat);
area_names = areas_ini.childGroups(); area_names = areas_ini.childGroups();
for (int i = 0; i < area_names.length(); i++) { for (int i = 0; i < area_names.length(); i++) {
QString area_name = area_names[i]; QString area_name = area_names[i];