Menu
▾
▴
decaldev-cvscommit — CVS Commit notifications
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(42) |
Sep
(42) |
Oct
(57) |
Nov
(12) |
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(14) |
Feb
(4) |
Mar
(52) |
Apr
(13) |
May
(89) |
Jun
(38) |
Jul
(5) |
Aug
(32) |
Sep
(68) |
Oct
(27) |
Nov
(2) |
Dec
(13) |
| 2004 |
Jan
(3) |
Feb
(6) |
Mar
(3) |
Apr
(1) |
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ec...@us...> - 2002-08-21 19:49:18
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv21335
Modified Files:
SkillInfo.h SkillInfo.cpp DecalFilters.idl CharacterStats.h
CharacterStats.cpp
Log Message:
Addition of a few sorely lacking functions:
-get_BurdenUnits gets the number of burden units your character is currently carrying
-get_Burden gets your burden percentage (ex: 97)
-get_FreeExp has been added to ISkillInfo, which gets the amount of free xp your character received in that skill at creation.
Index: SkillInfo.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/SkillInfo.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SkillInfo.h 29 Jul 2002 02:41:26 -0000 1.2
--- SkillInfo.h 21 Aug 2002 19:49:14 -0000 1.3
***************
*** 43,46 ****
--- 43,47 ----
STDMETHOD(get_ShortName)(/*[out, retval]*/ BSTR *pVal);
STDMETHOD(get_Name)(/*[out, retval]*/ BSTR *pVal);
+ STDMETHOD(get_FreeExp)(/*[out, retval]*/ long *pVal);
};
Index: SkillInfo.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/SkillInfo.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SkillInfo.cpp 31 Jul 2002 01:38:40 -0000 1.3
--- SkillInfo.cpp 21 Aug 2002 19:49:14 -0000 1.4
***************
*** 191,192 ****
--- 191,205 ----
return S_OK;
}
+
+ STDMETHODIMP cSkillInfo::get_FreeExp(long *pVal)
+ {
+ if( pVal == NULL )
+ {
+ _ASSERT( FALSE );
+ return E_POINTER;
+ }
+
+ *pVal = m_pSkill->m_nFreeExp;
+
+ return S_OK;
+ }
\ No newline at end of file
Index: DecalFilters.idl
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/DecalFilters.idl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** DecalFilters.idl 10 Aug 2002 20:12:06 -0000 1.25
--- DecalFilters.idl 21 Aug 2002 19:49:14 -0000 1.26
***************
*** 178,181 ****
--- 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);
};
***************
*** 274,277 ****
--- 275,280 ----
[propget, id(37), helpstring("property EffectiveVital")] HRESULT EffectiveVital(enum eVitalID Index, [out, retval] long *pVal);
[propget, id(38), helpstring("property Vitae")] HRESULT Vitae([out, retval] long *pVal);
+ [propget, id(39), helpstring("property BurdenUnits")] HRESULT BurdenUnits([out, retval] long *pVal);
+ [propget, id(40), helpstring("property Burden")] HRESULT Burden([out, retval] long *pVal);
};
Index: CharacterStats.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CharacterStats.h 10 Aug 2002 20:12:06 -0000 1.12
--- CharacterStats.h 21 Aug 2002 19:49:14 -0000 1.13
***************
*** 96,100 ****
long m_nDenominator;
long m_nOffset,
! m_nExp;
eTrainingType m_trained;
};
--- 96,101 ----
long m_nDenominator;
long m_nOffset,
! m_nExp,
! m_nFreeExp;
eTrainingType m_trained;
};
***************
*** 132,136 ****
DWORD PrimStat[6], PrimStatInitial[6];
DWORD SecStatInc[3];
! DWORD SkillInc[40], SkillTrain[40], SkillXP[40];
private:
--- 133,137 ----
DWORD PrimStat[6], PrimStatInitial[6];
DWORD SecStatInc[3];
! DWORD SkillInc[40], SkillTrain[40], SkillXP[40], SkillFreeXP[40];
private:
***************
*** 139,142 ****
--- 140,145 ----
DWORD TotalBurden, TotalPyreal, TotalXP, UnassignedXP, SkillPoints, Level, Rank;
+ float Burden;
+
Location_t Location;
***************
*** 234,237 ****
--- 237,243 ----
STDMETHOD(get_Vitae)(/*[out, retval]*/ long *pVal);
+
+ STDMETHOD(get_BurdenUnits)(/*[out, retval]*/ long *pVal);
+ STDMETHOD(get_Burden)(/*[out, retval]*/ long *pVal);
};
Index: CharacterStats.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** CharacterStats.cpp 21 Aug 2002 18:08:14 -0000 1.25
--- CharacterStats.cpp 21 Aug 2002 19:49:14 -0000 1.26
***************
*** 408,417 ****
IMessageMember* pRecord = (IMessageMember*) vMember1.pdispVal;
! _variant_t vSkillN, vSkillI, vSkillT, vSkillX;
pRecord->get_Member(_variant_t ("skill"), &vSkillN);
pRecord->get_Member(_variant_t ("increment"), &vSkillI);
pRecord->get_Member(_variant_t ("trained"), &vSkillT);
pRecord->get_Member(_variant_t ("exp"), &vSkillX);
SkillXP[vSkillN.iVal] = vSkillX.lVal;
SkillTrain[vSkillN.iVal] = vSkillT.lVal;
--- 408,419 ----
IMessageMember* pRecord = (IMessageMember*) vMember1.pdispVal;
! _variant_t vSkillN, vSkillI, vSkillT, vSkillX, vSkillF;
pRecord->get_Member(_variant_t ("skill"), &vSkillN);
pRecord->get_Member(_variant_t ("increment"), &vSkillI);
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;
***************
*** 1159,1162 ****
--- 1161,1165 ----
pSkill->m_pSkill->m_nExp = SkillXP[Index];
+ pSkill->m_pSkill->m_nFreeExp = SkillFreeXP[Index];
pSkill->m_pSkill->m_nOffset = SkillInc[Index];
***************
*** 1496,1499 ****
--- 1499,1524 ----
*pVal = long((1.00 - Vitae) * 100);
+ return S_OK;
+ }
+
+ HRESULT cCharacterStats::get_BurdenUnits(long *pVal)
+ {
+ if(!GotLogin)
+ return E_FAIL;
+
+ *pVal = long(TotalBurden);
+ return S_OK;
+ }
+
+ HRESULT cCharacterStats::get_Burden(long *pVal)
+ {
+ if(!GotLogin)
+ return E_FAIL;
+
+ long nLegalBurden;
+ get_EffectiveAttribute(eAttrStrength, &nLegalBurden);
+ nLegalBurden *= 150;
+
+ *pVal = long( ( float(TotalBurden) / nLegalBurden ) * 100 );
return S_OK;
}
|
|
From: <ec...@us...> - 2002-08-21 18:08:17
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv17644
Modified Files:
CharacterStats.cpp
Log Message:
fixed the (last?) switching problem with attributes
Index: CharacterStats.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CharacterStats.cpp 7 Aug 2002 17:31:40 -0000 1.24
--- CharacterStats.cpp 21 Aug 2002 18:08:14 -0000 1.25
***************
*** 376,381 ****
pMessage->get_Member(_variant_t ("initialStrength"), &G); PrimStatInitial[0] = G.lVal;
pMessage->get_Member(_variant_t ("initialEndurance"), &G); PrimStatInitial[1] = G.lVal;
! pMessage->get_Member(_variant_t ("initialCoordination"), &G); PrimStatInitial[2] = G.lVal;
! pMessage->get_Member(_variant_t ("initialQuickness"), &G); PrimStatInitial[3] = G.lVal;
pMessage->get_Member(_variant_t ("initialFocus"), &G); PrimStatInitial[4] = G.lVal;
pMessage->get_Member(_variant_t ("initialSelf"), &G); PrimStatInitial[5] = G.lVal;
--- 376,381 ----
pMessage->get_Member(_variant_t ("initialStrength"), &G); PrimStatInitial[0] = G.lVal;
pMessage->get_Member(_variant_t ("initialEndurance"), &G); PrimStatInitial[1] = G.lVal;
! pMessage->get_Member(_variant_t ("initialQuickness"), &G); PrimStatInitial[2] = G.lVal;
! pMessage->get_Member(_variant_t ("initialCoordination"), &G); PrimStatInitial[3] = G.lVal;
pMessage->get_Member(_variant_t ("initialFocus"), &G); PrimStatInitial[4] = G.lVal;
pMessage->get_Member(_variant_t ("initialSelf"), &G); PrimStatInitial[5] = G.lVal;
|
|
From: <go...@us...> - 2002-08-14 22:37:28
|
Update of /cvsroot/decaldev/source/DenAgent
In directory usw-pr-cvs1:/tmp/cvs-serv1858/DenAgent
Modified Files:
DenAgent.rc
Log Message:
Installer checkpoint 2.3.1.7
Index: DenAgent.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DenAgent/DenAgent.rc,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** DenAgent.rc 14 Aug 2002 21:55:01 -0000 1.51
--- DenAgent.rc 14 Aug 2002 22:36:53 -0000 1.52
***************
*** 197,202 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,6
! PRODUCTVERSION 2,3,1,6
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 197,202 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,7
! PRODUCTVERSION 2,3,1,7
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 216,220 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DenAgent MFC Application\0"
! VALUE "FileVersion", "2, 3, 1, 6\0"
VALUE "InternalName", "DenAgent\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
--- 216,220 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DenAgent MFC Application\0"
! VALUE "FileVersion", "2, 3, 1, 7\0"
VALUE "InternalName", "DenAgent\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
***************
*** 223,227 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DenAgent Application\0"
! VALUE "ProductVersion", "2, 3, 1, 6\0"
VALUE "SpecialBuild", "\0"
END
--- 223,227 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DenAgent Application\0"
! VALUE "ProductVersion", "2, 3, 1, 7\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-08-14 22:37:28
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv1858/DecalFilters
Modified Files:
DecalFilters.rc
Log Message:
Installer checkpoint 2.3.1.7
Index: DecalFilters.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/DecalFilters.rc,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** DecalFilters.rc 14 Aug 2002 21:55:01 -0000 1.42
--- DecalFilters.rc 14 Aug 2002 22:36:53 -0000 1.43
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,6
! PRODUCTVERSION 2,3,1,6
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,7
! PRODUCTVERSION 2,3,1,7
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalFilters Module\0"
! VALUE "FileVersion", "2, 3, 1, 6\0"
VALUE "InternalName", "DecalFilters\0"
VALUE "LegalCopyright", "Copyright 2001\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalFilters Module\0"
! VALUE "FileVersion", "2, 3, 1, 7\0"
VALUE "InternalName", "DecalFilters\0"
VALUE "LegalCopyright", "Copyright 2001\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalFilters Module\0"
! VALUE "ProductVersion", "2, 3, 1, 6\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalFilters Module\0"
! VALUE "ProductVersion", "2, 3, 1, 7\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-08-14 22:37:02
|
Update of /cvsroot/decaldev/source/Installer In directory usw-pr-cvs1:/tmp/cvs-serv1858/Installer Modified Files: DecalInstaller.wip Log Message: Installer checkpoint 2.3.1.7 Index: DecalInstaller.wip =================================================================== RCS file: /cvsroot/decaldev/source/Installer/DecalInstaller.wip,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 Binary files /tmp/cvsTrimvl and /tmp/cvsaRxm9A differ |
|
From: <go...@us...> - 2002-08-14 22:37:02
|
Update of /cvsroot/decaldev/source/Installer/Res
In directory usw-pr-cvs1:/tmp/cvs-serv1858/Installer/Res
Modified Files:
Install.vbs readme.rtf
Log Message:
Installer checkpoint 2.3.1.7
Index: Install.vbs
===================================================================
RCS file: /cvsroot/decaldev/source/Installer/Res/Install.vbs,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Install.vbs 14 Aug 2002 21:55:03 -0000 1.20
--- Install.vbs 14 Aug 2002 22:36:58 -0000 1.21
***************
*** 57,61 ****
'All of these -must- be specified
Private Const ThisProduct = "Decal" ' The name of your product, used it dialogs and such
! Private Const ThisVersion = "2.3.1.6" ' The version of your product, used in dialogs and such
Private Const MSIFileName = "Decal.msi" ' The name of the MSI file that will be excuted
'Add all of your previous product IDs to the dictionary for removal by the installer
--- 57,61 ----
'All of these -must- be specified
Private Const ThisProduct = "Decal" ' The name of your product, used it dialogs and such
! Private Const ThisVersion = "2.3.1.7" ' The version of your product, used in dialogs and such
Private Const MSIFileName = "Decal.msi" ' The name of the MSI file that will be excuted
'Add all of your previous product IDs to the dictionary for removal by the installer
***************
*** 85,88 ****
--- 85,89 ----
AllProducts.Add "2.3.1.5", "{09A9F4AE-C043-43CF-85D1-6F14BCAAEB11}"
AllProducts.Add "2.3.1.6", "{A6749A61-B1E5-4FFB-BA4D-AE93E5443EC8}"
+ AllProducts.Add "2.3.1.7", "{C667B179-E270-4BE5-9C73-0533C1D2B758}"
Index: readme.rtf
===================================================================
RCS file: /cvsroot/decaldev/source/Installer/Res/readme.rtf,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** readme.rtf 14 Aug 2002 21:55:04 -0000 1.12
--- readme.rtf 14 Aug 2002 22:36:58 -0000 1.13
***************
*** 3,12 ****
\viewkind4\uc1\pard\nowidctlpar\qc\cf1\b\f0\fs28 Decal README\par
\b0\f1\fs20\par
! \f2 This is the 2.3.1.6 \b BETA\b0 Release of Decal.\par
\par
\pard\nowidctlpar\fs22 Beta software is Unsupported Software. Use at your own risk. Please report bugs to the Decal support board at http://forums.acdev.org. \par
\par
If you do run into problems, please read the Decal FAQ for further information: http://decaldev.sourceforge.net/faq/\par
! \par
\b Changes since 2.3.1.5\par
\pard{\pntext\f4\'B7\tab}{\*\pn\pnlvlblt\pnf4\pnindent0{\pntxtb\'B7}}\nowidctlpar\fi-720\li720\b0 Fixed the bug(s) that resulted in coordination and quickness being switched around\par
--- 3,15 ----
\viewkind4\uc1\pard\nowidctlpar\qc\cf1\b\f0\fs28 Decal README\par
\b0\f1\fs20\par
! \f2 This is the 2.3.1.7 \b BETA\b0 Release of Decal.\par
\par
\pard\nowidctlpar\fs22 Beta software is Unsupported Software. Use at your own risk. Please report bugs to the Decal support board at http://forums.acdev.org. \par
\par
If you do run into problems, please read the Decal FAQ for further information: http://decaldev.sourceforge.net/faq/\par
! \b\par
! Changes since 2.3.1.6\par
! \pard{\pntext\f4\'B7\tab}{\*\pn\pnlvlblt\pnf4\pnindent0{\pntxtb\'B7}}\nowidctlpar\fi-720\li720\b0 Fixes to CharStats declarations\par
! \pard\nowidctlpar\par
\b Changes since 2.3.1.5\par
\pard{\pntext\f4\'B7\tab}{\*\pn\pnlvlblt\pnf4\pnindent0{\pntxtb\'B7}}\nowidctlpar\fi-720\li720\b0 Fixed the bug(s) that resulted in coordination and quickness being switched around\par
|
|
From: <go...@us...> - 2002-08-14 21:55:34
|
Update of /cvsroot/decaldev/source/Inject
In directory usw-pr-cvs1:/tmp/cvs-serv16302/Inject
Modified Files:
Inject.rc
Log Message:
Version and Installer changes
Index: Inject.rc
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/Inject.rc,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Inject.rc 31 Jul 2002 17:37:17 -0000 1.34
--- Inject.rc 14 Aug 2002 21:55:01 -0000 1.35
***************
*** 74,79 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,4
! PRODUCTVERSION 2,3,1,4
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 74,79 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,6
! PRODUCTVERSION 2,3,1,6
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 93,97 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "Inject Module\0"
! VALUE "FileVersion", "2, 3, 1, 4\0"
VALUE "InternalName", "Inject\0"
VALUE "LegalCopyright", "Copyright 2000, 2001\0"
--- 93,97 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "Inject Module\0"
! VALUE "FileVersion", "2, 3, 1, 6\0"
VALUE "InternalName", "Inject\0"
VALUE "LegalCopyright", "Copyright 2000, 2001\0"
***************
*** 101,105 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Inject Module\0"
! VALUE "ProductVersion", "2, 3, 1, 4\0"
VALUE "SpecialBuild", "\0"
END
--- 101,105 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Inject Module\0"
! VALUE "ProductVersion", "2, 3, 1, 6\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-08-14 21:55:34
|
Update of /cvsroot/decaldev/source/DenAgent
In directory usw-pr-cvs1:/tmp/cvs-serv16302/DenAgent
Modified Files:
DenAgent.rc
Log Message:
Version and Installer changes
Index: DenAgent.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DenAgent/DenAgent.rc,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** DenAgent.rc 31 Jul 2002 17:37:17 -0000 1.50
--- DenAgent.rc 14 Aug 2002 21:55:01 -0000 1.51
***************
*** 197,202 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,4
! PRODUCTVERSION 2,3,1,4
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 197,202 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,6
! PRODUCTVERSION 2,3,1,6
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 216,220 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DenAgent MFC Application\0"
! VALUE "FileVersion", "2, 3, 1, 4\0"
VALUE "InternalName", "DenAgent\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
--- 216,220 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DenAgent MFC Application\0"
! VALUE "FileVersion", "2, 3, 1, 6\0"
VALUE "InternalName", "DenAgent\0"
VALUE "LegalCopyright", "Copyright (C) 2000, 2001\0"
***************
*** 223,227 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DenAgent Application\0"
! VALUE "ProductVersion", "2, 3, 1, 4\0"
VALUE "SpecialBuild", "\0"
END
--- 223,227 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DenAgent Application\0"
! VALUE "ProductVersion", "2, 3, 1, 6\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-08-14 21:55:34
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv16302/DecalFilters
Modified Files:
DecalFilters.rc
Log Message:
Version and Installer changes
Index: DecalFilters.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/DecalFilters.rc,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** DecalFilters.rc 2 Aug 2002 00:38:33 -0000 1.41
--- DecalFilters.rc 14 Aug 2002 21:55:01 -0000 1.42
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,5
! PRODUCTVERSION 2,3,1,5
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,6
! PRODUCTVERSION 2,3,1,6
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalFilters Module\0"
! VALUE "FileVersion", "2, 3, 1, 5\0"
VALUE "InternalName", "DecalFilters\0"
VALUE "LegalCopyright", "Copyright 2001\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalFilters Module\0"
! VALUE "FileVersion", "2, 3, 1, 6\0"
VALUE "InternalName", "DecalFilters\0"
VALUE "LegalCopyright", "Copyright 2001\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalFilters Module\0"
! VALUE "ProductVersion", "2, 3, 1, 5\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalFilters Module\0"
! VALUE "ProductVersion", "2, 3, 1, 6\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-08-14 21:55:07
|
Update of /cvsroot/decaldev/source/Installer/Res
In directory usw-pr-cvs1:/tmp/cvs-serv16302/Installer/Res
Modified Files:
Install.vbs readme.rtf
Log Message:
Version and Installer changes
Index: Install.vbs
===================================================================
RCS file: /cvsroot/decaldev/source/Installer/Res/Install.vbs,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Install.vbs 31 Jul 2002 17:37:19 -0000 1.19
--- Install.vbs 14 Aug 2002 21:55:03 -0000 1.20
***************
*** 57,61 ****
'All of these -must- be specified
Private Const ThisProduct = "Decal" ' The name of your product, used it dialogs and such
! Private Const ThisVersion = "2.3.1.4" ' The version of your product, used in dialogs and such
Private Const MSIFileName = "Decal.msi" ' The name of the MSI file that will be excuted
'Add all of your previous product IDs to the dictionary for removal by the installer
--- 57,61 ----
'All of these -must- be specified
Private Const ThisProduct = "Decal" ' The name of your product, used it dialogs and such
! Private Const ThisVersion = "2.3.1.6" ' The version of your product, used in dialogs and such
Private Const MSIFileName = "Decal.msi" ' The name of the MSI file that will be excuted
'Add all of your previous product IDs to the dictionary for removal by the installer
***************
*** 83,86 ****
--- 83,88 ----
AllProducts.Add "2.3.1.3", "{92872CC7-2722-4534-81BE-E99B4D472A95}"
AllProducts.Add "2.3.1.4", "{8186889F-BF27-4F79-9D94-4DD7CB9956F2}"
+ AllProducts.Add "2.3.1.5", "{09A9F4AE-C043-43CF-85D1-6F14BCAAEB11}"
+ AllProducts.Add "2.3.1.6", "{A6749A61-B1E5-4FFB-BA4D-AE93E5443EC8}"
Index: readme.rtf
===================================================================
RCS file: /cvsroot/decaldev/source/Installer/Res/readme.rtf,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
Binary files /tmp/cvsxBQ9vs and /tmp/cvsgg4rPK differ
|
|
From: <go...@us...> - 2002-08-14 21:55:07
|
Update of /cvsroot/decaldev/source/Installer In directory usw-pr-cvs1:/tmp/cvs-serv16302/Installer Modified Files: DecalInstaller.wip Log Message: Version and Installer changes Index: DecalInstaller.wip =================================================================== RCS file: /cvsroot/decaldev/source/Installer/DecalInstaller.wip,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 Binary files /tmp/cvsmpKaGi and /tmp/cvsFGDfHm differ |
|
From: <ec...@us...> - 2002-08-10 20:12:10
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv17544
Modified Files:
DecalFilters.idl CharacterStats.h
Log Message:
fixed a small declaration problem for get_Enchantment
Index: DecalFilters.idl
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/DecalFilters.idl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** DecalFilters.idl 2 Aug 2002 00:38:33 -0000 1.24
--- DecalFilters.idl 10 Aug 2002 20:12:06 -0000 1.25
***************
*** 269,273 ****
[propget, id(32), helpstring("property MonarchFollowers")] HRESULT MonarchFollowers([out, retval] long *pVal);
[propget, id(33), helpstring("property EnchantmentCount")] HRESULT EnchantmentCount([out, retval] long *pVal);
! [propget, id(34), helpstring("property Enchantment")] HRESULT Enchantment(long SpellID, [out, retval] IEnchantment **pVal);
[propget, id(35), helpstring("property EffectiveAttribute")] HRESULT EffectiveAttribute(enum eAttributeID Index, [out, retval] long *pVal);
[propget, id(36), helpstring("property EffectiveSkill")] HRESULT EffectiveSkill(enum eSkillID Index, [out, retval] long *pVal);
--- 269,273 ----
[propget, id(32), helpstring("property MonarchFollowers")] HRESULT MonarchFollowers([out, retval] long *pVal);
[propget, id(33), helpstring("property EnchantmentCount")] HRESULT EnchantmentCount([out, retval] long *pVal);
! [propget, id(34), helpstring("property Enchantment")] HRESULT Enchantment(long EnchantNum, [out, retval] IEnchantment **pVal);
[propget, id(35), helpstring("property EffectiveAttribute")] HRESULT EffectiveAttribute(enum eAttributeID Index, [out, retval] long *pVal);
[propget, id(36), helpstring("property EffectiveSkill")] HRESULT EffectiveSkill(enum eSkillID Index, [out, retval] long *pVal);
Index: CharacterStats.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CharacterStats.h 7 Aug 2002 17:31:40 -0000 1.11
--- CharacterStats.h 10 Aug 2002 20:12:06 -0000 1.12
***************
*** 227,231 ****
STDMETHOD(get_EnchantmentCount)(long *pVal);
! STDMETHOD(get_Enchantment)(long SpellID, IEnchantment **pVal);
STDMETHOD(get_EffectiveVital)(enum eVitalID Index, /*[out, retval]*/ long *pVal);
--- 227,231 ----
STDMETHOD(get_EnchantmentCount)(long *pVal);
! STDMETHOD(get_Enchantment)(long EnchantNum, IEnchantment **pVal);
STDMETHOD(get_EffectiveVital)(enum eVitalID Index, /*[out, retval]*/ long *pVal);
|
|
From: <as...@us...> - 2002-08-07 23:59:43
|
Update of /cvsroot/decaldev/source/DecalControls
In directory usw-pr-cvs1:/tmp/cvs-serv11795
Modified Files:
List.cpp
Log Message:
Little update from cynica_l
Index: List.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalControls/List.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** List.cpp 7 Aug 2002 23:05:29 -0000 1.16
--- List.cpp 7 Aug 2002 23:59:40 -0000 1.17
***************
*** 35,38 ****
--- 35,39 ----
_ASSERTE( _CrtIsValidHeapPointer( m_pData ) );
row.m_pData = NULL;
+ row.m_colors = NULL;
}
|
|
From: <as...@us...> - 2002-08-07 23:05:32
|
Update of /cvsroot/decaldev/source/DecalControls
In directory usw-pr-cvs1:/tmp/cvs-serv13489
Modified Files:
List.h List.cpp
Log Message:
Updated to include cynica_l's fixes to the List control colouring
Index: List.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalControls/List.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** List.h 17 Feb 2002 04:42:01 -0000 1.6
--- List.h 7 Aug 2002 23:05:29 -0000 1.7
***************
*** 46,51 ****
*m_pEndData;
bool m_bInvalid;
! std::map<long, long> m_colors;
!
explicit cRow( long nDataWidth );
cRow( const cRow &row );
--- 46,51 ----
*m_pEndData;
bool m_bInvalid;
! mutable long *m_colors; /* cyn - 07/08/2002 */
!
explicit cRow( long nDataWidth );
cRow( const cRow &row );
Index: List.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalControls/List.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** List.cpp 17 Feb 2002 04:42:01 -0000 1.15
--- List.cpp 7 Aug 2002 23:05:29 -0000 1.16
***************
*** 18,25 ****
: m_pData( new VARIANT[ nDataWidth ] ),
m_pEndData( m_pData + nDataWidth ),
! m_bInvalid( true )
{
for( VARIANT *i_var = m_pData; i_var != m_pEndData; ++ i_var )
::VariantInit( i_var );
}
--- 18,27 ----
: m_pData( new VARIANT[ nDataWidth ] ),
m_pEndData( m_pData + nDataWidth ),
! m_bInvalid( true ),
! m_colors( NULL ) /* cyn - 07/08/2002 */
{
for( VARIANT *i_var = m_pData; i_var != m_pEndData; ++ i_var )
::VariantInit( i_var );
+
}
***************
*** 27,31 ****
: m_pData( row.m_pData ),
m_pEndData( row.m_pEndData ),
! m_bInvalid( row.m_bInvalid )
{
_ASSERTE( _CrtIsValidHeapPointer( m_pData ) );
--- 29,35 ----
: m_pData( row.m_pData ),
m_pEndData( row.m_pEndData ),
! m_bInvalid( row.m_bInvalid ),
! m_colors( row.m_colors ) /* cyn - 07/08/2002 -- This is the real fix, the rest of */
! /* the changes just make it faster */
{
_ASSERTE( _CrtIsValidHeapPointer( m_pData ) );
***************
*** 46,54 ****
delete[] m_pData;
}
}
cList::cRow &cList::cRow::operator =( const cRow &row )
{
! // Clear out our current data - if any
if( m_pData != NULL )
{
--- 50,64 ----
delete[] m_pData;
}
+
+ if (m_colors) { /* cyn - 07/08/2002 */
+ delete m_colors;
+ }
}
cList::cRow &cList::cRow::operator =( const cRow &row )
{
!
!
! // Clear out our current data - if any
if( m_pData != NULL )
{
***************
*** 69,75 ****
m_pEndData = row.m_pEndData;
m_bInvalid = row.m_bInvalid;
m_colors = row.m_colors;
! row.m_pData = NULL;
_ASSERTMEM( _CrtCheckMemory() );
--- 79,90 ----
m_pEndData = row.m_pEndData;
m_bInvalid = row.m_bInvalid;
+
+ if (m_colors) { /* cyn - 07/08/2002 */
+ delete m_colors;
+ }
m_colors = row.m_colors;
+ row.m_colors = NULL;
! row.m_pData = NULL;
_ASSERTMEM( _CrtCheckMemory() );
***************
*** 500,510 ****
STDMETHODIMP cList::get_Color(long nX, long nY, long *pVal)
{
cRow &rowData = m_rows[nY];
! if (rowData.m_colors[nX]) {
! *pVal = rowData.m_colors[nX];
! } else {
! *pVal = 0x00FFFFFF;
! }
return S_OK;
}
--- 515,536 ----
STDMETHODIMP cList::get_Color(long nX, long nY, long *pVal)
{
+
+ if (!pVal) { /* cyn - 07/08/2002 */
+ return E_FAIL;
+ }
+
+ *pVal = 0x00FFFFFF;
cRow &rowData = m_rows[nY];
! if (nX >= m_cols.size()) {
! return E_FAIL;
! }
!
! if (rowData.m_colors) {
! if (rowData.m_colors[nX]) {
! *pVal = rowData.m_colors[nX];
! }
! }
!
return S_OK;
}
***************
*** 512,520 ****
STDMETHODIMP cList::put_Color(long nX, long nY, long newVal)
{
cRow &rowData = m_rows[nY];
- m_pSite->Invalidate();
! rowData.m_colors[nX] = newVal;
! rowData.m_bInvalid = true;
return S_OK;
--- 538,558 ----
STDMETHODIMP cList::put_Color(long nX, long nY, long newVal)
{
+ if (nX >= m_cols.size()) { /* cyn - 07/08/2002 */
+ return E_FAIL;
+ }
+
cRow &rowData = m_rows[nY];
! if (!rowData.m_colors) {
! rowData.m_colors = new long[ m_cols.size() ];
! if (!rowData.m_colors) {
! return E_OUTOFMEMORY;
! }
! }
!
! rowData.m_colors[nX] = newVal;
!
! m_pSite->Invalidate();
! rowData.m_bInvalid = true;
return S_OK;
|
|
From: <ha...@us...> - 2002-08-07 17:31:45
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv31648
Modified Files:
StdAfx.h CharacterStats.h CharacterStats.cpp
Log Message:
Stopped the damn crash on removeenchantment. Using the PROPER container types for the enchantments and spells known now.
As far as I could tell it was working fine, however it probably needs more testing.
Index: StdAfx.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/StdAfx.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StdAfx.h 12 Apr 2002 01:07:34 -0000 1.6
--- StdAfx.h 7 Aug 2002 17:31:40 -0000 1.7
***************
*** 29,32 ****
--- 29,34 ----
#include <vector>
#include <map>
+ #include <set>
+ #include <utility>
#include <algorithm>
#include "DecalFilters.h"
Index: CharacterStats.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CharacterStats.h 2 Aug 2002 00:38:33 -0000 1.10
--- CharacterStats.h 7 Aug 2002 17:31:40 -0000 1.11
***************
*** 56,59 ****
--- 56,90 ----
DWORD dwAffected, dwAffectMask, dwFamily;
float fAdjustment;
+
+ cEnchantment()
+ {
+ }
+
+ cEnchantment( cEnchantment &right )
+ {
+ iSpellID = right.iSpellID;
+ iLayer = right.iLayer;
+ ExpireTime = right.ExpireTime;
+ dwAffected = right.dwAffected;
+ dwAffectMask = right.dwAffectMask;
+ dwFamily = right.dwFamily;
+ fAdjustment = right.fAdjustment;
+ }
+
+ cEnchantment& operator= ( cEnchantment& right )
+ {
+ if( this != &right )
+ {
+ iSpellID = right.iSpellID;
+ iLayer = right.iLayer;
+ ExpireTime = right.ExpireTime;
+ dwAffected = right.dwAffected;
+ dwAffectMask = right.dwAffectMask;
+ dwFamily = right.dwFamily;
+ fAdjustment = right.fAdjustment;
+ }
+
+ return *this;
+ }
};
***************
*** 104,108 ****
private:
! std::vector< cEnchantment * > Enchantments;
DWORD TotalBurden, TotalPyreal, TotalXP, UnassignedXP, SkillPoints, Level, Rank;
--- 135,139 ----
private:
! std::list< cEnchantment * > Enchantments;
DWORD TotalBurden, TotalPyreal, TotalXP, UnassignedXP, SkillPoints, Level, Rank;
***************
*** 134,138 ****
char Server[50];
! std::vector< DWORD > SpellsLearned;
long TotalSpells;
bool DecalDat;
--- 165,169 ----
char Server[50];
! std::set< DWORD > SpellsLearned;
long TotalSpells;
bool DecalDat;
Index: CharacterStats.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** CharacterStats.cpp 3 Aug 2002 23:12:21 -0000 1.23
--- CharacterStats.cpp 7 Aug 2002 17:31:40 -0000 1.24
***************
*** 440,444 ****
pMessage->get_Member (_variant_t ("spell"), &vKey);
! SpellsLearned.push_back(vKey.lVal);
}
--- 440,444 ----
pMessage->get_Member (_variant_t ("spell"), &vKey);
! SpellsLearned.insert(vKey.lVal);
}
***************
*** 712,728 ****
break;
}
!
! case (0x004D): // Spellbook Delete
{
_variant_t vSpellID;
pMessage->get_Member( _variant_t( "spell" ), &vSpellID );
! DWORD nSpellID = DWORD(vSpellID.lVal);
! for (std::vector< DWORD >::iterator Spell = SpellsLearned.begin(); Spell != SpellsLearned.end(); Spell++)
{
! if(*Spell==nSpellID)
! SpellsLearned.erase( Spell );
}
!
! Fire_Spellbook_Delete( vSpellID.lVal );
break;
--- 712,738 ----
break;
}
! case 0x004C: // Spellbook Add
{
_variant_t vSpellID;
pMessage->get_Member( _variant_t( "spell" ), &vSpellID );
! DWORD nSpellID = vSpellID.lVal;
!
! std::pair< std::set< DWORD >::iterator, bool > pSuccess;
!
! pSuccess = SpellsLearned.insert( nSpellID );
! if( pSuccess.second == true )
{
! Fire_Spellbook_Add( nSpellID );
}
! break;
! }
!
! case 0x004D: // Spellbook Delete
! {
! _variant_t vSpellID;
! pMessage->get_Member( _variant_t( "spell" ), &vSpellID );
! DWORD nSpellID = vSpellID.lVal;
! SpellsLearned.erase( nSpellID );
! Fire_Spellbook_Delete( nSpellID );
break;
***************
*** 738,741 ****
--- 748,754 ----
void cCharacterStats::AddEnchant(int SpellID, int Layer, double Duration, DWORD Family, double Elapsed, DWORD AffectMask, DWORD Affected, float Adjustment)
{
+ if(SpellID==666)
+ Vitae = Adjustment;
+
time_t TimeExpires = time(NULL);
// duration of the spell plus the (negative) number the server sends us indicating how many seconds have elapsed
***************
*** 751,757 ****
tpench->fAdjustment = Adjustment;
- if(SpellID==666)
- Vitae = Adjustment;
-
Enchantments.push_back(tpench);
--- 764,767 ----
***************
*** 764,768 ****
tpench->dwAffected--;
! for (std::vector<cEnchantment *>::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if ((((*tpi)->dwAffectMask & 0x13) == 0x01) && ((*tpi)->dwAffected == tpench->dwAffected))
--- 774,778 ----
tpench->dwAffected--;
! for (std::list<cEnchantment *>::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if ((((*tpi)->dwAffectMask & 0x13) == 0x01) && ((*tpi)->dwAffected == tpench->dwAffected))
***************
*** 789,793 ****
tpench->dwAffected /= 2;
! for (std::vector<cEnchantment *>::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if ((((*tpi)->dwAffectMask & 0x13) == 0x02) && ((*tpi)->dwAffected == tpench->dwAffected))
--- 799,803 ----
tpench->dwAffected /= 2;
! for (std::list<cEnchantment *>::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if ((((*tpi)->dwAffectMask & 0x13) == 0x02) && ((*tpi)->dwAffected == tpench->dwAffected))
***************
*** 812,816 ****
case 0x10: //Skill
{
! for (std::vector<cEnchantment *>::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if ((((*tpi)->dwAffectMask & 0x13) == 0x10) && ((*tpi)->dwAffected == tpench->dwAffected))
--- 822,826 ----
case 0x10: //Skill
{
! for (std::list<cEnchantment *>::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if ((((*tpi)->dwAffectMask & 0x13) == 0x10) && ((*tpi)->dwAffected == tpench->dwAffected))
***************
*** 831,835 ****
Vitae = 1.00;
! for (std::vector< cEnchantment * >::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if( ( (*tpi)->iSpellID == SpellID) && ( (*tpi)->iLayer == Layer) )
--- 841,845 ----
Vitae = 1.00;
! for (std::list< cEnchantment * >::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if( ( (*tpi)->iSpellID == SpellID) && ( (*tpi)->iLayer == Layer) )
***************
*** 861,865 ****
std::map<DWORD, float> FamilyMap;
! for (std::vector< cEnchantment * >::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if ((((*tpi)->dwAffectMask & 0x13) == 0x01) && ((*tpi)->dwAffected == Stat))
--- 871,875 ----
std::map<DWORD, float> FamilyMap;
! for (std::list< cEnchantment * >::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if ((((*tpi)->dwAffectMask & 0x13) == 0x01) && ((*tpi)->dwAffected == Stat))
***************
*** 889,893 ****
std::map<DWORD, float> FamilyMap;
! for (std::vector< cEnchantment * >::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if( (((*tpi)->dwAffectMask & 0x13) == 0x02) && ((*tpi)->dwAffected == SecStat) )
--- 899,903 ----
std::map<DWORD, float> FamilyMap;
! for (std::list< cEnchantment * >::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if( (((*tpi)->dwAffectMask & 0x13) == 0x02) && ((*tpi)->dwAffected == SecStat) )
***************
*** 917,921 ****
std::map<DWORD, float> FamilyMap;
! for (std::vector<cEnchantment *>::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if ((((*tpi)->dwAffectMask & 0x13) == 0x10) && ((*tpi)->dwAffected == Skill))
--- 927,931 ----
std::map<DWORD, float> FamilyMap;
! for (std::list<cEnchantment *>::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
{
if ((((*tpi)->dwAffectMask & 0x13) == 0x10) && ((*tpi)->dwAffected == Skill))
***************
*** 964,969 ****
}
! *pVal = SpellsLearned[ SpellID ];
return S_OK;
}
--- 974,985 ----
}
! std::set< DWORD >::iterator a = SpellsLearned.find( SpellID );
! if( a == SpellsLearned.end() )
! {
! *pVal = 0;
! return S_OK;
! }
+ *pVal = 1;
return S_OK;
}
***************
*** 1443,1481 ****
}
! HRESULT cCharacterStats::get_Enchantment(long SpellID, IEnchantment **pVal)
{
if (!GotLogin)
return E_FAIL;
! if (SpellID < 0)
return S_FALSE;
! for (std::vector<cEnchantment *>::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
! {
! if ((*tpi)->iSpellID == SpellID)
! {
! time_t CurrentTime = time(NULL);
! long SecondsLeft = (*tpi)->ExpireTime - CurrentTime;
! CComObject< ::Enchantment > *pEnchant;
! CComObject< ::Enchantment >::CreateInstance( &pEnchant );
! pEnchant->put_SpellID( (*tpi)->iSpellID );
! pEnchant->put_Layer( (*tpi)->iLayer );
! pEnchant->put_TimeRemaining( SecondsLeft );
! pEnchant->put_Affected( (*tpi)->dwAffected );
! pEnchant->put_AffectedMask( (*tpi)->dwAffectMask );
! pEnchant->put_Family( (*tpi)->dwFamily );
! pEnchant->put_Adjustment( (*tpi)->fAdjustment );
! return pEnchant->QueryInterface(pVal);
! return S_OK;
! }
! }
! return S_FALSE;
}
! HRESULT cCharacterStats::get_Vitae(/*[out, retval]*/ long *pVal)
{
if(!GotLogin)
--- 1459,1494 ----
}
! HRESULT cCharacterStats::get_Enchantment(long EnchantNum, IEnchantment **pVal)
{
if (!GotLogin)
return E_FAIL;
! if (EnchantNum < 0)
return S_FALSE;
! std::list<cEnchantment *>::iterator tpi = Enchantments.begin();
! for( int i = 1; i < EnchantNum; i++ )
! tpi++;
! time_t CurrentTime = time(NULL);
! long SecondsLeft = (*tpi)->ExpireTime - CurrentTime;
! CComObject< ::Enchantment > *pEnchant;
! CComObject< ::Enchantment >::CreateInstance( &pEnchant );
! pEnchant->put_SpellID( (*tpi)->iSpellID );
! pEnchant->put_Layer( (*tpi)->iLayer );
! pEnchant->put_TimeRemaining( SecondsLeft );
! pEnchant->put_Affected( (*tpi)->dwAffected );
! pEnchant->put_AffectedMask( (*tpi)->dwAffectMask );
! pEnchant->put_Family( (*tpi)->dwFamily );
! pEnchant->put_Adjustment( (*tpi)->fAdjustment );
!
! pEnchant->QueryInterface(pVal);
! return S_OK;
}
! HRESULT cCharacterStats::get_Vitae(long *pVal)
{
if(!GotLogin)
|
|
From: <ec...@us...> - 2002-08-06 01:08:52
|
Update of /cvsroot/decaldev/source/DecalControls
In directory usw-pr-cvs1:/tmp/cvs-serv311
Modified Files:
CheckColumn.cpp
Log Message:
fixed the unrefrenced local variable warning because I'm bored
Index: CheckColumn.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalControls/CheckColumn.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CheckColumn.cpp 23 Jul 2002 09:24:23 -0000 1.5
--- CheckColumn.cpp 6 Aug 2002 01:08:49 -0000 1.6
***************
*** 31,35 ****
{
_variant_t vCheck,vDisplay;
! bool bCheck,bDisplay;
m_pList->get_Data( ptCell->x, ptCell->y, 0, &vCheck );
--- 31,35 ----
{
_variant_t vCheck,vDisplay;
! bool bCheck;
m_pList->get_Data( ptCell->x, ptCell->y, 0, &vCheck );
|
|
From: <ec...@us...> - 2002-08-03 23:12:24
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv2330
Modified Files:
CharacterStats.cpp
Log Message:
fixed the bug(s) that resulted in coordination and quickness being switched around
Index: CharacterStats.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** CharacterStats.cpp 2 Aug 2002 00:38:33 -0000 1.22
--- CharacterStats.cpp 3 Aug 2002 23:12:21 -0000 1.23
***************
*** 383,388 ****
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 ("currentCoordination"), &G); PrimStat[2] = G.lVal; CurStat[2] = G.lVal;
! pMessage->get_Member(_variant_t ("currentQuickness"), &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;
--- 383,388 ----
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;
***************
*** 763,768 ****
{
tpench->dwAffected--;
- if (tpench->dwAffected == 3) tpench->dwAffected = 2;
- else if (tpench->dwAffected == 2) tpench->dwAffected = 3;
for (std::vector<cEnchantment *>::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
--- 763,766 ----
***************
*** 931,950 ****
if (SkillInfo[Skill].AttribA != eAttrNULL)
! {
! if(SkillInfo[Skill].AttribA==3)
! TPS += CurStat[3];
! else if(SkillInfo[Skill].AttribA==4)
! TPS += CurStat[2];
! else TPS += CurStat[SkillInfo[Skill].AttribA - 1];
! }
if (SkillInfo[Skill].AttribB != eAttrNULL)
! {
! if(SkillInfo[Skill].AttribB==3)
! TPS += CurStat[3];
! else if(SkillInfo[Skill].AttribB==4)
! TPS += CurStat[2];
! else TPS += CurStat[SkillInfo[Skill].AttribB - 1];
! }
TPS /= SkillInfo[Skill].Divider;
--- 929,936 ----
if (SkillInfo[Skill].AttribA != eAttrNULL)
! TPS += CurStat[SkillInfo[Skill].AttribA - 1];
if (SkillInfo[Skill].AttribB != eAttrNULL)
! TPS += CurStat[SkillInfo[Skill].AttribB - 1];
TPS /= SkillInfo[Skill].Divider;
***************
*** 1188,1194 ****
pAttrib->m_pInfo->m_szName = "Endurance";
else if (Index == 3)
- pAttrib->m_pInfo->m_szName = "Coordination";
- else if (Index == 4)
pAttrib->m_pInfo->m_szName = "Quickness";
else if (Index == 5)
pAttrib->m_pInfo->m_szName = "Focus";
--- 1174,1180 ----
pAttrib->m_pInfo->m_szName = "Endurance";
else if (Index == 3)
pAttrib->m_pInfo->m_szName = "Quickness";
+ else if (Index == 4)
+ pAttrib->m_pInfo->m_szName = "Coordination";
else if (Index == 5)
pAttrib->m_pInfo->m_szName = "Focus";
|
|
From: <che...@us...> - 2002-08-03 21:19:51
|
Update of /cvsroot/decaldev/source/Inject
In directory usw-pr-cvs1:/tmp/cvs-serv11138/Inject
Modified Files:
View.cpp
Log Message:
re-reverted to changed copy but with a slight change to fix crashing!
Index: View.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/View.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** View.cpp 3 Aug 2002 16:30:20 -0000 1.10
--- View.cpp 3 Aug 2002 21:19:48 -0000 1.11
***************
*** 18,21 ****
--- 18,24 ----
m_pRoot->removeView( this );
m_pPanel.Release( );
+
+ if( cManager::_p->m_bXMLViewViewer )
+ cManager::_p->clearDestroyList( );
}
|
|
From: <as...@us...> - 2002-08-03 16:30:24
|
Update of /cvsroot/decaldev/source/Inject
In directory usw-pr-cvs1:/tmp/cvs-serv10659
Modified Files:
View.cpp
Log Message:
Reverting change to remove crash
Index: View.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/View.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** View.cpp 30 Jul 2002 23:47:24 -0000 1.9
--- View.cpp 3 Aug 2002 16:30:20 -0000 1.10
***************
*** 14,23 ****
cView::~cView()
{
! m_pPanel->RemoveView( m_nViewID );
! m_pPanel.Release( );
!
! m_pRoot->m_pBars->RemoveBar( m_nViewID );
! m_pRoot->removeView( this );
! cManager::_p->clearDestroyList( );
}
--- 14,21 ----
cView::~cView()
{
! m_pRoot->m_pBars->RemoveBar( m_nViewID );
! m_pPanel->RemoveView( m_nViewID );
! m_pRoot->removeView( this );
! m_pPanel.Release( );
}
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv21178
Modified Files:
Enchantment.h Enchantment.cpp DecalFilters.rc DecalFilters.idl
CharacterStats.h CharacterStats.cpp
Log Message:
fixed the last of the enchantment handling bugs (get_Enchant now returns proper values for everything)
Index: Enchantment.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/Enchantment.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Enchantment.h 29 Jul 2002 02:56:03 -0000 1.1
--- Enchantment.h 2 Aug 2002 00:38:33 -0000 1.2
***************
*** 11,14 ****
--- 11,15 ----
#include "resource.h" // main symbols
+ #include "CharacterStats.h"
/////////////////////////////////////////////////////////////////////////////
***************
*** 22,25 ****
--- 23,27 ----
public:
Enchantment() {}
+
BEGIN_COM_MAP(Enchantment)
COM_INTERFACE_ENTRY(IDispatch)
***************
*** 30,34 ****
private:
! long SpellID, Layer, TimeLeft, Affected, AffectMask, Family;
double Adjustment;
--- 32,36 ----
private:
! long SpellID, Layer, SecondsLeft, Affected, AffectMask, Family;
double Adjustment;
Index: Enchantment.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/Enchantment.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Enchantment.cpp 29 Jul 2002 02:56:03 -0000 1.1
--- Enchantment.cpp 2 Aug 2002 00:38:33 -0000 1.2
***************
*** 38,42 ****
STDMETHODIMP Enchantment::get_TimeRemaining(long *pVal)
{
! *pVal = TimeLeft;
return S_OK;
--- 38,42 ----
STDMETHODIMP Enchantment::get_TimeRemaining(long *pVal)
{
! *pVal = SecondsLeft;
return S_OK;
***************
*** 45,49 ****
STDMETHODIMP Enchantment::put_TimeRemaining(long newVal)
{
! TimeLeft = newVal;
return S_OK;
--- 45,49 ----
STDMETHODIMP Enchantment::put_TimeRemaining(long newVal)
{
! SecondsLeft = newVal;
return S_OK;
Index: DecalFilters.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/DecalFilters.rc,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** DecalFilters.rc 31 Jul 2002 17:37:16 -0000 1.40
--- DecalFilters.rc 2 Aug 2002 00:38:33 -0000 1.41
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,4
! PRODUCTVERSION 2,3,1,4
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,5
! PRODUCTVERSION 2,3,1,5
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalFilters Module\0"
! VALUE "FileVersion", "2, 3, 1, 4\0"
VALUE "InternalName", "DecalFilters\0"
VALUE "LegalCopyright", "Copyright 2001\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalFilters Module\0"
! VALUE "FileVersion", "2, 3, 1, 5\0"
VALUE "InternalName", "DecalFilters\0"
VALUE "LegalCopyright", "Copyright 2001\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalFilters Module\0"
! VALUE "ProductVersion", "2, 3, 1, 4\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalFilters Module\0"
! VALUE "ProductVersion", "2, 3, 1, 5\0"
VALUE "SpecialBuild", "\0"
END
Index: DecalFilters.idl
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/DecalFilters.idl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** DecalFilters.idl 31 Jul 2002 01:38:40 -0000 1.23
--- DecalFilters.idl 2 Aug 2002 00:38:33 -0000 1.24
***************
*** 269,273 ****
[propget, id(32), helpstring("property MonarchFollowers")] HRESULT MonarchFollowers([out, retval] long *pVal);
[propget, id(33), helpstring("property EnchantmentCount")] HRESULT EnchantmentCount([out, retval] long *pVal);
! [propget, id(34), helpstring("property Enchantment")] HRESULT Enchantment(long EnchantNum, [out, retval] IEnchantment **pVal);
[propget, id(35), helpstring("property EffectiveAttribute")] HRESULT EffectiveAttribute(enum eAttributeID Index, [out, retval] long *pVal);
[propget, id(36), helpstring("property EffectiveSkill")] HRESULT EffectiveSkill(enum eSkillID Index, [out, retval] long *pVal);
--- 269,273 ----
[propget, id(32), helpstring("property MonarchFollowers")] HRESULT MonarchFollowers([out, retval] long *pVal);
[propget, id(33), helpstring("property EnchantmentCount")] HRESULT EnchantmentCount([out, retval] long *pVal);
! [propget, id(34), helpstring("property Enchantment")] HRESULT Enchantment(long SpellID, [out, retval] IEnchantment **pVal);
[propget, id(35), helpstring("property EffectiveAttribute")] HRESULT EffectiveAttribute(enum eAttributeID Index, [out, retval] long *pVal);
[propget, id(36), helpstring("property EffectiveSkill")] HRESULT EffectiveSkill(enum eSkillID Index, [out, retval] long *pVal);
Index: CharacterStats.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CharacterStats.h 31 Jul 2002 01:38:40 -0000 1.9
--- CharacterStats.h 2 Aug 2002 00:38:33 -0000 1.10
***************
*** 9,12 ****
--- 9,13 ----
#include "DecalDat.h" // NEED THIS FOR THE PORTAL DATSTREAM!
+ #include <time.h>
/////////////////////////////////////////////////////////////////////////////
***************
*** 52,56 ****
{
int iSpellID, iLayer;
! int iTimeLeft;
DWORD dwAffected, dwAffectMask, dwFamily;
float fAdjustment;
--- 53,57 ----
{
int iSpellID, iLayer;
! time_t ExpireTime;
DWORD dwAffected, dwAffectMask, dwFamily;
float fAdjustment;
***************
*** 195,199 ****
STDMETHOD(get_EnchantmentCount)(long *pVal);
! STDMETHOD(get_Enchantment)(long EnchantNum, IEnchantment **pVal);
STDMETHOD(get_EffectiveVital)(enum eVitalID Index, /*[out, retval]*/ long *pVal);
--- 196,200 ----
STDMETHOD(get_EnchantmentCount)(long *pVal);
! STDMETHOD(get_Enchantment)(long SpellID, IEnchantment **pVal);
STDMETHOD(get_EffectiveVital)(enum eVitalID Index, /*[out, retval]*/ long *pVal);
Index: CharacterStats.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** CharacterStats.cpp 1 Aug 2002 01:05:54 -0000 1.21
--- CharacterStats.cpp 2 Aug 2002 00:38:33 -0000 1.22
***************
*** 7,10 ****
--- 7,12 ----
#include "AttributeInfo.h"
#include "SkillInfo.h"
+ #include "Enchantment.h"
+ #include <time.h>
/////////////////////////////////////////////////////////////////////////////
***************
*** 736,744 ****
void cCharacterStats::AddEnchant(int SpellID, int Layer, double Duration, DWORD Family, double Elapsed, DWORD AffectMask, DWORD Affected, float Adjustment)
{
cEnchantment *tpench = new cEnchantment;
tpench->iSpellID = SpellID;
tpench->iLayer = Layer;
tpench->dwFamily = Family;
! tpench->iTimeLeft = (int) (Duration - Elapsed);
tpench->dwAffected = Affected;
tpench->dwAffectMask = AffectMask;
--- 738,750 ----
void cCharacterStats::AddEnchant(int SpellID, int Layer, double Duration, DWORD Family, double Elapsed, DWORD AffectMask, DWORD Affected, float Adjustment)
{
+ time_t TimeExpires = time(NULL);
+ // duration of the spell plus the (negative) number the server sends us indicating how many seconds have elapsed
+ TimeExpires += (long(Duration + 0.5f) + long(Elapsed + 0.5f));
+
cEnchantment *tpench = new cEnchantment;
tpench->iSpellID = SpellID;
tpench->iLayer = Layer;
tpench->dwFamily = Family;
! tpench->ExpireTime = TimeExpires;
tpench->dwAffected = Affected;
tpench->dwAffectMask = AffectMask;
***************
*** 1451,1476 ****
}
! HRESULT cCharacterStats::get_Enchantment(long EnchantNum, IEnchantment **pVal)
{
if (!GotLogin)
return E_FAIL;
! if ((EnchantNum < 0) || (EnchantNum >= Enchantments.size()))
return S_FALSE;
! CComPtr< IEnchantment > pEnchant;
! pEnchant.CoCreateInstance( _bstr_t( "DecalFilters.Enchantment" ), NULL, CLSCTX_INPROC_SERVER );
! pEnchant->put_SpellID( Enchantments[ EnchantNum ]->iSpellID );
! pEnchant->put_Layer( Enchantments[ EnchantNum ]->iLayer );
! pEnchant->put_TimeRemaining( Enchantments[ EnchantNum ]->iTimeLeft );
! pEnchant->put_Affected( Enchantments[ EnchantNum ]->dwAffected );
! pEnchant->put_AffectedMask( Enchantments[ EnchantNum ]->dwAffectMask );
! pEnchant->put_Family( Enchantments[ EnchantNum ]->dwFamily );
! pEnchant->put_Adjustment( Enchantments[ EnchantNum ]->fAdjustment );
! return pEnchant->QueryInterface( IID_IEnchantment, reinterpret_cast< void ** >( pVal ) );
! return S_OK;
}
--- 1457,1492 ----
}
! HRESULT cCharacterStats::get_Enchantment(long SpellID, IEnchantment **pVal)
{
if (!GotLogin)
return E_FAIL;
! if (SpellID < 0)
return S_FALSE;
! for (std::vector<cEnchantment *>::iterator tpi = Enchantments.begin(); tpi != Enchantments.end(); tpi++)
! {
! if ((*tpi)->iSpellID == SpellID)
! {
! time_t CurrentTime = time(NULL);
! long SecondsLeft = (*tpi)->ExpireTime - CurrentTime;
! CComObject< ::Enchantment > *pEnchant;
! CComObject< ::Enchantment >::CreateInstance( &pEnchant );
! pEnchant->put_SpellID( (*tpi)->iSpellID );
! pEnchant->put_Layer( (*tpi)->iLayer );
! pEnchant->put_TimeRemaining( SecondsLeft );
! pEnchant->put_Affected( (*tpi)->dwAffected );
! pEnchant->put_AffectedMask( (*tpi)->dwAffectMask );
! pEnchant->put_Family( (*tpi)->dwFamily );
! pEnchant->put_Adjustment( (*tpi)->fAdjustment );
! return pEnchant->QueryInterface(pVal);
! return S_OK;
! }
! }
!
! return S_FALSE;
}
|
|
From: <go...@us...> - 2002-08-01 15:02:00
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv11116
Modified Files:
World.h
Log Message:
Another test
Index: World.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/World.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** World.h 1 Aug 2002 14:51:34 -0000 1.28
--- World.h 1 Aug 2002 15:01:56 -0000 1.29
***************
*** 32,36 ****
};
-
class cWorldData
{
--- 32,35 ----
|
|
From: <go...@us...> - 2002-08-01 14:51:37
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv6461
Modified Files:
World.h
Log Message:
No real changes, testing commit notices
Index: World.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/World.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** World.h 31 Jul 2002 02:29:01 -0000 1.27
--- World.h 1 Aug 2002 14:51:34 -0000 1.28
***************
*** 32,35 ****
--- 32,36 ----
};
+
class cWorldData
{
|
