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

View File

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

View File

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

View File

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

View File

@ -27,10 +27,16 @@
<ClInclude Include="Player.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="WorldObject.h">
<ClInclude Include="IGame.h">
<Filter>Header Files</Filter>
</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>
</ClInclude>
</ItemGroup>
@ -47,10 +53,16 @@
<ClCompile Include="Player.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="WorldObject.cpp">
<ClCompile Include="IGame.cpp">
<Filter>Source Files</Filter>
</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>
</ClCompile>
</ItemGroup>

View File

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

View File

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