Merge branch 'master' of https://gitlab.cas.mcmaster.ca/andrem5/RogueReborn.git

.gitignore

+# Lab 3 files
+*.aux
+
+# Compiled files
+*.exe
+*.o
+
+# Editor files
+*.swp
+
+# General
+*.tmp
\ No newline at end of file

src/include/coord.h

+
+#ifndef COORD_H
+#define COORD_H
+
 class Coord {
 	public:
 		int& operator[](int);
-		Coord operator+(Coord, Coord);
-		Coord operator-(Coord, Coord);
+		Coord operator+(Coord);
+		Coord operator-(Coord);
 
 	private:
-		int x, int y;
-}
+		int x;
+		int y;
+};
+
+#endif

src/include/item.h

 #include "coord.h"
 #include <string>
 
+#ifndef ITEM_H
+#define ITEM_H
+
+
 class Item {
 	public:
-		static const enum Location {OnGround, InPack};
-		static const enum Identified {Known, Unknown};
+		enum Location {OnGround, InPack};
+		enum Identified {Known, Unknown};
 		Coord getCoord();
 		std::string getName();	
 		Location getLocation();
@@ -14,4 +18,6 @@ class Item {
 		std::string name;
 		Location location;
 		Identified knowledge;
-}
+};
+
+#endif

src/include/itemzone.h

 #include "item.h"
 #include <vector>
 
+#ifndef ITEMZONE_H
+#define ITEMZONE_H
+
 class ItemZone {
 	public:
 		Item operator[](int);
@@ -8,5 +11,6 @@ class ItemZone {
 		void add(Item);
 	private:
 		std::vector<Item> contents;
-}
+};
 
+#endif

src/include/playerchar.h

@@ -2,6 +2,9 @@
 #include "coord.h"
 #include "itemzone.h"
 
+#ifndef PLAYERCHAR_H
+#define PLAYERCHAR_H
+
 class PlayerChar {
 	public:
 		int getStrength();
@@ -22,4 +25,6 @@ class PlayerChar {
 		Coord coord;
 		ItemZone backpack;
 		int level;
-}
+};
+
+#endif

src/include/random.h

 #include <random>
 
+#ifndef RANDOM_H
+#define RANDOM_H
+
 class Generator {
 	public:
 		Generator();
@@ -7,3 +10,5 @@ class Generator {
 	private:
 		std::mt19937 gen;
 }
+
+#endif

src/include/terrain.h

+
+
+#ifndef TERRAIN_H
+#define TERRAIN_H
+
 class Terrain {
 	public:
 		static enum Passability {Blocked, Passable};
@@ -10,3 +15,5 @@ class Terrain {
 		Visibility visible;
 		Passability passable;
 }
+
+#endif

src/main.cpp

@@ -15,7 +15,7 @@ void putString(int x, int y, std::string text) {
 /**
   * Execution starts here
   */
-int main() {
+int main(int argv, char** args) {
     std::cout << "Welcome to Rogue Reborn!" << std::endl;
 
     TCODConsole::setCustomFont("assets/terminal-large.png");

src/playerchar.cpp

+
+#include <string>
+#include <iostream>
+#include <vector>
+#include "include/playerchar.h"
+#include "include/coord.h"
+
+
+int PlayerChar::getHP() {
+	return HP;
+}
+
+int PlayerChar::getMaxHP() {
+	return maxHP;
+}
+
+int PlayerChar::getArmor() {
+	return armor;
+}
+
+int PlayerChar::getStrength() {
+	return strength;
+}
+
+int PlayerChar::getGold() {
+	return gold;
+}
+
+std::string PlayerChar::getName() {
+	return name;
+}
+
+Coord PlayerChar::getCoord() {
+	return coord;
+}
+
+int PlayerChar::getLevel() {
+	return level;
+}