[Scummvm-cvs-logs] SF.net SVN: scummvm:[53182] scummvm/trunk/engines/sword25
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Oct 12 23:54:22 CEST 2010
Revision: 53182
http://scummvm.svn.sourceforge.net/scummvm/?rev=53182&view=rev
Author: sev
Date: 2010-10-12 21:54:21 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
SWORD25: Compilation fixes
Majority of files now compile under Windoze.
Modified Paths:
--------------
scummvm/trunk/engines/sword25/fmv/oggtheora/oggtheora.cpp
scummvm/trunk/engines/sword25/gfx/animation.cpp
scummvm/trunk/engines/sword25/gfx/animation.h
scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
scummvm/trunk/engines/sword25/gfx/bitmapresource.h
scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h
scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
scummvm/trunk/engines/sword25/gfx/graphicengine.h
scummvm/trunk/engines/sword25/gfx/image/imageloader.h
scummvm/trunk/engines/sword25/gfx/panel.cpp
scummvm/trunk/engines/sword25/gfx/renderobject.h
scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h
scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h
scummvm/trunk/engines/sword25/gfx/staticbitmap.h
scummvm/trunk/engines/sword25/gfx/text.h
scummvm/trunk/engines/sword25/gfx/timedrenderobject.cpp
scummvm/trunk/engines/sword25/gfx/timedrenderobject.h
scummvm/trunk/engines/sword25/input/inputengine.h
scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.h
scummvm/trunk/engines/sword25/kernel/kernel.h
scummvm/trunk/engines/sword25/kernel/kernel_script.cpp
scummvm/trunk/engines/sword25/kernel/log.cpp
scummvm/trunk/engines/sword25/kernel/objectregistry.h
scummvm/trunk/engines/sword25/kernel/persistenceblock.h
scummvm/trunk/engines/sword25/kernel/persistenceservice.cpp
scummvm/trunk/engines/sword25/kernel/resmanager.cpp
scummvm/trunk/engines/sword25/kernel/resource.cpp
scummvm/trunk/engines/sword25/kernel/resource.h
scummvm/trunk/engines/sword25/math/line.h
scummvm/trunk/engines/sword25/math/polygon.h
scummvm/trunk/engines/sword25/math/rect.h
scummvm/trunk/engines/sword25/math/region.h
scummvm/trunk/engines/sword25/math/vertex.h
scummvm/trunk/engines/sword25/math/walkregion.cpp
scummvm/trunk/engines/sword25/math/walkregion.h
scummvm/trunk/engines/sword25/module.mk
scummvm/trunk/engines/sword25/script/luascript.cpp
scummvm/trunk/engines/sword25/util/glsprites/glsprites.h
scummvm/trunk/engines/sword25/util/pluto/pdep/lua.h
scummvm/trunk/engines/sword25/util/pluto/pluto.c
Modified: scummvm/trunk/engines/sword25/fmv/oggtheora/oggtheora.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/oggtheora/oggtheora.cpp 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/fmv/oggtheora/oggtheora.cpp 2010-10-12 21:54:21 UTC (rev 53182)
@@ -92,7 +92,7 @@
{
return ((x > high) ? high : (( x < low) ? low : x));
}
-};
+}
// -----------------------------------------------------------------------------
// Konstruktion / Destruktion
@@ -313,7 +313,7 @@
float ScreenToVideoWidth = (float) pGfx->GetDisplayWidth() / (float) m_OutputBitmap->GetWidth();
float ScreenToVideoHeight = (float) pGfx->GetDisplayHeight() / (float) m_OutputBitmap->GetHeight();
float ScaleFactor = std::min(ScreenToVideoWidth, ScreenToVideoHeight);
- if (abs(ScaleFactor - 1.0f) < FLT_EPSILON) ScaleFactor = 1.0f;
+ if (ABS(ScaleFactor - 1.0f) < FLT_EPSILON) ScaleFactor = 1.0f;
m_OutputBitmap->SetScaleFactor(ScaleFactor);
// Z-Wert setzen
Modified: scummvm/trunk/engines/sword25/gfx/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animation.cpp 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/animation.cpp 2010-10-12 21:54:21 UTC (rev 53182)
@@ -28,7 +28,7 @@
#include "sword25/kernel/callbackregistry.h"
#include "sword25/package/packagemanager.h"
#include <tinyxml.h>
-#include "sword25/image/image.h"
+#include "sword25/gfx/image/image.h"
#include "sword25/gfx/animationtemplate.h"
#include "sword25/gfx/animationtemplateregistry.h"
#include "sword25/gfx/animationresource.h"
Modified: scummvm/trunk/engines/sword25/gfx/animation.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animation.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/animation.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -38,7 +38,7 @@
class BS_Animation : public BS_TimedRenderObject
{
-friend BS_RenderObject;
+friend class BS_RenderObject;
private:
BS_Animation(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, const std::string & FileName);
@@ -50,7 +50,7 @@
{
AT_ONESHOT,
AT_LOOP,
- AT_JOJO,
+ AT_JOJO
};
virtual ~BS_Animation();
Modified: scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp 2010-10-12 21:54:21 UTC (rev 53182)
@@ -22,7 +22,7 @@
#include "sword25/gfx/bitmapresource.h"
#include "sword25/kernel/kernel.h"
#include "sword25/gfx/graphicengine.h"
-#include "sword25/image/imageloader.h"
+#include "sword25/gfx/image/imageloader.h"
#include "sword25/package/packagemanager.h"
#define BS_LOG_PREFIX "BITMAP"
Modified: scummvm/trunk/engines/sword25/gfx/bitmapresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmapresource.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/bitmapresource.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -23,7 +23,7 @@
// Includes
#include "sword25/kernel/common.h"
#include "sword25/kernel/resource.h"
-#include "sword25/image/image.h"
+#include "sword25/gfx/image/image.h"
// -----------------------------------------------------------------------------
// Forward Declarations
Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -39,7 +39,7 @@
class BS_DynamicBitmap : public BS_Bitmap
{
-friend BS_RenderObject;
+friend class BS_RenderObject;
public:
virtual ~BS_DynamicBitmap();
Modified: scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine.cpp 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine.cpp 2010-10-12 21:54:21 UTC (rev 53182)
@@ -19,7 +19,7 @@
#define BS_LOG_PREFIX "GRAPHICENGINE"
-#include "sword25/image/image.h"
+#include "sword25/gfx/image/image.h"
#include "sword25/gfx/screenshot.h"
#include "sword25/kernel/memlog_off.h"
#include <memory>
Modified: scummvm/trunk/engines/sword25/gfx/graphicengine.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -111,7 +111,7 @@
/**
32 Bit Farbformat (8 Bit Alpha, 8 Bit Blau, 8 Bit Gr\xFCn, 8 Bit Rot) (little endian)
*/
- CF_ABGR32,
+ CF_ABGR32
};
// Interface
Modified: scummvm/trunk/engines/sword25/gfx/image/imageloader.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/imageloader.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/image/imageloader.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -349,7 +349,7 @@
@brief Sucht zu Bilddaten ein BS_ImageLoader Objekt, dass die Bilddaten dekodieren kann.
@return Gibt einen Pointer auf ein passendes BS_ImageLoader Objekt zur\xFCck, oder NULL, wenn kein passendes Objekt gefunden wurde.
*/
- static BS_ImageLoader* BS_ImageLoader::_FindSuitableImageLoader(const char* pFileData, unsigned int FileSize);
+ static BS_ImageLoader* _FindSuitableImageLoader(const char* pFileData, unsigned int FileSize);
static std::list<BS_ImageLoader*> _ImageLoaderList; // Die Liste aller BS_ImageLoader-Objekte
static bool _ImageLoaderListInitialized; // Gibt an, ob die Liste schon intialisiert wurde
Modified: scummvm/trunk/engines/sword25/gfx/panel.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/panel.cpp 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/panel.cpp 2010-10-12 21:54:21 UTC (rev 53182)
@@ -26,7 +26,7 @@
#include "sword25/kernel/inputpersistenceblock.h"
#include "sword25/kernel/outputpersistenceblock.h"
#include "sword25/gfx/graphicengine.h"
-#include "sword25/image/image.h"
+#include "sword25/gfx/image/image.h"
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/gfx/renderobject.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobject.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/renderobject.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -79,7 +79,7 @@
/// Ein Text. Siehe BS_Text.
TYPE_TEXT,
/// Ein unbekannter Objekttyp. Diesen Typ sollte kein Renderobjekt annehmen.
- TYPE_UNKNOWN,
+ TYPE_UNKNOWN
};
// Add-Methoden
@@ -373,13 +373,13 @@
// Das prim\xE4re Sortierkriterium ist hierbei der Z-Wert und das sekund\xE4re der Y-Wert (von oben nach unten).
// Beispiel:
// Screen
- // / | \
- // / | \
- // / | \
- // / | \
+ // / | \.
+ // / | \.
+ // / | \.
+ // / | \.
// Background Interface Maus
- // / \ / | \
- // / \ / | \
+ // / \ / | \.
+ // / \ / | \.
// George T\xFCr Icn1 Icn2 Icn3
//
// Wenn jetzt das Interface mit SetVisible() ausgeblendet w\xFCrde, verschwinden auch die Icons, die sich im Interface
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -36,7 +36,7 @@
#include "sword25/kernel/memlog_on.h"
#include "sword25/kernel/common.h"
-#include "sword25/renderobjectptr.h"
+#include "sword25/gfx/renderobjectptr.h"
#include "sword25/kernel/persistable.h"
// Klassendefinition
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -50,6 +50,8 @@
return *m_InstancePtr.get();
}
+ virtual ~BS_RenderObjectRegistry() {}
+
private:
virtual void LogErrorLn(const char * Message) const;
virtual void LogWarningLn(const char * Message) const;
Modified: scummvm/trunk/engines/sword25/gfx/staticbitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/staticbitmap.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/staticbitmap.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -33,7 +33,7 @@
class BS_StaticBitmap : public BS_Bitmap
{
-friend BS_RenderObject;
+friend class BS_RenderObject;
private:
/**
Modified: scummvm/trunk/engines/sword25/gfx/text.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/text.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/text.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -46,7 +46,7 @@
class BS_Text : public BS_RenderObject
{
-friend BS_RenderObject;
+friend class BS_RenderObject;
public:
/**
Modified: scummvm/trunk/engines/sword25/gfx/timedrenderobject.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/timedrenderobject.cpp 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/timedrenderobject.cpp 2010-10-12 21:54:21 UTC (rev 53182)
@@ -36,4 +36,4 @@
{
BS_ASSERT(GetManager());
GetManager()->DetatchTimedRenderObject(this);
-}
\ No newline at end of file
+}
Modified: scummvm/trunk/engines/sword25/gfx/timedrenderobject.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/timedrenderobject.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/gfx/timedrenderobject.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -44,7 +44,7 @@
{
public:
BS_TimedRenderObject(BS_RenderObjectPtr<BS_RenderObject> pParent, TYPES Type, unsigned int Handle = 0);
- BS_TimedRenderObject::~BS_TimedRenderObject();
+ ~BS_TimedRenderObject();
/**
@brief Teilt dem Objekt mit, dass ein neuer Frame begonnen wird.
@@ -54,4 +54,4 @@
@param int TimeElapsed gibt an wie viel Zeit (in Microsekunden) seit dem letzten Frame vergangen ist.
*/
virtual void FrameNotification(int TimeElapsed) = 0;
-};
\ No newline at end of file
+};
Modified: scummvm/trunk/engines/sword25/input/inputengine.h
===================================================================
--- scummvm/trunk/engines/sword25/input/inputengine.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/input/inputengine.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -133,7 +133,7 @@
KEY_LSHIFT = 0xA0,
KEY_RSHIFT = 0xA1,
KEY_LCONTROL = 0xA2,
- KEY_RCONTROL = 0xA3,
+ KEY_RCONTROL = 0xA3
};
// ACHTUNG: Diese Codes werden in inputengine_script.cpp beim Skript-Service registriert. Bei \xC4nderungen an diesem Enum muss auch diese
@@ -148,7 +148,7 @@
KEY_COMMAND_BACKSPACE = 6,
KEY_COMMAND_TAB = 7,
KEY_COMMAND_INSERT = 8,
- KEY_COMMAND_DELETE = 9,
+ KEY_COMMAND_DELETE = 9
};
/// --------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -42,7 +42,7 @@
{
NONE,
END_OF_DATA,
- OUT_OF_SYNC,
+ OUT_OF_SYNC
};
BS_InputPersistenceBlock(const void * Data, unsigned int DataLength);
Modified: scummvm/trunk/engines/sword25/kernel/kernel.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/kernel.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/kernel/kernel.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -328,11 +328,11 @@
class BS_ServiceInfo
{
public:
- BS_ServiceInfo(const std::string& SuperclassIdentifier, const std::string& ServiceIdentifier, BS_Service* (*CreateMethod)(BS_Kernel*))
+ BS_ServiceInfo(const std::string& SuperclassIdentifier_, const std::string& ServiceIdentifier_, BS_Service* (*CreateMethod_)(BS_Kernel*))
{
- this->SuperclassIdentifier = SuperclassIdentifier;
- this->ServiceIdentifier = ServiceIdentifier;
- this->CreateMethod = CreateMethod;
+ this->SuperclassIdentifier = SuperclassIdentifier_;
+ this->ServiceIdentifier = ServiceIdentifier_;
+ this->CreateMethod = CreateMethod_;
};
std::string SuperclassIdentifier;
Modified: scummvm/trunk/engines/sword25/kernel/kernel_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/kernel_script.cpp 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/kernel/kernel_script.cpp 2010-10-12 21:54:21 UTC (rev 53182)
@@ -28,7 +28,7 @@
#include "sword25/kernel/resmanager.h"
#include "sword25/kernel/persistenceservice.h"
#include "sword25/kernel/wincodegenerator.h"
-#include "sword25/debug/debugtools.h"
+#include "sword25/kernel/debug/debugtools.h"
#include "sword25/script/script.h"
#include "sword25/script/luabindhelper.h"
Modified: scummvm/trunk/engines/sword25/kernel/log.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/log.cpp 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/kernel/log.cpp 2010-10-12 21:54:21 UTC (rev 53182)
@@ -23,7 +23,7 @@
#include "sword25/kernel/filesystemutil.h"
#include "sword25/kernel/log.h"
-#include "sword25/debug/debugtools.h"
+#include "sword25/kernel/debug/debugtools.h"
// Konstanten
static const char* BF_LOG_FILENAME = "log.txt";
Modified: scummvm/trunk/engines/sword25/kernel/objectregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/objectregistry.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/kernel/objectregistry.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -35,7 +35,8 @@
class BS_ObjectRegistry
{
public:
- BS_ObjectRegistry() : m_NextHandle(1) {};
+ BS_ObjectRegistry() : m_NextHandle(1) {}
+ virtual ~BS_ObjectRegistry() {}
// -------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/kernel/persistenceblock.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/persistenceblock.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/kernel/persistenceblock.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -48,7 +48,7 @@
FLOAT_MARKER,
STRING_MARKER,
BOOL_MARKER,
- BLOCK_MARKER,
+ BLOCK_MARKER
};
// -----------------------------------------------------------------------------
@@ -102,7 +102,7 @@
// Compile time asserts
// -----------------------------------------------------------------------------
-#define CTASSERT(ex) typedef char ctassert_type[(ex) ? 1 : -1];
+#define CTASSERT(ex) typedef char ctassert_type[(ex) ? 1 : -1]
CTASSERT(sizeof(unsigned char) == 1);
CTASSERT(sizeof(signed int) == 4);
CTASSERT(sizeof(unsigned int) == 4);
Modified: scummvm/trunk/engines/sword25/kernel/persistenceservice.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/persistenceservice.cpp 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/kernel/persistenceservice.cpp 2010-10-12 21:54:21 UTC (rev 53182)
@@ -31,8 +31,8 @@
#include "sword25/input/inputengine.h"
#include "sword25/math/regionregistry.h"
#include "sword25/script/script.h"
-#include "sword25/debug/debugtools.h"
-#include "sword25/util/zlib/zlib.h"
+#include "sword25/kernel/debug/debugtools.h"
+#include <zlib.h>
#include "sword25/kernel/memlog_off.h"
#include <sstream>
Modified: scummvm/trunk/engines/sword25/kernel/resmanager.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/resmanager.cpp 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/kernel/resmanager.cpp 2010-10-12 21:54:21 UTC (rev 53182)
@@ -290,4 +290,4 @@
{
m_MaxMemoryUsage = MaxMemoryUsage;
DeleteResourcesIfNecessary();
-}
\ No newline at end of file
+}
Modified: scummvm/trunk/engines/sword25/kernel/resource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/resource.cpp 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/kernel/resource.cpp 2010-10-12 21:54:21 UTC (rev 53182)
@@ -32,7 +32,7 @@
_FileName = static_cast<BS_PackageManager *>(BS_Kernel::GetInstance()->GetService("package"))->GetAbsolutePath(FileName);
_FileNameHash = BS_String::GetHash(FileName);
-};
+}
void BS_Resource::Release()
{
Modified: scummvm/trunk/engines/sword25/kernel/resource.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/resource.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/kernel/resource.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -31,7 +31,7 @@
class BS_Resource
{
-friend BS_ResourceManager;
+friend class BS_ResourceManager;
public:
enum RESOURCE_TYPES
Modified: scummvm/trunk/engines/sword25/math/line.h
===================================================================
--- scummvm/trunk/engines/sword25/math/line.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/math/line.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -97,7 +97,7 @@
{
LEFT,
RIGHT,
- ON,
+ ON
};
/**
Modified: scummvm/trunk/engines/sword25/math/polygon.h
===================================================================
--- scummvm/trunk/engines/sword25/math/polygon.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/math/polygon.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -249,4 +249,4 @@
bool IsLineInCone(int StartVertexIndex, const BS_Vertex & EndVertex, bool IncludeEdges) const;
};
-#endif
\ No newline at end of file
+#endif
Modified: scummvm/trunk/engines/sword25/math/rect.h
===================================================================
--- scummvm/trunk/engines/sword25/math/rect.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/math/rect.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -57,12 +57,12 @@
@param right das rechte Extrem des Rechteckes + 1
@param bottom des untere Extrem des Rechteckes + 1
*/
- BS_Rect(int left, int top, int right, int bottom)
+ BS_Rect(int left_, int top_, int right_, int bottom_)
{
- this->left = left;
- this->top = top;
- this->right = right;
- this->bottom = bottom;
+ this->left = left_;
+ this->top = top_;
+ this->right = right_;
+ this->bottom = bottom_;
}
/**
@brief Verschiebt das Rechteck.
@@ -295,4 +295,4 @@
}
};
-#endif
\ No newline at end of file
+#endif
Modified: scummvm/trunk/engines/sword25/math/region.h
===================================================================
--- scummvm/trunk/engines/sword25/math/region.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/math/region.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -55,7 +55,7 @@
enum REGION_TYPE
{
RT_REGION,
- RT_WALKREGION,
+ RT_WALKREGION
};
static unsigned int Create(REGION_TYPE Type);
Modified: scummvm/trunk/engines/sword25/math/vertex.h
===================================================================
--- scummvm/trunk/engines/sword25/math/vertex.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/math/vertex.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -41,7 +41,7 @@
{
public:
BS_Vertex() : X(0), Y(0) {};
- BS_Vertex(int X, int Y) { this->X = X; this->Y = Y; }
+ BS_Vertex(int X_, int Y_) { this->X = X_; this->Y = Y_; }
int X;
int Y;
Modified: scummvm/trunk/engines/sword25/math/walkregion.cpp
===================================================================
--- scummvm/trunk/engines/sword25/math/walkregion.cpp 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/math/walkregion.cpp 2010-10-12 21:54:21 UTC (rev 53182)
@@ -30,7 +30,7 @@
// Konstanten
// -----------------------------------------------------------------------------
-static const int INFINITY = INT_MAX;
+static const int infinity = INT_MAX;
// -----------------------------------------------------------------------------
// Konstruktion / Destruktion
@@ -103,7 +103,7 @@
typedef Container::iterator Iter;
typedef Container::const_iterator ConstIter;
- DijkstraNode() : Cost(INFINITY), Chosen(false) {};
+ DijkstraNode() : Cost(infinity), Chosen(false) {};
ConstIter ParentIter;
int Cost;
bool Chosen;
@@ -127,7 +127,7 @@
static DijkstraNode::Iter ChooseClosestNode(DijkstraNode::Container & Nodes)
{
DijkstraNode::Iter ClosestNodeInter = Nodes.end();
- int MinCost = INFINITY;
+ int MinCost = infinity;
for (DijkstraNode::Iter iter = Nodes.begin(); iter != Nodes.end(); iter++)
{
@@ -152,7 +152,7 @@
for (unsigned int i = 0; i < Nodes.size(); i++)
{
int Cost = VisibilityMatrix[CurNodeIndex][i];
- if (!Nodes[i].Chosen && Cost != INFINITY)
+ if (!Nodes[i].Chosen && Cost != infinity)
{
int TotalCost = (*CurNodeIter).Cost + Cost;
if (TotalCost < Nodes[i].Cost)
@@ -268,7 +268,7 @@
void BS_WalkRegion::ComputeVisibilityMatrix()
{
// Sichtbarkeitsmatrix initialisieren
- m_VisibilityMatrix = std::vector< std::vector <int> >(m_Nodes.size(), std::vector<int>(m_Nodes.size(), INFINITY));
+ m_VisibilityMatrix = std::vector< std::vector <int> >(m_Nodes.size(), std::vector<int>(m_Nodes.size(), infinity));
// Sichtbarkeiten zwischen Vertecies berechnen und in die Sichbarkeitsmatrix eintragen.
for (unsigned int j = 0; j < m_Nodes.size(); ++j)
@@ -285,8 +285,8 @@
else
{
// Wenn keine Sichtlinie besteht wird die Entfernung "unendlich" eingetragen
- m_VisibilityMatrix[i][j] = INFINITY;
- m_VisibilityMatrix[j][i] = INFINITY;
+ m_VisibilityMatrix[i][j] = infinity;
+ m_VisibilityMatrix[j][i] = infinity;
}
}
}
Modified: scummvm/trunk/engines/sword25/math/walkregion.h
===================================================================
--- scummvm/trunk/engines/sword25/math/walkregion.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/math/walkregion.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -42,7 +42,7 @@
*/
class BS_WalkRegion : public BS_Region
{
- friend BS_Region;
+ friend class BS_Region;
protected:
BS_WalkRegion();
Modified: scummvm/trunk/engines/sword25/module.mk
===================================================================
--- scummvm/trunk/engines/sword25/module.mk 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/module.mk 2010-10-12 21:54:21 UTC (rev 53182)
@@ -122,9 +122,7 @@
util/lua/src/print.o \
util/pluto/pdep.o \
util/pluto/pluto.o \
- util/pluto/plzio.o \
- util/pluto/pptest.o \
- util/pluto/puptest.o
+ util/pluto/plzio.o
# This module can be built as a plugin
ifeq ($(ENABLE_SWORD25), DYNAMIC_PLUGIN)
Modified: scummvm/trunk/engines/sword25/script/luascript.cpp
===================================================================
--- scummvm/trunk/engines/sword25/script/luascript.cpp 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/script/luascript.cpp 2010-10-12 21:54:21 UTC (rev 53182)
@@ -328,7 +328,7 @@
enum PERMANENT_TABLE_TYPE
{
PTT_PERSIST,
- PTT_UNPERSIST,
+ PTT_UNPERSIST
};
// -------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/util/glsprites/glsprites.h
===================================================================
--- scummvm/trunk/engines/sword25/util/glsprites/glsprites.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/util/glsprites/glsprites.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -50,7 +50,7 @@
GLS_OPENGL_ERROR,
GLS_INVALID_DATA_DIMENSIONS,
GLS_INVALID_DATA_POINTER,
- GLS_INVALID_SUB_IMAGE,
+ GLS_INVALID_SUB_IMAGE
} GLS_Result;
/* GLS_Rect */
Modified: scummvm/trunk/engines/sword25/util/pluto/pdep/lua.h
===================================================================
--- scummvm/trunk/engines/sword25/util/pluto/pdep/lua.h 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/util/pluto/pdep/lua.h 2010-10-12 21:54:21 UTC (rev 53182)
@@ -13,7 +13,7 @@
#include <stddef.h>
-#include "luaconf.h"
+#include "sword25/util/lua/luaconf.h"
#define LUA_VERSION "Lua 5.1"
Modified: scummvm/trunk/engines/sword25/util/pluto/pluto.c
===================================================================
--- scummvm/trunk/engines/sword25/util/pluto/pluto.c 2010-10-12 21:52:41 UTC (rev 53181)
+++ scummvm/trunk/engines/sword25/util/pluto/pluto.c 2010-10-12 21:54:21 UTC (rev 53182)
@@ -16,7 +16,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "lua.h"
+#include "sword25/util/lua/lua.h"
#include "pluto.h"
#define USE_PDEP
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