From a683a420a9e43705c972b5e74d55e319729e1a81 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 29 Jul 2010 19:53:02 +0000 Subject: SWORD25: Importing original sources svn-id: r53171 --- engines/sword25/kernel/service.h | 57 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100755 engines/sword25/kernel/service.h (limited to 'engines/sword25/kernel/service.h') diff --git a/engines/sword25/kernel/service.h b/engines/sword25/kernel/service.h new file mode 100755 index 0000000000..d79194f41a --- /dev/null +++ b/engines/sword25/kernel/service.h @@ -0,0 +1,57 @@ +// ----------------------------------------------------------------------------- +// This file is part of Broken Sword 2.5 +// Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdörfer +// +// Broken Sword 2.5 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. +// +// Broken Sword 2.5 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 Broken Sword 2.5; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// ----------------------------------------------------------------------------- + +/* + BS_Service + ------------- + Dies ist die Basisklasse für alle Services der Engine. + Ein Service ist ein wesentlicher Bestandteil des Engine, z.B. die Graphiksystem. + Das Servicesystem macht es möglich mehrere verschiedene Services für ein System zu haben, + und je nach Betriebssystem einen passenden auszuwählen. + Denkbar wären z.B. zwei Graphiksysteme von denen eines hardwarebeschleunigt ist und ein + anderes nicht. + Die Services werden zur Laufzeit über die Kernelmethode NewService und NIEMALS mit new erzeugt. + + Autor: Malte Thiesen +*/ + +#ifndef _BS_SERVICE_H +#define _BS_SERVICE_H + +// Includes +#include "common.h" + +// Klassendefinition +class BS_Kernel; + +class BS_Service +{ +private: + BS_Kernel* _pKernel; + +protected: + BS_Service(BS_Kernel* pKernel) : _pKernel(pKernel) {}; + + BS_Kernel* GetKernel() const { return _pKernel; } + +public: + virtual ~BS_Service(){}; +}; + +#endif \ No newline at end of file -- cgit v1.2.3 From 7b964a2823406721ec1200938948c0cfcdb3f1b1 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 29 Jul 2010 19:55:03 +0000 Subject: SWORD25: Make couple file compilable svn-id: r53179 --- engines/sword25/kernel/service.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/sword25/kernel/service.h') diff --git a/engines/sword25/kernel/service.h b/engines/sword25/kernel/service.h index d79194f41a..c5ca98f747 100755 --- a/engines/sword25/kernel/service.h +++ b/engines/sword25/kernel/service.h @@ -31,11 +31,11 @@ Autor: Malte Thiesen */ -#ifndef _BS_SERVICE_H -#define _BS_SERVICE_H +#ifndef SWORD25_SERVICE_H +#define SWORD25_SERVICE_H // Includes -#include "common.h" +#include "sword25/kernel/common.h" // Klassendefinition class BS_Kernel; @@ -54,4 +54,4 @@ public: virtual ~BS_Service(){}; }; -#endif \ No newline at end of file +#endif -- cgit v1.2.3 From e78b19a650e27fe9a24d0e4c9c938294c7b08650 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 31 Jul 2010 06:23:38 +0000 Subject: SWORD25: Converted kernel/kernel.cpp to compile under ScummVM This commit creates a skeleton detection and engine class, as well as code necessary to call the kernel initiation. The kernel/kernel.cpp has been converted to compile under ScummVM, along with all dependant header files. svn-id: r53184 --- engines/sword25/kernel/service.h | 76 +++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 36 deletions(-) (limited to 'engines/sword25/kernel/service.h') diff --git a/engines/sword25/kernel/service.h b/engines/sword25/kernel/service.h index c5ca98f747..3fe5b06a79 100755 --- a/engines/sword25/kernel/service.h +++ b/engines/sword25/kernel/service.h @@ -1,34 +1,35 @@ -// ----------------------------------------------------------------------------- -// This file is part of Broken Sword 2.5 -// Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdörfer -// -// Broken Sword 2.5 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. -// -// Broken Sword 2.5 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 Broken Sword 2.5; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// ----------------------------------------------------------------------------- - -/* - BS_Service - ------------- - Dies ist die Basisklasse für alle Services der Engine. - Ein Service ist ein wesentlicher Bestandteil des Engine, z.B. die Graphiksystem. - Das Servicesystem macht es möglich mehrere verschiedene Services für ein System zu haben, - und je nach Betriebssystem einen passenden auszuwählen. - Denkbar wären z.B. zwei Graphiksysteme von denen eines hardwarebeschleunigt ist und ein - anderes nicht. - Die Services werden zur Laufzeit über die Kernelmethode NewService und NIEMALS mit new erzeugt. - - Autor: Malte Thiesen +/* 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. + * + * $URL$ + * $Id$ + * + * BS_Service + * ------------- + * This is the base class for all engine services. + * A serivce is an essential part of the engine, ex. the graphics system. + * This was intended to allow, for example, different plug in modules for + * different kinds of hardware and/or systems. + * The services are created at runtime via the kernel method NewService and NEVER with new. + * + * Autor: Malte Thiesen */ #ifndef SWORD25_SERVICE_H @@ -37,21 +38,24 @@ // Includes #include "sword25/kernel/common.h" +namespace Sword25 { + // Klassendefinition class BS_Kernel; -class BS_Service -{ +class BS_Service { private: - BS_Kernel* _pKernel; + BS_Kernel * _pKernel; protected: - BS_Service(BS_Kernel* pKernel) : _pKernel(pKernel) {}; + BS_Service(BS_Kernel *pKernel) : _pKernel(pKernel) {}; BS_Kernel* GetKernel() const { return _pKernel; } public: - virtual ~BS_Service(){}; + virtual ~BS_Service() {}; }; +} // End of namespace Sword25 + #endif -- cgit v1.2.3 From 293bf95c01f76c8d812a300eb038854f1246ab3d Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 31 Jul 2010 09:53:02 +0000 Subject: SWORD25: Replacing headers with ScummVM ones plus original (C) svn-id: r53188 --- engines/sword25/kernel/service.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) mode change 100755 => 100644 engines/sword25/kernel/service.h (limited to 'engines/sword25/kernel/service.h') diff --git a/engines/sword25/kernel/service.h b/engines/sword25/kernel/service.h old mode 100755 new mode 100644 index 3fe5b06a79..a42b5206bc --- a/engines/sword25/kernel/service.h +++ b/engines/sword25/kernel/service.h @@ -21,6 +21,18 @@ * $URL$ * $Id$ * + */ + +/* + * This code is based on Broken Sword 2.5 engine + * + * Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdoerfer + * + * Licensed under GNU GPL v2 + * + */ + +/* * BS_Service * ------------- * This is the base class for all engine services. -- cgit v1.2.3 From 47904bc7b2992189bb554833f00a79ff0fea9fb8 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 6 Aug 2010 13:13:25 +0000 Subject: SWORD25: Mass-astyle. svn-id: r53222 --- engines/sword25/kernel/service.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'engines/sword25/kernel/service.h') diff --git a/engines/sword25/kernel/service.h b/engines/sword25/kernel/service.h index a42b5206bc..0afcb05f11 100644 --- a/engines/sword25/kernel/service.h +++ b/engines/sword25/kernel/service.h @@ -23,7 +23,7 @@ * */ -/* +/* * This code is based on Broken Sword 2.5 engine * * Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdoerfer @@ -38,7 +38,7 @@ * This is the base class for all engine services. * A serivce is an essential part of the engine, ex. the graphics system. * This was intended to allow, for example, different plug in modules for - * different kinds of hardware and/or systems. + * different kinds of hardware and/or systems. * The services are created at runtime via the kernel method NewService and NEVER with new. * * Autor: Malte Thiesen @@ -57,13 +57,15 @@ class BS_Kernel; class BS_Service { private: - BS_Kernel * _pKernel; - + BS_Kernel *_pKernel; + protected: BS_Service(BS_Kernel *pKernel) : _pKernel(pKernel) {}; - - BS_Kernel* GetKernel() const { return _pKernel; } - + + BS_Kernel *GetKernel() const { + return _pKernel; + } + public: virtual ~BS_Service() {}; }; -- cgit v1.2.3 From b01994a53bbc96da907a4c28934e644184291017 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 18 Aug 2010 12:58:22 +0000 Subject: SWORD25: removed BS_ prefix from rest of the classes. The things which are intentionally left with the prefix: BS_LOG, BS_ASSERT, BS_Rect, BS_String. svn-id: r53261 --- engines/sword25/kernel/service.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engines/sword25/kernel/service.h') diff --git a/engines/sword25/kernel/service.h b/engines/sword25/kernel/service.h index 0afcb05f11..addcf50a08 100644 --- a/engines/sword25/kernel/service.h +++ b/engines/sword25/kernel/service.h @@ -53,21 +53,21 @@ namespace Sword25 { // Klassendefinition -class BS_Kernel; +class Kernel; -class BS_Service { +class Service { private: - BS_Kernel *_pKernel; + Kernel *_pKernel; protected: - BS_Service(BS_Kernel *pKernel) : _pKernel(pKernel) {}; + Service(Kernel *pKernel) : _pKernel(pKernel) {}; - BS_Kernel *GetKernel() const { + Kernel *GetKernel() const { return _pKernel; } public: - virtual ~BS_Service() {}; + virtual ~Service() {}; }; } // End of namespace Sword25 -- cgit v1.2.3