Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Jeck - Jean, please review for cross-platform compatibility. Fix stupid error in GameStateDeckViewer.cpp, also fix windows compile of JGE.cpp.

Browse Source
This commit is contained in:
wagic.jeck
2010-02-14 18:41:08 +00:00
parent cd746e7cbc
commit 350f06fab8
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
JGE/JGE.vcproj
View File

@@ -507,10 +507,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\src\JInputSystem.cpp"
>
</File>
<File
RelativePath="src\JLBFont.cpp"
>
@@ -757,10 +753,6 @@
RelativePath="include\JGui.h"
>
</File>
<File
RelativePath=".\include\JInputSystem.h"
>
</File>
<File
RelativePath="include\JLBFont.h"
>

5
JGE/src/JGE.cpp
View File

@@ -10,6 +10,7 @@
#include <iostream>
#include <map>
#include <limits>
#include "../include/JGE.h"
#include "../include/JApp.h"
@@ -105,7 +106,7 @@ void JGE::HoldKey_NoRepeat(const LocalKeySym sym)
{
keyBuffer.push(it->second);
if (holds.end() == holds.find(it->second))
holds[it->second] = NAN;
holds[it->second] = std::numeric_limits<float>::quiet_NaN();
}
}
void JGE::HoldKey(const JButton sym)
@@ -116,7 +117,7 @@ void JGE::HoldKey(const JButton sym)
void JGE::HoldKey_NoRepeat(const JButton sym)
{
keyBuffer.push(sym);
if (holds.end() == holds.find(sym)) holds[sym] = NAN;
if (holds.end() == holds.find(sym)) holds[sym] = std::numeric_limits<float>::quiet_NaN();
}
void JGE::ReleaseKey(const LocalKeySym sym)
{

8
projects/mtg/src/GameStateDeckViewer.cpp
View File

@@ -48,8 +48,8 @@ GameStateDeckViewer::~GameStateDeckViewer() {
SAFE_DELETE(myDeck->parent);
SAFE_DELETE(myDeck);
}
if(myCollection{
SAFE_DELETE(myCollection->parent)
if(myCollection){
SAFE_DELETE(myCollection->parent);
SAFE_DELETE(myCollection);
}
SAFE_DELETE(filterDeck);
@@ -221,8 +221,8 @@ void GameStateDeckViewer::End()
SAFE_DELETE(menu);
resources.Release(pspIconsTexture);
if(myCollection{
SAFE_DELETE(myCollection->parent)
if(myCollection){
SAFE_DELETE(myCollection->parent);
SAFE_DELETE(myCollection);
}
if(myDeck){