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

Fix compiling under windows

Browse source
This commit is contained in:
Nimetu 2015-04-20 01:04:52 +03:00
parent c047d7a581
commit 6a2a6ba6ea
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/include/nel/gui/group_html.h
View file

@ -249,10 +249,10 @@ namespace NLGUI
virtual void addText (const char * buf, int len); virtual void addText (const char * buf, int len);
// A link has been parsed // A link has been parsed
virtual void addLink (uint element_number, const BOOL *present, const char **value); virtual void addLink (uint element_number, const std::vector<bool> &present, const std::vector<const char *> &value);
// A new begin HTML element has been parsed (<IMG> for exemple) // A new begin HTML element has been parsed (<IMG> for exemple)
virtual void beginElement (uint element_number, const BOOL *present, const char **value); virtual void beginElement (uint element_number, const std::vector<bool> &present, const std::vector<const char *> &value);
// A new end HTML element has been parsed (</IMG> for exemple) // A new end HTML element has been parsed (</IMG> for exemple)
virtual void endElement (uint element_number); virtual void endElement (uint element_number);

2
code/nel/include/nel/gui/libwww_types.h
View file

@ -32,8 +32,6 @@
#ifndef CL_LIB_WWW_TYPES_H #ifndef CL_LIB_WWW_TYPES_H
#define CL_LIB_WWW_TYPES_H #define CL_LIB_WWW_TYPES_H
typedef char BOOL;
// //
// LibWWW elements // LibWWW elements
// - order must be kept for backward compatibility, new tags can be added to the end // - order must be kept for backward compatibility, new tags can be added to the end

10
code/nel/src/gui/group_html.cpp
View file

@ -674,7 +674,7 @@ namespace NLGUI
// *************************************************************************** // ***************************************************************************
void CGroupHTML::addLink (uint element_number, const BOOL *present, const char **value) void CGroupHTML::addLink (uint element_number, const std::vector<bool> &present, const std::vector<const char *> &value)
{ {
if (_Browsing) if (_Browsing)
{ {
@ -982,7 +982,7 @@ namespace NLGUI
// *************************************************************************** // ***************************************************************************
void CGroupHTML::beginElement (uint element_number, const BOOL *present, const char **value) void CGroupHTML::beginElement (uint element_number, const std::vector<bool> &present, const std::vector<const char *> &value)
{ {
if (_Browsing) if (_Browsing)
{ {
@ -4604,7 +4604,7 @@ namespace NLGUI
CLuaIHM::checkArgType(ls, funcName, 2, LUA_TTABLE); CLuaIHM::checkArgType(ls, funcName, 2, LUA_TTABLE);
uint element_number = (uint)ls.toNumber(1); uint element_number = (uint)ls.toNumber(1);
std::vector<BOOL> present; std::vector<bool> present;
std::vector<const char *> value; std::vector<const char *> value;
present.resize(30, false); present.resize(30, false);
value.resize(30); value.resize(30);
@ -4638,9 +4638,9 @@ namespace NLGUI
value.insert(value.begin() + (uint)it.nextKey().toNumber(), buffer); value.insert(value.begin() + (uint)it.nextKey().toNumber(), buffer);
} }
beginElement(element_number, &present[0], &value[0]); beginElement(element_number, present, value);
if (element_number == HTML_A) if (element_number == HTML_A)
addLink(element_number, &present[0], &value[0]); addLink(element_number, present, value);
return 0; return 0;
} }

6
code/nel/src/gui/group_html_parser.cpp
View file

@ -39,9 +39,11 @@ namespace NLGUI
{ {
CXMLAutoPtr ptr; CXMLAutoPtr ptr;
// load attributes into libwww structs // load attributes into libwww structs
BOOL present[MAX_ATTRIBUTES] = {0}; std::vector<bool> present;
const char *value[MAX_ATTRIBUTES] = {NULL}; std::vector<const char *>value;
std::string strvalues[MAX_ATTRIBUTES]; std::string strvalues[MAX_ATTRIBUTES];
present.resize(30, false);
value.resize(30);
uint nbAttributes = std::min(MAX_ATTRIBUTES, HTML_DTD->tags[element_number].number_of_attributes); uint nbAttributes = std::min(MAX_ATTRIBUTES, HTML_DTD->tags[element_number].number_of_attributes);
for(uint i=0; i<nbAttributes; i++) for(uint i=0; i<nbAttributes; i++)

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

@ -215,7 +215,7 @@ void CGroupQuickHelp::setGroupTextSize (CInterfaceGroup *group, bool selected)
extern CActionsContext ActionsContext; extern CActionsContext ActionsContext;
void CGroupQuickHelp::beginElement (uint element_number, const BOOL *present, const char **value) void CGroupQuickHelp::beginElement (uint element_number, const std::vector<bool> &present, const std::vector<const char *>&value)
{ {
CGroupHTML::beginElement (element_number, present, value); CGroupHTML::beginElement (element_number, present, value);

2
code/ryzom/client/src/interface_v3/group_quick_help.h
View file

@ -48,7 +48,7 @@ private:
virtual void updateCoords(); virtual void updateCoords();
// From CGroupHTML // From CGroupHTML
virtual void beginElement (uint element_number, const BOOL *present, const char **value); virtual void beginElement (uint element_number, const std::vector<bool> &present, const std::vector<const char *>&value);
virtual void endBuild (); virtual void endBuild ();
virtual void browse (const char *url); virtual void browse (const char *url);
virtual std::string home(); virtual std::string home();