From 63fcc433d01fb93f85a833b96009c58d4650d0c3 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 6 Jun 2009 14:20:30 +0100 Subject: [PATCH] Port lander to windows again --- msvc9/Lander/Lander.suo | Bin 27136 -> 23552 bytes msvc9/Lander/Lander/Lander.vcproj | 1 + src/Asteroid.hpp | 4 ---- src/GraphicsFwd.hpp | 2 +- src/HighScores.cpp | 4 ++-- src/HighScores.hpp | 2 ++ src/OpenGL.cpp | 4 ++-- src/Platform.hpp | 3 +++ 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/msvc9/Lander/Lander.suo b/msvc9/Lander/Lander.suo index 620190eb72f8f69136d93002758da15b4a27159b..2257c7b5723f847e0ec3bf29b6b834b22e4dc8ff 100644 GIT binary patch delta 3155 zcmcImYiyHc6n@|C`?~JdZH0~Q!q&;gwJU8mU_%zVwcEIC&^f>bSYXTom9B-ZRW>gh z7eR2`cDyG3Fd^}ei2)l7YQjZPF^XuyAN7whk?5Z>6HE*y%;$Xl3K-<_1K;N9xxD9l z-}9Yw-t&ILSLE<%d18@4PN4=vxoQ2)Jmd_!NNuiypUz(CqnL>Z5mDM*VCMFn}u+9RqfgFH! zya&@holc^q#%UF)C(58L2W&tEz~1rPY&v9|W~zp?2cXl&?aIr{*wgoJB~jz;@4rzM%6%pu<4pYH{_Ocjq>qJYu(xT%;f9n8}&&n0#{T zTFiRILa|<~#_9nP#s7M-LIg#x*hcw91>~&Eqp=JNy>B(CFouV}W^7O=fyvh*6wCCJ z&*CIcHX@bjmzJb9Yo$?Uz$lkR)d+5LqCUG%(vR82bS}q39z=FLCy$(pa*I#uI*pQd zO6Mn$hPZj9iuanx)Z`5M(|p-96Z5R2yt0`?W(cbQ9!4Q0$ZuL&3&ioXF^QB-Ol&p? z*7K-qA4|Rncv~CuhFdb8haoIk!#U=Xx%6JG<=V}$3D&nkPVJ@Zv$To1nDC0knY<=R zxfKp_Oty?#eCiCSXC)(I@vH1rHcLic_a_70uq@-?8S^353L2cWOy%k_vrU!-T-bm= z#C-AOYY6${g6pplxrre|r~r}$i_1G~LhOF%EV{{QRZ1RguZ$M@R4!hd7WYz$7k0`5 z?NzQ9`qd)LdE7{IlD<@lY%t4K#!U@mRDcWViX_n?k|f<$-}!k!^u+!=?obdgk@c zoA0WxsSP;m>bvc!#qWHxB|ZIHV?CQf0d23LN48lv7gW0Lw8*2k-Q(n=2l&u^dPQ8ItKHcQtTf)5M}ND!==)kLrPt*QrP8L; z<{j~#P%t)-@@AuJT`DC1N4&d-Oo)NVNS+fR6lVV8rEizlBlffUAq%6M-OQqht6;{H zXzH60-~gI!P;3!lt?^ciW-(9H;UK$l#Op*8RVYPrHl0^$+Na^!ZTc&=V76H}(Jz`| z>k`$X29is(fOFyJgSP7ACFfJVse(L(COL;s zjBx}rwFVk2t&|IrQ*E_buR(c2dtA`v)|xc*FIw!_lUQ3>Ea~XE!G8#jI>c54XghYxr%SU|%ENSQdL(gfwnrte zt&ICMHa}}WVCBY-F%JQ0!fUr69QDoKPCxnGi%RZO-KpJC%9iX?zaQkLuJtK0FPS;S z-x6~G1(>f-@J&_)@Tdb)&8!|gr)80@D+Fx-c<`zzyLRwww^G+3e7JChm;!X^x@^#} z5JO0#K=P6g^F743eh$F5J}=0I`+!zpKfpS+lQaO*BfC!H;m?)?#F&A-ci8mZl|REUTD%F${BTizZv`5a>J5(^MVcfzyGBPq|_ zpYty#M%%pPwYURo7kO(=qD{JX(B T!6loZ^TACpJA@TE3q1Y-KrPh_ delta 1919 zcmZvdZA@EL7{|}KyS*)?Eu|D%UJBhPFGAUhFvEB)P-P<7io!+~VwSjlS&Y=#C6mlh zmnDk{d!dgy{pjKc=az_GVwgrHf@affV-q#ePsT(OO(rIon0=uBpWa)ox+nSFbI$*~ z+;gAvoad$%Wok{%cPr9OJxUENDBcGGLWpWm19pHqunp9L5ZKIQGGQ*~MtuQp2 z>!|?BtW9Bj0&vGsl+SS;-x;1Z#S1FwGB=l1>hPy_YbB6`#o zla`YhIY>X$A0~(2leWh+KLnTYRMS-7`A6hPTV(+qbM4jGoA&IBq@Dh7-O{WO zin4;G2-Pu~b5>H^7M{`IWhsUD9clqee*2Bf?VjH@?`Bxfw|t!=Wzg)**WZEm{eAQ& zp)qWE&5Q0_bzQO_0WK=7mghb3i0;er{YbQ8Se-h-U-mLvM1=8uOsaMB;C3!ACOkbqukjEl&pwryfu%pOTIWqtaPtpkD{6bDpxgj zZn@d4ifdjp6{ERPHKx>?Jpn|9Jxm*c*_lO*xDGh#^Smb5AACQ{{-aM}r%ChF^2hV- zX#{+m@^y}dAYjYa$I;#|MF0OfSny@le^21E;#|O%TSy!cCn(`>q-X2=l&YDaJ9Ulp zM#CVjH&;{FuE)vR(JkY2u;*urH2dj7`-DE!dsR}RZa2+u_vniug!$5Nni35v<|Zf@ z@*uu%)xD%A8|oEGHJ_(oL?yLpghG+CrHSlS<~w#$JS95Cq=<u3h9`^xYjq__7uzdtr<1DxY_}o4P zxw*@zt71loFHDgG;bXvd1LP*JqTT>*n;NIoufPtlW@@~duR$C5CQrMAI!Eibrp5tx z6R>>;GDPDo6tsECQyYkRmm-}rj6#y>c|xorI7V2%6A0b4U*jd#ii$JWeCS0Kz%)Yqla=dtOFk4Q>& cy-58XzuY&jIxX~Y$4@jLHbQP6LhjAK0LOOxumAu6 diff --git a/msvc9/Lander/Lander/Lander.vcproj b/msvc9/Lander/Lander/Lander.vcproj index ad8d9f5..825cd0c 100644 --- a/msvc9/Lander/Lander/Lander.vcproj +++ b/msvc9/Lander/Lander/Lander.vcproj @@ -48,6 +48,7 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> - -using namespace std::tr1; - class Asteroid : public StaticObject { public: Asteroid(int x, int y, int width, int surftex); diff --git a/src/GraphicsFwd.hpp b/src/GraphicsFwd.hpp index 9592691..ab4ddb2 100644 --- a/src/GraphicsFwd.hpp +++ b/src/GraphicsFwd.hpp @@ -20,7 +20,7 @@ #define INC_GRAPHICSFWD_HPP class Image; -class TextureQuad; +struct TextureQuad; class Texture; #endif diff --git a/src/HighScores.cpp b/src/HighScores.cpp index 3f70570..a64dcd3 100644 --- a/src/HighScores.cpp +++ b/src/HighScores.cpp @@ -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() diff --git a/src/HighScores.hpp b/src/HighScores.hpp index bb2b1ba..b6fc40b 100644 --- a/src/HighScores.hpp +++ b/src/HighScores.hpp @@ -49,6 +49,8 @@ public: void WriteOnStream(ostream& os); void ReadFromStream(istream& is); + bool operator<(const ScoreFile::ScoreEntry& rhs) const; + private: char name[MAX_NAME]; int score; diff --git a/src/OpenGL.cpp b/src/OpenGL.cpp index d548a58..01ef831 100644 --- a/src/OpenGL.cpp +++ b/src/OpenGL.cpp @@ -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(gluErrorString(error))); + //throw runtime_error + // ("OpenGL error: " + boost::lexical_cast(gluErrorString(error))); } SDL_GL_SwapBuffers(); diff --git a/src/Platform.hpp b/src/Platform.hpp index 45e60a7..0789069 100644 --- a/src/Platform.hpp +++ b/src/Platform.hpp @@ -55,6 +55,9 @@ using namespace std; #define M_PI 3.1415926535897932384626433832795 #endif +#include +using namespace std::tr1; + #define msleep(n) Sleep(n) #define i18n(x) x -- 2.39.2