TONY: Implemented GfxEngine code

scummvm · May 1, 2012 · 7d9156b · 7d9156b
1 parent 68bcaa6
commit 7d9156b
Show file tree

Hide file tree

Showing 4 changed files with 1,020 additions and 27 deletions.
diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp
@@ -236,26 +236,6 @@ void RMOptionButton::AddToList(RMGfxTargetBuffer &bigBuf) {
 }
 
 
-/****************************************************************************\
-*       RMOptionSlide methods
-\****************************************************************************/
-
-#define INIT_GFX16_FROMRAW(dwRes, buf16)	\
-	raw = new RMResRaw(dwRes);	\
-	assert(raw->IsValid());			\
-	assert((buf16) == NULL);			\
-	(buf16) = new RMGfxSourceBuffer16(false); \
-	(buf16)->Init(*raw,raw->Width(),raw->Height()); \
-	delete raw;
-
-#define INIT_GFX8_FROMRAW(dwRes, buf8)	\
-	raw = new RMResRaw(dwRes);	\
-	assert(raw->IsValid());			\
-	assert((buf8) == NULL);			\
-	(buf8) = new RMGfxSourceBuffer8RLEByte(); \
-	(buf8)->Init(*raw, raw->Width(), raw->Height(), true); \
-	delete raw;
-
 /****************************************************************************\
 *       Metodi di RMGfxEngine
 \****************************************************************************/
@@ -284,23 +264,23 @@ RMGfxEngine::~RMGfxEngine() {
 }
 
 void RMGfxEngine::OpenOptionScreen(int type) {
-	bool bRes;
+	bool bRes = false;
 
 	switch (type) {
 	case 0:
-		bRes=m_opt.Init(m_bigBuf);
+		bRes = m_opt.Init(m_bigBuf);
 		break;
 	case 1:
-		bRes=m_opt.InitLoadMenuOnly(m_bigBuf, true);
+		bRes = m_opt.InitLoadMenuOnly(m_bigBuf, true);
 		break;
 	case 2:
-		bRes=m_opt.InitNoLoadSave(m_bigBuf);
+		bRes = m_opt.InitNoLoadSave(m_bigBuf);
 		break;
 	case 3:
-		bRes=m_opt.InitLoadMenuOnly(m_bigBuf, false);
+		bRes = m_opt.InitLoadMenuOnly(m_bigBuf, false);
 		break;
 	case 4:
-		bRes=m_opt.InitSaveMenuOnly(m_bigBuf, false);
+		bRes = m_opt.InitSaveMenuOnly(m_bigBuf, false);
 		break;
 	}
 

diff --git a/engines/tony/game.h b/engines/tony/game.h
@@ -56,6 +56,43 @@
 
 namespace Tony {
 
+#define INIT_GFX16_FROMRAW(dwRes, buf16)	\
+	raw = new RMResRaw(dwRes);	\
+	assert(raw->IsValid());			\
+	assert((buf16) == NULL);			\
+	(buf16) = new RMGfxSourceBuffer16(false); \
+	(buf16)->Init(*raw,raw->Width(),raw->Height()); \
+	delete raw;
+
+#define INIT_GFX8_FROMRAW(dwRes, buf8)	\
+	raw = new RMResRaw(dwRes);	\
+	assert(raw->IsValid());			\
+	assert((buf8) == NULL);			\
+	(buf8) = new RMGfxSourceBuffer8RLEByte(); \
+	(buf8)->Init(*raw, raw->Width(), raw->Height(), true); \
+	delete raw;
+
+extern bool bCfgInvLocked;
+extern bool bCfgInvNoScroll;
+extern bool bCfgTimerizedText;
+extern bool bCfgInvUp;
+extern bool bCfgAnni30;
+extern bool bCfgAntiAlias;
+extern bool bCfgSottotitoli;
+extern bool bCfgTransparence;
+extern bool bCfgInterTips;
+extern bool bCfgDubbing;
+extern bool bCfgMusic;
+extern bool bCfgSFX;
+extern int  nCfgTonySpeed;
+extern int  nCfgTextSpeed;
+extern int	 nCfgDubbingVolume;
+extern int	 nCfgMusicVolume;
+extern int	 nCfgSFXVolume;
+extern bool bSkipSfxNoLoop;
+
+extern bool bPatIrqFreeze;
+
 class RMPointer : public RMGfxTask {
 private:
 	RMGfxSourceBuffer8 *m_pointer[16];