Skip to content

Commit

Permalink
Removed TODOs, debug messages
Browse files Browse the repository at this point in the history
  • Loading branch information
bedder committed Nov 28, 2014
1 parent 0d77012 commit 897f017
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Assets/Scripts/MainMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void OnGUI() {
GUI.Label(className, classNames[selectedClass], classNameStyle);
GUI.Label(classDescription, classDescriptions[selectedClass], classDescriptionStyle);
if (GUI.Button(startButton, "Start!", buttonStyle)) {
switch (selectedClass) { // TODO: Work out how to load the level with different classes
switch (selectedClass) {
case 0:
gameController.playerController = lightInfantryPrefab;
break;
Expand Down
6 changes: 2 additions & 4 deletions Assets/Scripts/Player/PlayerController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ void performRotation(ref Vector3 input) {
performRotationKeyboard(ref input);
} else if (aimType == AimType.Mouse) {
performRotationMouse();
} else {
Debug.LogError("Player AimType unknown.");
}
}

Expand Down Expand Up @@ -144,7 +142,7 @@ void performActions() {
}

public virtual void performClassAction() {
Debug.Log("PlayerController::performClassAction does nothing by default. Inherited behavious scripts should be used to perform actions.");
Debug.LogError("PlayerController::performClassAction does nothing by default. Inherited behavious scripts should be used to perform actions.");
}

public void damage(float damage) {
Expand All @@ -162,7 +160,7 @@ public void damage(float damage) {
}
}

void kill() { // TODO
void kill() {
Destroy(gameObject);
}

Expand Down
6 changes: 4 additions & 2 deletions Assets/Scripts/PlayerGUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,11 @@ void OnGUI() {

if (Input.GetButtonDown("Pause") && (Time.realtimeSinceStartup - lastPause) > 0.01f) {
paused = !paused;
lastPause = Time.realtimeSinceStartup; // TODO: Remove hackyness
lastPause = Time.realtimeSinceStartup; // TODO
// This is a bit of a hacky solution to prevent the game
// pausing and unpausing instantly on pressing Esc. It might
// just be a key bounce error on my laptop?
Time.timeScale = paused ? 0 : 1;
Debug.Log("" + paused + "," + Time.timeScale);
}

if (!paused && Time.time < displayLevelNumberUntil) {
Expand Down

0 comments on commit 897f017

Please sign in to comment.