From cdf022c8ce2cd16f675c150e9f74c416b4f44495 Mon Sep 17 00:00:00 2001
From: Mark B
Date: Sat, 30 Oct 2021 16:48:46 -0400
Subject: [PATCH] fixed dumb mistake in the Makefile
---
.gitignore | 1 +
Makefile | 2 +-
README.md | 17 +++++++++--------
compileWindows.bat | 2 +-
src/{main.cpp => Main.cpp} | 20 ++++++++++++--------
src/RPG.cpp | 1 -
src/RPG.h | 3 +++
src/TobeeRPG.h | 1 -
8 files changed, 27 insertions(+), 20 deletions(-)
create mode 100644 .gitignore
rename src/{main.cpp => Main.cpp} (63%)
create mode 100644 src/RPG.h
delete mode 100644 src/TobeeRPG.h
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5ccfea4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+TobeeRPG
diff --git a/Makefile b/Makefile
index 44bc658..d277d1a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
#files to compile
-OBJS = src/main.cpp src/TobeeRPG.h src/RPG.cpp
+OBJS = src/Main.cpp src/RPG.cpp
#compiler to use
diff --git a/README.md b/README.md
index 1962041..b1a7e0a 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,19 @@
+# TobeeRPG
THIS GAME/CODE CONTAINS CURSE WORDS AND OTHER OBSCENITIES
-This is game I made for my good friend Tobi
-To build you need git,make, and g++
+
This is game I made for my good friend Tobi
+
To build you need git, make, and g++
-Building
+## Building
-1. git clone https://gitdab.com/Canneddonuts/Tobee_RPG
+1. git clone https://gitdab.com/Canneddonuts/Tobee_RPG.git
2. cd Tobee_RPG
-3. make
+3. make "or run the compileWindows.bat file on windows"
-To run
+## To run
-*nix
+### *nix
./TobeeRPG
-windows
+### Windows
TobeeRPG.exe
diff --git a/compileWindows.bat b/compileWindows.bat
index 1fa08ca..b901db4 100644
--- a/compileWindows.bat
+++ b/compileWindows.bat
@@ -1,2 +1,2 @@
@echo off
-g++ src/main.cpp src/TobeeRPG.h src/RPG.cpp res/icon.o -o TobeeRPG.exe
\ No newline at end of file
+g++ src/Main.cpp src/RPG.cpp res/icon.o -o TobeeRPG.exe
diff --git a/src/main.cpp b/src/Main.cpp
similarity index 63%
rename from src/main.cpp
rename to src/Main.cpp
index 8cc0ed5..c107a5b 100644
--- a/src/main.cpp
+++ b/src/Main.cpp
@@ -1,17 +1,14 @@
/* This code has no license so you can do whatever you want with it.
made by M-C-O-B 2021
*/
-
#include
-#include "TobeeRPG.h"
using namespace std;
-void PrgEnd() {
- string Name; // this makes a string called name
- cout << "To exit the program please type your name: ";
- cin >> Name; // this gets what you typed
- cout << "Thanks for playing: " << Name << endl;// this displays what you type
-}
+#include "RPG.h"
+
+
+// makes a function called PrgEnd
+void PrgEnd();
int main(){
cout << "Tobi was walking home from his long ass walk" << endl;
@@ -23,3 +20,10 @@ int main(){
PrgEnd();
return 0;
}
+
+void PrgEnd(){
+ string Name; // this makes a string called name
+ cout << "To exit the program please type your name: ";
+ cin >> Name; // this gets what you typed
+ cout << "Thanks for playing: " << Name << endl;// this displays what you type
+}
diff --git a/src/RPG.cpp b/src/RPG.cpp
index fb26f14..9241c39 100644
--- a/src/RPG.cpp
+++ b/src/RPG.cpp
@@ -1,5 +1,4 @@
#include
-#include "TobeeRPG.h"
using namespace std;
void RPG(){
diff --git a/src/RPG.h b/src/RPG.h
new file mode 100644
index 0000000..44d5b82
--- /dev/null
+++ b/src/RPG.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void RPG();
diff --git a/src/TobeeRPG.h b/src/TobeeRPG.h
deleted file mode 100644
index ff89617..0000000
--- a/src/TobeeRPG.h
+++ /dev/null
@@ -1 +0,0 @@
-void RPG();