Browse Source

Removed unneeded variables

master
chrisgregan 10 years ago
parent
commit
d00b7a29e4
  1. 26
      Assets/Fungus/Narrative/Scripts/Dialog.cs

26
Assets/Fungus/Narrative/Scripts/Dialog.cs

@ -12,15 +12,15 @@ namespace Fungus
{ {
public static Character speakingCharacter; public static Character speakingCharacter;
public float writingSpeed = 60;
public AudioClip writingSound; public AudioClip writingSound;
[Range(0,1)]
public float writingVolume = 1f; public float writingVolume = 1f;
public bool loopWritingSound = true; public bool loopWritingSound = true;
public bool beepPerCharacter = false; public bool beepPerCharacter = false;
public float slowBeepsAt = 10f; public float slowBeepsAt = 10f;
public float fastBeepsAt = 30f; public float fastBeepsAt = 30f;
public float punctuationPause = 0.25f; public AudioClip characterTypingSound;
public DialogAudio audioController = new DialogAudio();
public bool alwaysFadeDialog = false; public bool alwaysFadeDialog = false;
public float fadeDuration = 1f; public float fadeDuration = 1f;
public LeanTweenType fadeEaseType; public LeanTweenType fadeEaseType;
@ -29,19 +29,9 @@ namespace Fungus
public Text nameText; public Text nameText;
public Text storyText; public Text storyText;
public Image characterImage; public Image characterImage;
public AudioClip characterTypingSound;
protected float currentSpeed;
protected float currentPunctuationPause;
protected bool boldActive;
protected bool italicActive;
protected bool colorActive;
protected string colorText;
protected bool wasPointerClicked; protected bool wasPointerClicked;
public DialogAudio audioController = new DialogAudio();
protected virtual void LateUpdate() protected virtual void LateUpdate()
{ {
wasPointerClicked = false; wasPointerClicked = false;
@ -202,15 +192,7 @@ namespace Fungus
public virtual void Clear() public virtual void Clear()
{ {
ClearStoryText(); ClearStoryText();
// Reset control variables
currentSpeed = 60;
currentPunctuationPause = 0.25f;
boldActive = false;
italicActive = false;
colorActive = false;
colorText = "";
// Kill any active write coroutine // Kill any active write coroutine
StopAllCoroutines(); StopAllCoroutines();
} }

Loading…
Cancel
Save