From 85076e653dacddcb7298f0999b4c2efd9c80ca31 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Fri, 5 Jan 2001 00:17:57 +0000
Subject: [PATCH]

---
 source/frontend/demomode.cpp | 2 +-
 source/frontend/frontend.cpp | 6 +++---
 source/frontend/maintitl.cpp | 6 +++---
 source/frontend/options.cpp  | 3 ++-
 source/frontend/scrollbg.cpp | 2 +-
 source/frontend/scrollbg.h   | 7 ++++++-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/source/frontend/demomode.cpp b/source/frontend/demomode.cpp
index 1bc9b9e93..a9579de4a 100644
--- a/source/frontend/demomode.cpp
+++ b/source/frontend/demomode.cpp
@@ -156,7 +156,7 @@ void CFrontEndDemoMode::render()
 	setRGB1(g4,50,50,99);
 	setRGB2(g4,50,99,50);
 	setRGB3(g4,99,50,99);
-	AddPrimToList(g4,1001);
+	AddPrimToList(g4,MAX_OT-1);
 }
 
 /*----------------------------------------------------------------------
diff --git a/source/frontend/frontend.cpp b/source/frontend/frontend.cpp
index 93fec5ed3..d4707cf68 100644
--- a/source/frontend/frontend.cpp
+++ b/source/frontend/frontend.cpp
@@ -140,8 +140,8 @@ void CFrontEndScene::init()
 	m_font->initialise(&standardFont);
 	m_font->setJustification(FontBank::JUST_CENTRE);
 
-//	CSoundMediator::setSong(CSoundMediator::SONG_TITLE);
-//	CSoundMediator::playSong();
+	CSoundMediator::setSong(CSoundMediator::SONG_TITLE);
+	CSoundMediator::playSong();
 }
 
 
@@ -161,7 +161,7 @@ void CFrontEndScene::shutdown()
 		s_modeCodes[i]->shutdown();
 	}
 
-//	CSoundMediator::dumpSong();
+	CSoundMediator::dumpSong();
 }
 
 
diff --git a/source/frontend/maintitl.cpp b/source/frontend/maintitl.cpp
index 802eaaa04..fff912d7a 100644
--- a/source/frontend/maintitl.cpp
+++ b/source/frontend/maintitl.cpp
@@ -218,7 +218,7 @@ void CFrontEndMainTitles::render()
 
 	// The island
 	fh=m_sprites->getFrameHeader(FRM__ISLAND);
-	m_sprites->printFT4(fh,ISLAND_LEFT_X,ISLAND_BOTTOM_Y-(fh->H),0,0,221);
+	m_sprites->printFT4(fh,ISLAND_LEFT_X,ISLAND_BOTTOM_Y-(fh->H),0,0,201);
 
 	// Sky
 /*	
@@ -499,7 +499,7 @@ void CFrontEndMainTitles::renderSeaSection(sFrameHdr *_fh,int _x,int _y,int _w,i
 			ft4->y3=grid[xloop+1][yloop+1].y;
 			ft4->x2=grid[xloop  ][yloop+1].x;
 			ft4->y2=grid[xloop  ][yloop+1].y;
-			AddPrimToList(ft4,1000);
+			AddPrimToList(ft4,202);
 			x+=xstep;
 		}
 		y+=ystep;
@@ -510,7 +510,7 @@ void CFrontEndMainTitles::renderSeaSection(sFrameHdr *_fh,int _x,int _y,int _w,i
 	f4=GetPrimF4();
 	setXYWH(f4,0,HORIZON_LEVEL,512,256-HORIZON_LEVEL);
 	setRGB0(f4,80,70,60);
-	AddPrimToList(f4,1020);
+	AddPrimToList(f4,203);
 	//////////////////////// bg
 }
 
diff --git a/source/frontend/options.cpp b/source/frontend/options.cpp
index e118f36ff..42c595571 100644
--- a/source/frontend/options.cpp
+++ b/source/frontend/options.cpp
@@ -158,6 +158,7 @@ void CFrontEndOptions::init()
 
 	m_background=new ("Options Background") CScrollyBackground();
 	m_background->init();
+	m_background->setOt(MAX_OT-2);
 
 	// Create the menu frames
 	for(i=0;i<MODE__COUNT;i++)
@@ -356,7 +357,7 @@ void CFrontEndOptions::render()
 	setRGB1(g4, 0, 0,50);
 	setRGB2(g4, 0,50, 0);
 	setRGB3(g4,50, 0,50);
-	AddPrimToList(g4,1001);
+	AddPrimToList(g4,MAX_OT-1);
 
 	m_background->render();
 
diff --git a/source/frontend/scrollbg.cpp b/source/frontend/scrollbg.cpp
index bfc2554a5..b6281e2b8 100644
--- a/source/frontend/scrollbg.cpp
+++ b/source/frontend/scrollbg.cpp
@@ -1,6 +1,6 @@
 /*=========================================================================
 
-	paul.cpp
+	scrollbg.cpp
 
 	Author:		PKG
 	Created: 
diff --git a/source/frontend/scrollbg.h b/source/frontend/scrollbg.h
index 2817f5f47..69c4ec308 100644
--- a/source/frontend/scrollbg.h
+++ b/source/frontend/scrollbg.h
@@ -18,6 +18,11 @@
 	Includes
 	-------- */
 
+#ifndef __PRIM_HEADER__
+#include "gfx\prim.h"
+#endif
+
+
 /*	Std Lib
 	------- */
 
@@ -49,7 +54,7 @@ private:
 		DEFAULT_X_SPEED=-2,
 		DEFAULT_Y_SPEED=-3,
 		DEFAULT_SPEED_SCALE=2,
-		DEFAULT_OT=1000,
+		DEFAULT_OT=MAX_OT-1,
 	};
 
 	class SpriteBank	*m_sprites;