WINTERMUTE: Remove AdActorDir and fix build

6 files changed, 3 insertions, 102 deletions

diff --git a/engines/wintermute/Ad/AdActorDir.cpp b/engines/wintermute/Ad/AdActorDir.cpp
deleted file mode 100644
index d44cb3dc6d..0000000000
--- a/engines/wintermute/Ad/AdActorDir.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ScummVM - Graphic Adventure Engine

- *

- * ScummVM is the legal property of its developers, whose names

- * are too numerous to list here. Please refer to the COPYRIGHT

- * file distributed with this source distribution.

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

-

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

-

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- *

- */

-

-/*

- * This file is based on WME Lite.

- * http://dead-code.org/redir.php?target=wmelite

- * Copyright (c) 2011 Jan Nedoma

- */

-#include "engines/wintermute/Ad/AdActorDir.h"

-

-namespace WinterMute {

-

-IMPLEMENT_PERSISTENT(CAdActorDir, false)

-

-

-//////////////////////////////////////////////////////////////////////////

-CAdActorDir::CAdActorDir(CBGame *inGame): CBBase(inGame) {

-}

-

-

-//////////////////////////////////////////////////////////////////////////

-CAdActorDir::~CAdActorDir(void) {

-}

-

-

-//////////////////////////////////////////////////////////////////////////

-HRESULT CAdActorDir::Persist(CBPersistMgr *PersistMgr) {

-	//PersistMgr->Transfer(TMEMBER(x));

-

-	return S_OK;

-}

-

-} // end of namespace WinterMute

diff --git a/engines/wintermute/Ad/AdActorDir.h b/engines/wintermute/Ad/AdActorDir.h
deleted file mode 100644
index f3579ed72c..0000000000
--- a/engines/wintermute/Ad/AdActorDir.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ScummVM - Graphic Adventure Engine

- *

- * ScummVM is the legal property of its developers, whose names

- * are too numerous to list here. Please refer to the COPYRIGHT

- * file distributed with this source distribution.

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

-

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

-

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- *

- */

-

-/*

- * This file is based on WME Lite.

- * http://dead-code.org/redir.php?target=wmelite

- * Copyright (c) 2011 Jan Nedoma

- */

-

-#ifndef WINTERMUTE_ADACTORDIR_H

-#define WINTERMUTE_ADACTORDIR_H

-

-#include "engines/wintermute/persistent.h"

-#include "engines/wintermute/Base/BBase.h"

-

-namespace WinterMute {

-

-class CAdActorDir : public CBBase {

-public:

-	DECLARE_PERSISTENT(CAdActorDir, CBBase)

-	CAdActorDir(CBGame *inGame);

-	virtual ~CAdActorDir(void);

-};

-

-} // end of namespace WinterMute

-

-#endif // WINTERMUTE_ADACTORDIR_H

diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index ed94ebf2fc..64c334d0eb 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -2,7 +2,6 @@ MODULE := engines/wintermute
  
 MODULE_OBJS := \
 	Ad/AdActor.o \
-	Ad/AdActorDir.o \
 	Ad/AdEntity.o \
 	Ad/AdGame.o \
 	Ad/AdInventory.o \
diff --git a/engines/wintermute/utils/utils.cpp b/engines/wintermute/utils/utils.cpp
index 4e4678ffae..29c992f1ac 100644
--- a/engines/wintermute/utils/utils.cpp
+++ b/engines/wintermute/utils/utils.cpp
@@ -34,7 +34,7 @@
 #include "engines/wintermute/Base/BGame.h"

 #include "common/str.h"

 #include "common/textconsole.h"

-#include "wintermute.h"

+#include "engines/wintermute/wintermute.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/video/VidTheoraPlayer.cpp b/engines/wintermute/video/VidTheoraPlayer.cpp
index d0553a4ffd..aeba5608b3 100644
--- a/engines/wintermute/video/VidTheoraPlayer.cpp
+++ b/engines/wintermute/video/VidTheoraPlayer.cpp
@@ -42,7 +42,7 @@
 
 namespace WinterMute {
 
-IMPLEMENT_PERSISTENT(CVidTheoraPlayer, false);
+IMPLEMENT_PERSISTENT(CVidTheoraPlayer, false)
 
 //////////////////////////////////////////////////////////////////////////
 CVidTheoraPlayer::CVidTheoraPlayer(CBGame *inGame): CBBase(inGame) {
diff --git a/engines/wintermute/video/VidTheoraPlayer.h b/engines/wintermute/video/VidTheoraPlayer.h
index 039588d6a1..2c103095a1 100644
--- a/engines/wintermute/video/VidTheoraPlayer.h
+++ b/engines/wintermute/video/VidTheoraPlayer.h
@@ -50,7 +50,7 @@ private:
 	Video::RewindableVideoDecoder *_theoraDecoder;
 	Graphics::Surface _surface;
 public:
-	DECLARE_PERSISTENT(CVidTheoraPlayer, CBBase);
+	DECLARE_PERSISTENT(CVidTheoraPlayer, CBBase)
 
 	CVidTheoraPlayer(CBGame *inGame);
 	virtual ~CVidTheoraPlayer(void);