Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #825 Remove all warning when compiling Ryzom on Linux

Browse source
This commit is contained in:
kervala 2010-06-12 13:01:00 +02:00
parent f0af732417
commit a6d55108f2
8 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/ryzom/client/src/interface_v3/bot_chat_manager.cpp
View file

@ -239,7 +239,8 @@ void CBotChatManager::debugLocalReceiveMissionInfo()
{ {
viewTextID->setTextId(infos.Prerequisits[i].Description); viewTextID->setTextId(infos.Prerequisits[i].Description);
} }
/*if (!help->ScrollTextGroup.empty()) #if 0
if (!help->ScrollTextGroup.empty())
{ {
CInterfaceGroup *viewTextGroup = help->HelpWindow->getGroup(help->ScrollTextGroup); CInterfaceGroup *viewTextGroup = help->HelpWindow->getGroup(help->ScrollTextGroup);
if (viewTextGroup) if (viewTextGroup)
@ -248,8 +249,8 @@ void CBotChatManager::debugLocalReceiveMissionInfo()
CInterfaceGroup *viewTextGroup = help->HelpWindow->getGroup(help->ScrollTextIdGroup); CInterfaceGroup *viewTextGroup = help->HelpWindow->getGroup(help->ScrollTextIdGroup);
if (viewTextGroup) if (viewTextGroup)
viewTextGroup->setActive(true); viewTextGroup->setActive(true);
*/ #endif
/* } }
_MissionHelpWindowsWaiting.erase(index); _MissionHelpWindowsWaiting.erase(index);
} }

6
code/ryzom/client/src/interface_v3/chat_window.cpp
View file

@ -69,9 +69,9 @@ extern CClientChatManager ChatMngr;
CChatWindowDesc::CChatWindowDesc() : InsertPosition(-1), CChatWindowDesc::CChatWindowDesc() : InsertPosition(-1),
ParentBlink(false), ParentBlink(false),
Listener(NULL),
Savable(false), 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)
{ {
} }

2
code/ryzom/client/src/interface_v3/ctrl_button.cpp
View file

@ -192,6 +192,8 @@ void CCtrlButton::draw ()
} }
} }
break; break;
default:
break;
} }
color.A = (uint8)(((sint32)color.A*((sint32)globalColor.A+1))>>8); color.A = (uint8)(((sint32)color.A*((sint32)globalColor.A+1))>>8);

2
code/ryzom/client/src/interface_v3/ctrl_text_button.cpp
View file

@ -342,6 +342,8 @@ void CCtrlTextButton::draw ()
} }
} }
break; break;
default:
break;
} }
// *** Draw // *** Draw

3
code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
View file

@ -126,7 +126,7 @@ bool CDBGroupListSheetText::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
// get item size. // get item size.
CViewRenderer &rVR = pIM->getViewRenderer(); CViewRenderer &rVR = pIM->getViewRenderer();
sint32 dispSlotBmpId; sint32 dispSlotBmpId = 0;
switch(_CtrlInfo._Type) switch(_CtrlInfo._Type)
{ {
case CCtrlSheetInfo::SheetType_Auto: 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_Macro: dispSlotBmpId = rVR.getTextureIdFromName ("w_slot_brick.tga"); break;
case CCtrlSheetInfo::SheetType_GuildFlag: dispSlotBmpId = rVR.getTextureIdFromName ("w_slot_blason.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; case CCtrlSheetInfo::SheetType_ElevatorDestination: dispSlotBmpId = rVR.getTextureIdFromName ("w_slot_blason.tga"); break;
default: break;
} }
rVR.getTextureSizeFromId (dispSlotBmpId, _WSlot, _HSlot); rVR.getTextureSizeFromId (dispSlotBmpId, _WSlot, _HSlot);

4
code/ryzom/client/src/interface_v3/group_table.cpp
View file

@ -615,6 +615,8 @@ void CGroupTable::updateCoords()
alignmentX = _Columns[column].Width - cell->WidthMax; alignmentX = _Columns[column].Width - cell->WidthMax;
widthReduceX = alignmentX; widthReduceX = alignmentX;
break; break;
default:
break;
} }
} }
@ -665,6 +667,8 @@ void CGroupTable::updateCoords()
case CGroupCell::Bottom: case CGroupCell::Bottom:
alignmentY = _Rows[row].Height - (sint32)cell->Group->getH(); alignmentY = _Rows[row].Height - (sint32)cell->Group->getH();
break; break;
default:
break;
} }
} }

2
code/ryzom/client/src/interface_v3/interface_link.cpp
View file

@ -123,6 +123,8 @@ static bool affect(const CInterfaceExprValue &value, CInterfaceElement &destElem
return false; return false;
} }
break; break;
default:
break;
} }
return true; return true;

2
code/ryzom/client/src/interface_v3/interface_manager.cpp
View file

@ -2907,7 +2907,7 @@ bool CInterfaceManager::handleEvent (const CEventDescriptor& event)
// window handling. if not handled by a control // window handling. if not handled by a control
if (!handled) 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; CEventDescriptorMouse ev2 = eventDesc;
sint32 x= eventDesc.getX(), y = eventDesc.getY(); sint32 x= eventDesc.getX(), y = eventDesc.getY();