diff --git a/code/ryzom/client/src/interface_v3/bot_chat_manager.cpp b/code/ryzom/client/src/interface_v3/bot_chat_manager.cpp index 984e05700..1e1f123db 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_manager.cpp +++ b/code/ryzom/client/src/interface_v3/bot_chat_manager.cpp @@ -239,7 +239,8 @@ void CBotChatManager::debugLocalReceiveMissionInfo() { viewTextID->setTextId(infos.Prerequisits[i].Description); } - /*if (!help->ScrollTextGroup.empty()) +#if 0 + if (!help->ScrollTextGroup.empty()) { CInterfaceGroup *viewTextGroup = help->HelpWindow->getGroup(help->ScrollTextGroup); if (viewTextGroup) @@ -248,8 +249,8 @@ void CBotChatManager::debugLocalReceiveMissionInfo() CInterfaceGroup *viewTextGroup = help->HelpWindow->getGroup(help->ScrollTextIdGroup); if (viewTextGroup) viewTextGroup->setActive(true); - */ -/* } +#endif + } _MissionHelpWindowsWaiting.erase(index); } diff --git a/code/ryzom/client/src/interface_v3/chat_window.cpp b/code/ryzom/client/src/interface_v3/chat_window.cpp index a842de29b..6be8d315b 100644 --- a/code/ryzom/client/src/interface_v3/chat_window.cpp +++ b/code/ryzom/client/src/interface_v3/chat_window.cpp @@ -69,9 +69,9 @@ extern CClientChatManager ChatMngr; CChatWindowDesc::CChatWindowDesc() : InsertPosition(-1), ParentBlink(false), - Listener(NULL), Savable(false), - Localize(false) + Localize(false), + Listener(NULL) { } @@ -80,7 +80,7 @@ CChatWindowDesc::CChatWindowDesc() : InsertPosition(-1), ///////////////// //================================================================================= -CChatWindow::CChatWindow() : _Listener(NULL), _Chat(NULL), _ParentBlink(false), _EB(NULL) +CChatWindow::CChatWindow() : _Listener(NULL), _Chat(NULL), _EB(NULL), _ParentBlink(false) { } diff --git a/code/ryzom/client/src/interface_v3/ctrl_button.cpp b/code/ryzom/client/src/interface_v3/ctrl_button.cpp index 887d32b17..17d89e900 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_button.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_button.cpp @@ -192,6 +192,8 @@ void CCtrlButton::draw () } } break; + default: + break; } color.A = (uint8)(((sint32)color.A*((sint32)globalColor.A+1))>>8); diff --git a/code/ryzom/client/src/interface_v3/ctrl_text_button.cpp b/code/ryzom/client/src/interface_v3/ctrl_text_button.cpp index 358532c0e..d2191a4eb 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_text_button.cpp +++ b/code/ryzom/client/src/interface_v3/ctrl_text_button.cpp @@ -342,6 +342,8 @@ void CCtrlTextButton::draw () } } break; + default: + break; } // *** Draw diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp index 559bd44d4..40e62346f 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp +++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp @@ -126,7 +126,7 @@ bool CDBGroupListSheetText::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup) // get item size. CViewRenderer &rVR = pIM->getViewRenderer(); - sint32 dispSlotBmpId; + sint32 dispSlotBmpId = 0; switch(_CtrlInfo._Type) { case CCtrlSheetInfo::SheetType_Auto: @@ -144,6 +144,7 @@ bool CDBGroupListSheetText::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup) case CCtrlSheetInfo::SheetType_Macro: dispSlotBmpId = rVR.getTextureIdFromName ("w_slot_brick.tga"); break; case CCtrlSheetInfo::SheetType_GuildFlag: dispSlotBmpId = rVR.getTextureIdFromName ("w_slot_blason.tga"); break; case CCtrlSheetInfo::SheetType_ElevatorDestination: dispSlotBmpId = rVR.getTextureIdFromName ("w_slot_blason.tga"); break; + default: break; } rVR.getTextureSizeFromId (dispSlotBmpId, _WSlot, _HSlot); diff --git a/code/ryzom/client/src/interface_v3/group_table.cpp b/code/ryzom/client/src/interface_v3/group_table.cpp index 2f4b018c1..48ec926a4 100644 --- a/code/ryzom/client/src/interface_v3/group_table.cpp +++ b/code/ryzom/client/src/interface_v3/group_table.cpp @@ -615,6 +615,8 @@ void CGroupTable::updateCoords() alignmentX = _Columns[column].Width - cell->WidthMax; widthReduceX = alignmentX; break; + default: + break; } } @@ -665,6 +667,8 @@ void CGroupTable::updateCoords() case CGroupCell::Bottom: alignmentY = _Rows[row].Height - (sint32)cell->Group->getH(); break; + default: + break; } } diff --git a/code/ryzom/client/src/interface_v3/interface_link.cpp b/code/ryzom/client/src/interface_v3/interface_link.cpp index f102855b3..e8f583bea 100644 --- a/code/ryzom/client/src/interface_v3/interface_link.cpp +++ b/code/ryzom/client/src/interface_v3/interface_link.cpp @@ -123,6 +123,8 @@ static bool affect(const CInterfaceExprValue &value, CInterfaceElement &destElem return false; } break; + default: + break; } return true; diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp index 4fdc00375..16c85edf2 100644 --- a/code/ryzom/client/src/interface_v3/interface_manager.cpp +++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp @@ -2907,7 +2907,7 @@ bool CInterfaceManager::handleEvent (const CEventDescriptor& event) // window handling. if not handled by a control if (!handled) { - if ((pNewCurrentWnd != NULL) && _ModalStack.empty() || (!_ModalStack.empty() && _ModalStack.back().ModalWindow == pNewCurrentWnd)) + if (((pNewCurrentWnd != NULL) && _ModalStack.empty()) || ((!_ModalStack.empty() && _ModalStack.back().ModalWindow == pNewCurrentWnd))) { CEventDescriptorMouse ev2 = eventDesc; sint32 x= eventDesc.getX(), y = eventDesc.getY();