Merge branch 'master' of github.com:Allanis/LibD

This commit is contained in:
Rtch90 2012-04-15 13:27:57 +01:00
commit e6f773dd68
3 changed files with 9 additions and 1 deletions

View File

@ -109,6 +109,7 @@
<ClInclude Include="..\..\src\System\Debug.h" />
<ClInclude Include="..\..\src\System\FileReader.h" />
<ClInclude Include="..\..\src\System\ResourceManager.h" />
<ClInclude Include="..\..\src\System\String.h" />
<ClInclude Include="..\..\src\Texture\Texture.h" />
<ClInclude Include="..\..\src\TMXParser\base64.h" />
<ClInclude Include="..\..\src\TMXParser\Tmx.h" />
@ -148,6 +149,7 @@
<ClCompile Include="..\..\src\Sprite\Sprite.cpp" />
<ClCompile Include="..\..\src\System\Debug.cpp" />
<ClCompile Include="..\..\src\System\FileReader.cpp" />
<ClCompile Include="..\..\src\System\String.cpp" />
<ClCompile Include="..\..\src\Texture\Texture.cpp" />
<ClCompile Include="..\..\src\TMXParser\base64.cpp" />
<ClCompile Include="..\..\src\TMXParser\TmxImage.cpp" />

View File

@ -171,6 +171,9 @@
<ClInclude Include="..\..\src\System\FileReader.h">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="..\..\src\System\String.h">
<Filter>System</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\Main\main.cpp">
@ -275,5 +278,8 @@
<ClCompile Include="..\..\src\System\FileReader.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="..\..\src\System\String.cpp">
<Filter>System</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@ -74,7 +74,7 @@ void Game::Render(void) {
if(xOffset > maxXOffset) xOffset = maxXOffset;
if(yOffset > maxYOffset) yOffset = maxYOffset;
glTranslatef(-xOffset, -yOffset, 0.0f);
glTranslatef((int)-xOffset, (int)-yOffset, 0.0f);
// Render our shit..
_level->Draw(xOffset, yOffset);