[Scummvm-cvs-logs] scummvm master -> 4b1f426103497f2bf6d1e9fd002dfb14ff1a3c31

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bee9e1bfd7 NEVERHOOD: Remove unused method drawShadowSurface()
4b1f426103 NEVERHOOD: Fix Klaymen's idle blinking animation in the teleporter


Commit: bee9e1bfd7877035b582d32df52aea1ec9859353
    https://github.com/scummvm/scummvm/commit/bee9e1bfd7877035b582d32df52aea1ec9859353
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-11-02T19:18:20-07:00

Commit Message:
NEVERHOOD: Remove unused method drawShadowSurface()

Changed paths:
    engines/neverhood/screen.h



diff --git a/engines/neverhood/screen.h b/engines/neverhood/screen.h
index c778066..a9b5af0 100644
--- a/engines/neverhood/screen.h
+++ b/engines/neverhood/screen.h
@@ -79,7 +79,6 @@ public:
 	void drawSurface2(const Graphics::Surface *surface, NDrawRect &drawRect, NRect &clipRect, bool transparent, byte version,
 		const Graphics::Surface *shadowSurface = NULL);
 	void drawSurface3(const Graphics::Surface *surface, int16 x, int16 y, NDrawRect &drawRect, NRect &clipRect, bool transparent, byte version);
-	void drawShadowSurface(const Graphics::Surface *surface, const Graphics::Surface *shadowSurface, int16 x, int16 y, NDrawRect &drawRect, NRect &clipRect);
 	void drawDoubleSurface2(const Graphics::Surface *surface, NDrawRect &drawRect);
 	void drawUnk(const Graphics::Surface *surface, NDrawRect &drawRect, NDrawRect &sysRect, NRect &clipRect, bool transparent, byte version);
 	void drawSurfaceClipRects(const Graphics::Surface *surface, NDrawRect &drawRect, NRect *clipRects, uint clipRectsCount, bool transparent, byte version);


Commit: 4b1f426103497f2bf6d1e9fd002dfb14ff1a3c31
    https://github.com/scummvm/scummvm/commit/4b1f426103497f2bf6d1e9fd002dfb14ff1a3c31
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-11-02T19:19:17-07:00

Commit Message:
NEVERHOOD: Fix Klaymen's idle blinking animation in the teleporter

The wrong animation hash was used in stSitIdleTeleporterBlinkSecond()

Changed paths:
    engines/neverhood/klaymen.cpp



diff --git a/engines/neverhood/klaymen.cpp b/engines/neverhood/klaymen.cpp
index a942bca..e1a0d72 100644
--- a/engines/neverhood/klaymen.cpp
+++ b/engines/neverhood/klaymen.cpp
@@ -300,7 +300,7 @@ void Klaymen::stSitIdleTeleporterBlink() {
 void Klaymen::stSitIdleTeleporterBlinkSecond() {
 	_busyStatus = 0;
 	_acceptInput = true;
-	startAnimation(0x5C24C018, 0, -1);
+	startAnimation(0x582EC138, 0, -1);
 	SetUpdateHandler(&Klaymen::upSitIdleTeleporter);
 	SetMessageHandler(&Klaymen::hmLowLevel);
 	SetSpriteUpdate(NULL);