diff --git a/src/Items.cpp b/src/Items.cpp index 469fdf2..a3618dc 100644 --- a/src/Items.cpp +++ b/src/Items.cpp @@ -199,7 +199,7 @@ static int getCrateItem(sItemBase* result, int itemSetId, int rarity, int player 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 itemWeights(validItems.size(), itemSet.defaultItemWeight); if (!itemSet.alterItemWeightMap.empty()) { diff --git a/src/Missions.cpp b/src/Missions.cpp index 1e445b2..3478006 100644 --- a/src/Missions.cpp +++ b/src/Missions.cpp @@ -27,9 +27,9 @@ static void saveMission(Player* player, int missionId) { } static bool isMissionCompleted(Player* player, int missionId) { - int row = missionId / 64; - int column = missionId % 64; - return player->aQuestFlag[row] & (1ULL << column); + int row = missionId / 64; + int column = missionId % 64; + return player->aQuestFlag[row] & (1ULL << column); } int Missions::findQSlot(Player *plr, int id) { @@ -230,8 +230,8 @@ static bool endTask(CNSocket *sock, int32_t taskNum, int choice=0) { } if (!found) { - std::cout << "[WARN] Player tried to end task that isn't in journal?" << std::endl; - return false; + std::cout << "[WARN] Player tried to end task that isn't in journal?" << std::endl; + return false; } 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]; if (task["m_iCTRReqLvMin"] > plr->level) { - std::cout << "[WARN] Player tried to start a task below their level" << std::endl; - return false; + std::cout << "[WARN] Player tried to start a task below their level" << std::endl; + return false; } if (isMissionCompleted(plr, (int)(task["m_iHMissionID"]) - 1)) { - std::cout << "[WARN] Player tried to start an already completed mission" << std::endl; - return false; + std::cout << "[WARN] Player tried to start an already completed mission" << std::endl; + return false; } // client freaks out if nano mission isn't sent first after relogging, so it's easiest to set it here diff --git a/src/Trading.cpp b/src/Trading.cpp index d2d29e4..a46abfd 100644 --- a/src/Trading.cpp +++ b/src/Trading.cpp @@ -392,7 +392,7 @@ static void tradeRegisterCash(CNSocket* sock, CNPacketData* data) { Player* plr = PlayerManager::getPlayer(sock); 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 if (pacdat->iID_Request == pacdat->iID_From)