From 18f34e14f83b8b1dbff53cf21b00ed0116b12dc3 Mon Sep 17 00:00:00 2001 From: AlexVinS Date: Tue, 8 Jul 2014 22:01:01 +0400 Subject: [PATCH] set scale to off by default --- client/CMT.cpp | 2 ++ client/CVideoHandler.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/client/CMT.cpp b/client/CMT.cpp index 11beac7bb..92b6866db 100644 --- a/client/CMT.cpp +++ b/client/CMT.cpp @@ -779,10 +779,12 @@ void processCommand(const std::string &message) //plays intro, ends when intro is over or button has been pressed (handles events) void playIntro() { + CCS->videoh->setScaling(true); if(CCS->videoh->openAndPlayVideo("3DOLOGO.SMK", 60, 40, screen, true)) { CCS->videoh->openAndPlayVideo("AZVS.SMK", 60, 80, screen, true); } + CCS->videoh->setScaling(false); } void dispose() diff --git a/client/CVideoHandler.cpp b/client/CVideoHandler.cpp index 272541859..8d817187e 100644 --- a/client/CVideoHandler.cpp +++ b/client/CVideoHandler.cpp @@ -72,7 +72,7 @@ CVideoPlayer::CVideoPlayer() // av_register_output_format() / av_register_protocol() instead. av_register_all(); - doScale = true; + doScale = false; } bool CVideoPlayer::open(std::string fname)