mojotrollz/mojo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed all project related warnings

Browse Source
This commit is contained in:
Ulf Gebhardt 2017-07-27 21:46:37 +02:00
parent 6569422dc5
commit 05f2328b5b
10 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Client/CMakeLists.txt
View File

@ -54,7 +54,7 @@ RemoteController.cpp
SCPDatabase.cpp
)
set_property(DIRECTORY "${PROJECT_SOURCE_DIR}/src/Client" PROPERTY VS_STARTUP_PROJECT pseuwow)
# Link the executable to the libraries.
target_link_libraries (pseuwow ${PSEUWOW_LIBS})

9
src/Client/GUI/CM2MeshFileLoader.cpp
View File

@ -1,4 +1,3 @@
#define _DEBUG 1
#include <iostream>
#include "MemoryDataHolder.h"
#include "MemoryInterface.h"
@ -650,14 +649,14 @@ for(u32 i=0; i < currentView.Submesh.num;i++)//
//Put the Indices and Vertices of the Submesh into a mesh buffer
//Each Submesh contains only the Indices and Vertices that belong to it.
//Because of this the Index values for the Submeshes must be corrected by the Vertex offset of the Submesh
for(u32 j=M2MSubmeshes[i].ofsTris;j<M2MSubmeshes[i].ofsTris+M2MSubmeshes[i].nTris;j++)
for(s32 j=M2MSubmeshes[i].ofsTris;j<M2MSubmeshes[i].ofsTris+M2MSubmeshes[i].nTris;j++)
{
MeshBuffer->Indices.push_back(M2MIndices[M2MTriangles[j]]-M2MSubmeshes[i].ofsVertex);
if(M2MIndices[M2MTriangles[j]]<M2MSubmeshes[i].ofsVertex)
logerror("Index %u < ofsVertex %u",M2MIndices[M2MTriangles[j]],M2MSubmeshes[i].ofsVertex);
}
for(u32 j=M2MSubmeshes[i].ofsVertex;j<M2MSubmeshes[i].ofsVertex+M2MSubmeshes[i].nVertex;j++)
for(s32 j=M2MSubmeshes[i].ofsVertex;j<M2MSubmeshes[i].ofsVertex+M2MSubmeshes[i].nVertex;j++)
{
MeshBuffer->Vertices_Standard.push_back(M2Vertices[j]);
for(u32 k=0; k<4; k++)
@ -685,8 +684,8 @@ for(u32 i=0; i < currentView.Submesh.num;i++)//
s16 vColIndex = M2MTextureUnit[j].colorIndex;
if(vColIndex != -1)
{
DEBUG(logdebug("Applying color %f %f %f %f",M2MVertexColor[vColIndex].Colors.values[0],M2MVertexColor[vColIndex].Colors.values[1],M2MVertexColor[vColIndex].Colors.values[2],M2MVertexColor[vColIndex].Alpha.values[0]));
video::SColor color = video::SColorf(M2MVertexColor[vColIndex].Colors.values[0],M2MVertexColor[vColIndex].Colors.values[1],M2MVertexColor[vColIndex].Colors.values[2],M2MVertexColor[vColIndex].Alpha.values[0]).toSColor();
//DEBUG(logdebug("Applying color %f %f %f %f",M2MVertexColor[vColIndex].Colors.values[0],M2MVertexColor[vColIndex].Colors.values[1],M2MVertexColor[vColIndex].Colors.values[2],M2MVertexColor[vColIndex].Alpha.values[0]));
//video::SColor color = video::SColorf(M2MVertexColor[vColIndex].Colors.values[0],M2MVertexColor[vColIndex].Colors.values[1],M2MVertexColor[vColIndex].Colors.values[2],M2MVertexColor[vColIndex].Alpha.values[0]).toSColor();
// Device->getSceneManager()->getMeshManipulator()->apply(scene::SVertexColorSetManipulator(color), MeshBuffer);//
//MeshBuffer->getMaterial().DiffuseColor = color; // if we want to set diffuse instead of vertex color
}

3
src/Client/GUI/PseuGUI.cpp
View File

@ -7,6 +7,7 @@
#include "PseuWoW.h"
#include "Scene.h"
#include "PseuGUI.h"
#include "irrklang/irrKlang.h"
PseuGUIRunnable::PseuGUIRunnable()
{
@ -138,7 +139,7 @@ void PseuGUI::_Init(void)
// initialize the sound engine
if(_usesound)
{
_soundengine = NULL; // createIrrKlangDevice();
_soundengine = createIrrKlangDevice();
if(_soundengine)
{
logdetail("PseuGUI: Sound Driver: %s",_soundengine->getDriverName());

14
src/Client/GUI/ShTlTerrainSceneNode.cpp
View File

@ -160,8 +160,8 @@ ShTlTerrainSceneNode::ShTlTerrainSceneNode(scene::ISceneManager* smgr,
// set color of mesh vertices to white
// vertex color is not used, 2nd texture layer is used to render tile colors
for(s32 j=0; j<MeshSize.Height; j++)
for(s32 i=0; i<MeshSize.Width; i++)
for(u32 j=0; j<MeshSize.Height; j++)
for(u32 i=0; i<MeshSize.Width; i++)
{
Tile(i,j).Vertex[0]->Color = video::SColor(255,255,255,255);
Tile(i,j).Vertex[1]->Color = video::SColor(255,255,255,255);
@ -183,9 +183,9 @@ ShTlTerrainSceneNode::ShTlTerrainSceneNode(scene::ISceneManager* smgr,
// create 2nd texture layer
// find size of texture, must be power of two
s32 tw = 2;
u32 tw = 2;
while(tw < MeshSize.Width) tw = tw + tw;
s32 th = 2;
u32 th = 2;
while(th < MeshSize.Height) th = th + th;
// create texture
@ -209,9 +209,9 @@ ShTlTerrainSceneNode::ShTlTerrainSceneNode(scene::ISceneManager* smgr,
f32 ry = 1.0f - (f32)MeshSize.Height/ CTexture->getSize().Height;
s32 n = MeshSize.Height-1;
for(s32 j=0; j<MeshSize.Height; j++)
for(u32 j=0; j<MeshSize.Height; j++)
{
for(s32 i=0; i<MeshSize.Width; i++)
for(u32 i=0; i<MeshSize.Width; i++)
{
Tile(i,n).Vertex[0]->TCoords = core::vector2d<f32>(i*ax, ry+(j+1)*ay);
Tile(i,n).Vertex[1]->TCoords = core::vector2d<f32>(i*ax, ry+j*ay);
@ -506,7 +506,7 @@ void ShTlTerrainSceneNode::setTileSize(f32 newsize)
// returns dimension of rendered mesh in tiles
core::dimension2d<s32> ShTlTerrainSceneNode::getRenderedSize()
core::dimension2d<u32> ShTlTerrainSceneNode::getRenderedSize()
{
return MeshSize;
}

4
src/Client/GUI/ShTlTerrainSceneNode.h
View File

@ -76,7 +76,7 @@ class ShTlTerrainSceneNode : public scene::ISceneNode
array2d<TlTTile> Tile;
// size of vissible terrain mesh
core::dimension2d<s32> MeshSize;
core::dimension2d<u32> MeshSize;
// position of vissible terrain mesh relative to whole terrain in tiles
core::vector2d<s32> MeshPosition;
@ -167,7 +167,7 @@ public:
virtual void setTileSize(f32 newsize);
// returns dimension of rendered mesh in tiles
virtual core::dimension2d<s32> getRenderedSize();
virtual core::dimension2d<u32> getRenderedSize();
// return number of sectors into which terrain mesh is divided
virtual s32 getSectorCount();

1
src/Client/World/Object.cpp
View File

@ -14,7 +14,6 @@ Object::Object()
Object::~Object()
{
ASSERT(_valuescount > 0);
DEBUG(logdebug("~Object() GUID=%016I64X",GetGUID()));
if(_uint32values)
delete [] _uint32values;

1
src/Client/World/UpdateData.cpp
View File

@ -337,7 +337,6 @@ void WorldSession::_MovementUpdate(uint8 objtypeid, uint64 uguid, WorldPacket& r
uint8 spline_mode;
float facing_angle,facing_x,facing_y,facing_z, duration_mod, duration_next, vertical_acceleration;
float x,y,z;
uint64 facing_target;
recvPacket >> splineflags;
if(splineflags & SF_Final_Angle)
recvPacket >> facing_angle;

BIN
src/dep/lib/static/IrrKlang.lib.new
View File

Binary file not shown.

4
src/dep/src/irrKlang/CMakeLists.txt
View File

@ -1,3 +1,3 @@
include_directories (${PROJECT_SOURCE_DIR}/src/dep/include/irrklang)
add_library(IrrKlang
irrKlang.cpp)
#add_library(IrrKlang
#irrKlang.cpp)

2
src/dep/src/irrlicht/CNullDriver.cpp
View File

@ -449,7 +449,7 @@ ITexture* CNullDriver::getTexture(io::IReadFile* file)
}
if (!texture)
os::Printer::log("Could not load texture", file->getFileName(), ELL_WARNING);
os::Printer::log("Could not load texture", file ? file->getFileName() : "", ELL_WARNING);
return texture;
}