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

Fix three-space indentation in a few places

Browse Source
This commit is contained in:
dongresource 2022-02-11 18:27:00 +01:00
parent 00865e1c7b
commit 91f9a2085b
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Items.cpp
View File

@ -199,7 +199,7 @@ static int getCrateItem(sItemBase* result, int itemSetId, int rarity, int player
return -1; return -1;
} }
// initialize all weights as the default weight for all item slots // initialize all weights as the default weight for all item slots
std::vector<int> itemWeights(validItems.size(), itemSet.defaultItemWeight); std::vector<int> itemWeights(validItems.size(), itemSet.defaultItemWeight);
if (!itemSet.alterItemWeightMap.empty()) { if (!itemSet.alterItemWeightMap.empty()) {

18
src/Missions.cpp
View File

@ -27,9 +27,9 @@ static void saveMission(Player* player, int missionId) {
} }
static bool isMissionCompleted(Player* player, int missionId) { static bool isMissionCompleted(Player* player, int missionId) {
int row = missionId / 64; int row = missionId / 64;
int column = missionId % 64; int column = missionId % 64;
return player->aQuestFlag[row] & (1ULL << column); return player->aQuestFlag[row] & (1ULL << column);
} }
int Missions::findQSlot(Player *plr, int id) { int Missions::findQSlot(Player *plr, int id) {
@ -230,8 +230,8 @@ static bool endTask(CNSocket *sock, int32_t taskNum, int choice=0) {
} }
if (!found) { if (!found) {
std::cout << "[WARN] Player tried to end task that isn't in journal?" << std::endl; std::cout << "[WARN] Player tried to end task that isn't in journal?" << std::endl;
return false; return false;
} }
if (i == ACTIVE_MISSION_COUNT - 1 && plr->tasks[i] != 0) { if (i == ACTIVE_MISSION_COUNT - 1 && plr->tasks[i] != 0) {
@ -305,13 +305,13 @@ bool Missions::startTask(Player* plr, int TaskID) {
TaskData& task = *Missions::Tasks[TaskID]; TaskData& task = *Missions::Tasks[TaskID];
if (task["m_iCTRReqLvMin"] > plr->level) { if (task["m_iCTRReqLvMin"] > plr->level) {
std::cout << "[WARN] Player tried to start a task below their level" << std::endl; std::cout << "[WARN] Player tried to start a task below their level" << std::endl;
return false; return false;
} }
if (isMissionCompleted(plr, (int)(task["m_iHMissionID"]) - 1)) { if (isMissionCompleted(plr, (int)(task["m_iHMissionID"]) - 1)) {
std::cout << "[WARN] Player tried to start an already completed mission" << std::endl; std::cout << "[WARN] Player tried to start an already completed mission" << std::endl;
return false; return false;
} }
// client freaks out if nano mission isn't sent first after relogging, so it's easiest to set it here // client freaks out if nano mission isn't sent first after relogging, so it's easiest to set it here

2
src/Trading.cpp
View File

@ -392,7 +392,7 @@ static void tradeRegisterCash(CNSocket* sock, CNPacketData* data) {
Player* plr = PlayerManager::getPlayer(sock); Player* plr = PlayerManager::getPlayer(sock);
if (pacdat->iCandy < 0 || pacdat->iCandy > plr->money) if (pacdat->iCandy < 0 || pacdat->iCandy > plr->money)
return; // famous glitch, begone return; // famous glitch, begone
CNSocket* otherSock; // weird flip flop because we need to know who the other player is CNSocket* otherSock; // weird flip flop because we need to know who the other player is
if (pacdat->iID_Request == pacdat->iID_From) if (pacdat->iID_Request == pacdat->iID_From)