diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp index 75cca443b..c03459b92 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp +++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp @@ -70,7 +70,7 @@ CDBGroupListSheet::CDBGroupListSheet(const TCtorParam ¶m) _TopMargin= 0; _BottomMargin= 0; _StartDbIdx= 0; - _ColumnMax= ~0; + _ColumnMax= std::numeric_limits::max(); _ColumnFactor= 1; _ColumnCenter= false; _NeedToSort = true; diff --git a/code/ryzom/client/src/interface_v3/group_editbox.cpp b/code/ryzom/client/src/interface_v3/group_editbox.cpp index b2916b909..afbf8e61a 100644 --- a/code/ryzom/client/src/interface_v3/group_editbox.cpp +++ b/code/ryzom/client/src/interface_v3/group_editbox.cpp @@ -54,8 +54,8 @@ CGroupEditBox::CGroupEditBox(const TCtorParam ¶m) : _ViewText(NULL), _Setupped(false), _EntryType(Text), - _MaxNumChar(~0), - _MaxNumReturn(~0), + _MaxNumChar(std::numeric_limits::max()), + _MaxNumReturn(std::numeric_limits::max()), _MaxFloatPrec(20), _MaxCharsSize(32768), _CursorAtPreviousLineEnd(false), diff --git a/code/ryzom/client/src/interface_v3/view_text.cpp b/code/ryzom/client/src/interface_v3/view_text.cpp index 2a84e213a..a70b065a7 100644 --- a/code/ryzom/client/src/interface_v3/view_text.cpp +++ b/code/ryzom/client/src/interface_v3/view_text.cpp @@ -77,7 +77,7 @@ void CViewText::setupDefault () _TextSelection= false; _TextSelectionStart= 0; - _TextSelectionEnd= ~0; + _TextSelectionEnd= std::numeric_limits::max(); _InvalidTextContext= true; _FirstLineX = 0; @@ -1795,7 +1795,7 @@ void CViewText::disableStringSelection() { _TextSelection= false; _TextSelectionStart= 0; - _TextSelectionEnd= ~0; + _TextSelectionEnd= std::numeric_limits::max(); } // *************************************************************************** diff --git a/code/ryzom/client/src/user_entity.cpp b/code/ryzom/client/src/user_entity.cpp index bd93bcdd1..57031e84b 100644 --- a/code/ryzom/client/src/user_entity.cpp +++ b/code/ryzom/client/src/user_entity.cpp @@ -456,7 +456,7 @@ void CUserEntity::updateVisualPropertyBehaviour(const NLMISC::TGameCycle &/* gam bc.BehavTime = TimeInSec; 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(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_0)); CCDBNodeLeaf *targetList1 = dynamic_cast(_DBEntry->getNode(CLFECOMMON::PROPERTY_TARGET_LIST_1)); @@ -1192,7 +1192,10 @@ void CUserEntity::applyMotion(CEntityCL *target) if(UserControls.isInternalView()) { // 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 _HasMoved = true; _Primitive->move(speed, dynamicWI); @@ -4395,4 +4398,4 @@ void CUserEntity::trader(const CLFECOMMON::TCLEntityId &slot) EntitiesMngr.refreshInsceneInterfaceOfFriendNPC(prevTrader); if (_Trader != CLFECOMMON::INVALID_SLOT) EntitiesMngr.refreshInsceneInterfaceOfFriendNPC(_Trader); -} \ No newline at end of file +} diff --git a/code/ryzom/common/src/game_share/mirrored_data_set.cpp b/code/ryzom/common/src/game_share/mirrored_data_set.cpp index cbb18ca0f..b9e2eba32 100644 --- a/code/ryzom/common/src/game_share/mirrored_data_set.cpp +++ b/code/ryzom/common/src/game_share/mirrored_data_set.cpp @@ -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() ) template <> -void displayValueLine( 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( 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 value( const_cast(*dataset), entityIndex, propIndex ); TValueToStringFunc valueToString; diff --git a/code/ryzom/common/src/game_share/utils.h b/code/ryzom/common/src/game_share/utils.h index f985609fe..fd99e0bf2 100644 --- a/code/ryzom/common/src/game_share/utils.h +++ b/code/ryzom/common/src/game_share/utils.h @@ -378,7 +378,7 @@ class ICallStackEntry { public: ICallStackEntry(); - ~ICallStackEntry(); + virtual ~ICallStackEntry(); void displayStack(NLMISC::CLog& log) const; virtual void displayEntry(NLMISC::CLog& log) const=0; diff --git a/code/ryzom/server/src/ai_share/ai_spawn_commands.h b/code/ryzom/server/src/ai_share/ai_spawn_commands.h index 623009484..96f2d99a0 100644 --- a/code/ryzom/server/src/ai_share/ai_spawn_commands.h +++ b/code/ryzom/server/src/ai_share/ai_spawn_commands.h @@ -16,6 +16,9 @@ +#ifndef RYAI_SPAWN_COMMANDS_H +#define RYAI_SPAWN_COMMANDS_H + #include "nel/misc/types_nl.h" #include "nel/misc/debug.h" @@ -52,3 +55,5 @@ // // static CAISpawnCtrl *_instance; //}; + +#endif diff --git a/code/ryzom/server/src/ai_share/ai_types.h b/code/ryzom/server/src/ai_share/ai_types.h index 802fe5ba6..2e04f23f6 100644 --- a/code/ryzom/server/src/ai_share/ai_types.h +++ b/code/ryzom/server/src/ai_share/ai_types.h @@ -16,6 +16,8 @@ +#ifndef RYAI_TYPES_H +#define RYAI_TYPES_H #include @@ -23,9 +25,6 @@ #include "nel/misc/string_mapper.h" #include "nel/misc/algo.h" -#ifndef RYAI_TYPES_H -#define RYAI_TYPES_H - // Be carefull when implementing new types : // always create a badtype at the end of lists ( see others implementations as examples ). // don't forget to fill the .cpp part .. :) @@ -50,7 +49,7 @@ namespace AITYPES class CDescTypeEntry { public: - CDescTypeEntry(char *name, T value) : _name(name), _value(value) {} + CDescTypeEntry(const char *name, T value) : _name(name), _value(value) {} const char *_name; T _value; }; diff --git a/code/ryzom/server/src/input_output_service/chat_manager.cpp b/code/ryzom/server/src/input_output_service/chat_manager.cpp index e16ca6223..e45bcd14f 100644 --- a/code/ryzom/server/src/input_output_service/chat_manager.cpp +++ b/code/ryzom/server/src/input_output_service/chat_manager.cpp @@ -27,13 +27,12 @@ #include "game_share/backup_service_interface.h" #include "server_share/r2_variables.h" +#include "server_share/log_chat_gen.h" #include "chat_manager.h" #include "input_output_service.h" #include "chat_unifier_client.h" -#include "server_share/log_chat_gen.h" - //#include "ios_pd.h" using namespace std; diff --git a/code/ryzom/server/src/input_output_service/stdpch.h b/code/ryzom/server/src/input_output_service/stdpch.h index 2d4e66bcd..62e634de7 100644 --- a/code/ryzom/server/src/input_output_service/stdpch.h +++ b/code/ryzom/server/src/input_output_service/stdpch.h @@ -19,5 +19,83 @@ #include "nel/misc/types_nl.h" +#include +#include +#include +#include +#include +#include + +#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