Skip to content
Permalink
Browse files

Fix to items randomly loading with AOS props due to incorrect initali…

…zation of props on load of server.

Hotfix/dynaprop fix (#93)
  • Loading branch information...
sigmantium committed Jul 12, 2019
1 parent 2dd0396 commit 0729ed71299aa84582b903cc1b6a84445fdcaa63
@@ -1,6 +1,6 @@
function(set_compile_flags target is_executable)
message("* ${target}")
target_include_directories(${target} PRIVATE
target_include_directories(${target} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR} #own folder
${PROJECT_BINARY_DIR} #global config
)
@@ -66,7 +66,7 @@ function(set_compile_flags target is_executable)
$<$<AND:${FORCE_ARCH_BITS},${linux}>:
-m${ARCH_BITS}
>

$<$<AND:${debug},${linux}>:
-ggdb
>
@@ -79,6 +79,7 @@ function(set_compile_flags target is_executable)
/GF # string pooling
/EHa # exception handling
/W4
/w45038
>
)

@@ -113,7 +114,7 @@ function(set_compile_flags target is_executable)
)
endif()
endif()

if (${is_executable})
if (${release} AND ${linux})
if (${ENABLE_ASAN} OR ${ENABLE_USAN} OR ${ENABLE_MSAN} OR ${ENABLE_TSAN})
@@ -217,7 +218,7 @@ function(use_curl target)
endfunction()

function(use_benchmark target)
if (ENABLE_BENCHMARK)
if (ENABLE_BENCHMARK)
target_link_libraries(${target} PUBLIC benchmark)
endif()
endfunction()
@@ -2,22 +2,29 @@
<ESCRIPT>
<header>
<topic>Latest Core Changes</topic>
<datemodified>06-18-2019</datemodified>
<datemodified>07-12-2019</datemodified>
</header>
<version name="POL100">
<entry>
<date>06-18-2018</date>
<date>07-12-2019</date>
<author>DevGIB:</author>
<change type="Fixed">Initalization error with the new AOS props causing items with no props set to inject random numbers on server boot.</change>
<change type="Changed">Fixed issue with moving a character to a shadow realm within the same screen, the core would not correctly send mobile serials to the characters client on relocation and you would still see inaccessible characters in the shadow realm.</change>
<change type="Changed">Fixed some incorrect dates on the change log.</change>
</entry>
<entry>
<date>06-18-2019</date>
<author>DevGIB:</author>
<change type="Changed">Fixed SendQuestArrow() function to use arrow id's rather than an actual object reference. This allows for multiple arrows to be sent to the client and cancelled individually by storing them in a cprop to be recalled later.<br/>
When sending SendQuestArrow() the function will return the arrows id for further processing.</change>
</entry>
<entry>
<date>06-17-2018</date>
<date>06-17-2019</date>
<author>DevGIB:</author>
<change type="Changed">Fixed default for OS::Start_Skill_Script on script_name attribute to be string like required.</change>
</entry>
<entry>
<date>06-17-2018</date>
<date>06-17-2019</date>
<author>DevGIB:</author>
<change type="Added">Support for LowerReagentCost, SpellDamageIncrease, FasterCasting, FasterCastRecovery, DefenceIncrease, DefenceIncreaseCap, LowerManaCost, Hitchance,<br/>
Luck, FireResistCap, ColdResistCap, EnergyResistCap, PhysicalResistCap, and PoisonResistCap and their subsequent mods to UObject as dynaprops.</change>
@@ -1,10 +1,14 @@
-- POL100 --
06-18-2018 DevGIB:
07-12-2019 DevGIB:
Fixed: Initalization error with the new AOS props causing items with no props set to inject random numbers on server boot.
Changed: Fixed issue with moving a character to a shadow realm within the same screen, the core would not correctly send mobile serials to the characters client on relocation and you would still see inaccessible characters in the shadow realm.
Changed: Fixed some incorrect dates on the change log.
06-18-2019 DevGIB:
Changed: Fixed SendQuestArrow() function to use arrow id's rather than an actual object reference. This allows for multiple arrows to be sent to the client and cancelled individually by storing them in a cprop to be recalled later.
When sending SendQuestArrow() the function will return the arrows id for further processing.
06-17-2018 DevGIB:
06-17-2019 DevGIB:
Changed: Fixed default for OS::Start_Skill_Script on script_name attribute to be string like required.
06-17-2018 DevGIB:
06-17-2019 DevGIB:
Added: Support for LowerReagentCost, SpellDamageIncrease, FasterCasting, FasterCastRecovery, DefenceIncrease, DefenceIncreaseCap, LowerManaCost, Hitchance,
Luck, FireResistCap, ColdResistCap, EnergyResistCap, PhysicalResistCap, and PoisonResistCap and their subsequent mods to UObject as dynaprops.
Changed: Elevated Luck to UObject and added related LuckMod.
@@ -200,9 +200,38 @@ ItemDesc::ItemDesc( u32 objtype, Clib::ConfigElem& elem, Type type, const Plib::
no_drop( elem.remove_bool( "NoDrop", false ) ),
base_str_req( elem.remove_ushort( "StrRequired", 0 ) * 10 ),
quality( elem.remove_double( "QUALITY", 1.0 ) ),
lower_reag_cost(0),
spell_damage_increase(0),
faster_casting(0),
faster_cast_recovery(0),
defence_increase(0),
defence_increase_cap(0),
lower_mana_cost(0),
hit_chance(0),
resist_fire_cap(0),
resist_cold_cap(0),
resist_energy_cap(0),
resist_physical_cap(0),
resist_poison_cap(0),
defence_increase_mod(0),
defence_increase_cap_mod(0),
lower_mana_cost_mod(0),
hit_chance_mod(0),
resist_fire_cap_mod(0),
resist_cold_cap_mod(0),
resist_energy_cap_mod(0),
resist_physical_cap_mod(0),
resist_poison_cap_mod(0),
lower_reagent_cost_mod(0),
spell_damage_increase_mod(0),
faster_casting_mod(0),
faster_cast_recovery_mod(0),
luck(0),
luck_mod(0),
props( Core::CPropProfiler::Type::ITEM ),
method_script( nullptr ),
save_on_exit( elem.remove_bool( "SaveOnExit", true ) )

{
if ( type == BOATDESC || type == HOUSEDESC )
{
@@ -241,6 +270,7 @@ ItemDesc::ItemDesc( u32 objtype, Clib::ConfigElem& elem, Type type, const Plib::
elem.throw_error( "Configuration error" );
}


unsigned short stacklimit = elem.remove_ushort( "StackLimit", MAX_STACK_ITEMS );

if ( stacklimit > MAX_STACK_ITEMS )
@@ -638,9 +668,6 @@ ItemDesc::ItemDesc( Type type )
quality( 1.0 ),
multiid( 0xFFFF ),
maxhp( 0 ),
props( Core::CPropProfiler::Type::ITEM ),
method_script( nullptr ),
save_on_exit( true ),
lower_reag_cost( 0 ),
spell_damage_increase( 0 ),
faster_casting( 0 ),
@@ -668,7 +695,10 @@ ItemDesc::ItemDesc( Type type )
faster_casting_mod( 0 ),
faster_cast_recovery_mod( 0 ),
luck( 0 ),
luck_mod( 0 )
luck_mod( 0 ),
props( Core::CPropProfiler::Type::ITEM ),
method_script( nullptr ),
save_on_exit( true )
{
memset( &element_resist, 0, sizeof( element_resist ) );
memset( &element_damage, 0, sizeof( element_damage ) );

0 comments on commit 0729ed7

Please sign in to comment.
You can’t perform that action at this time.