update upload action

Author: llde

.github/workflows/msbuild.yml

@@ -51,7 +51,7 @@ jobs:
             .\obse_steam_loader.dll
  
     - name: Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: xOBSE
         path: |
@@ -65,4 +65,4 @@ jobs:
             .\obse_command_doc.html
             .\README.md
             .\Data\OBSE\obse.ini
- 
+ 

obse/obse/Commands_MiscReference.cpp

@@ -1463,8 +1463,10 @@ static bool Cmd_SetPlayerProjectile_Execute(COMMAND_ARGS)
 	if (mag)
 	{
 		MagicCaster* caster = (MagicCaster*)Oblivion_DynamicCast(*g_thePlayer, 0, RTTI_Actor, RTTI_MagicCaster, 0);
-		if (caster)
+		if (caster  && mag->caster != caster) {
+		//	mag->RemoveCaster(mag->caster);
 			mag->caster = caster;
+		}
 	}
 	else
 	{

obse/obse/Commands_Weather.cpp

@@ -219,7 +219,6 @@ static bool SetClimateValue_Execute(COMMAND_ARGS, UInt32 whichVal)
 	ExtractArgsEx(paramInfo, arg1, opcodeOffsetPtr, scriptObj, eventList, &intVal, &form);
 	TESClimate* climate = (TESClimate*)Oblivion_DynamicCast(form, 0, RTTI_TESForm, RTTI_TESClimate, 0);
 	if (!climate) return true;
-	Console_Print("CLimate %08X   %s", climate->refID, climate->GetEditorName());
 	UInt8 nuVal = (UInt8)intVal;
 
 	switch (whichVal) {

obse/obse/GameAPI.cpp

@@ -1427,6 +1427,11 @@ bool InterfaceManager::MenuModeHasFocus(UInt32 menuType)
 	return bMenuMode ? true : false;
 }
 
+UInt32 InterfaceManager::GetTopVisibleMenuID()
+{
+	return ThisStdCall(0x0057CF60, this);
+}
+
 bool InterfaceManager::IsGameMode()
 {
 	return !IsMenuMode();

obse/obse/GameAPI.h

@@ -489,7 +489,8 @@ class InterfaceManager
 
 	SceneGraph*		unk000;							// 000
 	SceneGraph*		unk004;							// 004
-	UInt32			unk008[(0x018 - 0x008) >> 2];	// 008
+	UInt32			currentMode;					// 008
+	UInt32			unk00C[(0x018 - 0x00C) >> 2];	// 00C
 	void*			unk018;							// 018 NiDirectionalLight *
 	Tile			* cursor;						// 01C
 	UInt32			unk020[(0x050 - 0x020) >> 2];	// 020
@@ -526,7 +527,7 @@ class InterfaceManager
 	float GetDepth();
 	bool MenuModeHasFocus(UInt32 menuType);		// returns true if menuType is on top (has focus)
 	bool IsGameMode();
-
+	UInt32 GetTopVisibleMenuID();
 	static void ToggleDebugText();
 
 };

obse/obse/GameObjects.h

@@ -1224,6 +1224,30 @@ enum
 class MagicProjectile : public MobileObject
 {
 public:
+	/*
+	.rdata:00A76488                     dd offset nullsub_returnvVoid_1arg
+.rdata:00A7648C                     dd offset nullsub_26
+.rdata:00A76490                     dd offset nullsub_returnVoid_2arg
+.rdata:00A76494                     dd offset MagicProjectile_NotDeleted
+.rdata:00A76498                     dd offset ?ClearComponentReferences@TESTexture@@UAEXXZ?
+.rdata:00A7649C                     dd offset MagicProjectile_RemoveCaster
+.rdata:00A764A0                     dd offset sub_738500
+.rdata:00A764A4                     dd offset nullsub_returnTrue_0arg
+	*/
+
+
+	MagicProjectile();
+	~MagicProjectile();
+	virtual void __stdcall	       Unk81(int a1) = 0;
+	virtual void __stdcall		   Unk82(int a1, int a2, int a3, int a4, int a5, int a6) = 0;
+	virtual void  __stdcall		   Unk83(int a1, int a2) = 0;
+	virtual void		   NotDeleted(void);  //in Jroush IDB
+	virtual void		   Unk85(void) = 0;
+	virtual void		   RemoveCaster(MagicCaster* caster);
+	virtual void __stdcall		   Unk87(int a1, int a2) = 0;
+	virtual bool		   Unk88(void) = 0;
+
+
 	float			speed;				// 5C base speed * GMST fMagicProjectileBaseSpeed
 	float			distanceTraveled;	// 60 speed * elapsedTime while in flight
 	float			elapsedTime;		// 64 length of time projectile has existed
@@ -1232,6 +1256,9 @@ class MagicProjectile : public MobileObject
 	MagicItem		* magicItem;		// 6C can always cast to SpellItem? NO - can be EnchantmentItem for staves
 	UInt32			effectCode;			// 70 i.e. 'SEFF'
 	EffectSetting	* effectSetting;	// 74
+
+
+
 };
 
 //90

obse_plugin_example/obse_plugin_example.vcxproj

@@ -122,6 +122,7 @@
     <ClCompile Include="..\obse\obse\NiRTTI.cpp" />
     <ClCompile Include="..\obse\obse\Script.cpp" />
     <ClCompile Include="..\obse\obse\Utilities.cpp" />
+    <ClCompile Include="..\obse\obse_common\SafeWrite.cpp" />
     <ClCompile Include="dllmain.c">
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </ForcedIncludeFiles>
@@ -147,6 +148,7 @@
     <ClInclude Include="..\obse\obse\PluginAPI.h" />
     <ClInclude Include="..\obse\obse\Script.h" />
     <ClInclude Include="..\obse\obse\Utilities.h" />
+    <ClInclude Include="..\obse\obse_common\SafeWrite.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\obse\obse\GameRTTI_1_2_416.inl" />

obse_plugin_example/obse_plugin_example.vcxproj.filters

@@ -50,6 +50,9 @@
     </ClCompile>
     <ClCompile Include="dllmain.c" />
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="..\obse\obse_common\SafeWrite.cpp">
+      <Filter>obse</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\obse\obse\GameActorValues.h">
@@ -100,6 +103,9 @@
     <ClInclude Include="..\obse\obse\Utilities.h">
       <Filter>obse</Filter>
     </ClInclude>
+    <ClInclude Include="..\obse\obse_common\SafeWrite.h">
+      <Filter>obse</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\obse\obse\GameRTTI_1_2_416.inl">