From 6dc0999c6d000c08175e961da7e19c1b9a68e4c8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 24 Jan 2011 14:00:55 +0000
Subject: SWORD25: Cleanup
svn-id: r55501
---
engines/sword25/gfx/bitmapresource.cpp | 60 ----------------------------------
engines/sword25/gfx/bitmapresource.h | 12 ++++---
engines/sword25/math/geometry.cpp | 48 ---------------------------
engines/sword25/math/geometry.h | 6 +++-
engines/sword25/module.mk | 2 --
5 files changed, 12 insertions(+), 116 deletions(-)
delete mode 100644 engines/sword25/gfx/bitmapresource.cpp
delete mode 100644 engines/sword25/math/geometry.cpp
(limited to 'engines/sword25')
diff --git a/engines/sword25/gfx/bitmapresource.cpp b/engines/sword25/gfx/bitmapresource.cpp
deleted file mode 100644
index ac76bad4ef..0000000000
--- a/engines/sword25/gfx/bitmapresource.cpp
+++ /dev/null
@@ -1,60 +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.
- *
- * $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
- *
- */
-
-#include "sword25/gfx/bitmapresource.h"
-#include "sword25/kernel/kernel.h"
-#include "sword25/gfx/graphicengine.h"
-#include "sword25/package/packagemanager.h"
-
-namespace Sword25 {
-
-BitmapResource::BitmapResource(const Common::String &filename, Image *pImage) :
- _valid(false),
- _pImage(pImage),
- Resource(filename, Resource::TYPE_BITMAP) {
- _valid = _pImage != 0;
-}
-
-BitmapResource::~BitmapResource() {
- delete _pImage;
-}
-
-uint BitmapResource::getPixel(int x, int y) const {
- assert(x >= 0 && x < _pImage->getWidth());
- assert(y >= 0 && y < _pImage->getHeight());
-
- return _pImage->getPixel(x, y);
-}
-
-} // End of namespace Sword25
diff --git a/engines/sword25/gfx/bitmapresource.h b/engines/sword25/gfx/bitmapresource.h
index 5abff58642..9feca82184 100644
--- a/engines/sword25/gfx/bitmapresource.h
+++ b/engines/sword25/gfx/bitmapresource.h
@@ -59,14 +59,15 @@ public:
FLIP_VH = FLIP_H | FLIP_V
};
- BitmapResource(const Common::String &filename, Image *pImage);
- virtual ~BitmapResource();
+ BitmapResource(const Common::String &filename, Image *pImage) :
+ _pImage(pImage), Resource(filename, Resource::TYPE_BITMAP) {}
+ virtual ~BitmapResource() { delete _pImage; }
/**
@brief Gibt zur�ck, ob das Objekt einen g�ltigen Zustand hat.
*/
bool isValid() const {
- return _valid;
+ return (_pImage != 0);
}
/**
@@ -156,7 +157,9 @@ public:
@remark Diese Methode sollte auf keine Fall benutzt werden um gr��ere Teile des Bildes zu lesen, da sie sehr langsam ist. Sie ist
eher daf�r gedacht einzelne Pixel des Bildes auszulesen.
*/
- uint getPixel(int x, int y) const;
+ uint getPixel(int x, int y) const {
+ return _pImage->getPixel(x, y);
+ }
//@{
/** @name Auskunfts-Methoden */
@@ -204,7 +207,6 @@ public:
private:
Image *_pImage;
- bool _valid;
};
} // End of namespace Sword25
diff --git a/engines/sword25/math/geometry.cpp b/engines/sword25/math/geometry.cpp
deleted file mode 100644
index cf3adae60a..0000000000
--- a/engines/sword25/math/geometry.cpp
+++ /dev/null
@@ -1,48 +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.
- *
- * $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
- *
- */
-
-#include "sword25/sword25.h" // for kDebugScript
-#include "sword25/math/geometry.h"
-
-namespace Sword25 {
-
-Geometry::Geometry(Kernel *pKernel) : Service(pKernel) {
- if (!registerScriptBindings())
- error("Script bindings could not be registered.");
- else
- debugC(kDebugScript, "Script bindings registered.");
-}
-
-
-} // End of namespace Sword25
diff --git a/engines/sword25/math/geometry.h b/engines/sword25/math/geometry.h
index 78aa30696e..60898df635 100644
--- a/engines/sword25/math/geometry.h
+++ b/engines/sword25/math/geometry.h
@@ -44,7 +44,11 @@ class Kernel;
class Geometry : public Service {
public:
- Geometry(Kernel *pKernel);
+ Geometry(Kernel *pKernel) : Service(pKernel) {
+ if (!registerScriptBindings())
+ error("Script bindings could not be registered.");
+ }
+
virtual ~Geometry() {}
private:
diff --git a/engines/sword25/module.mk b/engines/sword25/module.mk
index 3ce3f52421..a797d95ee9 100644
--- a/engines/sword25/module.mk
+++ b/engines/sword25/module.mk
@@ -12,7 +12,6 @@ MODULE_OBJS := \
gfx/animationtemplate.o \
gfx/animationtemplateregistry.o \
gfx/bitmap.o \
- gfx/bitmapresource.o \
gfx/dynamicbitmap.o \
gfx/fontresource.o \
gfx/framecounter.o \
@@ -41,7 +40,6 @@ MODULE_OBJS := \
kernel/persistenceservice.o \
kernel/resmanager.o \
kernel/resource.o \
- math/geometry.o \
math/geometry_script.o \
math/polygon.o \
math/region.o \
--
cgit v1.2.3