From ab41faa21e19e3cbd09c191d452d52cb608af08f Mon Sep 17 00:00:00 2001
From: prinsij <prinsij@mcmaster.ca>
Date: Thu, 22 Sep 2016 08:59:39 -0500
Subject: [PATCH] implement terrain.h (last didn't go through)
---
src/include/terrain.h | 7 ++++---
src/terrain.cpp | 11 +++++++++--
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/include/terrain.h b/src/include/terrain.h
index dc5b5e1..00434ee 100644
--- a/src/include/terrain.h
+++ b/src/include/terrain.h
@@ -5,8 +5,9 @@
class Terrain {
public:
- static enum Passability {Blocked, Passable};
- static enum Visibility {Blocked, Corridor, Transparent};
+ enum Passability {P_Blocked, Passable};
+ enum Visibility {Opaque, Corridor, Transparent};
+ Terrain(char, Visibility, Passability);
char getChar();
Passability isPassable();
Visibility getVisibility();
@@ -14,6 +15,6 @@ class Terrain {
char character;
Visibility visible;
Passability passable;
-}
+};
#endif
diff --git a/src/terrain.cpp b/src/terrain.cpp
index 753b498..f285304 100644
--- a/src/terrain.cpp
+++ b/src/terrain.cpp
@@ -6,7 +6,14 @@ Terrain::Terrain(char character, Terrain::Visibility vis, Terrain::Passability p
, passable(pass)
{}
+char Terrain::getChar() {
+ return character;
+}
+
Terrain::Passability Terrain::isPassable() {
return passable;
- return arglebargle;
-}
\ No newline at end of file
+}
+
+Terrain::Visibility Terrain::getVisibility() {
+ return visible;
+}
--
GitLab