From 1aae79648f4893e89616bb4512df6328fbb8f70f Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Fri, 26 Jan 2024 23:10:06 +0100
Subject: [PATCH] Updated autosave system

---
 scripts/_00e_autosavesystem_functions.pex     | Bin 2367 -> 2367 bytes
 source/Enderal DLL/src/PapyrusFunctions.h     |   4 ++++
 .../scripts/_00e_autosavesystem_functions.psc |   4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/_00e_autosavesystem_functions.pex b/scripts/_00e_autosavesystem_functions.pex
index 75d2366474327133a7322528344afe7630374d0f..6a645788464b50404fc2ad698340a790bfc6a4fe 100644
GIT binary patch
delta 1138
zcma)5U2hUW6g_u$p^AVMQCj?{U)TbLVq2|ZrP6MJ$EGIwXpGr3Bv=f^MxRJb`~~yk
zvwy%Cjj#2W@Zc}dSD!pHyBpeIqJ-JGbI-YR&z-q*ls-zQen0&_vMmVs^S&0peNG*S
z`e>&k&StOIRbTAoQ&X=8oo;9FRvp@l>Flnz*Etw?{bsNKxU;|4_0-7Dt9P=SovPIa
z-pf}j2#i%YFT8G7{gS$>TXpr`Y9tdaZ?N;c@9ht^G&Hh4oDNfeQgLTN)t#E!aboI?
z^J5r6(if)1ImqG+W-yB!5=awD%?d6GE(x->W=soaLi+-3?R2t&%Yuv`Z8$k(^eha$
zBA658%+kWugdonPze(I7=?TJJYz;b%p9rFpLEL(jh9Ac~*T#8-etNDS^H{h63)8r%
zo<-({dECN07EoY4MUD~{Q6^epjZ5@bgBsT;^tNDGkT*j0C&TpfbWqe1E#_G<RzZVW
zvoY+jRN|}0a0VA-h{E}hNBoY#izeRSDEiY0*4=-y9AE94z~3uIga64bhdPz*U&6hR
zJxL2$_XV~8Vm%00VqyL7+v$dQ$ohG5B~!1ju@tbw(~EFj)p&&blNVbJ50>)lf(=1g
z6M5w^zx+o*v(Z!Ls1Ps&-WQWqbk##agQjs?*gQwsKFIv$=yb=KsBy;`IlAMjrsJxU
z!Vn!l7{M0XDGHa3w9Te!a<tfJZPQqXNyN1d^90;LhJFHVfy>gjnSxW3j<bT6aWpBO
cR*Mo_IwDFsUrd`kvxAoA8kajE&Gld1AFCT-(*OVf

delta 1109
zcmaiz&2kb^5QR_A4=4d7h$aw1fJBWN#UyCrgdZ~#jZ0m*wk#H@LSrdb>1q~MxpC)R
zxNzeu<O$+KxYa6s3|F3eX9iSC1!lOn&!PM4xy^C$xLEk{;L}&zf`G5V(casm!gEpE
z*8N4tKRg^F?RlfY<ENW&9u0=$ZCib`dimV`V07={v%!;5KuvwI`X|yaMhC-#(JQrJ
z`|qr>8rtvGXIWFPrKmp0x++_>lS!#JD(kGeY4ELDPG7xrzPlD?F{fIorEnf)RIq?5
z7E!|z>ilj{ZDIz?jISVvBJ$WO3(g773+8RMAo^Cy3n~oc1j}5_2`-pbRg0il<>w49
zy>}?D8o6fVjG!(EYmu#fHn!Onl(a6iUo`f5l8yE{vzfh3`O@#jC|8;6PuJytx<Z2%
z^|lrxfM}XLN;Z{~<|~4$iTUrYmf+g|T%mxr_1GpBHsXAI9;Q*3`xOo8vg1ubNl-M;
zhvDQ=k*F=WE@;F`CTi%$#M=--Q;;zRo)=qe>PA?9i%S!>uzi{!kvKjNZPs#pED260
zMF2sT_h~SsI5B4ac#ycsaZ17CAnkCdI=s3ZvYr{NFpq5XK>GqO#<<0rJ#JZRhb8#c
zVc?XYYXTj@bJZncSN|eKJ2`svnG71uGa+vZ&5MQ$ZVVXe&fs8|R6ePKc-#ww+7sLs
z?3(6h1%9$-U0(<FMBka52>(V=@^L@GFZ~cOh>~O-T{2FhzPY8g@oDP7PzO`gI<h~h
I#4)-16I_v3NdN!<

diff --git a/source/Enderal DLL/src/PapyrusFunctions.h b/source/Enderal DLL/src/PapyrusFunctions.h
index 36af5e60..b685bc9a 100644
--- a/source/Enderal DLL/src/PapyrusFunctions.h	
+++ b/source/Enderal DLL/src/PapyrusFunctions.h	
@@ -89,12 +89,16 @@ namespace Papyrus::PapyrusFunctions
 		sstream << StringToHex(RE::PlayerCharacter::GetSingleton()->GetName()).c_str();
 		sstream << "_";
 
+		// TODO: Add cell names and delete old copies, current implementation breaks rotation
+		/*
 		RE::TESObjectCELL* parentCell = RE::PlayerCharacter::GetSingleton()->parentCell;
 		if (parentCell->IsInteriorCell()) {
 			sstream << parentCell->GetFormEditorID();
 		} else {
 			sstream << RE::PlayerCharacter::GetSingleton()->GetWorldspace()->GetFormEditorID();
 		}
+		*/
+		sstream << "Vyn";
 
 		sstream << "_000000_00000000000000_1_1";
 
diff --git a/source/scripts/_00e_autosavesystem_functions.psc b/source/scripts/_00e_autosavesystem_functions.psc
index f0c7ab86..586e4271 100644
--- a/source/scripts/_00e_autosavesystem_functions.psc
+++ b/source/scripts/_00e_autosavesystem_functions.psc
@@ -4,11 +4,11 @@ Event OnUpdate()
 	
 	Actor PlayerREF = Game.GetForm(0x14) as Actor
 	
-	if PlayerREF.IsDead() || ! PlayerREF.GetParentCell()
+	if PlayerREF.IsDead()
 		return
 	endif
 	
-	If PlayerREF.IsInCombat() || PlayerREF.IsOnMount() || PlayerREF.IsSwimming() || ! Game.IsFightingControlsEnabled() || Utility.IsInMenuMode() || UI.IsTextInputEnabled() || UI.IsMenuOpen("Dialogue Menu")
+	If PlayerREF.IsInCombat() || PlayerREF.IsOnMount() || PlayerREF.IsSwimming() || ! Game.IsFightingControlsEnabled() || Utility.IsInMenuMode() || UI.IsTextInputEnabled() || UI.IsMenuOpen("Dialogue Menu") || ! PlayerREF.GetParentCell()
 		RegisterForSingleUpdate(5)
 		return
 	endif