add world map and fast travel
This commit is contained in:
@@ -43,23 +43,7 @@ void Update()
|
||||
// TODO: Move input detection somewhere else
|
||||
if (Input.GetKeyDown(KeyCode.Escape))
|
||||
{
|
||||
if (!paused)
|
||||
{
|
||||
Cursor.lockState = CursorLockMode.None;
|
||||
Time.timeScale = 0;
|
||||
canUseTools = false;
|
||||
hasControl = false;
|
||||
GameManager.Instance.MenuController.ShowScreen("Pause");
|
||||
}
|
||||
else
|
||||
{
|
||||
Time.timeScale = 1;
|
||||
canUseTools = true;
|
||||
hasControl = true;
|
||||
GameManager.Instance.MenuController.HideAllScreens();
|
||||
}
|
||||
|
||||
paused = !paused;
|
||||
TogglePause();
|
||||
}
|
||||
|
||||
if (hasControl)
|
||||
@@ -86,6 +70,27 @@ void Update()
|
||||
DoMovement();
|
||||
}
|
||||
|
||||
public void TogglePause()
|
||||
{
|
||||
if (!paused)
|
||||
{
|
||||
Cursor.lockState = CursorLockMode.None;
|
||||
Time.timeScale = 0;
|
||||
canUseTools = false;
|
||||
hasControl = false;
|
||||
GameManager.Instance.MenuController.ShowScreen("Pause");
|
||||
}
|
||||
else
|
||||
{
|
||||
Time.timeScale = 1;
|
||||
canUseTools = true;
|
||||
hasControl = true;
|
||||
GameManager.Instance.MenuController.HideAllScreens();
|
||||
}
|
||||
|
||||
paused = !paused;
|
||||
}
|
||||
|
||||
#region Movement Calculation/Input Processing
|
||||
/// <summary>
|
||||
/// If player presses space, jump
|
||||
@@ -384,6 +389,16 @@ public void CharacterControllerMove(Vector3 movement)
|
||||
characterController.Move(movement);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Set the character controller's position
|
||||
/// </summary>
|
||||
public void CharacterControllerSetPosition(Vector3 pos)
|
||||
{
|
||||
characterController.enabled = false;
|
||||
transform.position = pos;
|
||||
characterController.enabled = true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Auto-walk the character in the specified direction. Uses character's walk
|
||||
/// speed and camera rotation (per-frame)
|
||||
|
||||
Reference in New Issue
Block a user