From 5d87c7e8236c80ce2778993c6598c57a80327f7b Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 4 Jun 2011 13:48:27 +0200 Subject: [PATCH] Changed: #878 Fix typos in comments/code --- .../lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h | 6 ++++-- .../tools/leveldesign/georges_dll/cool_dialog_bar.cpp | 9 ++++----- .../georges_plugin_sound/listener_view.cpp | 11 ++++++++--- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h index 0e1434c3b..69eed259a 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/cj60/CJOutlookBar.h @@ -76,10 +76,12 @@ protected: public: CContentItems( UINT nID, CString str ) : - m_nImageID( nID ), m_csText( str ) { + m_nImageID( nID ), m_csText( str ) + { } - void operator = ( CContentItems& pItems ) { + void operator = ( CContentItems& pItems ) + { m_nImageID = pItems.m_nImageID; m_csText = pItems.m_csText; } diff --git a/code/ryzom/tools/leveldesign/georges_dll/cool_dialog_bar.cpp b/code/ryzom/tools/leveldesign/georges_dll/cool_dialog_bar.cpp index 801cc4ea5..765c7c272 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/cool_dialog_bar.cpp +++ b/code/ryzom/tools/leveldesign/georges_dll/cool_dialog_bar.cpp @@ -568,8 +568,8 @@ void CCoolDialogBar::DrawGripper(CDC & dc) ScreenToClient( gripper ); gripper.OffsetRect( -gripper.left, -gripper.top ); - if( m_dwStyle & CBRS_ORIENT_HORZ ) { - + if( m_dwStyle & CBRS_ORIENT_HORZ ) + { // gripper at left m_rectGripper.top = gripper.top + 40; m_rectGripper.bottom = gripper.bottom; @@ -597,9 +597,8 @@ void CCoolDialogBar::DrawGripper(CDC & dc) gripper.OffsetRect(4, 0); dc.Draw3dRect( gripper, m_clrBtnHilight, m_clrBtnShadow ); } - - else { - + else + { // gripper at top m_rectGripper.top = gripper.top; m_rectGripper.bottom = gripper.top + 20; diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/listener_view.cpp b/code/ryzom/tools/leveldesign/georges_plugin_sound/listener_view.cpp index 426f6c50e..7352be953 100644 --- a/code/ryzom/tools/leveldesign/georges_plugin_sound/listener_view.cpp +++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/listener_view.cpp @@ -258,15 +258,20 @@ void CListenerView::OnDraw(CDC* dc) // linearly descending volume on a dB scale double db1 = -100.0 * (x - _MinDist) / (_MaxDist - _MinDist); - if (_Alpha == 0.0) { + if (_Alpha == 0.0) + { y = db1; - } else if (_Alpha > 0.0) { + } + else if (_Alpha > 0.0) + { double amp2 = 0.0001 + 0.9999 * (_MaxDist - x) / (_MaxDist - _MinDist); // linear amp between 0.00001 and 1.0 double db2 = 20. * log10(amp2); y = ((1.0 - _Alpha) * db1 + _Alpha * db2); - } else if (_Alpha < 0.0) { + } + else if (_Alpha < 0.0) + { double amp3 = _MinDist / x; // linear amplitude is 1/distance double db3 = 20.0 * log10(amp3); y = ((1.0 + _Alpha) * db1 - _Alpha * db3);