Merge pull request #1418 from Sphereserver/dev

Dev

Author: cbnolok

.clang-tidy

@@ -14,6 +14,7 @@ Checks: >
   readability-*,
   # Disable specific checks/warnings:
   -clang-analyzer-security.insecureAPI.strcpy,
+  -clang-diagnostic-format-security,
   -cppcoreguidelines-avoid-c-arrays,
   -cppcoreguidelines-avoid-goto,
   -cppcoreguidelines-avoid-magic-numbers,
@@ -56,7 +57,7 @@ Checks: >
 
 CheckOptions:
   - key: 'clang-analyzer-core.NonNullParamChecker:assert_like_macro'
-    value: 'DEBUG_ASSERT,ASSERT,PERSISTANT_ASSERT'
+    value: 'DEBUG_ASSERT,ASSERT,ASSERT_ALWAYS'
   - key: 'clang-analyzer-config:noreturn_function'
     value: 'RaiseImmediateAbort,RaiseRecoverableAbort'
   - { key: readability-identifier-naming.NamespaceCase,          value: lower_case }

.github/workflows/build_linux_x86.yml

@@ -94,6 +94,7 @@ jobs:
     - name: Report building tools
       run:  |
             echo "GCC:" && gcc -v
+            echo "Default Linker:" && ld -v
             echo && echo "CMake:" && cmake --version
             echo && echo "Ninja:" && ninja --version
 

.github/workflows/build_linux_x86_64.yml

@@ -49,6 +49,7 @@ jobs:
     - name: Report building tools
       run:  |
             echo "GCC:" && gcc -v
+            echo "Default Linker:" && ld -v
             echo && echo "CMake:" && cmake --version
             echo && echo "Ninja:" && ninja --version
 

.github/workflows/build_osx_arm.yml

@@ -38,11 +38,12 @@ jobs:
             echo && echo "** Setting up compiler" && echo
             export HOMEBREW_NO_AUTO_UPDATE=1
             export HOMEBREW_NO_INSTALL_CLEANUP=1
-            brew install ninja mariadb-connector-c
+            brew install mariadb-connector-c
 
     - name: Report building tools
       run:  |
             echo "Apple Clang:" && clang --version
+            echo "Default Linker:" && ld -v
             echo && echo "CMake:" && cmake --version
             echo && echo "Ninja:" && ninja --version
 

.github/workflows/build_osx_x86_64.yml

@@ -37,10 +37,11 @@ jobs:
             echo && echo "** Setting up compiler" && echo
             export HOMEBREW_NO_AUTO_UPDATE=1
             export HOMEBREW_NO_INSTALL_CLEANUP=1
-            brew install ninja mariadb-connector-c
+            brew install mariadb-connector-c
     - name: Report building tools
       run:  |
             echo "Apple Clang:" && clang --version
+            echo "Default Linker:" && ld -v
             echo && echo "CMake:" && cmake --version
             echo && echo "Ninja:" && ninja --version
 

.github/workflows/codeql.yml

@@ -52,6 +52,7 @@ jobs:
     - name: Report building tools
       run:  |
             echo "GCC:" && gcc -v
+            echo "Default Linker:" && ld -v
             echo && echo "CMake:" && cmake --version
             #echo && echo "Ninja:" && ninja --version
 

.github/workflows/coverity-scan.yml

@@ -37,6 +37,7 @@ jobs:
         - name: Report building tools
           run:  |
                 echo "GCC:" && gcc -v
+                echo "Default Linker:" && ld -v
                 echo && echo "CMake:" && cmake --version
 
         - name: Download Coverity Build Tool

.gitignore

@@ -2,6 +2,7 @@
 /.cache
 /.git
 /.vscode
+/.idea
 *.vshistory*
 /.kdev*
 /.ctagsd
@@ -50,7 +51,6 @@
 *.*workspace
 *.kdev*
 
-
 # Ignore some files in the parent folder
 CMakeCache.txt
 
@@ -62,3 +62,4 @@ CMakeCache.txt
 /lib/mariadb_connector_c/mysql/config.h
 /lib/mariadb_connector_c/mysql/ma_config.h
 /lib/mariadb_connector_c/mysql/mariadb_version.h
+/lib/zlib/zlib/zconf.h

CMakeLists.txt

@@ -1,6 +1,6 @@
 #    Main config    #
 
-cmake_minimum_required(VERSION 3.24)
+cmake_minimum_required(VERSION 3.29)
 set(CMAKE_SUPPRESS_REGENERATION TRUE) # Supress the ZERO_CHECK generation
 
 # -------------------- Utility functions --------------------
@@ -21,15 +21,33 @@ if((NOT TOOLCHAIN_LOADED) AND (NOT ${CMAKE_TOOLCHAIN_FILE} STREQUAL ""))
     toolchain_force_compiler()
 endif()
 
+# Remove default, global compiler and linker flags set by CMake.
+#   Init: must come before project() command
+set(CMAKE_C_FLAGS_INIT "")
+set(CMAKE_CXX_FLAGS_INIT "")
+set(CMAKE_EXE_LINKER_FLAGS_INIT "")
+#   Generic
+set(CMAKE_CXX_FLAGS "")
+set(CMAKE_C_FLAGS "")
+set(CMAKE_EXE_LINKER_FLAGS "")
+set(CMAKE_SHARED_LINKER_FLAGS "")
+#   Also clear build-type specific flags
+set(CMAKE_CXX_FLAGS_DEBUG "")
+set(CMAKE_CXX_FLAGS_RELEASE "")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "")
+set(CMAKE_CXX_FLAGS_MINSIZEREL "")
+
 message(STATUS "Scanning system build tools...")
 project(SphereServer CXX C) # does a scan for C++ and C compilers
 
+
 # If we have not specified a toolchain, let's detect which one we should use, using the detected arch.
 # We need to do this after "project", otherwise CMake doesn't know where it's running.
 if(NOT TOOLCHAIN_LOADED)
     include("cmake/DetectDefaultToolchain.cmake")
 endif()
 
+
 # Setup global flags, to be done before creating targets.
 
 if(NOT DEFINED CMAKE_CXX_STANDARD)
@@ -42,6 +60,7 @@ elseif(CMAKE_CXX_STANDARD LESS 20)
 endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_SCAN_FOR_MODULES OFF) # disable C++ module scanning
 
 # Need to clear shared library flags. If not, cmake sets -rdynamic and this
 # add to the executable the full symbol table (included unused symbols).
@@ -73,20 +92,28 @@ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "")
 # Also, it fails to create those predefined flags, which it needs, for custom build types (e.g. Nightly).
 set(CMAKE_EXE_LINKER_FLAGS_NIGHTLY "")
 
+
 # --------------------  GUI checkboxes --------------------
 
 option(
     CMAKE_NO_GIT_REVISION
     "Do not try to retrieve the current git revision. Useful for building source not git-cloned from Github."
     FALSE
 )
+if(WIN32)
+    option(WIN_SPAWN_CONSOLE "Spawn an additional console, useful for debugging." FALSE)
+    if(MSVC)
+        option(WIN_GENERATE_CRASHDUMP "For non-Debug builds, add Windows Structured Exception Handling and generate a Crash Dump if a fatal SE is thrown." FALSE)
+    endif()
+endif()
 option(CROSSCOMPILE "Are we compiling for a different target architecture?" FALSE)
 option(
     RUNTIME_STATIC_LINK
     "Statically link inside the executable the runtime libraries? (MSVC, libc/libcc, libstdc++)."
     FALSE
 )
 option(CMAKE_EXPORT_COMPILE_COMMANDS "Export compiler commands to compile_commands.json" TRUE)
+set(CMAKE_LINKER_TYPE "DEFAULT" CACHE STRING "Linker to be used for the linking step.")
 
 set(predef_LIB_LIBEV_BUILD FALSE)
 if(NOT WIN32)
@@ -96,13 +123,6 @@ option(LIB_LIBEV_BUILD "Build libev." ${predef_LIB_LIBEV_BUILD})
 option(LIB_SQLITE_BUILD "Build sqlite." TRUE)
 option(LIB_ZLIB_BUILD "Build zlib." TRUE)
 
-if(WIN32)
-    option(WIN_SPAWN_CONSOLE "Spawn an additional console, useful for debugging." FALSE)
-    if(MSVC)
-        option(WIN_GENERATE_CRASHDUMP "For non-Debug builds, add Windows Structured Exception Handling and generate a Crash Dump if a fatal SE is thrown." FALSE)
-    endif()
-endif()
-
 if(NOT MSVC)
     option(USE_COMPILER_HARDENING_OPTIONS "Enable compiler (even runtime) safety checks and code hardening." FALSE)
 endif()
@@ -179,9 +199,11 @@ else(SINGLE_TARGET)
     set(CMAKE_CONFIGURATION_TYPES "Debug;Release;Nightly" CACHE STRING "" FORCE)
 endif(SINGLE_TARGET)
 
+
 # Include the list of all Sphere source files
 include("src/CMakeSources.cmake")
 
+
 # Configure output binaries
 set(TARGETS "" CACHE INTERNAL "List of Sphere targets to build.")
 if(SINGLE_TARGET)

Changelog.txt

@@ -3957,34 +3957,36 @@ Added: 'H' shortcut for variables to get the value as hexadecimal.
 	LOCAL.ReflectDamage (r/w) = The amount of damage that will be reflected to this other party
 	LOCAL.ReduceDamage (r/w) = Amount to be deducted from damage received
 	LOCAL.DamageType (r/w) = Type of damage received (Default: DAMAGE_FIXED andDAMAGE_REACTIVE)
-	NOTE; 
-		1. If no ReflectDamage or ReduceDamage values are entered, the system defaults to the Reactive Armor Effect value.
+	NOTE:
+		1. If no ReflectDamage or ReduceDamage values ​​are entered, the system defaults to the Reactive Armor Effect value.
 		2. No damage amount can be less than 1.
 
 4-12-2024, canerksk
 - Fixed: Sphere crash troubleshooting if a player has no CHATNAME value and remove a channel.
 
 6-12-2024, canerksk
-- Added: Added LOCAL.WOPTalkMode in @SpellCast trigger and ini setting WOPTalkMode.
-	In some clients, different operations can be performed in return for this, for example, if this talkmode went from sphere as TALKMODE SPELL, the operation is performed according to this incoming talk mode according to the client versions. Here, the possibility of changing the talkmode according to the client version used is given. By default, TALKMODE_SPELL
-	Default talk mode: TALKMODE_SPELL = 10
-	Sphere.ini;
-	WOPTalkMode=0/14
-	
-	Trigger;
-	@SpellCast
-	Local.WOPTalkMode=0/14
-	
-	TALKMODE_SAY        = 0 // A character speaking.
-	TALKMODE_SYSTEM     = 1 // Display as system prompt
-	TALKMODE_EMOTE      = 2 // *smiles* at object (client shortcut: :+space)
-	TALKMODE_ITEM       = 6 // text labeling an item. Preceeded by "You see"
-	TALKMODE_NOSCROLL   = 7 // As a status msg. Does not scroll (as reported by the packet guides)
-	TALKMODE_WHISPER    = 8 // Only those close can here. (client shortcut: ;+space)
-	TALKMODE_YELL       = 9 // Can be heard 2 screens away. (client shortcut: !+space)
-	TALKMODE_SPELL      = 10 // Used by spells
-	TALKMODE_GUILD      = 13 // Used by guild chat (client shortcut: \)
-	TALKMODE_ALLIANCE   = 14 // Used by alliance chat (client shortcut: shift+\)
+- Added: LOCAL.WOPTalkMode in @SpellCast trigger and ini setting WOPTalkMode.
+    In some clients, different operations can be performed based on this. For example, if this talk mode was sent from Sphere as TALKMODE_SPELL, the operation is performed according to the client version. The possibility of changing the talk mode according to the client version used is now provided. By default, TALKMODE_SPELL.
+    
+    Default talk mode: TALKMODE_SPELL = 10
+    
+    Sphere.ini:
+    WOPTalkMode = 0/14
+    
+    Trigger:
+    @SpellCast
+    Local.WOPTalkMode = 0/14
+    
+    TALKMODE_SAY        = 0  // A character speaking.
+    TALKMODE_SYSTEM     = 1  // Display as system prompt.
+    TALKMODE_EMOTE      = 2  // *smiles* at object (client shortcut: :+space).
+    TALKMODE_ITEM       = 6  // Text labeling an item. Preceded by "You see".
+    TALKMODE_NOSCROLL   = 7  // As a status message. Does not scroll (as reported by the packet guides).
+    TALKMODE_WHISPER    = 8  // Only those close can hear. (client shortcut: ;+space).
+    TALKMODE_YELL       = 9  // Can be heard 2 screens away. (client shortcut: !+space).
+    TALKMODE_SPELL      = 10 // Used by spells.
+    TALKMODE_GUILD      = 13 // Used by guild chat (client shortcut: \).
+    TALKMODE_ALLIANCE   = 14 // Used by alliance chat (client shortcut: shift+\).
 
 08-01-2025, DavideRei
 - Fixed: NPC FLEE action didn't work because it was using action target (empty) instead of fight target
@@ -3997,18 +3999,51 @@ Added: 'H' shortcut for variables to get the value as hexadecimal.
 	Serv.Log <DLOCAL.DoorAutoDist>
 	Local.DoorAutoDist=10
 
-28-02-2025, cbnolok
+28-02-2025, Nolok
 - Fixed: failing assertion if targeting a non-corpse object when casting Animate Dead spell.
 
-09-03-2025, cbnolok
+09-03-2025, Nolok
 - Fixed: If Giant Spiders and Fire Elementals are denied going into sleeping state into a sleeping sector, their dropped items (ie. i_spider_web) went into sleeping state and didn't decay, leading to accumulation (partial fix for Issue #1249).
   Also, stamina wasn't consumed, thus NPCs had no limit in placing those items.
 
-11-03-2025, cbnolok
+11-03-2025, Nolok
 - Added: log message with informations about the newly created object, if just placed in a sector exceeding complexity threshold.
 
-15-03-2025, cbnolok
+15-03-2025, Nolok
 - Fixed: when using the ini setting ItemTimers=1 (enabling items to tick even if inside a container), the items kept ticking even after a char logout.
 - Fixed: when using the ini setting ItemTimers=1, items ticked on npcs ridden by a disconnected char.
 
-
+22-04-2025, Mulambo
+- Added ini settings:
+	// Display more bounce messages when drinking potions, fishing, crafting etc. (Old sphere behaviour).
+    VerboseItemBounce = 0 // (default)
+
+22-04-2025, canerksk
+- Added: New item function, CARVECORPSE: carves a corpse with SRC = char carving the corpse. 
+- Added: New ini RevealFlag setting REVEALF_ONHORSE, to allow or disallow stealth walking if you are on a mount.
+- Added: new ini CombatFlags setting COMBAT_ATTACK_NOAGGREIVED.
+	In the old behavior (55i/55r/56b/56c) we were not guilty when we hit a murderer. Now when we attack a criminal or murderer we are guilty towards that person. An ini setting option has been added for this behavior. Although this is a normal behavior in OSI, it can be perceived as a problem since not every server designs games like OSI.
+
+03-05-2025, Nolok
+- Changed: Retrieving the MORE1/2 of items with the flag CAN_I_SCRIPTEDMORE will always return the raw numerical value.
+    This allows using the full numerical range available.
+
+03-05-2025, canerksk (from PR #1319), Nolok
+- Added: New optionflag OF_PetBehaviorOwnerNeutral.
+    If this setting is enabled, pets you own will appear to you with the original noto (pre-taming, old behavior). If this setting is not enabled, the assets you own will always appear natural to you. This setting only applies when the owning character is looking at the asset they own. It does not apply when someone else is looking at the asset you own.
+- Added: OF_NPCMovementOldStyle, TAG.OVERRIDE.MOVESTYLE.
+    Support for the old 0.56b NPC movement formulas with: OF_NPCMovementOldStyle ini setting and TAG.OVERRIDE.MOVESTYLE (to override the behavior for a single character).
+    With that formula, among the other things, char MOVERATE property and TAG.OVERRIDE.MOVERATE will return to be the percent modifier of the speed of the NPC - the higher it is, the slower will the NPC be. Default is 100.
+
+04-05-2025, Nolok
+- Fixed: spell or skill defname reading from an object property.
+When setting a property like MORE to the a spell or skill defname, trying to read it returned back the resource index (like the spell number) instead of the defname (Issue #1397)
+
+05-05-2025, Mulambo
+- Added: new command line switch `-I=/path/to/ini/`
+    Allows you to define path to folder with ini files. Usable, when you want to separate binary from configuration or when running Sphere as Windows service (since services are usually run in C:\Windows\System32).
+    Usage: Linux: `.\SphereSvrX64_debug -I=/etc/sphereserver/`, Windows: `SphereSvrX64_nightly.exe -I=C:/sphere/` (trailing slash required).
+
+08-05-2025, Nolok
+- Added: NPCWanderingLookAroundChance ini setting and TAG.OVERRIDE.LOOKAROUNDCHANCE.
+    It allows to change the chance that a wandering NPC will analyze its surroundings for the current step. This also means that the trigger @NPCLookAtChar will fire more frequently.