# HG changeset patch
# User nemo
# Date 1241386785 0
# Node ID 7c051453a487b59bcd5a8942e9624df854378113
# Parent  21c986c528baa179d0dd09b54b422f8c24c44653
oops - checked in my disabling of frontend sound/animation

diff -r 21c986c528ba -r 7c051453a487 QTfrontend/SDLs.cpp
--- a/QTfrontend/SDLs.cpp	Sun May 03 21:38:56 2009 +0000
+++ b/QTfrontend/SDLs.cpp	Sun May 03 21:39:45 2009 +0000
@@ -26,10 +26,10 @@
 	music = NULL;
 
 	SDL_Init(SDL_INIT_VIDEO);
-//	SDL_Init(SDL_INIT_AUDIO);
-//	Mix_OpenAudio(22050, 0x8010, 2, 512);
-	
-//	Mix_VolumeMusic(33);
+	SDL_Init(SDL_INIT_AUDIO);
+	Mix_OpenAudio(22050, 0x8010, 2, 512);
+  
+	Mix_VolumeMusic(33);
 }
 
 SDLInteraction::~SDLInteraction()
@@ -59,15 +59,13 @@
 }
 void SDLInteraction::StartMusic()
 {
-/*
 	if (!music)
 		music = Mix_LoadMUS(QString(datadir->absolutePath() + "/Music/main theme.ogg").toLocal8Bit().constData());
 
 	Mix_FadeInMusic(music, -1, 3000);
-*/
 }
 
 void SDLInteraction::StopMusic()
 {
-//	Mix_FadeOutMusic(2000);
+	Mix_FadeOutMusic(2000);
 }
diff -r 21c986c528ba -r 7c051453a487 QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp	Sun May 03 21:38:56 2009 +0000
+++ b/QTfrontend/hwform.cpp	Sun May 03 21:39:45 2009 +0000
@@ -171,7 +171,7 @@
 	wBackground->setFixedSize(this->width(), this->height());
 	wBackground->lower();
 	wBackground->init();
-	//wBackground->startAnimation();
+	wBackground->startAnimation();
 
 	PagesStack.push(ID_PAGE_MAIN);
 	GoBack();
@@ -751,7 +751,7 @@
 		case gsFinished: {
 			GoBack();
 			Music(ui.pageOptions->CBEnableMusic->isChecked());
-			//if (wBackground) wBackground->startAnimation();	
+			if (wBackground) wBackground->startAnimation();	
 			GoToPage(ID_PAGE_GAMESTATS);
 			if (hwnet) hwnet->gameFinished();
 			break;
@@ -761,7 +761,7 @@
 			if (id == ID_PAGE_INGAME) {
 				GoBack();
 				Music(ui.pageOptions->CBEnableMusic->isChecked());
-				//if (wBackground) wBackground->startAnimation();	
+				if (wBackground) wBackground->startAnimation();	
 				if (hwnet) hwnet->gameFinished();
 			}
 		};