forked from metin-server/m2dev-client-src
client almost builds
This commit is contained in:
@@ -692,7 +692,7 @@ bool CPythonSkill::RegisterSkill(DWORD dwSkillIndex, const char * c_szFileName)
|
||||
if (SKILL_GRADE_COUNT*2 != pGradeDataVector->size())
|
||||
TraceError("CPythonSkill::RegisterSkill(dwSkillIndex=%d, c_szFileName=%s) - Strange Grade Data Count", dwSkillIndex, c_szFileName);
|
||||
|
||||
for (DWORD i = 0; i < min(SKILL_GRADE_COUNT, pGradeDataVector->size()/2); ++i)
|
||||
for (DWORD i = 0; i < std::min((size_t)SKILL_GRADE_COUNT, pGradeDataVector->size()/2); ++i)
|
||||
{
|
||||
SkillData.GradeData[i].strName = pGradeDataVector->at(i*2+0);
|
||||
std::string strIconFileName = g_strImagePath + pGradeDataVector->at(i*2+1);
|
||||
@@ -1792,7 +1792,7 @@ PyObject * skillGetSkillRequirementData(PyObject * poSelf, PyObject * poArgs)
|
||||
if (!CPythonSkill::Instance().GetSkillDataByName(c_pSkillData->strRequireSkillName.c_str(), &pRequireSkillData))
|
||||
return Py_BuildValue("si", 0, "None", 0);
|
||||
|
||||
int ireqLevel = (int)ceil(float(c_pSkillData->byRequireSkillLevel)/float(max(1, pRequireSkillData->byLevelUpPoint)));
|
||||
int ireqLevel = (int)ceil(float(c_pSkillData->byRequireSkillLevel)/float(std::max(1, (int)pRequireSkillData->byLevelUpPoint)));
|
||||
return Py_BuildValue("si", c_pSkillData->strRequireSkillName.c_str(), ireqLevel);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user