metin2/server
4
3
Fork 13
Code Issues 13 Pull Requests 3 Packages Projects Releases Wiki Activity

Fixed usage of uninitialized variables.

Browse Source
This commit is contained in:
Exynox
2022-11-27 11:56:23 +02:00
parent 972530f3a7
commit 868b8394bb
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/src/PeerBase.cpp
View File

@ -90,7 +90,7 @@ void CPeerBase::Encode(const void* data, size_t size)
return; return;
} }
if(bufferevent_write(m_bufferevent, data, size) != 0) { if (bufferevent_write(m_bufferevent, data, size) != 0) {
sys_err("Buffer write error!"); sys_err("Buffer write error!");
return; return;
} }

16
game/src/battle.cpp
View File

@ -22,8 +22,6 @@
#include "ani.h" #include "ani.h"
#include "locale_service.h" #include "locale_service.h"
int battle_hit(LPCHARACTER ch, LPCHARACTER victim, int & iRetDam);
bool battle_distance_valid_by_xy(int x, int y, int tx, int ty) bool battle_distance_valid_by_xy(int x, int y, int tx, int ty)
{ {
int distance = DISTANCE_APPROX(x - tx, y - ty); int distance = DISTANCE_APPROX(x - tx, y - ty);
@ -161,9 +159,7 @@ int battle_melee_attack(LPCHARACTER ch, LPCHARACTER victim)
const PIXEL_POSITION & vpos = victim->GetXYZ(); const PIXEL_POSITION & vpos = victim->GetXYZ();
ch->SetRotationToXY(vpos.x, vpos.y); ch->SetRotationToXY(vpos.x, vpos.y);
int dam; return battle_hit(ch, victim);
int ret = battle_hit(ch, victim, dam);
return (ret);
} }
// <20><><EFBFBD><EFBFBD> GET_BATTLE_VICTIM<49><4D> NULL<4C><4C> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>̺<EFBFBD>Ʈ<EFBFBD><C6AE> ĵ<><C4B5> <20><>Ų<EFBFBD><C5B2>. // <20><><EFBFBD><EFBFBD> GET_BATTLE_VICTIM<49><4D> NULL<4C><4C> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>̺<EFBFBD>Ʈ<EFBFBD><C6AE> ĵ<><C4B5> <20><>Ų<EFBFBD><C5B2>.
@ -633,12 +629,8 @@ void NormalAttackAffect(LPCHARACTER pkAttacker, LPCHARACTER pkVictim)
AttackAffect(pkAttacker, pkVictim, POINT_SLOW_PCT, IMMUNE_SLOW, AFFECT_SLOW, POINT_MOV_SPEED, -30, AFF_SLOW, 20, "SLOW"); AttackAffect(pkAttacker, pkVictim, POINT_SLOW_PCT, IMMUNE_SLOW, AFFECT_SLOW, POINT_MOV_SPEED, -30, AFF_SLOW, 20, "SLOW");
} }
int battle_hit(LPCHARACTER pkAttacker, LPCHARACTER pkVictim, int & iRetDam) int battle_hit(LPCHARACTER pkAttacker, LPCHARACTER pkVictim)
{ {
//PROF_UNIT puHit("Hit");
if (test_server)
sys_log(0, "battle_hit : [%s] attack to [%s] : dam :%d type :%d", pkAttacker->GetName(), pkVictim->GetName(), iRetDam);
int iDam = CalcMeleeDamage(pkAttacker, pkVictim); int iDam = CalcMeleeDamage(pkAttacker, pkVictim);
if (iDam <= 0) if (iDam <= 0)
@ -684,7 +676,9 @@ int battle_hit(LPCHARACTER pkAttacker, LPCHARACTER pkVictim, int & iRetDam)
float tempIDam = iDam; float tempIDam = iDam;
iDam = attMul * tempIDam + 0.5f; iDam = attMul * tempIDam + 0.5f;
iRetDam = iDam; //PROF_UNIT puHit("Hit");
if (test_server)
sys_log(0, "battle_hit : [%s] attack to [%s] : dam: %d", pkAttacker->GetName(), pkVictim->GetName(), iDam);
//PROF_UNIT puDam("Dam"); //PROF_UNIT puDam("Dam");
if (pkVictim->Damage(pkAttacker, iDam, DAMAGE_TYPE_NORMAL)) if (pkVictim->Damage(pkAttacker, iDam, DAMAGE_TYPE_NORMAL))

2
game/src/battle.h
View File

@ -28,6 +28,8 @@ extern int battle_count_attackers(LPCHARACTER ch);
extern void NormalAttackAffect(LPCHARACTER pkAttacker, LPCHARACTER pkVictim); extern void NormalAttackAffect(LPCHARACTER pkAttacker, LPCHARACTER pkVictim);
extern int battle_hit(LPCHARACTER ch, LPCHARACTER victim);
// Ư<><C6AF> <20><><EFBFBD><EFBFBD> // Ư<><C6AF> <20><><EFBFBD><EFBFBD>
inline void AttackAffect(LPCHARACTER pkAttacker, inline void AttackAffect(LPCHARACTER pkAttacker,
LPCHARACTER pkVictim, LPCHARACTER pkVictim,

4
game/src/char.h
View File

@ -1982,8 +1982,8 @@ class CHARACTER : public CEntity, public CFSM, public CHorseRider
//<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>Ŷ <20>ӽ<EFBFBD> <20><><EFBFBD><EFBFBD> //<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>Ŷ <20>ӽ<EFBFBD> <20><><EFBFBD><EFBFBD>
private: private:
unsigned int itemAward_vnum; unsigned int itemAward_vnum = 0;
char itemAward_cmd[20]; char itemAward_cmd[20] = "";
//bool itemAward_flag; //bool itemAward_flag;
public: public:
unsigned int GetItemAward_vnum() { return itemAward_vnum; } unsigned int GetItemAward_vnum() { return itemAward_vnum; }