Permalink
Browse files

Port lander to windows again

  • Loading branch information...
unknown unknown
unknown authored and unknown committed Jun 6, 2009
1 parent e8f9336 commit 63fcc433d01fb93f85a833b96009c58d4650d0c3
View
Binary file not shown.
@@ -48,6 +48,7 @@
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
/>
<Tool
View
@@ -24,10 +24,6 @@
#include "Surface.hpp"
#include "ObjectGrid.hpp"
-#include <tr1/memory>
-
-using namespace std::tr1;
-
class Asteroid : public StaticObject {
public:
Asteroid(int x, int y, int width, int surftex);
View
@@ -20,7 +20,7 @@
#define INC_GRAPHICSFWD_HPP
class Image;
-class TextureQuad;
+struct TextureQuad;
class Texture;
#endif
View
@@ -292,9 +292,9 @@ string ScoreFile::GetHighScoreFile()
return GetConfigDir() + ".lander.scores";
}
-bool operator<(const ScoreFile::ScoreEntry& a, const ScoreFile::ScoreEntry& b)
+bool ScoreFile::ScoreEntry::operator<(const ScoreFile::ScoreEntry& rhs) const
{
- return a.GetScore() > b.GetScore();
+ return this->GetScore() > rhs.GetScore();
}
void ScoreFile::Sort()
View
@@ -49,6 +49,8 @@ class ScoreFile {
void WriteOnStream(ostream& os);
void ReadFromStream(istream& is);
+ bool operator<(const ScoreFile::ScoreEntry& rhs) const;
+
private:
char name[MAX_NAME];
int score;
View
@@ -189,8 +189,8 @@ void OpenGL::DrawGLScene()
// Check for OpenGL errors
GLenum error = glGetError();
if (error != GL_NO_ERROR) {
- throw runtime_error
- ("OpenGL error: " + boost::lexical_cast<string>(gluErrorString(error)));
+ //throw runtime_error
+ // ("OpenGL error: " + boost::lexical_cast<string>(gluErrorString(error)));
}
SDL_GL_SwapBuffers();
View
@@ -55,6 +55,9 @@ using namespace std;
#define M_PI 3.1415926535897932384626433832795
#endif
+#include <boost/tr1/memory.hpp>
+using namespace std::tr1;
+
#define msleep(n) Sleep(n)
#define i18n(x) x

0 comments on commit 63fcc43

Please sign in to comment.