diff --git a/source/fmv/fmv.cpp b/source/fmv/fmv.cpp index 4abecbe93..1e1b1cfc7 100644 --- a/source/fmv/fmv.cpp +++ b/source/fmv/fmv.cpp @@ -40,7 +40,7 @@ #include "..\..\tools\vlc\include\vlc_bit.h" -#if defined(__USER_paul__) +#ifndef __USER_paul__ #define FORCE_FMV 1 #endif diff --git a/source/frontend/maintitl.cpp b/source/frontend/maintitl.cpp index 35129092a..b2ae8a9c8 100644 --- a/source/frontend/maintitl.cpp +++ b/source/frontend/maintitl.cpp @@ -196,7 +196,7 @@ void CFrontEndMainTitles::select() ASSERT(s_image); SetScreenImage(s_image); - CSoundMediator::setSong(CSoundMediator::SONG_TITLE); + CSoundMediator::setSong(CSoundMediator::SONG_OPTIONS); m_musicStarted=false; CFader::setFadingIn(); diff --git a/source/player/player.h b/source/player/player.h index 647604729..43e49c723 100644 --- a/source/player/player.h +++ b/source/player/player.h @@ -295,7 +295,7 @@ private: enum { INVINCIBLE_FRAMES__START=200, // Invincible for this many frames at start of life - INVINCIBLE_FRAMES__HIT=60, // Invincible for this many frames after taking damage + INVINCIBLE_FRAMES__HIT=120, // Invincible for this many frames after taking damage }; int m_invincibleFrameCount; // Initial invincibility and also invincibility after taking damage