Changed: #825 Remove all warning when compiling Ryzom
This commit is contained in:
parent
85d3d6e68c
commit
b485e6e986
10 changed files with 100 additions and 16 deletions
|
@ -70,7 +70,7 @@ CDBGroupListSheet::CDBGroupListSheet(const TCtorParam ¶m)
|
||||||
_TopMargin= 0;
|
_TopMargin= 0;
|
||||||
_BottomMargin= 0;
|
_BottomMargin= 0;
|
||||||
_StartDbIdx= 0;
|
_StartDbIdx= 0;
|
||||||
_ColumnMax= ~0;
|
_ColumnMax= std::numeric_limits<uint>::max();
|
||||||
_ColumnFactor= 1;
|
_ColumnFactor= 1;
|
||||||
_ColumnCenter= false;
|
_ColumnCenter= false;
|
||||||
_NeedToSort = true;
|
_NeedToSort = true;
|
||||||
|
|
|
@ -54,8 +54,8 @@ CGroupEditBox::CGroupEditBox(const TCtorParam ¶m) :
|
||||||
_ViewText(NULL),
|
_ViewText(NULL),
|
||||||
_Setupped(false),
|
_Setupped(false),
|
||||||
_EntryType(Text),
|
_EntryType(Text),
|
||||||
_MaxNumChar(~0),
|
_MaxNumChar(std::numeric_limits<uint32>::max()),
|
||||||
_MaxNumReturn(~0),
|
_MaxNumReturn(std::numeric_limits<uint32>::max()),
|
||||||
_MaxFloatPrec(20),
|
_MaxFloatPrec(20),
|
||||||
_MaxCharsSize(32768),
|
_MaxCharsSize(32768),
|
||||||
_CursorAtPreviousLineEnd(false),
|
_CursorAtPreviousLineEnd(false),
|
||||||
|
|
|
@ -77,7 +77,7 @@ void CViewText::setupDefault ()
|
||||||
|
|
||||||
_TextSelection= false;
|
_TextSelection= false;
|
||||||
_TextSelectionStart= 0;
|
_TextSelectionStart= 0;
|
||||||
_TextSelectionEnd= ~0;
|
_TextSelectionEnd= std::numeric_limits<uint>::max();
|
||||||
|
|
||||||
_InvalidTextContext= true;
|
_InvalidTextContext= true;
|
||||||
_FirstLineX = 0;
|
_FirstLineX = 0;
|
||||||
|
@ -1795,7 +1795,7 @@ void CViewText::disableStringSelection()
|
||||||
{
|
{
|
||||||
_TextSelection= false;
|
_TextSelection= false;
|
||||||
_TextSelectionStart= 0;
|
_TextSelectionStart= 0;
|
||||||
_TextSelectionEnd= ~0;
|
_TextSelectionEnd= std::numeric_limits<uint>::max();
|
||||||
}
|
}
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
|
|
|
@ -456,7 +456,7 @@ void CUserEntity::updateVisualPropertyBehaviour(const NLMISC::TGameCycle &/* gam
|
||||||
bc.BehavTime = TimeInSec;
|
bc.BehavTime = TimeInSec;
|
||||||
if(VerboseAnimUser)
|
if(VerboseAnimUser)
|
||||||
{
|
{
|
||||||
nlinfo("UE::updateVPBeha: '%d(%s)'.", (int)bc.Behav.Behaviour, MBEHAV::behaviourToString(bc.Behav.Behaviour).c_str());
|
nlinfo("UE::updateVPBeha: '%d(%s)'.", (sint)bc.Behav.Behaviour, MBEHAV::behaviourToString(bc.Behav.Behaviour).c_str());
|
||||||
}
|
}
|
||||||
CCDBNodeLeaf *targetList0 = dynamic_cast<CCDBNodeLeaf *>(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_0));
|
CCDBNodeLeaf *targetList0 = dynamic_cast<CCDBNodeLeaf *>(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_0));
|
||||||
CCDBNodeLeaf *targetList1 = dynamic_cast<CCDBNodeLeaf *>(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_1));
|
CCDBNodeLeaf *targetList1 = dynamic_cast<CCDBNodeLeaf *>(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_1));
|
||||||
|
@ -1192,7 +1192,10 @@ void CUserEntity::applyMotion(CEntityCL *target)
|
||||||
if(UserControls.isInternalView())
|
if(UserControls.isInternalView())
|
||||||
{
|
{
|
||||||
// If the server is slow, the client move slower too (only needed in FPV).
|
// If the server is slow, the client move slower too (only needed in FPV).
|
||||||
speed *= (100.0f/(float)NetMngr.getMsPerTick());
|
double modif = (100.0f/(float)NetMngr.getMsPerTick());
|
||||||
|
// don't increase speed
|
||||||
|
clamp(modif, 0.0, 1.0);
|
||||||
|
speed *= modif;
|
||||||
// Move
|
// Move
|
||||||
_HasMoved = true;
|
_HasMoved = true;
|
||||||
_Primitive->move(speed, dynamicWI);
|
_Primitive->move(speed, dynamicWI);
|
||||||
|
|
|
@ -1477,7 +1477,7 @@ void displayValueLine( const std::string& propName, const char *valueFormat, con
|
||||||
|
|
||||||
// This specialisation is necessary to compile it with gcc because of toString( valueFormat, value() )
|
// This specialisation is necessary to compile it with gcc because of toString( valueFormat, value() )
|
||||||
template <>
|
template <>
|
||||||
void displayValueLine<struct CEntityId>( const std::string& propName, const char * /* valueFormat */, const char *typeString, CEntityId*, const CMirroredDataSet *dataset, const TDataSetRow& entityIndex, TPropertyIndex propIndex, const char *flagsString, NLMISC::CLog& log, bool /* typeIsBool */, bool typeIsEntityId )
|
inline void displayValueLine<struct CEntityId>( const std::string& propName, const char * /* valueFormat */, const char *typeString, CEntityId*, const CMirroredDataSet *dataset, const TDataSetRow& entityIndex, TPropertyIndex propIndex, const char *flagsString, NLMISC::CLog& log, bool /* typeIsBool */, bool typeIsEntityId )
|
||||||
{
|
{
|
||||||
CMirrorPropValue<CEntityId> value( const_cast<CMirroredDataSet&>(*dataset), entityIndex, propIndex );
|
CMirrorPropValue<CEntityId> value( const_cast<CMirroredDataSet&>(*dataset), entityIndex, propIndex );
|
||||||
TValueToStringFunc valueToString;
|
TValueToStringFunc valueToString;
|
||||||
|
|
|
@ -378,7 +378,7 @@ class ICallStackEntry
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ICallStackEntry();
|
ICallStackEntry();
|
||||||
~ICallStackEntry();
|
virtual ~ICallStackEntry();
|
||||||
void displayStack(NLMISC::CLog& log) const;
|
void displayStack(NLMISC::CLog& log) const;
|
||||||
|
|
||||||
virtual void displayEntry(NLMISC::CLog& log) const=0;
|
virtual void displayEntry(NLMISC::CLog& log) const=0;
|
||||||
|
|
|
@ -16,6 +16,9 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef RYAI_SPAWN_COMMANDS_H
|
||||||
|
#define RYAI_SPAWN_COMMANDS_H
|
||||||
|
|
||||||
#include "nel/misc/types_nl.h"
|
#include "nel/misc/types_nl.h"
|
||||||
#include "nel/misc/debug.h"
|
#include "nel/misc/debug.h"
|
||||||
|
|
||||||
|
@ -52,3 +55,5 @@
|
||||||
//
|
//
|
||||||
// static CAISpawnCtrl *_instance;
|
// static CAISpawnCtrl *_instance;
|
||||||
//};
|
//};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
@ -16,6 +16,8 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef RYAI_TYPES_H
|
||||||
|
#define RYAI_TYPES_H
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
@ -23,9 +25,6 @@
|
||||||
#include "nel/misc/string_mapper.h"
|
#include "nel/misc/string_mapper.h"
|
||||||
#include "nel/misc/algo.h"
|
#include "nel/misc/algo.h"
|
||||||
|
|
||||||
#ifndef RYAI_TYPES_H
|
|
||||||
#define RYAI_TYPES_H
|
|
||||||
|
|
||||||
// Be carefull when implementing new types :
|
// Be carefull when implementing new types :
|
||||||
// always create a badtype at the end of lists ( see others implementations as examples ).
|
// always create a badtype at the end of lists ( see others implementations as examples ).
|
||||||
// don't forget to fill the .cpp part .. :)
|
// don't forget to fill the .cpp part .. :)
|
||||||
|
@ -50,7 +49,7 @@ namespace AITYPES
|
||||||
class CDescTypeEntry
|
class CDescTypeEntry
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CDescTypeEntry(char *name, T value) : _name(name), _value(value) {}
|
CDescTypeEntry(const char *name, T value) : _name(name), _value(value) {}
|
||||||
const char *_name;
|
const char *_name;
|
||||||
T _value;
|
T _value;
|
||||||
};
|
};
|
||||||
|
|
|
@ -27,13 +27,12 @@
|
||||||
#include "game_share/backup_service_interface.h"
|
#include "game_share/backup_service_interface.h"
|
||||||
|
|
||||||
#include "server_share/r2_variables.h"
|
#include "server_share/r2_variables.h"
|
||||||
|
#include "server_share/log_chat_gen.h"
|
||||||
|
|
||||||
#include "chat_manager.h"
|
#include "chat_manager.h"
|
||||||
#include "input_output_service.h"
|
#include "input_output_service.h"
|
||||||
#include "chat_unifier_client.h"
|
#include "chat_unifier_client.h"
|
||||||
|
|
||||||
#include "server_share/log_chat_gen.h"
|
|
||||||
|
|
||||||
//#include "ios_pd.h"
|
//#include "ios_pd.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
|
@ -19,5 +19,83 @@
|
||||||
|
|
||||||
#include "nel/misc/types_nl.h"
|
#include "nel/misc/types_nl.h"
|
||||||
|
|
||||||
|
#include <list>
|
||||||
|
#include <map>
|
||||||
|
#include <set>
|
||||||
|
#include <string>
|
||||||
|
#include <time.h>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#include "nel/georges/load_form.h"
|
||||||
|
#include "nel/georges/u_form.h"
|
||||||
|
#include "nel/georges/u_form_elm.h"
|
||||||
|
|
||||||
|
#include "nel/misc/algo.h"
|
||||||
|
#include "nel/misc/bit_mem_stream.h"
|
||||||
|
#include "nel/misc/command.h"
|
||||||
|
#include "nel/misc/diff_tool.h"
|
||||||
|
#include "nel/misc/displayer.h"
|
||||||
|
#include "nel/misc/entity_id.h"
|
||||||
|
#include "nel/misc/file.h"
|
||||||
|
#include "nel/misc/i18n.h"
|
||||||
|
#include "nel/misc/i_xml.h"
|
||||||
|
#include "nel/misc/path.h"
|
||||||
|
#include "nel/misc/sheet_id.h"
|
||||||
|
#include "nel/misc/singleton.h"
|
||||||
|
#include "nel/misc/sstring.h"
|
||||||
|
#include "nel/misc/string_mapper.h"
|
||||||
|
#include "nel/misc/time_nl.h"
|
||||||
|
#include "nel/misc/variable.h"
|
||||||
|
|
||||||
|
#include "nel/net/message.h"
|
||||||
|
#include "nel/net/module.h"
|
||||||
|
#include "nel/net/module_builder_parts.h"
|
||||||
|
#include "nel/net/service.h"
|
||||||
|
#include "nel/net/unified_network.h"
|
||||||
|
|
||||||
|
#include "game_share/backup_service_interface.h"
|
||||||
|
#include "game_share/base_types.h"
|
||||||
|
#include "game_share/body.h"
|
||||||
|
#include "game_share/bot_chat_types.h"
|
||||||
|
#include "game_share/brick_families.h"
|
||||||
|
#include "game_share/brick_types.h"
|
||||||
|
#include "game_share/characteristics.h"
|
||||||
|
#include "game_share/chat_group.h"
|
||||||
|
#include "game_share/damage_types.h"
|
||||||
|
#include "game_share/dyn_chat.h"
|
||||||
|
#include "game_share/ecosystem.h"
|
||||||
|
#include "game_share/fame.h"
|
||||||
|
#include "game_share/gender.h"
|
||||||
|
#include "game_share/generic_xml_msg_mngr.h"
|
||||||
|
#include "game_share/loot_harvest_state.h"
|
||||||
|
#include "game_share/mirror.h"
|
||||||
|
#include "game_share/mirror_prop_value.h"
|
||||||
|
#include "game_share/mode_and_behaviour.h"
|
||||||
|
#include "game_share/msg_client_server.h"
|
||||||
|
#include "game_share/news_types.h"
|
||||||
|
#include "game_share/people.h"
|
||||||
|
#include "game_share/player_visual_properties.h"
|
||||||
|
#include "game_share/power_types.h"
|
||||||
|
#include "game_share/properties.h"
|
||||||
|
#include "game_share/r2_basic_types.h"
|
||||||
|
#include "game_share/r2_share_itf.h"
|
||||||
|
#include "game_share/roles.h"
|
||||||
|
#include "game_share/ryzom_entity_id.h"
|
||||||
|
#include "game_share/ryzom_mirror_properties.h"
|
||||||
|
#include "game_share/ryzom_version.h"
|
||||||
|
#include "game_share/scores.h"
|
||||||
|
#include "game_share/shard_names.h"
|
||||||
|
#include "game_share/singleton_registry.h"
|
||||||
|
#include "game_share/skills.h"
|
||||||
|
#include "game_share/string_manager_sender.h"
|
||||||
|
#include "game_share/synchronised_message.h"
|
||||||
|
#include "game_share/tick_event_handler.h"
|
||||||
|
|
||||||
|
#include "server_share/char_name_mapper_itf.h"
|
||||||
|
#include "server_share/chat_unifier_itf.h"
|
||||||
|
#include "server_share/log_chat_gen.h"
|
||||||
|
#include "server_share/logger_service_client.h"
|
||||||
|
#include "server_share/r2_variables.h"
|
||||||
|
|
||||||
#endif //INPUT_OUTPUT_SERVICE_STDPCH_H
|
#endif //INPUT_OUTPUT_SERVICE_STDPCH_H
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue