diff options
| author | Eugene Sandulenko | 2010-08-06 10:59:50 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:30:57 +0000 |
| commit | a17ec87b7dd09e7b251a3f578d1f788917550451 (patch) | |
| tree | c77bdbb06d39d9a200b5e0514d2aedc7f43c8e28 /engines/sword25/gfx/opengl/openglgfx.h | |
| parent | 6dcf9f0ee557e692df3c70a263ca35068ff45380 (diff) | |
| download | scummvm-rg350-a17ec87b7dd09e7b251a3f578d1f788917550451.tar.gz scummvm-rg350-a17ec87b7dd09e7b251a3f578d1f788917550451.tar.bz2 scummvm-rg350-a17ec87b7dd09e7b251a3f578d1f788917550451.zip | |
SWORD25: Number of compilation and warning fixes
svn-id: r53219
Diffstat (limited to 'engines/sword25/gfx/opengl/openglgfx.h')
| -rw-r--r-- | engines/sword25/gfx/opengl/openglgfx.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/sword25/gfx/opengl/openglgfx.h b/engines/sword25/gfx/opengl/openglgfx.h index c1b6143827..df0d81cb04 100644 --- a/engines/sword25/gfx/opengl/openglgfx.h +++ b/engines/sword25/gfx/opengl/openglgfx.h @@ -85,12 +85,12 @@ public: virtual bool GetVsync() const; virtual bool Fill(const BS_Rect* FillRectPtr = 0, unsigned int Color = BS_RGB(0, 0, 0)); - virtual bool GetScreenshot(unsigned int & Width, unsigned int & Height, std::vector<unsigned int> & Data); + virtual bool GetScreenshot(unsigned int & Width, unsigned int & Height, Common::Array<unsigned int> & Data); // Resource-Managing Methoden // -------------------------- - virtual BS_Resource* LoadResource(const std::string& FileName); - virtual bool CanLoadResource(const std::string& FileName); + virtual BS_Resource* LoadResource(const Common::String& FileName); + virtual bool CanLoadResource(const Common::String& FileName); // Debugging Methoden // ------------------ @@ -121,11 +121,11 @@ private: unsigned int Color; }; - std::vector<DebugLine> m_DebugLines; + Common::Array<DebugLine> m_DebugLines; - static bool ReadFramebufferContents(unsigned int Width, unsigned int Height, std::vector<unsigned int> & Data); - static void ReverseRGBAComponentOrder(std::vector<unsigned int> & Data); - static void FlipImagedataVertical(unsigned int Width, unsigned int Height, std::vector<unsigned int> & Data); + static bool ReadFramebufferContents(unsigned int Width, unsigned int Height, Common::Array<unsigned int> & Data); + static void ReverseRGBAComponentOrder(Common::Array<unsigned int> & Data); + static void FlipImagedataVertical(unsigned int Width, unsigned int Height, Common::Array<unsigned int> & Data); }; } // End of namespace Sword25 |