Merge branch 'master' of https://github.com/iimarckus/pokered

Conflicts:
	main.asm

1 files changed, 0 insertions, 54 deletions

diff --git a/music/pokeredwavptnvis/Console.cpp b/music/pokeredwavptnvis/Console.cpp
deleted file mode 100644
index 9bac7b1f..00000000
--- a/music/pokeredwavptnvis/Console.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "Console.h"

-

-using namespace std;

-

-// Basic

-void Console::Get(char* value)

-{

-    cin >> value;

-}

-void Console::Get(string& value)

-{

-    cin >> value;

-}

-void Console::Print(const char* value)

-{

-    cout << value;

-}

-void Console::Error(const char* value)

-{

-    cerr << value;

-}

-

-// Upper-Basic

-void Console::PrintLn(const char* value)

-{

-    Print(value);

-    cout << endl;

-}

-void Console::ErrorLn(const char* value)

-{

-    Error(value);

-    cerr << endl;

-}

-

-// Higher

-void Console::Ask(const char* question, char* answer)

-{

-    Print(question);

-    Get(answer);

-}

-void Console::Ask(const char* question, string& answer)

-{

-    Print(question);

-    Get(answer);

-}

-

-// Better Error Handling

-int Console::atoi_ex(const char* input, bool supress)

-{

-	//int convInp = atoi(input);

-	//if((supress == false) && (convInp == 0))

-	//		PrintLn("Warning: the converted integer input is 0, this may not be what you intended");

-	//	return convInp;

-}