decaldev-cvscommit

[Decaldev-cvscommit] source: Added DamageBonus to WorldObject ID information

[John D. <go...@us...>]

Log Message:
-----------
Added DamageBonus to WorldObject ID information

Modified Files:
--------------
    /cvsroot/decaldev/source/DecalFilters:
        DecalFilters.idl
        World.cpp
        World.h
        WorldObject.cpp
        WorldObject.h

Revision Data
-------------
Index: DecalFilters.idl
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/DecalFilters.idl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- DecalFilters.idl	13 Sep 2003 17:57:09 -0000	1.36
+++ DecalFilters.idl	18 Sep 2003 02:55:31 -0000	1.37
@@ -577,6 +577,7 @@
 		[propget, id(83), helpstring("property FireProt")]     HRESULT FireProt([out, retval] float *pVal);
 		[propget, id(84), helpstring("property ElectProt")]    HRESULT ElectProt([out, retval] float *pVal);
 		[propget, id(85), helpstring("property RaceReq")]      HRESULT RaceReq([out, retval] BSTR *pVal);
+		[propget, id(86), helpstring("property DamageBonus")]  HRESULT DamageBonus([out, retval] float *pVal);
 	};
 
 	[
Index: World.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/World.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- World.cpp	14 Sep 2003 19:25:55 -0000	1.55
+++ World.cpp	18 Sep 2003 02:55:31 -0000	1.56
@@ -46,6 +46,7 @@
 BSTR strskill ;
 BSTR strdamage ;
 BSTR strdamageRange ;
+BSTR strdamageBonus ;
 BSTR strrange ;
 BSTR strdefenseBonus ;
 BSTR strattackBonus ;
@@ -194,6 +195,7 @@
 	SysReAllocString( &strskill, L"skill") ;
 	SysReAllocString( &strdamage, L"damage") ;
 	SysReAllocString( &strdamageRange, L"damageRange") ;
+	SysReAllocString( &strdamageBonus, L"damageBonus") ;
 	SysReAllocString( &strrange, L"range") ;
 	SysReAllocString( &strdefenseBonus, L"defenseBonus") ;
 	SysReAllocString( &strattackBonus, L"attackBonus") ;
@@ -356,6 +358,7 @@
 	SysFreeString(strskill) ;
 	SysFreeString(strdamage) ;
 	SysFreeString(strdamageRange) ;
+	SysFreeString(strdamageBonus) ;
 	SysFreeString(strrange) ;
 	SysFreeString(strdefenseBonus) ;
 	SysFreeString(strattackBonus) ;
@@ -986,6 +989,7 @@
 		pMembers->get_NextInt(strskill, &(pData->m_EquipSkill)) ;
 		pMembers->get_NextInt(strdamage, &(pData->m_MaxDamage)) ;
 		pMembers->get_NextFloat(strdamageRange, &(pData->m_Variance)) ;
+		pMembers->get_NextFloat(strdamageBonus, &(pData->m_DamageBonus)) ;
 		pMembers->get_NextFloat(strrange, &(pData->m_Range)) ;
 		pMembers->get_NextFloat(strdefenseBonus, &(pData->m_DefenseBonus)) ;
 		pMembers->get_NextFloat(strattackBonus, &(pData->m_AttackBonus)) ;
Index: World.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/World.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- World.h	30 Aug 2003 16:57:22 -0000	1.37
+++ World.h	18 Sep 2003 02:55:31 -0000	1.38
@@ -72,6 +72,7 @@
 		m_fyHeading = 0.0f;
 		m_fzHeading = 0.0f;
 		m_fwHeading = 0.0f;
+		m_DamageBonus = 0.0f;
 		m_nItemSlots = 0;
 		m_nPackSlots = 0;
 		m_nUsesLeft = 0;
@@ -165,6 +166,7 @@
 	float m_fzHeading;
 	float m_fwHeading;
 	float m_fApproachDistance ;
+	float m_DamageBonus ;
 	BYTE m_nItemSlots;
 	BYTE m_nPackSlots;
 	WORD m_nUsesLeft;
Index: WorldObject.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/WorldObject.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- WorldObject.cpp	30 Aug 2003 16:57:22 -0000	1.23
+++ WorldObject.cpp	18 Sep 2003 02:55:31 -0000	1.24
@@ -652,3 +652,13 @@
 	return S_OK ;
 }
 
+STDMETHODIMP cWorldObject::get_DamageBonus(float *pVal)
+{
+	if (!pVal) {
+		_ASSERT(FALSE) ;
+		return E_POINTER ;
+	}
+	*pVal = m_p->m_DamageBonus ;
+	return S_OK ;
+}
+
Index: WorldObject.h
===================================================================
RCS file: /cvsroot/decaldev/source/DecalFilters/WorldObject.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- WorldObject.h	30 Aug 2003 16:57:22 -0000	1.19
+++ WorldObject.h	18 Sep 2003 02:55:31 -0000	1.20
@@ -122,6 +122,7 @@
 	STDMETHOD(get_FireProt)(/*[out, retval]*/ float *pVal);
 	STDMETHOD(get_ElectProt)(/*[out, retval]*/ float *pVal);
 	STDMETHOD(get_RaceReq)(/*[out, retval]*/ BSTR *pVal);
+	STDMETHOD(get_DamageBonus)(/*[out, retval]*/ float *pVal);
 
 	// IWorldObject2
 	STDMETHOD(get_Flags)(/*[out, retval]*/ long *pVal);

[Decaldev-cvscommit] source: Added DamageBonus to WorldObject ID information

[John D. <go...@us...>]

Log Message:
-----------
Added DamageBonus to WorldObject ID information

Modified Files:
--------------
    /cvsroot/decaldev/source/Inject:
        Panel.cpp
        View.cpp
        View.h

Revision Data
-------------
Index: Panel.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/Panel.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Panel.cpp	2 Oct 2003 11:49:59 -0000	1.16
+++ Panel.cpp	5 Oct 2003 18:00:41 -0000	1.17
@@ -240,10 +240,15 @@
 
    m_pcView = (cView*)pView;
 
+	VARIANT_BOOL isTransparent=VARIANT_FALSE ;
+	if (m_pcView)	m_pcView->get_Transparent(&isTransparent) ;
+	put_Transparent(isTransparent) ;
+
    if( m_pVP->alpha == -1 )
 	   m_pSite->put_Alpha( m_Alpha );
    else
 	   m_pSite->put_Alpha( m_pVP->alpha );
+
 
 #ifdef _DEBUG
    // Make sure the child exists
Index: View.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/View.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- View.cpp	2 Oct 2003 18:31:54 -0000	1.28
+++ View.cpp	5 Oct 2003 18:00:41 -0000	1.29
@@ -444,7 +444,11 @@
 	if( pVal == NULL )
 		return E_POINTER;
 
-	*pVal = m_VP.alpha;
+	if (m_bTransparent) {
+		*pVal = m_lOldAlpha ;
+	} else {
+		*pVal = m_VP.alpha;
+	}
 	return S_OK;
 }
 
@@ -493,17 +497,16 @@
 			return S_OK;
 
 		m_bTransparent = false;
-		m_VP.alpha = m_lOldTrans;
+		m_VP.alpha = m_lOldAlpha;
 		m_pPanel->put_Transparent( VARIANT_FALSE );
 	}
-
 	else
 	{
 		if( m_bTransparent )
 			return S_OK;
 
 		m_bTransparent = true;
-		m_lOldTrans = m_VP.alpha;
+		m_lOldAlpha = m_VP.alpha;
 		m_VP.alpha = 255;
 		m_pPanel->put_Transparent( VARIANT_TRUE );
 	}
Index: View.h
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/View.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- View.h	28 Sep 2003 19:05:05 -0000	1.13
+++ View.h	5 Oct 2003 18:00:41 -0000	1.14
@@ -22,7 +22,7 @@
 	cView( )
 	{
 		m_VP.alpha = -1;
-		m_lOldTrans = 255;
+		m_lOldAlpha = 255;
 	}
 
    ~cView();
@@ -36,7 +36,7 @@
    CComPtr< IPanel > m_pPanel;
       
    ViewParams m_VP;
-   long		m_lOldTrans;
+   long		m_lOldAlpha;
    bool		m_bTransparent;
 
    // Named controls