Merge branch 'Starfield-Reverse-Engineering:main' into main

Starfield-Reverse-Engineering · Mar 3, 2024 · b9ac3d1 · b9ac3d1
2 parents aab56bf + 29d3991
commit b9ac3d1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/CommonLibSF/include/RE/S/Script.h b/CommonLibSF/include/RE/S/Script.h
@@ -171,7 +171,7 @@ namespace RE
 		inline static SCRIPT_FUNCTION* LocateConsoleCommand(const std::string_view a_longName)
 		{
 			for (auto& command : GetConsoleCommands()) {
-				if (std::strlen(command.functionName) == a_longName.size())
+				if (command.functionName && std::strlen(command.functionName) == a_longName.size())
 					if (_strnicmp(command.functionName, a_longName.data(), a_longName.size()) == 0)
 						return std::addressof(command);
 			}
@@ -182,7 +182,7 @@ namespace RE
 		inline static SCRIPT_FUNCTION* LocateScriptCommand(const std::string_view a_longName)
 		{
 			for (auto& command : GetScriptCommands()) {
-				if (std::strlen(command.functionName) == a_longName.size())
+				if (command.functionName && std::strlen(command.functionName) == a_longName.size())
 					if (_strnicmp(command.functionName, a_longName.data(), a_longName.size()) == 0)
 						return std::addressof(command);
 			}

diff --git a/CommonLibSF/vcpkg.json b/CommonLibSF/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "commonlibsf",
-  "version-date": "2024-02-03",
+  "version-date": "2024-02-15",
   "port-version": 0,
   "description": "A collaborative reverse-engineered library for Starfield.",
   "homepage": "https://github.com/Starfield-Reverse-Engineering/CommonLibSF",

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![C++23](https://img.shields.io/static/v1?label=standard&message=c%2B%2B23&color=blue&logo=c%2B%2B&&logoColor=red&style=flat)](https://en.cppreference.com/w/cpp/compiler_support)
 ![Platform](https://img.shields.io/static/v1?label=platform&message=windows&color=dimgray&style=flat&logo=windows)
 [![Game version](https://img.shields.io/badge/game%20version-1.8.86-orange)](#Developing-with-CommonLibSF)
-[![VCPKG_VER](https://img.shields.io/static/v1?label=vcpkg%20registry&message=2024-02-03&color=green&style=flat)](https://github.com/Starfield-Reverse-Engineering/Starfield-RE-vcpkg)
+[![VCPKG_VER](https://img.shields.io/static/v1?label=vcpkg%20registry&message=2024-02-15&color=green&style=flat)](https://github.com/Starfield-Reverse-Engineering/Starfield-RE-vcpkg)
 [![Main CI](https://img.shields.io/github/actions/workflow/status/Starfield-Reverse-Engineering/CommonLibSF/main_ci.yml)](https://github.com/Starfield-Reverse-Engineering/CommonLibSF/actions/workflows/main_ci.yml)
 
 ## Build Dependencies
@@ -71,8 +71,8 @@ The main requirement of this license is: if you link your mod against CommonLibS
     </a>
   </td>
   <td align="center">
-    <a href="https://github.com/Qudix" title="Qudix">
-      <img src="https://avatars.githubusercontent.com/u/17361645?v=4" width="50;" alt="Qudix"/>
+    <a href="https://github.com/qudix" title="qudix">
+      <img src="https://avatars.githubusercontent.com/u/17361645?v=4" width="50;" alt="qudix"/>
     </a>
   </td>
   <td align="center">
@@ -120,6 +120,11 @@ The main requirement of this license is: if you link your mod against CommonLibS
       <img src="https://avatars.githubusercontent.com/u/7975925?v=4" width="50;" alt="Gary McGovern"/>
     </a>
   </td>
+  <td align="center">
+    <a href="https://github.com/Meridiano" title="Meridiano">
+      <img src="https://avatars.githubusercontent.com/u/25160065?v=4" width="50;" alt="Meridiano"/>
+    </a>
+  </td>
   <td align="center">
     <a href="https://github.com/lStewieAl" title="lStewieAl">
       <img src="https://avatars.githubusercontent.com/u/16544747?v=4" width="50;" alt="lStewieAl"/>