[Scummvm-cvs-logs] scummvm master -> be5df8e30455b45e20dff36c899ce18184544ed1

dreammaster dreammaster at scummvm.org
Sun Jun 14 16:22:53 CEST 2015


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

Summary:
be5df8e304 SHERLOCK: Compilation fix


Commit: be5df8e30455b45e20dff36c899ce18184544ed1
    https://github.com/scummvm/scummvm/commit/be5df8e30455b45e20dff36c899ce18184544ed1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-14T10:21:50-04:00

Commit Message:
SHERLOCK: Compilation fix

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 9fb6919..270ddc8 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -71,6 +71,7 @@ static const AdjustWalk ADJUST_WALKS[NUM_ADJUSTED_WALKS] = {
 };
 
 SherlockEngine *BaseObject::_vm;
+bool BaseObject::_countCAnimFrames;
 
 /*----------------------------------------------------------------*/
 
@@ -1024,8 +1025,6 @@ void UseType::load3DO(Common::SeekableReadStream &s) {
 
 /*----------------------------------------------------------------*/
 
-bool Object::_countCAnimFrames;
-
 Object::Object(): BaseObject() {
 	_sequenceNumber = 0;
 	_sequenceOffset = 0;






More information about the Scummvm-git-logs mailing list