diff --git a/assets/uox3.rc b/assets/uox3.rc index d0fb95e59..94decb659 100644 --- a/assets/uox3.rc +++ b/assets/uox3.rc @@ -74,11 +74,11 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "UOX3" - VALUE "FileVersion", "0.99.6-RC6x" + VALUE "FileVersion", "0.99.6" VALUE "InternalName", "UOX3.exe" VALUE "OriginalFilename", "UOX3.exe" VALUE "ProductName", "Ultima Offline eXperiment 3" - VALUE "ProductVersion", "0.99.6-RC6x" + VALUE "ProductVersion", "0.99.6" END END BLOCK "VarFileInfo" diff --git a/source/CPacketSend.cpp b/source/CPacketSend.cpp index b68494923..7d3963143 100644 --- a/source/CPacketSend.cpp +++ b/source/CPacketSend.cpp @@ -483,7 +483,7 @@ void CPExtMove::SetFlags( CChar &toCopy ) //const UI08 BIT__IGNOREMOBILES = 4; // 0x10, ignore other mobiles? flag.set( BIT__FROZEN, toCopy.IsFrozen() ); - flag.set( BIT__FEMALE, ( toCopy.GetId() == 0x0191 || toCopy.GetId() == 0x025E ) || toCopy.GetId() == 0x029B ); + flag.set( BIT__FEMALE, ( toCopy.GetId() == 0x0191 || toCopy.GetId() == 0x025E || toCopy.GetId() == 0x029B || toCopy.GetId() == 0xb8 || toCopy.GetId() == 0xba )); flag.set( BIT__FLYING, ( toCopy.IsFlying() )); flag.set( BIT__GOLDEN, ( toCopy.IsInvulnerable() )); } @@ -1190,7 +1190,7 @@ void CPDrawGamePlayer::CopyData( CChar &toCopy ) //const UI08 BIT__IGNOREMOBILES = 5; // 0x10, ignore other mobiles? flag.set( BIT__FROZEN, toCopy.IsFrozen() ); - flag.set( BIT__FEMALE, ( toCopy.GetId() == 0x0191 || toCopy.GetId() == 0x025E )); + flag.set( BIT__FEMALE, ( toCopy.GetId() == 0x0191 || toCopy.GetId() == 0x025E || toCopy.GetId() == 0x029B || toCopy.GetId() == 0xb8 || toCopy.GetId() == 0xba )); flag.set( BIT__FLYING, toCopy.IsFlying() ); flag.set( BIT__GOLDEN, toCopy.IsInvulnerable() ); } diff --git a/source/Changelog.txt b/source/Changelog.txt index 13cc7014f..33ec67b0e 100644 --- a/source/Changelog.txt +++ b/source/Changelog.txt @@ -1,3 +1,7 @@ +14/10/2023 - Xuri (0.99.6) + Updated version number :) + Fixed an issue where the "female" flag was not set correctly in CPExtMove() and CPDrawGamePlayer() packets for characters with female Gargoyle (or Savage) body IDs + 14/10/2023 - Xuri (0.99.6-RC6x) Added dummy context restore function to additional scripts Updated 'go command to support specifying location to teleport to by name, mapped to locations from locations.dfn (Thanks Dragon Slayer!) diff --git a/source/cVersionClass.cpp b/source/cVersionClass.cpp index f5e60eb34..8d00c3830 100644 --- a/source/cVersionClass.cpp +++ b/source/cVersionClass.cpp @@ -11,7 +11,7 @@ // product info //o------------------------------------------------------------------------------------------------o const std::string VER = "0.99"; -const std::string BUILD = "6-RC6x"; +const std::string BUILD = "6"; const std::string REALBUILD = "0"; const std::string SVER = "2.0"; const std::string CVER = "2.0";