[Scummvm-cvs-logs] SF.net SVN: scummvm:[55501] scummvm/trunk/engines/sword25
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Jan 24 15:00:55 CET 2011
Revision: 55501
http://scummvm.svn.sourceforge.net/scummvm/?rev=55501&view=rev
Author: thebluegr
Date: 2011-01-24 14:00:55 +0000 (Mon, 24 Jan 2011)
Log Message:
-----------
SWORD25: Cleanup
Modified Paths:
--------------
scummvm/trunk/engines/sword25/gfx/bitmapresource.h
scummvm/trunk/engines/sword25/math/geometry.h
scummvm/trunk/engines/sword25/module.mk
Removed Paths:
-------------
scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
scummvm/trunk/engines/sword25/math/geometry.cpp
Deleted: scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp 2011-01-24 12:41:16 UTC (rev 55500)
+++ scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp 2011-01-24 14:00:55 UTC (rev 55501)
@@ -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
Modified: scummvm/trunk/engines/sword25/gfx/bitmapresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmapresource.h 2011-01-24 12:41:16 UTC (rev 55500)
+++ scummvm/trunk/engines/sword25/gfx/bitmapresource.h 2011-01-24 14:00:55 UTC (rev 55501)
@@ -59,14 +59,15 @@
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\xFCck, ob das Objekt einen g\xFCltigen Zustand hat.
*/
bool isValid() const {
- return _valid;
+ return (_pImage != 0);
}
/**
@@ -156,7 +157,9 @@
@remark Diese Methode sollte auf keine Fall benutzt werden um gr\xF6\xDFere Teile des Bildes zu lesen, da sie sehr langsam ist. Sie ist
eher daf\xFCr 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 @@
private:
Image *_pImage;
- bool _valid;
};
} // End of namespace Sword25
Deleted: scummvm/trunk/engines/sword25/math/geometry.cpp
===================================================================
--- scummvm/trunk/engines/sword25/math/geometry.cpp 2011-01-24 12:41:16 UTC (rev 55500)
+++ scummvm/trunk/engines/sword25/math/geometry.cpp 2011-01-24 14:00:55 UTC (rev 55501)
@@ -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
Modified: scummvm/trunk/engines/sword25/math/geometry.h
===================================================================
--- scummvm/trunk/engines/sword25/math/geometry.h 2011-01-24 12:41:16 UTC (rev 55500)
+++ scummvm/trunk/engines/sword25/math/geometry.h 2011-01-24 14:00:55 UTC (rev 55501)
@@ -44,7 +44,11 @@
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:
Modified: scummvm/trunk/engines/sword25/module.mk
===================================================================
--- scummvm/trunk/engines/sword25/module.mk 2011-01-24 12:41:16 UTC (rev 55500)
+++ scummvm/trunk/engines/sword25/module.mk 2011-01-24 14:00:55 UTC (rev 55501)
@@ -12,7 +12,6 @@
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 @@
kernel/persistenceservice.o \
kernel/resmanager.o \
kernel/resource.o \
- math/geometry.o \
math/geometry_script.o \
math/polygon.o \
math/region.o \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list