aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWyatt <[email protected]>2022-09-29 14:31:39 -0700
committerWyatt <[email protected]>2022-09-29 14:31:39 -0700
commitf4cf1380812789231505e0a7106a62f45f76acb1 (patch)
treef810c98f3c7e15f1a8a9172e09ed5806e35b4b17
parentCommit (diff)
downloadcst116-lab0-debugging-johnson-f4cf1380812789231505e0a7106a62f45f76acb1.tar.xz
cst116-lab0-debugging-johnson-f4cf1380812789231505e0a7106a62f45f76acb1.zip
changes
-rw-r--r--Ch 5 Debugging Project/Ch 5 Debugging Project.cpp2
-rw-r--r--Ch 5 Debugging Project/readme.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/Ch 5 Debugging Project/Ch 5 Debugging Project.cpp b/Ch 5 Debugging Project/Ch 5 Debugging Project.cpp
index 0dcf564..39ec7a1 100644
--- a/Ch 5 Debugging Project/Ch 5 Debugging Project.cpp
+++ b/Ch 5 Debugging Project/Ch 5 Debugging Project.cpp
@@ -104,6 +104,6 @@ class Wall
void combine(Wall other)
{
-
+ health += other.health;
}
}; \ No newline at end of file
diff --git a/Ch 5 Debugging Project/readme.txt b/Ch 5 Debugging Project/readme.txt
new file mode 100644
index 0000000..f2262a5
--- /dev/null
+++ b/Ch 5 Debugging Project/readme.txt
@@ -0,0 +1 @@
+this is a simple change to the project. \ No newline at end of file