diff --git a/engines/hpl1/engine/game/low_level_game_setup.cpp b/engines/hpl1/engine/game/low_level_game_setup.cpp index 0c0c8a77abd..1e8a92c177e 100644 --- a/engines/hpl1/engine/game/low_level_game_setup.cpp +++ b/engines/hpl1/engine/game/low_level_game_setup.cpp @@ -28,6 +28,7 @@ #include "hpl1/engine/resources/low_level_resources.h" #include "hpl1/engine/impl/LowLevelSoundOpenAL.h" #include "hpl1/engine/impl/MouseSDL.h" +#include "hpl1/engine/haptic/LowLevelHaptic.h" namespace hpl { diff --git a/engines/hpl1/engine/gui/GuiSet.cpp b/engines/hpl1/engine/gui/GuiSet.cpp index 6904c0fba3d..5989af5d6ac 100644 --- a/engines/hpl1/engine/gui/GuiSet.cpp +++ b/engines/hpl1/engine/gui/GuiSet.cpp @@ -377,7 +377,7 @@ void cGuiSet::DrawFont(const tWString &asText, const cVector2f &avSize, const cColor &aColor, eFontAlign aAlign, eGuiMaterial aMaterial) { int lCount = 0; - float lXAdd = 0; + //float lXAdd = 0; cVector3f vPos = avPos; if (aAlign == eFontAlign_Center) { @@ -586,7 +586,7 @@ void cGuiSet::DestroyWidget(iWidget *apWidget) { void cGuiSet::CreatePopUpMessageBox(const tWString &asLabel, const tWString &asText, const tWString &asButton1, const tWString &asButton2, void *apCallbackObject, tGuiCallbackFunc apCallback) { - cGuiPopUpMessageBox *pMessageBox = hplNew(cGuiPopUpMessageBox, (this, asLabel, asText, + /* cGuiPopUpMessageBox *pMessageBox = */(void)hplNew(cGuiPopUpMessageBox, (this, asLabel, asText, asButton1, asButton2, apCallbackObject, apCallback)); } @@ -835,7 +835,7 @@ void cGuiSet::RenderClipRegion() { // Iterate for all with same texture and material do { cGuiRenderObject object = *it; - cGuiGfxElement *pGfx = object.mpGfx; + pGfx = object.mpGfx; if (kLogRender) { if (pGfx->mvImages[0]) diff --git a/engines/hpl1/engine/impl/CollideShapeNewton.cpp b/engines/hpl1/engine/impl/CollideShapeNewton.cpp index c0e12d9f9a4..20f844dabe1 100644 --- a/engines/hpl1/engine/impl/CollideShapeNewton.cpp +++ b/engines/hpl1/engine/impl/CollideShapeNewton.cpp @@ -62,8 +62,7 @@ cCollideShapeNewton::cCollideShapeNewton(eCollideShapeType aType, const cVector3 //////////////////////////////////////////// // Create Newton collision - switch(aType) - { + switch(aType) { case eCollideShapeType_Null: mpNewtonCollision = NewtonCreateNull(apNewtonWorld); break; case eCollideShapeType_Box: mpNewtonCollision = NewtonCreateBox(apNewtonWorld, @@ -81,6 +80,8 @@ cCollideShapeNewton::cCollideShapeNewton(eCollideShapeType aType, const cVector3 case eCollideShapeType_Capsule: mpNewtonCollision = NewtonCreateCapsule(apNewtonWorld, mvSize.x, mvSize.y, 0, pMtx); break; + default: + break; } //////////////////////////////////////////// diff --git a/engines/hpl1/engine/impl/LowLevelGraphicsSDL.cpp b/engines/hpl1/engine/impl/LowLevelGraphicsSDL.cpp index 4374eba172b..2cbd4dbe62e 100644 --- a/engines/hpl1/engine/impl/LowLevelGraphicsSDL.cpp +++ b/engines/hpl1/engine/impl/LowLevelGraphicsSDL.cpp @@ -63,6 +63,7 @@ GLenum ColorFormatToGL(eColorDataFormat format) { break; } Hpl1::logError(Hpl1::kDebugOpenGL, "invalid color format (%d)", format); + return GL_RGB; } GLenum TextureTargetToGL(eTextureTarget target) { @@ -81,6 +82,7 @@ GLenum TextureTargetToGL(eTextureTarget target) { break; } Hpl1::logError(Hpl1::kDebugOpenGL, "invalid texture target (%d)", target); + return GL_TEXTURE_1D; } cLowLevelGraphicsSDL::cLowLevelGraphicsSDL() { @@ -863,7 +865,7 @@ void cLowLevelGraphicsSDL::SetStencilTwoSide(eStencilFunc aFrontFunc, eStencilFu void cLowLevelGraphicsSDL::SetStencilTwoSide(bool abX) { if (GetCaps(eGraphicCaps_TwoSideStencil)) - Hpl1::logError(Hpl1::kDebugOpenGL, "call to setStencilTwoSide with two side stencil enabled"); + Hpl1::logError(Hpl1::kDebugOpenGL, "call to setStencilTwoSide with two side stencil enabled%c", "."); } //----------------------------------------------------------------------- diff --git a/engines/hpl1/engine/impl/LowLevelGraphicsSDL.h b/engines/hpl1/engine/impl/LowLevelGraphicsSDL.h index 0252fb11628..3fffbd82b9e 100644 --- a/engines/hpl1/engine/impl/LowLevelGraphicsSDL.h +++ b/engines/hpl1/engine/impl/LowLevelGraphicsSDL.h @@ -245,7 +245,7 @@ private: int mlBpp; // Gamma - uint16 mvStartGammaArray[3][256]; + //uint16 mvStartGammaArray[3][256]; float mfGammaCorrection; // Clipping diff --git a/engines/hpl1/engine/impl/MeshLoaderCollada.cpp b/engines/hpl1/engine/impl/MeshLoaderCollada.cpp index 88f58034154..fedce9dcca2 100644 --- a/engines/hpl1/engine/impl/MeshLoaderCollada.cpp +++ b/engines/hpl1/engine/impl/MeshLoaderCollada.cpp @@ -1711,8 +1711,8 @@ void cMeshLoaderCollada::AddSceneObjects(cColladaNode *apNode, cWorld3D *apWorld // If no entity was loaded, try old style. if (pEntity == NULL) { - tString sName = vParams[1]; - tString sFile = cString::Sub(apNode->msName, 5 + (int)+sName.size() + 1); + sName = vParams[1]; + sFile = cString::Sub(apNode->msName, 5 + (int)+sName.size() + 1); sFile = cString::SetFileExt(sFile, "ent"); apWorld->CreateEntity(sName, apNode->m_mtxWorldTransform, sFile, true); @@ -1827,7 +1827,7 @@ void cMeshLoaderCollada::AddSceneObjects(cColladaNode *apNode, cWorld3D *apWorld Error("Too few params in billboard entity entity '%s'\n", apNode->msName.c_str()); } else { tString sName = vParams[vParams.size() - 1]; - tString sType = ""; + sType = ""; for (size_t i = 1; i < vParams.size() - 1; ++i) { sType += vParams[i]; if (i != vParams.size() - 2) @@ -1840,7 +1840,7 @@ void cMeshLoaderCollada::AddSceneObjects(cColladaNode *apNode, cWorld3D *apWorld if (pPS == NULL) { sName = vParams[1]; sType = cString::Sub(apNode->msName, 4 + (int)sName.size() + 1); - cParticleSystem3D *pPS = apWorld->CreateParticleSystem(sName, sType, apNode->mvScale, + pPS = apWorld->CreateParticleSystem(sName, sType, apNode->mvScale, apNode->m_mtxWorldTransform); if (pPS == NULL) { @@ -1872,7 +1872,6 @@ void cMeshLoaderCollada::AddSceneObjects(cColladaNode *apNode, cWorld3D *apWorld TempBV.AddArrayPoints(&vVertexVec[0], (int)vArray.size()); TempBV.CreateFromPoints(3); - tString sType; tString sName; if (vParams.size() < 3 || (mFlags & eWorldLoadFlag_NoGameEntities)) { sType = "";