NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged with wapon, static and dynamic

This commit is contained in:
Linda Andersson 2013-11-20 16:01:39 +01:00
parent 28da371b80
commit 96245fc52e
6 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Code/GameLogic/DynamicObject.cpp
View File

@ -1,5 +1,6 @@
#include "DynamicObject.h" #include "DynamicObject.h"
using namespace GameLogic;
DynamicObject::DynamicObject(void) DynamicObject::DynamicObject(void)
{ {

8
Code/GameLogic/Game.h
View File

@ -12,8 +12,8 @@ namespace GameLogic
private: private:
GameLogic::Level *level; Level* level;
GameLogic::Player *player; Player** player;
public: public:
Game(); Game();
@ -24,8 +24,4 @@ namespace GameLogic
void Update(); void Update();
}; };
} }
#endif #endif

8
Code/GameLogic/GameLogic.vcxproj
View File

@ -153,20 +153,24 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="DynamicObject.h" />
<ClInclude Include="Game.h" /> <ClInclude Include="Game.h" />
<ClInclude Include="IGame.h" /> <ClInclude Include="IGame.h" />
<ClInclude Include="Level.h" /> <ClInclude Include="Level.h" />
<ClInclude Include="Object.h" /> <ClInclude Include="Object.h" />
<ClInclude Include="Player.h" /> <ClInclude Include="Player.h" />
<ClInclude Include="WorldObject.h" /> <ClInclude Include="StaticObject.h" />
<ClInclude Include="Weapon.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="DynamicObject.cpp" />
<ClCompile Include="Game.cpp" /> <ClCompile Include="Game.cpp" />
<ClCompile Include="IGame.cpp" /> <ClCompile Include="IGame.cpp" />
<ClCompile Include="Level.cpp" /> <ClCompile Include="Level.cpp" />
<ClCompile Include="Object.cpp" /> <ClCompile Include="Object.cpp" />
<ClCompile Include="Player.cpp" /> <ClCompile Include="Player.cpp" />
<ClCompile Include="WorldObject.cpp" /> <ClCompile Include="StaticObject.cpp" />
<ClCompile Include="Weapon.cpp" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

20
Code/GameLogic/GameLogic.vcxproj.filters
View File

@ -27,10 +27,16 @@
<ClInclude Include="Player.h"> <ClInclude Include="Player.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WorldObject.h"> <ClInclude Include="IGame.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="IGame.h"> <ClInclude Include="StaticObject.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Weapon.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="DynamicObject.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
@ -47,10 +53,16 @@
<ClCompile Include="Player.cpp"> <ClCompile Include="Player.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="WorldObject.cpp"> <ClCompile Include="IGame.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="IGame.cpp"> <ClCompile Include="StaticObject.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Weapon.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="DynamicObject.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>

5
Code/GameLogic/IGame.h
View File

@ -1,3 +1,5 @@
// Game Logic interface
#ifndef IGAME_H #ifndef IGAME_H
#define IGAME_H #define IGAME_H
@ -7,7 +9,6 @@
#define DLL_USAGE __declspec(dllimport) #define DLL_USAGE __declspec(dllimport)
#endif #endif
namespace GameLogic namespace GameLogic
{ {
class Game; class Game;
@ -26,6 +27,4 @@ namespace GameLogic
private: private:
}; };
} }
#endif #endif

1
Code/GameLogic/StaticObject.cpp
View File

@ -1,5 +1,6 @@
#include "StaticObject.h" #include "StaticObject.h"
using namespace GameLogic;
StaticObject::StaticObject(void) StaticObject::StaticObject(void)
{ {