diff options
| author | johndoe123 | 2013-01-17 09:50:10 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:47:40 +0200 |
| commit | f945448c7ba3884cded68314a13aa2132603121d (patch) | |
| tree | 01287dcf95c60ab21bc35551a1cb6084f7f0c2bc /engines/neverhood/resource.h | |
| parent | 57497817e1f086a62471587e3601d8f0f7d7f13b (diff) | |
| download | scummvm-rg350-f945448c7ba3884cded68314a13aa2132603121d.tar.gz scummvm-rg350-f945448c7ba3884cded68314a13aa2132603121d.tar.bz2 scummvm-rg350-f945448c7ba3884cded68314a13aa2132603121d.zip | |
NEVERHOOD: Change graphic resource draw method to get a Surface instead of separate pixels/pitch
- Merge SpriteResource::load and load2
Diffstat (limited to 'engines/neverhood/resource.h')
| -rw-r--r-- | engines/neverhood/resource.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/neverhood/resource.h b/engines/neverhood/resource.h index c6f63bf92d..e2609b6fd2 100644 --- a/engines/neverhood/resource.h +++ b/engines/neverhood/resource.h @@ -46,9 +46,8 @@ class SpriteResource { public: SpriteResource(NeverhoodEngine *vm); ~SpriteResource(); - void draw(byte *dest, int destPitch, bool flipX, bool flipY); - bool load(uint32 fileHash); - bool load2(uint32 fileHash); + void draw(Graphics::Surface *destSurface, bool flipX, bool flipY); + bool load(uint32 fileHash, bool doLoadPosition = false); void unload(); const NDimensions& getDimensions() { return _dimensions; } NPoint& getPosition() { return _position; } @@ -90,7 +89,7 @@ class AnimResource { public: AnimResource(NeverhoodEngine *vm); ~AnimResource(); - void draw(uint frameIndex, byte *dest, int destPitch, bool flipX, bool flipY); + void draw(uint frameIndex, Graphics::Surface *destSurface, bool flipX, bool flipY); bool load(uint32 fileHash); void unload(); void clear(); @@ -120,7 +119,7 @@ public: void load(uint32 fileHash); void unload(); NDrawRect& getRect(); - void draw(int frameNum, byte *dest, int destPitch); + void draw(int frameNum, Graphics::Surface *destSurface); int getCursorNum() const { return _cursorNum; } void setCursorNum(int cursorNum) { _cursorNum = cursorNum; } protected: |