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

Merge pull request #131 from JadeShrineMaiden/bugfix

Browse Source 
Bugfixes
This commit is contained in:
dongresource 2020-10-07 19:52:11 +02:00 committed by GitHub
commit 7a83a3b45c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CNProtocol.hpp
View File

@ -7,7 +7,9 @@
#include <stdint.h> #include <stdint.h>
#ifdef _WIN32 #ifdef _WIN32
// windows // windows
#ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif
#define _WINSOCK_DEPRECATED_NO_WARNINGS #define _WINSOCK_DEPRECATED_NO_WARNINGS
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>

3
src/GroupManager.cpp
View File

@ -147,9 +147,6 @@ void GroupManager::joinGroup(CNSocket* sock, CNPacketData* data) {
} }
void GroupManager::leaveGroup(CNSocket* sock, CNPacketData* data) { void GroupManager::leaveGroup(CNSocket* sock, CNPacketData* data) {
if (data->size != sizeof(P_CL2FE_REQ_PC_GROUP_LEAVE))
return; // malformed packet
Player* plr = PlayerManager::getPlayer(sock); Player* plr = PlayerManager::getPlayer(sock);
if (plr == nullptr) if (plr == nullptr)

4
src/NPCManager.cpp
View File

@ -351,7 +351,7 @@ void NPCManager::npcVendorTable(CNSocket* sock, CNPacketData* data) {
INITSTRUCT(sP_FE2CL_REP_PC_VENDOR_TABLE_UPDATE_SUCC, resp); INITSTRUCT(sP_FE2CL_REP_PC_VENDOR_TABLE_UPDATE_SUCC, resp);
for (int i = 0; i < listings.size() && i < 20; i++) { // 20 is the max for (int i = 0; i < (int)listings.size() && i < 20; i++) { // 20 is the max
sItemBase base; sItemBase base;
base.iID = listings[i].iID; base.iID = listings[i].iID;
base.iOpt = 0; base.iOpt = 0;
@ -393,7 +393,7 @@ void NPCManager::npcVendorBuyBattery(CNSocket* sock, CNPacketData* data) {
if (plr == nullptr) if (plr == nullptr)
return; return;
int cost = req->Item.iOpt * 100; int cost = req->Item.iOpt * 10;
if ((req->Item.iID == 3 ? (plr->batteryW >= 9999) : (plr->batteryN >= 9999)) || plr->money < cost) { // sanity check if ((req->Item.iID == 3 ? (plr->batteryW >= 9999) : (plr->batteryN >= 9999)) || plr->money < cost) { // sanity check
INITSTRUCT(sP_FE2CL_REP_PC_VENDOR_BATTERY_BUY_FAIL, failResp); INITSTRUCT(sP_FE2CL_REP_PC_VENDOR_BATTERY_BUY_FAIL, failResp);
failResp.iErrorCode = 0; failResp.iErrorCode = 0;

6
src/NanoManager.cpp
View File

@ -702,6 +702,8 @@ void NanoManager::nanoBuff(CNSocket* sock, int16_t nanoId, int skillId, int16_t
if (groupPower) if (groupPower)
pktCnt = leader->groupCnt; pktCnt = leader->groupCnt;
else
leader = plr;
if (!validOutVarPacket(sizeof(sP_FE2CL_NANO_SKILL_USE), pktCnt, sizeof(sSkillResult_Buff))) { if (!validOutVarPacket(sizeof(sP_FE2CL_NANO_SKILL_USE), pktCnt, sizeof(sSkillResult_Buff))) {
std::cout << "[WARN] bad sP_FE2CL_NANO_SKILL_USE packet size\n"; std::cout << "[WARN] bad sP_FE2CL_NANO_SKILL_USE packet size\n";
@ -783,6 +785,8 @@ void NanoManager::nanoUnbuff(CNSocket* sock, int32_t iCBFlag, int16_t eCharStatu
if (groupPower) if (groupPower)
pktCnt = leader->groupCnt; pktCnt = leader->groupCnt;
else
leader = plr;
for (int i = 0; i < pktCnt; i++) { for (int i = 0; i < pktCnt; i++) {
Player* varPlr; Player* varPlr;
@ -813,7 +817,7 @@ void NanoManager::nanoUnbuff(CNSocket* sock, int32_t iCBFlag, int16_t eCharStatu
// 0=A 1=B 2=C -1=Not found // 0=A 1=B 2=C -1=Not found
int NanoManager::nanoStyle(int nanoId) { int NanoManager::nanoStyle(int nanoId) {
if (nanoId < 0 || nanoId >= NanoTable.size()) if (nanoId < 0 || nanoId >= (int)NanoTable.size())
return -1; return -1;
return NanoTable[nanoId].style; return NanoTable[nanoId].style;
} }