← Back to branch summary

~ubuntu-branches/ubuntu/raring/scummvm/raring

« back to all changes in this revision

Viewing changes to engines/gob/mult_v2.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Moritz Muehlenhoff
  • Date: 2011-05-25 19:02:23 UTC
  • mto: (21.1.2 sid)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: james.westby@ubuntu.com-20110525190223-fiqm0oaec714xk31
Tags: upstream-1.3.0
Import upstream version 1.3.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
engines/gob/mult_v2.cpp
18
18
 * along with this program; if not, write to the Free Software
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
20
 *
21
 
 * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-1-2-1/engines/gob/mult_v2.cpp $
22
 
 * $Id: mult_v2.cpp 53038 2010-10-05 21:23:04Z drmccoy $
 
21
 * $URL$
 
22
 * $Id$
23
23
 *
24
24
 */
25
25
 
37
37
#include "gob/goblin.h"
38
38
#include "gob/inter.h"
39
39
#include "gob/scenery.h"
 
40
#include "gob/map.h"
40
41
#include "gob/video.h"
41
42
#include "gob/videoplayer.h"
42
43
 
582
583
                _vm->_draw->initSpriteSurf(Draw::kAnimSurface, width, height, 0);
583
584
                _animSurf = _vm->_draw->_spritesArray[Draw::kAnimSurface];
584
585
 
585
 
                _vm->_video->drawSprite(*_vm->_draw->_spritesArray[Draw::kBackSurface],
586
 
                                *_vm->_draw->_spritesArray[Draw::kAnimSurface], 0, 0,
587
 
                                _vm->_video->_surfWidth, _vm->_video->_surfHeight, 0, 0, 0);
 
586
                _vm->_draw->_spritesArray[Draw::kAnimSurface]->blit(*_vm->_draw->_spritesArray[Draw::kBackSurface],
 
587
                                0, 0, _vm->_video->_surfWidth, _vm->_video->_surfHeight, 0, 0);
588
588
 
589
589
                for (_counter = 0; _counter < _objCount; _counter++)
590
590
                        _multData->palAnimIndices[_counter] = _counter;
639
639
                        _vm->_scenery->_curStatic = -1;
640
640
                }
641
641
 
642
 
                _vm->_video->drawSprite(*_vm->_draw->_spritesArray[Draw::kBackSurface],
643
 
                                *_vm->_draw->_spritesArray[Draw::kAnimSurface], 0, 0,
644
 
                                _vm->_video->_surfWidth, _vm->_video->_surfHeight, 0, 0, 0);
 
642
                _vm->_draw->_spritesArray[Draw::kAnimSurface]->blit(*_vm->_draw->_spritesArray[Draw::kBackSurface],
 
643
                                0, 0, _vm->_video->_surfWidth, _vm->_video->_surfHeight, 0, 0);
645
644
        }
646
645
}
647
646
 
717
716
        if (animData.animType == 4) {
718
717
                animData.frame = 0;
719
718
                animData.isPaused = 1;
720
 
                if (animData.animation < 0)
721
 
                        warning("Woodruff Stub: AnimType 4, animation: %d", animData.animation);
 
719
                if ((animData.animation < 0) && (animObj.videoSlot > 0)) {
 
720
                        _vm->_vidPlayer->closeVideo(animObj.videoSlot - 1);
 
721
                        animObj.videoSlot = 0;
 
722
                }
722
723
                return;
723
724
        }
724
725
 
828
829
                Mult_Object &animObj = _objects[i];
829
830
                Mult_AnimData &animData = *(animObj.pAnimData);
830
831
 
 
832
                if (_vm->_map->_mapUnknownBool) {
 
833
                        // TODO!
 
834
                }
 
835
 
831
836
                animData.intersected = 200;
832
837
                if (animData.isStatic != 2) {
833
838
                        if ((animData.isStatic == 0) || (animObj.lastLeft != -1)) {
844
849
                Mult_AnimData &animData = *(animObj.pAnimData);
845
850
 
846
851
                animObj.needRedraw = 0;
847
 
                animObj.newTop = 1000;
848
 
                animObj.newLeft = 1000;
849
 
                animObj.newBottom = 0;
850
 
                animObj.newRight = 0;
 
852
                animObj.newTop     = 1000;
 
853
                animObj.newLeft    = 1000;
 
854
                animObj.newBottom  = 0;
 
855
                animObj.newRight   = 0;
851
856
 
852
857
                if (animData.isStatic == 2)
853
858
                        continue;