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: <go...@us...> - 2002-09-17 19:40:23
|
Update of /cvsroot/decaldev/source/DenAgent
In directory usw-pr-cvs1:/tmp/cvs-serv32330/DenAgent
Modified Files:
DenAgent.rc
Log Message:
Removes items immediately on DestroyObject or RemoveItem
message
Index: DenAgent.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DenAgent/DenAgent.rc,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** DenAgent.rc 10 Sep 2002 05:19:26 -0000 1.55
--- DenAgent.rc 17 Sep 2002 19:39:50 -0000 1.56
***************
*** 197,202 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,0,0
! PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 197,202 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,1,1
! PRODUCTVERSION 2,4,1,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 216,220 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DenAgent MFC Application\0"
! VALUE "FileVersion", "2, 4, 0, 0\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, 4, 1, 1\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, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
--- 223,227 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DenAgent Application\0"
! VALUE "ProductVersion", "2, 4, 1, 1\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-09-17 19:40:23
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv32330/DecalFilters
Modified Files:
DecalFilters.rc World.cpp
Log Message:
Removes items immediately on DestroyObject or RemoveItem
message
Index: DecalFilters.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/DecalFilters.rc,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** DecalFilters.rc 10 Sep 2002 05:19:25 -0000 1.46
--- DecalFilters.rc 17 Sep 2002 19:39:49 -0000 1.47
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,0,0
! PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,1,1
! PRODUCTVERSION 2,4,1,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalFilters Module\0"
! VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "DecalFilters\0"
VALUE "LegalCopyright", "Copyright 2001\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalFilters Module\0"
! VALUE "FileVersion", "2, 4, 1, 1\0"
VALUE "InternalName", "DecalFilters\0"
VALUE "LegalCopyright", "Copyright 2001\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalFilters Module\0"
! VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalFilters Module\0"
! VALUE "ProductVersion", "2, 4, 1, 1\0"
VALUE "SpecialBuild", "\0"
END
Index: World.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/World.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** World.cpp 16 Sep 2002 19:17:04 -0000 1.40
--- World.cpp 17 Sep 2002 19:39:49 -0000 1.41
***************
*** 346,356 ****
STDMETHODIMP cWorld::get_Object(long GUID, IWorldObject **pVal)
{
! if (cWorldData *pData = Data(GUID))
! {
pData->m_p->QueryInterface(pVal);
return S_OK;
}
- *pVal = NULL;
return S_FALSE;
}
--- 346,355 ----
STDMETHODIMP cWorld::get_Object(long GUID, IWorldObject **pVal)
{
! *pVal = NULL ;
! if (cWorldData *pData = Data(GUID)) {
pData->m_p->QueryInterface(pVal);
return S_OK;
}
return S_FALSE;
}
***************
*** 478,490 ****
void cWorld::DoDestroyObj(CComPtr< IMessageIterator > pMembers)
{
! // long nDestroyed;
! // pMembers->get_NextInt(strdestroyed, &nDestroyed);
! // _DebugLog("\n\nDestroyObj %x", nDestroyed) ;
! //
! // // if we know about this object
! // if (cWorldData *pData = Data(nDestroyed)) {
! // // remove it
! // DestroyObject(pData) ;
! // }
}
--- 477,489 ----
void cWorld::DoDestroyObj(CComPtr< IMessageIterator > pMembers)
{
! long nDestroyed;
! pMembers->get_NextInt(strdestroyed, &nDestroyed);
! _DebugLog("\n\nDestroyObj %x", nDestroyed) ;
!
! // if we know about this object
! if (cWorldData *pData = Data(nDestroyed)) {
! // remove it
! DestroyObject(pData) ;
! }
}
***************
*** 1101,1113 ****
void cWorld::DoRemoveItem(CComPtr<IMessageIterator> pMembers)
{
! // long nObject;
! // pMembers->get_NextInt(strobject, &nObject);
! //
! // _DebugLog("\n\nRemoveItem %x", nObject) ;
! //
! // // don't remove it if we don't have a record of it
! // if (cWorldData *pData = Data(nObject)) {
! // DestroyObject(pData) ;
! // }
}
--- 1100,1112 ----
void cWorld::DoRemoveItem(CComPtr<IMessageIterator> pMembers)
{
! long nObject;
! pMembers->get_NextInt(strobject, &nObject);
!
! _DebugLog("\n\nRemoveItem %x", nObject) ;
!
! // don't remove it if we don't have a record of it
! if (cWorldData *pData = Data(nObject)) {
! DestroyObject(pData) ;
! }
}
|
|
From: <go...@us...> - 2002-09-17 19:40:23
|
Update of /cvsroot/decaldev/source/Decal
In directory usw-pr-cvs1:/tmp/cvs-serv32330/Decal
Modified Files:
Decal.rc
Log Message:
Removes items immediately on DestroyObject or RemoveItem
message
Index: Decal.rc
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/Decal.rc,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Decal.rc 10 Sep 2002 05:19:25 -0000 1.29
--- Decal.rc 17 Sep 2002 19:39:49 -0000 1.30
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,0,0
! PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,1,0
! PRODUCTVERSION 2,4,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "Decal Module\0"
! VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "Decal\0"
VALUE "LegalCopyright", "Copyright 2001-2002\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "Decal Module\0"
! VALUE "FileVersion", "2, 4, 1, 0\0"
VALUE "InternalName", "Decal\0"
VALUE "LegalCopyright", "Copyright 2001-2002\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Decal Module\0"
! VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Decal Module\0"
! VALUE "ProductVersion", "2, 4, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-09-17 19:39:56
|
Update of /cvsroot/decaldev/source/Installer In directory usw-pr-cvs1:/tmp/cvs-serv32330/Installer Modified Files: DecalInstaller.wip Log Message: Removes items immediately on DestroyObject or RemoveItem message Index: DecalInstaller.wip =================================================================== RCS file: /cvsroot/decaldev/source/Installer/DecalInstaller.wip,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 Binary files /tmp/cvsgrc0m1 and /tmp/cvsaQrvl7 differ |
|
From: <go...@us...> - 2002-09-17 19:39:56
|
Update of /cvsroot/decaldev/source/Installer/Res
In directory usw-pr-cvs1:/tmp/cvs-serv32330/Installer/Res
Modified Files:
Install.vbs readme.rtf
Log Message:
Removes items immediately on DestroyObject or RemoveItem
message
Index: Install.vbs
===================================================================
RCS file: /cvsroot/decaldev/source/Installer/Res/Install.vbs,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Install.vbs 10 Sep 2002 05:19:27 -0000 1.24
--- Install.vbs 17 Sep 2002 19:39:53 -0000 1.25
***************
*** 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.4.0.0" ' 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.4.1.0" ' 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
***************
*** 89,92 ****
--- 89,94 ----
AllProducts.Add "2.3.1.9", "{1CF52690-D209-47C7-97EF-F38D64463AD5}"
AllProducts.Add "2.4.0.0", "{4D7BE8B5-6B0A-4135-8C75-BE8E4BB2E351}"
+ AllProducts.Add "2.4.1.0", "{E6E9AB9D-812C-40D7-A57C-ED298B48557F}"
+
Index: readme.rtf
===================================================================
RCS file: /cvsroot/decaldev/source/Installer/Res/readme.rtf,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
Binary files /tmp/cvsf7F2Yg and /tmp/cvsWhlXHn differ
|
|
From: <ma...@us...> - 2002-09-16 21:39:44
|
Update of /cvsroot/decaldev/source/Include
In directory usw-pr-cvs1:/tmp/cvs-serv16064
Modified Files:
Decal.idl
Log Message:
Add SetAutorun interface
Index: Decal.idl
===================================================================
RCS file: /cvsroot/decaldev/source/Include/Decal.idl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Decal.idl 16 Sep 2002 21:27:29 -0000 1.16
--- Decal.idl 16 Sep 2002 21:39:41 -0000 1.17
***************
*** 31,35 ****
eArea3DHeight = 0x00100000,
eObjectDestroyed= 0x00200000,
! eSendTell = 0x00400000
} ;
--- 31,36 ----
eArea3DHeight = 0x00100000,
eObjectDestroyed= 0x00200000,
! eSendTell = 0x00400000,
! eSetAutorun = 0x00800000
} ;
***************
*** 253,256 ****
--- 254,258 ----
[id(31), helpstring("method ItemIsKnown")] HRESULT ItemIsKnown([in] long lGUID, [out,retval] VARIANT_BOOL *pVal);
[id(32), helpstring("method SendTell")] HRESULT SendTell([in]long lPlayerID, BSTR Message);
+ [id(33), helpstring("method SetAutorun")] HRESULT SetAutorun([in] VARIANT_BOOL bOnOff);
};
|
|
From: <ma...@us...> - 2002-09-16 21:39:26
|
Update of /cvsroot/decaldev/source/Decal
In directory usw-pr-cvs1:/tmp/cvs-serv15945
Modified Files:
ACHooks.h ACHooks.cpp
Log Message:
Add SetAutorun implementation
Index: ACHooks.h
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/ACHooks.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ACHooks.h 16 Sep 2002 21:27:17 -0000 1.18
--- ACHooks.h 16 Sep 2002 21:39:23 -0000 1.19
***************
*** 125,128 ****
--- 125,131 ----
long m_lFaceHeading;
+ bool m_bSetAutorun;
+ long m_lSetAutorun;
+
bool m_bInternalStringConstructor;
bool m_bInternalStringDestructor;
***************
*** 169,172 ****
--- 172,176 ----
STDMETHOD(ItemIsKnown)(long lGUID, VARIANT_BOOL* pRetval) ;
STDMETHOD(SendTell)(long lPlayerID, BSTR Message);
+ STDMETHOD(SetAutorun)(VARIANT_BOOL bOnOff) ;
static cACHooks* s_pACHooks;
Index: ACHooks.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/ACHooks.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ACHooks.cpp 16 Sep 2002 21:27:17 -0000 1.19
--- ACHooks.cpp 16 Sep 2002 21:39:23 -0000 1.20
***************
*** 42,45 ****
--- 42,46 ----
m_bMoveItemEx = false;
m_bFaceHeading = false;
+ m_bSetAutorun = false;
m_Hooks = 0 ;
***************
*** 255,258 ****
--- 256,264 ----
}
+ if( QueryMemLoc( _bstr_t( "SetAutorun" ), &Val ) == S_OK)
+ {
+ m_lSetAutorun = Val;
+ }
+
if (m_lMovementThingyParent && m_lMovementThingyOffset && m_lFaceHeading)
{
***************
*** 262,265 ****
--- 268,278 ----
}
+ if (m_lMovementThingyParent && m_lMovementThingyOffset && m_lSetAutorun)
+ {
+ m_bSetAutorun = true;
+
+ m_Hooks |= eSetAutorun;
+ }
+
/*
// While the address of ObjectDestroyed is interesting, it isn't actually needed.
***************
*** 1119,1122 ****
--- 1132,1163 ----
*pRetval = lResult ? VARIANT_TRUE : VARIANT_FALSE;
+
+ return S_OK;
+ }
+
+ // Set auto-run, discovered by Madar on 9/16/2002
+ STDMETHODIMP cACHooks::SetAutorun (VARIANT_BOOL bOnOff)
+ {
+ if (!m_bSetAutorun)
+ {
+ return S_FALSE;
+ }
+
+ DWORD dwTemp = m_lSetAutorun;
+
+ DWORD ** pTemp = (DWORD **) m_lMovementThingyParent;
+
+ DWORD dwMovementThingy = pTemp[0][m_lMovementThingyOffset];
+
+ long lFirstArg = (bOnOff == VARIANT_TRUE) ? 1 : 0;
+ long lUnknown = 1;
+
+ __asm
+ {
+ mov ecx,dwMovementThingy
+ push lUnknown
+ push lFirstArg
+ call dwTemp
+ }
return S_OK;
|
|
From: <ha...@us...> - 2002-09-16 21:27:31
|
Update of /cvsroot/decaldev/source/Include
In directory usw-pr-cvs1:/tmp/cvs-serv12568
Modified Files:
Decal.idl
Log Message:
SendTell stuffages
Index: Decal.idl
===================================================================
RCS file: /cvsroot/decaldev/source/Include/Decal.idl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Decal.idl 28 Aug 2002 20:55:03 -0000 1.15
--- Decal.idl 16 Sep 2002 21:27:29 -0000 1.16
***************
*** 30,34 ****
eArea3DWidth = 0x00080000,
eArea3DHeight = 0x00100000,
! eObjectDestroyed= 0x00200000
} ;
--- 30,35 ----
eArea3DWidth = 0x00080000,
eArea3DHeight = 0x00100000,
! eObjectDestroyed= 0x00200000,
! eSendTell = 0x00400000
} ;
***************
*** 251,255 ****
[propget, id(30), helpstring("property Screen3DHeight")] HRESULT Area3DHeight([out, retval] long *pVal);
[id(31), helpstring("method ItemIsKnown")] HRESULT ItemIsKnown([in] long lGUID, [out,retval] VARIANT_BOOL *pVal);
! };
[
--- 252,257 ----
[propget, id(30), helpstring("property Screen3DHeight")] HRESULT Area3DHeight([out, retval] long *pVal);
[id(31), helpstring("method ItemIsKnown")] HRESULT ItemIsKnown([in] long lGUID, [out,retval] VARIANT_BOOL *pVal);
! [id(32), helpstring("method SendTell")] HRESULT SendTell([in]long lPlayerID, BSTR Message);
! };
[
|
|
From: <ha...@us...> - 2002-09-16 21:27:22
|
Update of /cvsroot/decaldev/source/Decal
In directory usw-pr-cvs1:/tmp/cvs-serv12500
Modified Files:
ACHooks.cpp ACHooks.h
Log Message:
SendTell stuffages
Index: ACHooks.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/ACHooks.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ACHooks.cpp 30 Aug 2002 19:12:42 -0000 1.18
--- ACHooks.cpp 16 Sep 2002 21:27:17 -0000 1.19
***************
*** 9,12 ****
--- 9,15 ----
void (*pfnUseItem)( DWORD, DWORD ) = NULL;
void (*pfnMoveItemEx)( DWORD, DWORD, DWORD ) = NULL;
+ void (*pfnInternalStringDestructor)( qString * ) = NULL;
+ long (*pfnSendMessageToID)( qString *, long ) = NULL;
+ qString* (*pfnInternalStringConstructor)( qString *, long, char * ) = NULL;
extern void ObjectDestroyedHook ();
***************
*** 298,301 ****
--- 301,331 ----
}
}
+
+ if( QueryMemLoc( _bstr_t( "InternalStringConstructor" ), &Val ) == S_OK)
+ {
+ m_bInternalStringConstructor = true;
+ m_lInternalStringConstructor = Val;
+
+ pfnInternalStringConstructor = reinterpret_cast< qString *(*)(qString *, long, char *) >( Val );
+ }
+
+ if( QueryMemLoc( _bstr_t( "InternalStringDestructor" ), &Val ) == S_OK)
+ {
+ m_bInternalStringDestructor = true;
+ m_lInternalStringDestructor = Val;
+
+ pfnInternalStringDestructor = reinterpret_cast< void(*)(qString *) >( Val );
+ }
+
+ if( QueryMemLoc( _bstr_t( "SendMessageToID" ), &Val ) == S_OK)
+ {
+ m_bSendMessageToID = true;
+ m_lSendMessageToID = Val;
+
+ pfnSendMessageToID = reinterpret_cast< long(*)(qString *, long) >( Val );
+ }
+
+ if( m_bInternalStringConstructor && m_bInternalStringDestructor && m_bSendMessageToID )
+ m_Hooks |= eSendTell;
}
***************
*** 1135,1138 ****
--- 1165,1185 ----
*pVal = *( reinterpret_cast< long * >( m_lArea3DHeight ) );
+
+ return S_OK;
+ }
+
+ STDMETHODIMP cACHooks::SendTell( long lPlayerID, BSTR Message )
+ {
+ if( !(m_bInternalStringConstructor && m_bInternalStringDestructor && m_bSendMessageToID) )
+ return S_FALSE;
+
+ USES_CONVERSION;
+ char *Text = OLE2A( Message );
+
+ long retval;
+ qString Msg;
+ pfnInternalStringConstructor( &Msg, 0, Text );
+ retval = pfnSendMessageToID( &Msg, lPlayerID );
+ pfnInternalStringDestructor( &Msg );
return S_OK;
Index: ACHooks.h
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/ACHooks.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ACHooks.h 30 Aug 2002 10:46:09 -0000 1.17
--- ACHooks.h 16 Sep 2002 21:27:17 -0000 1.18
***************
*** 13,16 ****
--- 13,24 ----
};
+ // qString struct for internal client strings - this is all cynica_l's work
+ struct qString
+ {
+ void **vTable;
+ char *Data;
+ long MaximumLength;
+ };
+
/////////////////////////////////////////////////////////////////////////////
// ACHooks
***************
*** 117,120 ****
--- 125,136 ----
long m_lFaceHeading;
+ bool m_bInternalStringConstructor;
+ bool m_bInternalStringDestructor;
+ bool m_bSendMessageToID;
+
+ long m_lInternalStringConstructor;
+ long m_lInternalStringDestructor;
+ long m_lSendMessageToID;
+
public:
STDMETHOD(MoveItemEx)(long lObjectID, long lDestinationID);
***************
*** 152,155 ****
--- 168,172 ----
STDMETHOD(get_Area3DHeight)(long *pVal);
STDMETHOD(ItemIsKnown)(long lGUID, VARIANT_BOOL* pRetval) ;
+ STDMETHOD(SendTell)(long lPlayerID, BSTR Message);
static cACHooks* s_pACHooks;
|
|
From: <go...@us...> - 2002-09-16 19:17:09
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv950/DecalFilters
Modified Files:
World.cpp World.h
Log Message:
Modified to use the new ACHooks ObjectDestroyed event
to determine when to clean up lists. This should help reduce
both memory usage and lag.
Index: World.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/World.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** World.cpp 31 Jul 2002 02:29:01 -0000 1.39
--- World.cpp 16 Sep 2002 19:17:04 -0000 1.40
***************
*** 6,13 ****
--- 6,25 ----
#include "WorldObject.h"
#include "WorldIterator.h"
+
#include <time.h>
#include <stdio.h>
#include <math.h>
+
+ const IID EVTID_AcHooks = {
+ 0xEB282FE5, 0x7170, 0x4a37, {0xA2, 0x6E, 0x92, 0xAF, 0x36, 0x38, 0x5D, 0x2C}} ;
+
+ const IID LIBID_Decal = {
+ 0xFF7F5F6D, 0x34E0, 0x4B6F, {0xB3, 0xBB, 0x81, 0x41, 0xDE, 0x2E, 0xF7, 0x32}} ;
+
+ const IID IID_Plugins = {
+ 0x702D3901, 0xC13A, 0x448e, {0x88, 0x71, 0xEC, 0xDC, 0x8B, 0xC8, 0xD0, 0x79}} ;
+
+
/////////////////////////////////////////////////////////////////////////////
// cWorld
***************
*** 117,120 ****
--- 129,133 ----
{
m_nNextTime = 0;
+ m_HookIsSet = false ;
};
***************
*** 126,133 ****
--- 139,193 ----
+ void cWorld::SetHook()
+ {
+ CComPtr< IDecal > pDecal;
+ HRESULT hr = m_pService->get_Decal( &pDecal );
+ if (SUCCEEDED(hr)) {
+ _DebugLog("\nGotDecal") ;
+ CComPtr< IInjectService > pInject;
+ HRESULT hr = pDecal->get_Object ( _bstr_t ( _T( "services\\DecalPlugins.InjectService" ) ),
+ __uuidof ( IInjectService ), reinterpret_cast< LPVOID * > ( &pInject ) );
+
+ if (SUCCEEDED(hr)) {
+ _DebugLog("\nGot Inject") ;
+ pInject->get_Site(&m_pPluginSite);
+ if (SUCCEEDED(hr)) {
+ _DebugLog("\nGot PluginSite") ;
+ hr = m_pPluginSite->get_Hooks(&m_pHooks) ;
+ if (SUCCEEDED(hr)) {
+ _DebugLog("\nGot Hooks") ;
+ IACHooksEventsImpl<HookDestroyObj, cWorld>::advise(m_pHooks) ;
+ m_HookIsSet = true ;
+ } else {
+ _DebugLog("\nFailed Get Hooks %x", hr) ;
+ }
+ } else {
+ _DebugLog("\nFailed to get PluginSite %x", hr) ;
+ }
+ } else {
+ _DebugLog("\nFailed to get Inject %x", hr) ;
+ }
+ } else {
+ _DebugLog("\nFailed to get Decal %x", hr) ;
+ }
+ }
+
+
HRESULT cWorld::onTerminate()
{
_DebugLog("OnTerminate") ;
_DebugLog("CLOSEFILE") ;
+ if (m_HookIsSet) {
+ IACHooksEventsImpl<HookDestroyObj, cWorld>::unadvise(m_pPluginSite) ;
+ if (m_pHooks!=NULL) {
+ m_pHooks.Release() ;
+ m_pHooks = NULL ;
+ }
+ if (m_pPluginSite!=NULL) {
+ m_pPluginSite.Release() ;
+ m_pPluginSite = NULL ;
+ }
+ m_HookIsSet = false ;
+ }
return S_OK;
}
***************
*** 147,150 ****
--- 207,223 ----
// Gouru: reset the player so next login the player gets updated...
m_objects.player(0) ;
+
+ if (m_HookIsSet) {
+ IACHooksEventsImpl<HookDestroyObj, cWorld>::unadvise(m_pPluginSite) ;
+ if (m_pHooks!=NULL) {
+ m_pHooks.Release() ;
+ m_pHooks = NULL ;
+ }
+ if (m_pPluginSite!=NULL) {
+ m_pPluginSite.Release() ;
+ m_pPluginSite = NULL ;
+ }
+ m_HookIsSet = false ;
+ }
}
***************
*** 178,182 ****
}
! ReleaseAllPendingObjects() ;
return S_OK;
--- 251,255 ----
}
! // ReleaseAllPendingObjects() ;
return S_OK;
***************
*** 226,255 ****
void cWorld::ReleaseAllPendingObjects()
{
! if (m_nNextTime <= time(NULL))
! {
! cWorldData *pData = NULL;
!
! for (cWorldDataMap::iterator iData = m_objects.begin(); iData != m_objects.end();)
! {
! pData = iData->second;
!
! if (pData && pData->m_tExpires && pData->m_tExpires <= time(NULL))
! {
! _DebugLog("\nReleased object %x", pData->m_dwGUID) ;
! cWorldDataMap::iterator iSkip = iData;
!
! Fire_ReleaseObject(pData->m_p);
!
! iSkip++;
! m_objects.erase(pData->m_dwGUID);
! delete pData;
! iData = iSkip;
! }
! else
! ++iData;
! }
! m_nNextTime = time(NULL) + 5; // 5 seconds until next check
}
}
--- 299,343 ----
void cWorld::ReleaseAllPendingObjects()
{
! // if (m_nNextTime <= time(NULL))
! // {
! // cWorldData *pData = NULL;
! //
! // for (cWorldDataMap::iterator iData = m_objects.begin(); iData != m_objects.end();)
! // {
! // pData = iData->second;
! //
! // if (pData && pData->m_tExpires && pData->m_tExpires <= time(NULL))
! // {
! // _DebugLog("\nReleased object %x", pData->m_dwGUID) ;
! // cWorldDataMap::iterator iSkip = iData;
! // iSkip++;
! //
! // DestroyObject(pData) ;
! //
! // iData = iSkip;
! // }
! // else
! // ++iData;
! // }
! // m_nNextTime = time(NULL) + 5; // 5 seconds until next check
! // }
! }
! void cWorld::DestroyObject(cWorldData* pData)
! {
! _DebugLog("\nDestroyObject: %x", pData->m_dwGUID) ;
!
! if (pData->m_dwGUID != m_objects.player()) {
! _DebugLog(" : ReleaseObject") ;
! Fire_ReleaseObject(pData->m_p);
! _DebugLog(" : MoveSlotBack") ;
! MoveSlotBack(pData);
!
! _DebugLog(" : erase") ;
! m_objects.erase(pData->m_dwGUID);
!
! _DebugLog(" : delete") ;
! delete pData;
}
}
***************
*** 390,407 ****
void cWorld::DoDestroyObj(CComPtr< IMessageIterator > pMembers)
{
! long nDestroyed;
! pMembers->get_NextInt(strdestroyed, &nDestroyed);
! _DebugLog("\n\nDestroyObj %x", nDestroyed) ;
!
! if (nDestroyed == m_objects.player()) return ;
!
! if (cWorldData *pData = Data(nDestroyed))
! {
! Fire_ReleaseObject(pData->m_p);
! MoveSlotBack(pData);
!
! m_objects.erase(m_objects.find(nDestroyed));
! delete pData;
! }
}
--- 478,490 ----
void cWorld::DoDestroyObj(CComPtr< IMessageIterator > pMembers)
{
! // long nDestroyed;
! // pMembers->get_NextInt(strdestroyed, &nDestroyed);
! // _DebugLog("\n\nDestroyObj %x", nDestroyed) ;
! //
! // // if we know about this object
! // if (cWorldData *pData = Data(nDestroyed)) {
! // // remove it
! // DestroyObject(pData) ;
! // }
}
***************
*** 623,626 ****
--- 706,712 ----
{
_DebugLog("\n\nLogin") ;
+ if (!m_HookIsSet) {
+ SetHook() ;
+ }
CComPtr<IMessageIterator> pItems, pItem;
long nCount, ixSlot = 0, ixPack=0 ;
***************
*** 1015,1034 ****
void cWorld::DoRemoveItem(CComPtr<IMessageIterator> pMembers)
{
! long nObject;
! pMembers->get_NextInt(strobject, &nObject);
!
! _DebugLog("\n\nRemoveItem %x", nObject) ;
!
! // never remove yourself
! if (nObject == m_objects.player()) return ;
!
! // don't remove it if we don't have a record of it
! if (cWorldData *pData = Data(nObject))
! {
! Fire_ReleaseObject(pData->m_p);
!
! m_objects.erase(m_objects.find(nObject));
! delete pData;
! }
}
--- 1101,1113 ----
void cWorld::DoRemoveItem(CComPtr<IMessageIterator> pMembers)
{
! // long nObject;
! // pMembers->get_NextInt(strobject, &nObject);
! //
! // _DebugLog("\n\nRemoveItem %x", nObject) ;
! //
! // // don't remove it if we don't have a record of it
! // if (cWorldData *pData = Data(nObject)) {
! // DestroyObject(pData) ;
! // }
}
***************
*** 1058,1070 ****
bool cWorld::OutsideCullDistance(cWorldData* data, long row, long col)
{
! _DebugLog("\nCull Distance %d-%d, %d-%d", data->m_LandblockRow, row,
! data->m_LandblockCol, col) ;
! long x = abs(data->m_LandblockRow-row) ;
! long y = abs(data->m_LandblockCol-col) ;
! if (x>2 || y>2) {
! _DebugLog(" <true>") ;
! return true ;
! }
! _DebugLog(" <false>") ;
return false ;
}
--- 1137,1150 ----
bool cWorld::OutsideCullDistance(cWorldData* data, long row, long col)
{
! // _DebugLog("\nCull Distance %d-%d, %d-%d", data->m_LandblockRow, row,
! // data->m_LandblockCol, col) ;
! // long x = abs(data->m_LandblockRow-row) ;
! // long y = abs(data->m_LandblockCol-col) ;
! // if (x>2 || y>2) {
! // _DebugLog(" <true>") ;
! // return true ;
! // }
! // _DebugLog(" <false>") ;
! // return false ;
return false ;
}
***************
*** 1076,1080 ****
// Gouru: not normally logged as we get an S load of these messages, uncomment if you
// really need it for testing...
! _DebugLog("\nSetObjectPosition %x", nObject) ;
cWorldData *pData = Data(nObject);
--- 1156,1160 ----
// Gouru: not normally logged as we get an S load of these messages, uncomment if you
// really need it for testing...
! // _DebugLog("\nSetObjectPosition %x", nObject) ;
cWorldData *pData = Data(nObject);
***************
*** 1088,1099 ****
pPos->get_NextInt(strlandblock, (long *)&dwLandblock);
! long oldLandblock = pData->m_dwLandblock ;
! long colLandblock = (dwLandblock>>24) & 0xff ;
! long rowLandblock = (dwLandblock>>16) & 0xff ;
// store landblock and landblock h/v values so we don't have to recalculate them
// everytime since we do this a lot
pData->m_dwLandblock = dwLandblock;
! pData->m_LandblockCol = colLandblock ;
! pData->m_LandblockRow = rowLandblock ;
pPos->get_NextFloat(strxOffset, &pData->m_fxOffset);
pPos->get_NextFloat(stryOffset, &pData->m_fyOffset);
--- 1168,1179 ----
pPos->get_NextInt(strlandblock, (long *)&dwLandblock);
! // long oldLandblock = pData->m_dwLandblock ;
! // long colLandblock = (dwLandblock>>24) & 0xff ;
! // long rowLandblock = (dwLandblock>>16) & 0xff ;
// store landblock and landblock h/v values so we don't have to recalculate them
// everytime since we do this a lot
pData->m_dwLandblock = dwLandblock;
! pData->m_LandblockCol = (dwLandblock>>24) & 0xff ;
! pData->m_LandblockRow = (dwLandblock>>16) & 0xff ;
pPos->get_NextFloat(strxOffset, &pData->m_fxOffset);
pPos->get_NextFloat(stryOffset, &pData->m_fyOffset);
***************
*** 1104,1177 ****
// If moving object is player, and player changed landblocks...
// if the object changed landblocks
! if (HIWORD(oldLandblock) != HIWORD(pData->m_dwLandblock)) {
! if (nObject == m_objects.player()) {
! _DebugLog("\n\nPlayer changed landblock!") ;
! // If the moving object was the player, scan all items and tag those
! // too far away with an expiration time
! for (cWorldDataMap::iterator i = m_objects.begin(); i != m_objects.end(); i++)
! {
! cWorldData *pObject = i->second;
! if (!pObject) {
! continue ; // can't process if we don't have the object...
! }
!
! // get the outmost container of this object, its landblock is used in
! // distance checking...
! cWorldData *pLbData = OuterContainer(pObject) ;
!
! // if the object moving is the player, or carried by the player
! // dont process it, it should not be culled
! if (pLbData->m_dwGUID == m_objects.player()) {
! _DebugLog("\nplayerobj: %x", pObject->m_dwGUID) ;
! continue ;
! }
!
! #ifdef LOGGING
! if (pLbData != pObject) {
! _DebugLog("object %x contained in %x",
! pObject->m_dwGUID, pLbData->m_dwGUID) ;
! }
! #endif
! // if the object is outside the culling distance
! if (OutsideCullDistance(pLbData, rowLandblock, colLandblock)) {
! // if the item is not already tagged, tag it to expire in 30 seconds
! if (!pObject->m_tExpires) {
! _DebugLog("\nculling %x", pObject->m_dwGUID) ;
! pObject->m_tExpires = time(NULL)+30 ;
! Fire_ChangeObject(pObject->m_p, strReleasePending);
! } else {
! _DebugLog("\n%x already tagged", pObject->m_dwGUID) ;
! }
! } else if (pObject->m_tExpires) {
! // else it is inside the culling distance and if tagged to expire
! // cance the expiration
! _DebugLog("\ncancelled cull %x", pObject->m_dwGUID) ;
! pObject->m_tExpires = 0 ;
! Fire_ChangeObject(pObject->m_p, strExpirationCancel);
! }
! }
! } else {
! _DebugLog("\n\nItem %x changed landblock!", nObject) ;
! // object is not a player, tag it to expire if it has moved to far away
! cWorldData* pLbData = OuterContainer(pData) ;
! cWorldData* pPlayer = Data(m_objects.player()) ;
! if ( OutsideCullDistance(pPlayer, pLbData->m_LandblockRow, pLbData->m_LandblockCol)){
! // if not already tagged, tag it to expire
! if (!pData->m_tExpires) {
! _DebugLog("\nculling %x", pData->m_dwGUID) ;
! pData->m_tExpires = time(NULL) + 30 ;
! Fire_ChangeObject(pData->m_p, strReleasePending);
! } else {
! _DebugLog("%x already tagged", pData->m_dwGUID) ;
! }
! } else if (pData->m_tExpires) {
! _DebugLog("\ncancelled cull %x", pData->m_dwGUID) ;
! // else it is inside the culling distance and if tagged to expire
! // cancel the expiration
! pData->m_tExpires = 0 ;
! Fire_ChangeObject(pData->m_p, strExpirationCancel);
! }
! }
! }
pData->m_flags |= FLAG_LOCATION;
Fire_ChangeObject(pData->m_p, strLocationChange);
--- 1184,1257 ----
// If moving object is player, and player changed landblocks...
// if the object changed landblocks
! // if (HIWORD(oldLandblock) != HIWORD(pData->m_dwLandblock)) {
! // if (nObject == m_objects.player()) {
! // _DebugLog("\n\nPlayer changed landblock!") ;
! // // If the moving object was the player, scan all items and tag those
! // // too far away with an expiration time
! // for (cWorldDataMap::iterator i = m_objects.begin(); i != m_objects.end(); i++)
! // {
! // cWorldData *pObject = i->second;
! // if (!pObject) {
! // continue ; // can't process if we don't have the object...
! // }
! //
! // // get the outmost container of this object, its landblock is used in
! // // distance checking...
! // cWorldData *pLbData = OuterContainer(pObject) ;
! //
! // // if the object moving is the player, or carried by the player
! // // dont process it, it should not be culled
! // if (pLbData->m_dwGUID == m_objects.player()) {
! // _DebugLog("\nplayerobj: %x", pObject->m_dwGUID) ;
! // continue ;
! // }
! //
! //#ifdef LOGGING
! // if (pLbData != pObject) {
! // _DebugLog("object %x contained in %x",
! // pObject->m_dwGUID, pLbData->m_dwGUID) ;
! // }
! //#endif
! // // if the object is outside the culling distance
! // if (OutsideCullDistance(pLbData, rowLandblock, colLandblock)) {
! // // if the item is not already tagged, tag it to expire in 30 seconds
! // if (!pObject->m_tExpires) {
! // _DebugLog("\nculling %x", pObject->m_dwGUID) ;
! // pObject->m_tExpires = time(NULL)+30 ;
! // Fire_ChangeObject(pObject->m_p, strReleasePending);
! // } else {
! // _DebugLog("\n%x already tagged", pObject->m_dwGUID) ;
! // }
! // } else if (pObject->m_tExpires) {
! // // else it is inside the culling distance and if tagged to expire
! // // cance the expiration
! // _DebugLog("\ncancelled cull %x", pObject->m_dwGUID) ;
! // pObject->m_tExpires = 0 ;
! // Fire_ChangeObject(pObject->m_p, strExpirationCancel);
! // }
! // }
! // } else {
! // _DebugLog("\n\nItem %x changed landblock!", nObject) ;
! // // object is not a player, tag it to expire if it has moved to far away
! // cWorldData* pLbData = OuterContainer(pData) ;
! // cWorldData* pPlayer = Data(m_objects.player()) ;
! // if ( OutsideCullDistance(pPlayer, pLbData->m_LandblockRow, pLbData->m_LandblockCol)){
! // // if not already tagged, tag it to expire
! // if (!pData->m_tExpires) {
! // _DebugLog("\nculling %x", pData->m_dwGUID) ;
! // pData->m_tExpires = time(NULL) + 30 ;
! // Fire_ChangeObject(pData->m_p, strReleasePending);
! // } else {
! // _DebugLog("%x already tagged", pData->m_dwGUID) ;
! // }
! // } else if (pData->m_tExpires) {
! // _DebugLog("\ncancelled cull %x", pData->m_dwGUID) ;
! // // else it is inside the culling distance and if tagged to expire
! // // cancel the expiration
! // pData->m_tExpires = 0 ;
! // Fire_ChangeObject(pData->m_p, strExpirationCancel);
! // }
! // }
! // }
pData->m_flags |= FLAG_LOCATION;
Fire_ChangeObject(pData->m_p, strLocationChange);
***************
*** 1283,1286 ****
--- 1363,1379 ----
+ void cWorld::onObjectDestroyed(long nId)
+ {
+ _DebugLog("\nonObjectDestroyed %x", nId) ;
+ // if we know about this object
+ if (cWorldData *pData = Data(nId)) {
+ bool IsPlayer = pData->m_eType==ePlayer ;
+ // remove it
+ DestroyObject(pData) ;
+ if (IsPlayer) {
+ _DebugLog("\n Remove wielded items") ;
+ }
+ }
+ }
#ifdef Logging
Index: World.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/World.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** World.h 1 Aug 2002 15:01:56 -0000 1.29
--- World.h 16 Sep 2002 19:17:05 -0000 1.30
***************
*** 7,10 ****
--- 7,11 ----
#include "DecalNetImpl.h"
#include "WorldObject.h"
+ #include "..\inject\inject.h"
#include <deque>
***************
*** 12,15 ****
--- 13,30 ----
//#define Logging 1
+ #define HookDestroyObj 101
+
+ extern const IID EVTID_AcHooks ;
+
+ // Template class used to connect ACHooks events
+ template<UINT nID, class cImpl >class IACHooksEventsImpl
+ :public IDispEventImpl<nID, cImpl, &EVTID_AcHooks,
+ &LIBID_Decal, 1, 0 >
+ {
+ public: HRESULT advise(IUnknown *pUnk){return DispEventAdvise(pUnk);}
+ HRESULT unadvise(IUnknown *pUnk){return DispEventUnadvise(pUnk);}
+ };
+
+
// Gouru: added structure to store slot and slot type. Containers have two types of slots
// we need to track, slots than can contain other containers, and slots that contain items
***************
*** 160,163 ****
--- 175,179 ----
public IDispatchImpl<IWorld, &IID_IWorld, &LIBID_DecalFilters>,
public IProvideClassInfo2Impl<&CLSID_World, &DIID_IWorldEvents, &LIBID_DecalFilters>,
+ public IACHooksEventsImpl<HookDestroyObj, cWorld>,
public INetworkFilterImpl<cWorld>,
public CProxyIWorldEvents<cWorld>
***************
*** 184,187 ****
--- 200,207 ----
END_CONNECTION_POINT_MAP()
+ BEGIN_SINK_MAP(cWorld)
+ SINK_ENTRY_EX(HookDestroyObj, EVTID_AcHooks, 1, onObjectDestroyed)
+ END_SINK_MAP()
+
public:
cWorldData *Data(DWORD nGuid);
***************
*** 193,199 ****
bool OutsideCullDistance(cWorldData* data, long row, long col) ;
cWorldData* OuterContainer(cWorldData* obj) ;
!
void FreeData();
void ReleaseAllPendingObjects() ;
// AC message handlers
--- 213,221 ----
bool OutsideCullDistance(cWorldData* data, long row, long col) ;
cWorldData* OuterContainer(cWorldData* obj) ;
! void DestroyObject(cWorldData* pData) ;
!
void FreeData();
void ReleaseAllPendingObjects() ;
+ void SetHook() ;
// AC message handlers
***************
*** 224,227 ****
--- 246,254 ----
long m_nNextTime;
+ bool m_HookIsSet ;
+ CComPtr<IPluginSite> m_pPluginSite ;
+ CComPtr< IACHooks > m_pHooks ;
+
+ void _stdcall onObjectDestroyed(long nId);
public:
|
|
From: <ec...@us...> - 2002-09-14 15:28:56
|
Update of /cvsroot/decaldev/source/DecalFilters In directory usw-pr-cvs1:/tmp/cvs-serv29078 Modified Files: CharacterStats.cpp Log Message: fixed a rounding error and removed some stupid code to keep from subtracting .5 and then adding it again in the next line Index: CharacterStats.cpp =================================================================== RCS file: /cvsroot/decaldev/source/DecalFilters/CharacterStats.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** CharacterStats.cpp 3 Sep 2002 18:03:34 -0000 1.27 --- CharacterStats.cpp 14 Sep 2002 15:28:53 -0000 1.28 *************** *** 1400,1404 **** long nBuffs = CurSecStat[Index - 1] - static_cast< long >(fSkill); //calculates net buffs ! *pVal = long((fSkill * Vitae) + 0.5f) + nBuffs; return S_OK; --- 1400,1404 ---- long nBuffs = CurSecStat[Index - 1] - static_cast< long >(fSkill); //calculates net buffs ! *pVal = long((fSkill * Vitae)) + nBuffs; return S_OK; *************** *** 1425,1432 **** long nBuffs = CurSkill[Index] - long(fSkill); - fSkill -= 0.5f; // avoid double round... - // AC calculates the vitae penalty to a skill before buffs, so we do too ! *pVal = long((long(fSkill) * Vitae) + 0.5f) + nBuffs; return S_OK; --- 1425,1430 ---- long nBuffs = CurSkill[Index] - long(fSkill); // AC calculates the vitae penalty to a skill before buffs, so we do too ! *pVal = long((long(fSkill) * Vitae)) + nBuffs; return S_OK; |
|
From: <go...@us...> - 2002-09-10 05:19:29
|
Update of /cvsroot/decaldev/source/PlainText
In directory usw-pr-cvs1:/tmp/cvs-serv23304/PlainText
Modified Files:
PlainText.rc
Log Message:
2.4 update
Index: PlainText.rc
===================================================================
RCS file: /cvsroot/decaldev/source/PlainText/PlainText.rc,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** PlainText.rc 7 Jul 2002 23:42:22 -0000 1.22
--- PlainText.rc 10 Sep 2002 05:19:27 -0000 1.23
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,0,0
! PRODUCTVERSION 2,3,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,0,0
! PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "PlainText Module\0"
! VALUE "FileVersion", "2, 3, 0, 0\0"
VALUE "InternalName", "PlainText\0"
VALUE "LegalCopyright", "Copyright 2001\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "PlainText Module\0"
! VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "PlainText\0"
VALUE "LegalCopyright", "Copyright 2001\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "PlainText Module\0"
! VALUE "ProductVersion", "2, 3, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "PlainText Module\0"
! VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-09-10 05:19:29
|
Update of /cvsroot/decaldev/source/Installer In directory usw-pr-cvs1:/tmp/cvs-serv23304/Installer Modified Files: DecalInstaller.wip Log Message: 2.4 update Index: DecalInstaller.wip =================================================================== RCS file: /cvsroot/decaldev/source/Installer/DecalInstaller.wip,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 Binary files /tmp/cvsAmcJNc and /tmp/cvsKOUZ5k differ |
|
From: <go...@us...> - 2002-09-10 05:19:29
|
Update of /cvsroot/decaldev/source/Installer/Res
In directory usw-pr-cvs1:/tmp/cvs-serv23304/Installer/Res
Modified Files:
Install.vbs readme.rtf
Log Message:
2.4 update
Index: Install.vbs
===================================================================
RCS file: /cvsroot/decaldev/source/Installer/Res/Install.vbs,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Install.vbs 4 Sep 2002 02:04:23 -0000 1.23
--- Install.vbs 10 Sep 2002 05:19:27 -0000 1.24
***************
*** 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.9" ' 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.4.0.0" ' 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
***************
*** 88,91 ****
--- 88,92 ----
AllProducts.Add "2.3.1.8", "{88947320-85FC-4327-908D-7801365AD4D9}"
AllProducts.Add "2.3.1.9", "{1CF52690-D209-47C7-97EF-F38D64463AD5}"
+ AllProducts.Add "2.4.0.0", "{4D7BE8B5-6B0A-4135-8C75-BE8E4BB2E351}"
Index: readme.rtf
===================================================================
RCS file: /cvsroot/decaldev/source/Installer/Res/readme.rtf,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
Binary files /tmp/cvsnREPIn and /tmp/cvsoyWWjB differ
|
|
From: <go...@us...> - 2002-09-10 05:19:29
|
Update of /cvsroot/decaldev/source/DecalNet
In directory usw-pr-cvs1:/tmp/cvs-serv23304/DecalNet
Modified Files:
DecalNet.rc
Log Message:
2.4 update
Index: DecalNet.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DecalNet/DecalNet.rc,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** DecalNet.rc 20 Jul 2002 23:24:43 -0000 1.22
--- DecalNet.rc 10 Sep 2002 05:19:25 -0000 1.23
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,1
! PRODUCTVERSION 2,3,1,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,0,0
! PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalNet Module\0"
! VALUE "FileVersion", "2, 3, 1, 1\0"
VALUE "InternalName", "DecalNet\0"
VALUE "LegalCopyright", "Copyright 2001\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalNet Module\0"
! VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "DecalNet\0"
VALUE "LegalCopyright", "Copyright 2001\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalNet Module\0"
! VALUE "ProductVersion", "2, 3, 1, 1\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalNet Module\0"
! VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-09-10 05:19:29
|
Update of /cvsroot/decaldev/source/Inject
In directory usw-pr-cvs1:/tmp/cvs-serv23304/Inject
Modified Files:
Inject.rc
Log Message:
2.4 update
Index: Inject.rc
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/Inject.rc,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Inject.rc 14 Aug 2002 21:55:01 -0000 1.35
--- Inject.rc 10 Sep 2002 05:19:26 -0000 1.36
***************
*** 74,79 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,6
! PRODUCTVERSION 2,3,1,6
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 74,79 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,0,0
! PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 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"
--- 93,97 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "Inject Module\0"
! VALUE "FileVersion", "2, 4, 0, 0\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, 6\0"
VALUE "SpecialBuild", "\0"
END
--- 101,105 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Inject Module\0"
! VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-09-10 05:19:28
|
Update of /cvsroot/decaldev/source/DenAgent
In directory usw-pr-cvs1:/tmp/cvs-serv23304/DenAgent
Modified Files:
DenAgent.rc
Log Message:
2.4 update
Index: DenAgent.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DenAgent/DenAgent.rc,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** DenAgent.rc 4 Sep 2002 02:04:20 -0000 1.54
--- DenAgent.rc 10 Sep 2002 05:19:26 -0000 1.55
***************
*** 197,202 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,9
! PRODUCTVERSION 2,3,1,9
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 197,202 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,0,0
! PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 216,220 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DenAgent MFC Application\0"
! VALUE "FileVersion", "2, 3, 1, 9\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, 4, 0, 0\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, 9\0"
VALUE "SpecialBuild", "\0"
END
--- 223,227 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DenAgent Application\0"
! VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-09-10 05:19:28
|
Update of /cvsroot/decaldev/source/DecalInput
In directory usw-pr-cvs1:/tmp/cvs-serv23304/DecalInput
Modified Files:
DecalInput.rc
Log Message:
2.4 update
Index: DecalInput.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DecalInput/DecalInput.rc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** DecalInput.rc 7 Jul 2002 23:42:22 -0000 1.21
--- DecalInput.rc 10 Sep 2002 05:19:25 -0000 1.22
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,0,0
! PRODUCTVERSION 2,3,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,0,0
! PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalInput Module\0"
! VALUE "FileVersion", "2, 3, 0, 0\0"
VALUE "InternalName", "DecalInput\0"
VALUE "LegalCopyright", "Copyright 2001\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalInput Module\0"
! VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "DecalInput\0"
VALUE "LegalCopyright", "Copyright 2001\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalInput Module\0"
! VALUE "ProductVersion", "2, 3, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalInput Module\0"
! VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-09-10 05:19:28
|
Update of /cvsroot/decaldev/source/DecalFilters
In directory usw-pr-cvs1:/tmp/cvs-serv23304/DecalFilters
Modified Files:
DecalFilters.rc
Log Message:
2.4 update
Index: DecalFilters.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/DecalFilters.rc,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** DecalFilters.rc 4 Sep 2002 02:04:20 -0000 1.45
--- DecalFilters.rc 10 Sep 2002 05:19:25 -0000 1.46
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,9
! PRODUCTVERSION 2,3,1,9
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,0,0
! PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalFilters Module\0"
! VALUE "FileVersion", "2, 3, 1, 9\0"
VALUE "InternalName", "DecalFilters\0"
VALUE "LegalCopyright", "Copyright 2001\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalFilters Module\0"
! VALUE "FileVersion", "2, 4, 0, 0\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, 9\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalFilters Module\0"
! VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-09-10 05:19:28
|
Update of /cvsroot/decaldev/source/DecalDat
In directory usw-pr-cvs1:/tmp/cvs-serv23304/DecalDat
Modified Files:
DecalDat.rc
Log Message:
2.4 update
Index: DecalDat.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DecalDat/DecalDat.rc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** DecalDat.rc 7 Jul 2002 23:42:22 -0000 1.21
--- DecalDat.rc 10 Sep 2002 05:19:25 -0000 1.22
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,0,0
! PRODUCTVERSION 2,3,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,0,0
! PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalDat Module\0"
! VALUE "FileVersion", "2, 3, 0, 0\0"
VALUE "InternalName", "DecalDat\0"
VALUE "LegalCopyright", "Copyright 2001\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalDat Module\0"
! VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "DecalDat\0"
VALUE "LegalCopyright", "Copyright 2001\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalDat Module\0"
! VALUE "ProductVersion", "2, 3, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalDat Module\0"
! VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-09-10 05:19:28
|
Update of /cvsroot/decaldev/source/Decal
In directory usw-pr-cvs1:/tmp/cvs-serv23304/Decal
Modified Files:
Decal.rc
Log Message:
2.4 update
Index: Decal.rc
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/Decal.rc,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Decal.rc 4 Sep 2002 02:04:20 -0000 1.28
--- Decal.rc 10 Sep 2002 05:19:25 -0000 1.29
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,9
! PRODUCTVERSION 2,3,1,9
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,0,0
! PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "Decal Module\0"
! VALUE "FileVersion", "2, 3, 1, 9\0"
VALUE "InternalName", "Decal\0"
VALUE "LegalCopyright", "Copyright 2001-2002\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "Decal Module\0"
! VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "Decal\0"
VALUE "LegalCopyright", "Copyright 2001-2002\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Decal Module\0"
! VALUE "ProductVersion", "2, 3, 1, 9\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Decal Module\0"
! VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
|
|
From: <go...@us...> - 2002-09-10 05:19:28
|
Update of /cvsroot/decaldev/source/DecalControls
In directory usw-pr-cvs1:/tmp/cvs-serv23304/DecalControls
Modified Files:
DecalControls.rc List.cpp
Log Message:
2.4 update
Index: DecalControls.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DecalControls/DecalControls.rc,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** DecalControls.rc 29 Jul 2002 06:05:12 -0000 1.32
--- DecalControls.rc 10 Sep 2002 05:19:25 -0000 1.33
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,3
! PRODUCTVERSION 2,3,1,3
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,4,0,0
! PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalControls Module\0"
! VALUE "FileVersion", "2, 3, 1, 3\0"
VALUE "InternalName", "DecalControls\0"
VALUE "LegalCopyright", "Copyright 2001\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DecalControls Module\0"
! VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "DecalControls\0"
VALUE "LegalCopyright", "Copyright 2001\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalControls Module\0"
! VALUE "ProductVersion", "2, 3, 1, 3\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DecalControls Module\0"
! VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
Index: List.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalControls/List.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** List.cpp 8 Sep 2002 23:47:24 -0000 1.18
--- List.cpp 10 Sep 2002 05:19:25 -0000 1.19
***************
*** 53,57 ****
if (m_colors) { /* cyn - 07/08/2002 */
! delete m_colors;
}
}
--- 53,57 ----
if (m_colors) { /* cyn - 07/08/2002 */
! delete[] m_colors;
}
}
***************
*** 82,86 ****
if (m_colors) { /* cyn - 07/08/2002 */
! delete m_colors;
}
m_colors = row.m_colors;
--- 82,86 ----
if (m_colors) { /* cyn - 07/08/2002 */
! delete[] m_colors;
}
m_colors = row.m_colors;
***************
*** 539,542 ****
--- 539,544 ----
STDMETHODIMP cList::put_Color(long nX, long nY, long newVal)
{
+ int i, j;
+
if (nX >= m_cols.size()) { /* cyn - 07/08/2002 */
return E_FAIL;
***************
*** 546,550 ****
if (!rowData.m_colors) {
! rowData.m_colors = new long[ m_cols.size() ];
if (!rowData.m_colors) {
return E_OUTOFMEMORY;
--- 548,553 ----
if (!rowData.m_colors) {
! j = m_cols.size();
! rowData.m_colors = new long[ j ];
if (!rowData.m_colors) {
return E_OUTOFMEMORY;
|
|
From: <ma...@us...> - 2002-09-08 23:47:27
|
Update of /cvsroot/decaldev/source/DecalControls
In directory usw-pr-cvs1:/tmp/cvs-serv10420
Modified Files:
List.cpp
Log Message:
Initialize colors to white when allocating, prevents random color garbage.
Index: List.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalControls/List.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** List.cpp 7 Aug 2002 23:59:40 -0000 1.17
--- List.cpp 8 Sep 2002 23:47:24 -0000 1.18
***************
*** 550,553 ****
--- 550,558 ----
return E_OUTOFMEMORY;
}
+
+ // Madar 9/8/2002: Initialize colors to white.
+ for (long loop = 0; loop < m_cols.size(); ++loop) {
+ rowData.m_colors[loop] = 0x00ffffff;
+ }
}
|
|
From: <ha...@us...> - 2002-09-05 11:19:54
|
Update of /cvsroot/decaldev/source/Inject
In directory usw-pr-cvs1:/tmp/cvs-serv25065
Modified Files:
Inject.idl
Log Message:
enum for combatstate
Index: Inject.idl
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/Inject.idl,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Inject.idl 24 Jul 2002 03:56:34 -0000 1.33
--- Inject.idl 5 Sep 2002 11:19:50 -0000 1.34
***************
*** 74,77 ****
--- 74,85 ----
};
+ enum eCombatState
+ {
+ ePeace = 1,
+ eMelee = 2,
+ eMissile = 3,
+ eMagic = 4
+ };
+
struct LayerParams
{
|
|
From: <go...@us...> - 2002-09-04 02:04:54
|
Update of /cvsroot/decaldev/source/Decal
In directory usw-pr-cvs1:/tmp/cvs-serv25708/Decal
Modified Files:
Decal.rc
Log Message:
Update install to 2.3.1.9
Index: Decal.rc
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/Decal.rc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Decal.rc 27 Aug 2002 19:41:19 -0000 1.27
--- Decal.rc 4 Sep 2002 02:04:20 -0000 1.28
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,8
! PRODUCTVERSION 2,3,1,8
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,3,1,9
! PRODUCTVERSION 2,3,1,9
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,78 ****
VALUE "CompanyName", "\0"
VALUE "FileDescription", "Decal Module\0"
! VALUE "FileVersion", "2, 3, 1, 8\0"
VALUE "InternalName", "Decal\0"
VALUE "LegalCopyright", "Copyright 2001-2002\0"
--- 74,78 ----
VALUE "CompanyName", "\0"
VALUE "FileDescription", "Decal Module\0"
! VALUE "FileVersion", "2, 3, 1, 9\0"
VALUE "InternalName", "Decal\0"
VALUE "LegalCopyright", "Copyright 2001-2002\0"
***************
*** 82,86 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Decal Module\0"
! VALUE "ProductVersion", "2, 3, 1, 8\0"
VALUE "SpecialBuild", "\0"
END
--- 82,86 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Decal Module\0"
! VALUE "ProductVersion", "2, 3, 1, 9\0"
VALUE "SpecialBuild", "\0"
END
|
