[Scummvm-cvs-logs] SF.net SVN: scummvm:[53217] scummvm/trunk/engines/sword25
sev at users.sourceforge.net
sev at users.sourceforge.net
Wed Oct 13 00:28:54 CEST 2010
Revision: 53217
http://scummvm.svn.sourceforge.net/scummvm/?rev=53217&view=rev
Author: sev
Date: 2010-10-12 22:28:54 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
SWORD25: Fix warnings and compilation
Modified Paths:
--------------
scummvm/trunk/engines/sword25/gfx/animationdescription.h
scummvm/trunk/engines/sword25/gfx/renderobject.h
scummvm/trunk/engines/sword25/gfx/renderobjectptr.h
scummvm/trunk/engines/sword25/gfx/text.cpp
scummvm/trunk/engines/sword25/kernel/resservice.h
scummvm/trunk/engines/sword25/module.mk
Added Paths:
-----------
scummvm/trunk/engines/sword25/gfx/renderobjectptr.cpp
Modified: scummvm/trunk/engines/sword25/gfx/animationdescription.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationdescription.h 2010-10-12 22:28:21 UTC (rev 53216)
+++ scummvm/trunk/engines/sword25/gfx/animationdescription.h 2010-10-12 22:28:54 UTC (rev 53217)
@@ -69,8 +69,8 @@
int HotspotY;
bool FlipV;
bool FlipH;
- std::string FileName;
- std::string Action;
+ Common::String FileName;
+ Common::String Action;
};
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/gfx/renderobject.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobject.h 2010-10-12 22:28:21 UTC (rev 53216)
+++ scummvm/trunk/engines/sword25/gfx/renderobject.h 2010-10-12 22:28:54 UTC (rev 53217)
@@ -51,6 +51,8 @@
#include "sword25/math/rect.h"
#include "sword25/gfx/renderobjectptr.h"
+#include "common/list.h"
+
namespace Sword25 {
// -----------------------------------------------------------------------------
@@ -339,8 +341,8 @@
protected:
// Typen
// -----
- typedef std::vector<BS_RenderObjectPtr<BS_RenderObject> > RENDEROBJECT_LIST;
- typedef std::vector<BS_RenderObjectPtr<BS_RenderObject> >::iterator RENDEROBJECT_ITER;
+ typedef Common::List<BS_RenderObjectPtr<BS_RenderObject> > RENDEROBJECT_LIST;
+ typedef Common::List<BS_RenderObjectPtr<BS_RenderObject> >::iterator RENDEROBJECT_ITER;
int m_X; ///< Die X-Position des Objektes relativ zum Eltern-Objekt
int m_Y; ///< Die Y-Position des Objektes relativ zum Eltern-Objekt
Added: scummvm/trunk/engines/sword25/gfx/renderobjectptr.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectptr.cpp (rev 0)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectptr.cpp 2010-10-12 22:28:54 UTC (rev 53217)
@@ -0,0 +1,42 @@
+/* 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/renderobjectptr.h"
+
+namespace Sword25 {
+
+BS_RenderObjectPtr::BS_RenderObjectPtr(BS_RenderObject * RenderObjectPtr) {
+ m_Handle = RenderObjectPtr->GetHandle();
+}
+
+} // End of namespace Sword25
Property changes on: scummvm/trunk/engines/sword25/gfx/renderobjectptr.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectptr.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectptr.h 2010-10-12 22:28:21 UTC (rev 53216)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectptr.h 2010-10-12 22:28:54 UTC (rev 53217)
@@ -64,10 +64,7 @@
BS_RenderObjectPtr(unsigned int Handle) : m_Handle(Handle)
{}
- BS_RenderObjectPtr(BS_RenderObject * RenderObjectPtr)
- {
- m_Handle = RenderObjectPtr->GetHandle();
- }
+ BS_RenderObjectPtr(BS_RenderObject * RenderObjectPtr);
T * operator->() const
{
Modified: scummvm/trunk/engines/sword25/gfx/text.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/text.cpp 2010-10-12 22:28:21 UTC (rev 53216)
+++ scummvm/trunk/engines/sword25/gfx/text.cpp 2010-10-12 22:28:54 UTC (rev 53217)
@@ -84,7 +84,7 @@
// -----------------------------------------------------------------------------
-bool BS_Text::SetFont(const std::string & Font)
+bool BS_Text::SetFont(const Common::String & Font)
{
// Font precachen.
if (GetResourceManager()->PrecacheResource(Font))
@@ -104,7 +104,7 @@
// -----------------------------------------------------------------------------
-void BS_Text::SetText(const std::string & Text)
+void BS_Text::SetText(const Common::String & Text)
{
m_Text = Text;
UpdateFormat();
@@ -398,11 +398,11 @@
// Beim Laden der anderen Member werden die Set-Methoden benutzt statt der tats\xE4chlichen Member.
// So wird das Layout automatisch aktualisiert und auch alle anderen notwendigen Methoden ausgef\xFChrt.
- std::string Font;
+ Common::String Font;
Reader.Read(Font);
SetFont(Font);
- std::string Text;
+ Common::String Text;
Reader.Read(Text);
SetText(Text);
Modified: scummvm/trunk/engines/sword25/kernel/resservice.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/resservice.h 2010-10-12 22:28:21 UTC (rev 53216)
+++ scummvm/trunk/engines/sword25/kernel/resservice.h 2010-10-12 22:28:54 UTC (rev 53217)
@@ -88,7 +88,7 @@
// 1. The pattern starts with '*' -> TRUE
if (*Pattern == '*') {
// Use a copy of the pattern pointer so as not to destroy the current state
- char *PatternCopy = (char *)Pattern;
+ const char *PatternCopy = Pattern;
while (*PatternCopy == '*') { PatternCopy++; }
if (!*PatternCopy) return true;
}
Modified: scummvm/trunk/engines/sword25/module.mk
===================================================================
--- scummvm/trunk/engines/sword25/module.mk 2010-10-12 22:28:21 UTC (rev 53216)
+++ scummvm/trunk/engines/sword25/module.mk 2010-10-12 22:28:54 UTC (rev 53217)
@@ -30,6 +30,7 @@
gfx/panel.o \
gfx/renderobject.o \
gfx/renderobjectmanager.o \
+ gfx/renderobjectptr.o \
gfx/renderobjectregistry.o \
gfx/screenshot.o \
gfx/staticbitmap.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