Menu
▾
▴
[Decaldev-cvscommit] source/DecalFilters SkillInfo.h,1.3,1.4 SkillInfo.cpp,1.4,1.5 DecalFilters.idl,1.27,1.28 CharacterStats.h,1.13,1.14 CharacterStats.cpp,1.29,1.30
|
From: <ec...@us...> - 2002-10-17 00:16:38
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv14894
Modified Files:
SkillInfo.h SkillInfo.cpp DecalFilters.idl CharacterStats.h
CharacterStats.cpp
Log Message:
Charstats wub night tonight! These are the October compatability fixes courtesy of Akilla.
Index: SkillInfo.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/SkillInfo.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SkillInfo.h 21 Aug 2002 19:49:14 -0000 1.3
--- SkillInfo.h 17 Oct 2002 00:16:34 -0000 1.4
***************
*** 43,47 ****
STDMETHOD(get_ShortName)(/*[out, retval]*/ BSTR *pVal);
STDMETHOD(get_Name)(/*[out, retval]*/ BSTR *pVal);
! STDMETHOD(get_FreeExp)(/*[out, retval]*/ long *pVal);
};
--- 43,47 ----
STDMETHOD(get_ShortName)(/*[out, retval]*/ BSTR *pVal);
STDMETHOD(get_Name)(/*[out, retval]*/ BSTR *pVal);
! STDMETHOD(get_Bonus)(/*[out, retval]*/ long *pVal);
};
Index: SkillInfo.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/SkillInfo.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SkillInfo.cpp 21 Aug 2002 19:49:14 -0000 1.4
--- SkillInfo.cpp 17 Oct 2002 00:16:35 -0000 1.5
***************
*** 135,139 ****
get_Base( &nBase );
! *pVal = nBase + m_pSkill->m_nOffset;
return S_OK;
--- 135,139 ----
get_Base( &nBase );
! *pVal = nBase + m_pSkill->m_nOffset + m_pSkill->m_nBonus;
return S_OK;
***************
*** 192,196 ****
}
! STDMETHODIMP cSkillInfo::get_FreeExp(long *pVal)
{
if( pVal == NULL )
--- 192,196 ----
}
! STDMETHODIMP cSkillInfo::get_Bonus(long *pVal)
{
if( pVal == NULL )
***************
*** 200,204 ****
}
! *pVal = m_pSkill->m_nFreeExp;
return S_OK;
--- 200,204 ----
}
! *pVal = m_pSkill->m_nBonus;
return S_OK;
Index: DecalFilters.idl
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/DecalFilters.idl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** DecalFilters.idl 30 Aug 2002 19:13:40 -0000 1.27
--- DecalFilters.idl 17 Oct 2002 00:16:35 -0000 1.28
***************
*** 178,182 ****
[propget, id(8), helpstring("property Known")] HRESULT Known([out, retval] VARIANT_BOOL *pVal);
[propget, id(9), helpstring("property Increment")] HRESULT Increment([out, retval] long *pVal);
! [propget, id(10), helpstring("property FreeExp")] HRESULT FreeExp([out, retval] long *pVal);
};
--- 178,182 ----
[propget, id(8), helpstring("property Known")] HRESULT Known([out, retval] VARIANT_BOOL *pVal);
[propget, id(9), helpstring("property Increment")] HRESULT Increment([out, retval] long *pVal);
! [propget, id(10), helpstring("property Bonus")] HRESULT Bonus([out, retval] long *pVal);
};
Index: CharacterStats.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CharacterStats.h 21 Aug 2002 19:49:14 -0000 1.13
--- CharacterStats.h 17 Oct 2002 00:16:35 -0000 1.14
***************
*** 97,101 ****
long m_nOffset,
m_nExp,
! m_nFreeExp;
eTrainingType m_trained;
};
--- 97,101 ----
long m_nOffset,
m_nExp,
! m_nBonus;
eTrainingType m_trained;
};
***************
*** 133,137 ****
DWORD PrimStat[6], PrimStatInitial[6];
DWORD SecStatInc[3];
! DWORD SkillInc[40], SkillTrain[40], SkillXP[40], SkillFreeXP[40];
private:
--- 133,137 ----
DWORD PrimStat[6], PrimStatInitial[6];
DWORD SecStatInc[3];
! DWORD SkillInc[40], SkillTrain[40], SkillXP[40], SkillBonus[40];
private:
Index: CharacterStats.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** CharacterStats.cpp 16 Oct 2002 22:15:11 -0000 1.29
--- CharacterStats.cpp 17 Oct 2002 00:16:35 -0000 1.30
***************
*** 287,293 ****
_variant_t vAttrib, vNew;
pMessage->get_Member(_variant_t("Attribute"), &vAttrib);
! pMessage->get_Member(_variant_t("NewValue"), &vNew);
! PrimStat[vAttrib.iVal - 1] = vNew.lVal;
RecalcStat(vAttrib.iVal - 1);
--- 287,293 ----
_variant_t vAttrib, vNew;
pMessage->get_Member(_variant_t("Attribute"), &vAttrib);
! pMessage->get_Member(_variant_t("NewIncrement"), &vNew);
! PrimStat[vAttrib.iVal - 1] = vNew.lVal + vAttrib.lVal;
RecalcStat(vAttrib.iVal - 1);
***************
*** 391,400 ****
pMessage->get_Member(_variant_t ("initialSelf"), &G); PrimStatInitial[5] = G.lVal;
! pMessage->get_Member(_variant_t ("currentStrength"), &G); PrimStat[0] = G.lVal; CurStat[0] = G.lVal;
! pMessage->get_Member(_variant_t ("currentEndurance"), &G); PrimStat[1] = G.lVal; CurStat[1] = G.lVal;
! pMessage->get_Member(_variant_t ("currentQuickness"), &G); PrimStat[2] = G.lVal; CurStat[2] = G.lVal;
! pMessage->get_Member(_variant_t ("currentCoordination"), &G); PrimStat[3] = G.lVal; CurStat[3] = G.lVal;
! pMessage->get_Member(_variant_t ("currentFocus"), &G); PrimStat[4] = G.lVal; CurStat[4] = G.lVal;
! pMessage->get_Member(_variant_t ("currentSelf"), &G); PrimStat[5] = G.lVal; CurStat[5] = G.lVal;
pMessage->get_Member(_variant_t ("incHealth"), &G); SecStatInc[0] = G.lVal;
--- 391,400 ----
pMessage->get_Member(_variant_t ("initialSelf"), &G); PrimStatInitial[5] = G.lVal;
! pMessage->get_Member(_variant_t ("incStrength"), &G); PrimStat[0] = G.lVal + PrimStatInitial[0]; CurStat[0] = G.lVal;
! pMessage->get_Member(_variant_t ("incEndurance"), &G); PrimStat[1] = G.lVal + PrimStatInitial[1]; CurStat[1] = G.lVal;
! pMessage->get_Member(_variant_t ("incQuickness"), &G); PrimStat[2] = G.lVal + PrimStatInitial[2]; CurStat[2] = G.lVal;
! pMessage->get_Member(_variant_t ("incCoordination"), &G); PrimStat[3] = G.lVal + PrimStatInitial[3]; CurStat[3] = G.lVal;
! pMessage->get_Member(_variant_t ("incFocus"), &G); PrimStat[4] = G.lVal + PrimStatInitial[4]; CurStat[4] = G.lVal;
! pMessage->get_Member(_variant_t ("incSelf"), &G); PrimStat[5] = G.lVal + PrimStatInitial[5]; CurStat[5] = G.lVal;
pMessage->get_Member(_variant_t ("incHealth"), &G); SecStatInc[0] = G.lVal;
***************
*** 410,413 ****
--- 410,415 ----
pMessage->get_Member (_variant_t ("skills"), &vSkills);
+ ZeroMemory(SkillTrain, sizeof(SkillTrain));
+
for(i = 0; i < (vRecordCount.iVal); i++)
{
***************
*** 423,432 ****
pRecord->get_Member(_variant_t ("trained"), &vSkillT);
pRecord->get_Member(_variant_t ("exp"), &vSkillX);
! pRecord->get_Member(_variant_t ("freeXP"), &vSkillF);
! SkillFreeXP[vSkillN.iVal] = vSkillF.lVal;
SkillXP[vSkillN.iVal] = vSkillX.lVal;
SkillTrain[vSkillN.iVal] = vSkillT.lVal;
! SkillInc[vSkillN.iVal] = vSkillI.lVal;
float TPS = 0;
--- 425,434 ----
pRecord->get_Member(_variant_t ("trained"), &vSkillT);
pRecord->get_Member(_variant_t ("exp"), &vSkillX);
! pRecord->get_Member(_variant_t ("bonusPoints"), &vSkillF);
! SkillBonus[vSkillN.iVal] = vSkillF.lVal;
SkillXP[vSkillN.iVal] = vSkillX.lVal;
SkillTrain[vSkillN.iVal] = vSkillT.lVal;
! SkillInc[vSkillN.iVal] = vSkillI.iVal;
float TPS = 0;
***************
*** 971,975 ****
TPS /= SkillInfo[Skill].Divider;
! TPS += SkillInc[Skill] + 0.5f;
for (std::map<DWORD, float>::iterator tpf = FamilyMap.begin(); tpf != FamilyMap.end(); tpf++)
--- 973,977 ----
TPS /= SkillInfo[Skill].Divider;
! TPS += SkillInc[Skill] + SkillBonus[Skill] + 0.5f;
for (std::map<DWORD, float>::iterator tpf = FamilyMap.begin(); tpf != FamilyMap.end(); tpf++)
***************
*** 1160,1163 ****
--- 1162,1166 ----
pSkill->m_pSkill->m_nExp = SecondaryStatArray[SecStatInc[Index - 1]];
+ pSkill->m_pSkill->m_nBonus = 0;
pSkill->m_pSkill->m_nOffset = SecStatInc[Index - 1];
pSkill->m_pSkill->m_trained = eTrainTrained;
***************
*** 1181,1185 ****
pSkill->m_pSkill->m_nExp = SkillXP[Index];
! pSkill->m_pSkill->m_nFreeExp = SkillFreeXP[Index];
pSkill->m_pSkill->m_nOffset = SkillInc[Index];
--- 1184,1188 ----
pSkill->m_pSkill->m_nExp = SkillXP[Index];
! pSkill->m_pSkill->m_nBonus = SkillBonus[Index];
pSkill->m_pSkill->m_nOffset = SkillInc[Index];
|
