[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