Prevent saving before race menu

source/scripts/EnderalSteam.psc

@@ -1,3 +1,4 @@
 Scriptname EnderalSteam Hidden
 
+; Do not call this function directly, use Steam.pex
 bool Function CallUnlockAchievement(string name) global native

source/scripts/_00e_mq00_racetesttriggbox.psc

@@ -1,12 +0,0 @@
-Scriptname _00E_MQ00_RaceTestTriggBox extends ObjectReference  
-
-
-int DoOnce
-
-
-Event OnTriggerEnter(ObjectReference akActionRef)
-	if DoOnce == 0
-		Game.ShowRaceMenu()
-		DoOnce = 1
-	endif
-EndEvent

source/scripts/_00e_mq00_trigbox00script.psc

@@ -1,31 +0,0 @@
-Scriptname _00E_MQ00_TrigBox00Script extends ObjectReference  
-
-
-int DoOnce
-
-Quest Property _00E_MQ00 auto
-Race Property NordRaceChild auto
-
-Event OnTriggerEnter(ObjectReference akActionRef)
-
-	if ( DoOnce == 0 )
-		if(akActionRef == Game.GetPlayer())
-
-			Game.FadeOutGame(false, true, 2.0, 1.0)					; Fade in after the mainmenu
-			;Game.SetInChargen(false, true, false)						; Save, Rest, HUD ? Disabled
-			Game.EnablePlayerControls()								; Enable Player Controls
-			;Game.ShowTitleSequenceMenu()
-
-			Game.GetPlayer().SetScale(0.98)							; Scale the player
-			Game.GetPlayer().SetRace(NordRaceChild) 					; Set player race to child
-
-			Debug.MessageBox("Yippee, jetzt bin ich Jorle Rostlöffel!")
-			_00E_MQ00.SetCurrentStageID(0)									; Starts _00E_MQ00 Quest
-
-			DoOnce = -1
-
-		endif
-	endif
-
-EndEvent
-

source/scripts/_00e_mq00_trigbox01script.psc

@@ -1,31 +0,0 @@
-Scriptname _00E_MQ00_TrigBox01Script extends ObjectReference  
-
-int DoOnce
-
-Event OnTriggerEnter(ObjectReference akActionRef)
-
-	if ( DoOnce == 0 )
-		if(akActionRef == Game.GetPlayer())
-
-			Game.SetInChargen(false, false, false)
-			;Game.ShowRaceMenu()
-
-			DoOnce = -1
-
-		endif
-	endif
-
-
-	if ( DoOnce == -1)
-
-	utility.Wait(4)	
-
-	Game.RequestAutoSave()
-	Game.RequestSave()
-	DoOnce = -2
-
-	endif
-
-
-EndEvent
-

source/scripts/_00e_mqp01_functions.psc

@@ -8,6 +8,7 @@ Import Utility
 
 Function SetUpScene()
 
+	Game.SetInChargen(true, true, false)
 	Game.FadeOutGame(false, true, 0.5, 0.5)
 	FadeToBlackHoldIMOD.Apply()
 	PlayerREF.SetScale(0.85)
@@ -19,16 +20,13 @@ Function SetUpScene()
 	FadeToBlackHoldIMOD.Remove()
 	MQP01_DreamDoorREF.BlockActivation(True)
 	Wait(5.0)
-	Game.EnablePlayerControls()
 	
 	if EnderalFunctions.GetNewGameCount() > 1
+		Game.EnablePlayerControls()
 		Game.QuitToMainMenu()
 		Debug.MessageBox("Due to an engine bug, new game should not be started after quitting to the main menu. Please, restart Enderal first.")
-		return
 	endif
 	
-	Game.DisablePlayerControls(false, true, true, false, true, false, false)
-
 EndFunction
 
 Function UnlockDoor()

source/scripts/_00e_mqp02_functions.psc

@@ -420,6 +420,7 @@ State Chargen
 			Game.EnablePlayerControls()
 			PlayerREF.PlayIdle(IdleForceDefaultState)
 			Debug.SendAnimationEvent(PlayerREF, "IdleForceDefaultState")
+			Game.SetInCharGen(false, true, false)
 		Else
 			RegisterForSingleUpdate(1)
 		EndIf

source/scripts/_00e_mqp03_functions.psc

@@ -11,7 +11,7 @@ Import Game
 Event OnUpdate()
 
 	If (Self.GetCurrentStageID() < 20) && _00E_DisableMenuTutorials.GetValueInt() == 0
-		If UsingGamepad()
+		If Game.UsingGamepad()
 			Message.ResetHelpMessage("Empty")
 			_00E_MQP03_Tutorial_LeaveMenuHintConsole.ShowAsHelpMessage("Empty", 5, 1, 1)
 		Else

source/scripts/_00e_startdoorscript.psc

@@ -1,16 +0,0 @@
-Scriptname _00E_StartDoorScript extends ObjectReference  
-int count
-
-Event OnActivate(ObjectReference akActionRef)
-	
-	if count == 0
-       	;Game.ShowRaceMenu()
-		Game.GetPlayer().SetActorValue("health", 50)
-		Game.GetPlayer().SetActorValue("Magicka", 50)
-		Game.GetPlayer().SetActorValue("Stamina", 50)
-		Game.GetPlayer().RemoveAllItems(abRemoveQuestItems = true)
-	endif
-
-	count = 1
-
- endEvent