Moved data files to model. Need to add gitignore. Added class for man…

…aging data

Risk/Risk/Debug/Risk.log

@@ -1,5 +1,2 @@
-  Continent.cpp
-  Source.cpp
-  Territory.cpp
-  Generating Code...
+  Source.cpp
   Risk.vcxproj -> D:\MyFiles\git\Risk\Risk\Debug\Risk.exe

Risk/Risk/GameBoard.cpp

@@ -0,0 +1,19 @@
+#include "GameBoard.h"
+
+void GameBoard::InitializeBoard()
+{
+	// TODO: implement
+	int i = 0;
+}
+
+// TODO: Determine if the initializer list here is necessary -- we may be able to forgo this
+GameBoard::GameBoard() : _continents()
+{
+	InitializeBoard();
+}
+
+Continent GameBoard::getContinent(string name)
+{
+	// TODO: implement
+	return _continents[0];
+}

Risk/Risk/GameBoard.h

@@ -0,0 +1,16 @@
+#pragma once
+using namespace std;
+#include <vector>
+#include <string>
+
+#include "Model\Continent.h"
+
+class GameBoard
+{
+private:
+	vector<Continent> _continents;
+	void InitializeBoard();
+public:
+	GameBoard();
+	Continent getContinent(string name);
+};

Risk/Risk/Model/Army.h

@@ -0,0 +1,9 @@
+#pragma once
+#include <string>
+using namespace std;
+
+struct Army
+{
+	enum _team {RED, GREEN, BLUE, BLACK, YELLOW};
+	int _numberOfTroops;
+};

Risk/Risk/Continent.h → Risk/Risk/Model/Continent.h

@@ -5,12 +5,8 @@ using namespace std;
 
 #include "Territory.h"
 
-class Continent
+struct Continent
 {
-private:
 	string _name;
 	vector<Territory> _territories;
-public:
-	Continent(string name);
-	string getName();
 };

Risk/Risk/Model/Territory.h

@@ -0,0 +1,11 @@
+#pragma once
+using namespace std;
+#include <string>
+
+#include "Army.h"
+
+struct Territory
+{
+	string _name;
+	Army _occupyingArmy;
+};

Risk/Risk/Risk.vcxproj

@@ -146,12 +146,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Continent.cpp" />
+    <ClCompile Include="GameBoard.cpp" />
     <ClCompile Include="Source.cpp" />
-    <ClCompile Include="Territory.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="Army.h" />
     <ClInclude Include="Continent.h" />
+    <ClInclude Include="GameBoard.h" />
     <ClInclude Include="Territory.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Risk/Risk/Risk.vcxproj.filters

@@ -13,23 +13,29 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="Header Files\Model">
+      <UniqueIdentifier>{ecc04aa2-6eab-4b97-a3ef-354497aeaeda}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Source.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Continent.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Territory.cpp">
+    <ClCompile Include="GameBoard.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="Army.h">
+      <Filter>Header Files\Model</Filter>
+    </ClInclude>
     <ClInclude Include="Continent.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files\Model</Filter>
     </ClInclude>
     <ClInclude Include="Territory.h">
+      <Filter>Header Files\Model</Filter>
+    </ClInclude>
+    <ClInclude Include="GameBoard.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Risk/Risk/Source.cpp

@@ -1,16 +1,15 @@
 using namespace std;
 #include <iostream>
 #include <string>
-#include <map>
 
-#include "Continent.h"
+#include "Model/Continent.h"
 
 int main()
 {
-	Continent continent("Africa");
-	string name = continent.getName();
+	Continent continent;
+	continent._name = "Africa";
 
 	cout << "Hello World!" << endl;
-	cout << "name: " << name << endl;
+	cout << "name: " << continent._name << endl;
 	return 0;
 }

Risk/Risk/Territory.h

@@ -1,12 +1,11 @@
 #pragma once
-#include <string>
 using namespace std;
+#include <string>
+
+#include "Army.h"
 
-class Territory
+struct Territory
 {
-private:
 	string _name;
-public:
-	Territory(string name);
-	string getName();
+	Army _occupyingArmy;
 };