Revert "feet wiggle and inheritance for future multiplayer"

This reverts commit 975bdd1.
matthewperiut · Oct 3, 2020 · ffba211 · ffba211
1 parent f28b52d
commit ffba211
Show file tree

Hide file tree

Showing 9 changed files with 219 additions and 280 deletions.
diff --git a/Kiwifield/Kiwifield.vcxproj b/Kiwifield/Kiwifield.vcxproj
@@ -148,7 +148,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="camera.cpp" />
-    <ClCompile Include="character.cpp" />
     <ClCompile Include="editor.cpp" />
     <ClCompile Include="files.cpp" />
     <ClCompile Include="image.cpp" />
@@ -161,7 +160,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="camera.h" />
-    <ClInclude Include="character.h" />
     <ClInclude Include="editor.h" />
     <ClInclude Include="files.h" />
     <ClInclude Include="const.h" />

diff --git a/Kiwifield/Kiwifield.vcxproj.filters b/Kiwifield/Kiwifield.vcxproj.filters
@@ -34,9 +34,6 @@
     <Filter Include="Header Files\bases">
       <UniqueIdentifier>{a08baa8f-aa28-4867-86d9-635c5866a94e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\entity">
-      <UniqueIdentifier>{61f3cae3-9167-4339-a95b-f599ae9e3a1e}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -69,11 +66,17 @@
     <ClCompile Include="lodepng.cpp">
       <Filter>Source Files\Utilities\filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="character.cpp">
-      <Filter>Source Files\Entities</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="player.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="stage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="editor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="lodepng.h">
       <Filter>Header Files\external</Filter>
     </ClInclude>
@@ -83,6 +86,9 @@
     <ClInclude Include="svpng.h">
       <Filter>Header Files\external</Filter>
     </ClInclude>
+    <ClInclude Include="camera.h">
+      <Filter>Header Files\bases</Filter>
+    </ClInclude>
     <ClInclude Include="image.h">
       <Filter>Header Files\bases</Filter>
     </ClInclude>
@@ -92,20 +98,5 @@
     <ClInclude Include="files.h">
       <Filter>Header Files\bases</Filter>
     </ClInclude>
-    <ClInclude Include="editor.h">
-      <Filter>Header Files\entity</Filter>
-    </ClInclude>
-    <ClInclude Include="player.h">
-      <Filter>Header Files\entity</Filter>
-    </ClInclude>
-    <ClInclude Include="camera.h">
-      <Filter>Header Files\entity</Filter>
-    </ClInclude>
-    <ClInclude Include="stage.h">
-      <Filter>Header Files\bases</Filter>
-    </ClInclude>
-    <ClInclude Include="character.h">
-      <Filter>Header Files\entity</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Kiwifield/assets/player.png b/Kiwifield/assets/player.png
diff --git a/Kiwifield/character.cpp b/Kiwifield/character.cpp
diff --git a/Kiwifield/character.h b/Kiwifield/character.h
diff --git a/Kiwifield/editor.cpp b/Kiwifield/editor.cpp
@@ -1,7 +1,10 @@
 #include "editor.h"
 #include <iostream>
-
-Editor::Editor(Stage& s, PixelGameEngine& g) : stage{ &s }, g{ &g } { }
+Editor::Editor(Stage& s, PixelGameEngine& g)
+{
+    this->stage = &s;
+    this->g = &g;
+}
 
 void Editor::manager()
 {