mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7444] Fixed some recently added and old type conversion warnings.

Browse source
This commit is contained in:
VladimirMangos 2009-03-12 11:45:03 +03:00
parent 719991d381
commit 1ed2f1e65d
3 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/GameObject.cpp
View file

@ -125,8 +125,8 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMa
int64 rotation = 0; int64 rotation = 0;
float f_rot1 = sin(ang / 2.0f); double f_rot1 = sin(ang / 2.0f);
int64 i_rot1 = f_rot1 / atan(pow(2.0f, -20.0f)); int64 i_rot1 = int64(f_rot1 / atan(pow(2.0f, -20.0f)));
rotation |= (i_rot1 << 43 >> 43) & 0x00000000001FFFFF; rotation |= (i_rot1 << 43 >> 43) & 0x00000000001FFFFF;
//float f_rot2 = sin(0.0f / 2.0f); //float f_rot2 = sin(0.0f / 2.0f);

22
src/game/Map.cpp
View file

@ -65,7 +65,8 @@ bool Map::ExistMap(uint32 mapid,int x,int y)
map_fileheader header; map_fileheader header;
fread(&header, sizeof(header), 1, pf); fread(&header, sizeof(header), 1, pf);
if (header.mapMagic != MAP_MAGIC || header.versionMagic != MAP_VERSION_MAGIC) if (header.mapMagic != uint32(MAP_MAGIC) ||
header.versionMagic != uint32(MAP_VERSION_MAGIC))
{ {
sLog.outError("Map file '%s' is non-compatible version (outdated?). Please, create new using ad.exe program.",tmp); sLog.outError("Map file '%s' is non-compatible version (outdated?). Please, create new using ad.exe program.",tmp);
delete [] tmp; delete [] tmp;
@ -1081,7 +1082,8 @@ bool GridMap::loadData(char *filename)
if (!in) if (!in)
return true; return true;
fread(&header, sizeof(header),1,in); fread(&header, sizeof(header),1,in);
if (header.mapMagic == MAP_MAGIC && header.versionMagic == MAP_VERSION_MAGIC) if (header.mapMagic == uint32(MAP_MAGIC) &&
header.versionMagic == uint32(MAP_VERSION_MAGIC))
{ {
// loadup area data // loadup area data
if (header.areaMapOffset && !loadAreaData(in, header.areaMapOffset, header.areaMapSize)) if (header.areaMapOffset && !loadAreaData(in, header.areaMapOffset, header.areaMapSize))
@ -1132,11 +1134,11 @@ bool GridMap::loadAreaData(FILE *in, uint32 offset, uint32 size)
map_areaHeader header; map_areaHeader header;
fseek(in, offset, SEEK_SET); fseek(in, offset, SEEK_SET);
fread(&header, sizeof(header), 1, in); fread(&header, sizeof(header), 1, in);
if (header.fourcc != MAP_AREA_MAGIC) if (header.fourcc != uint32(MAP_AREA_MAGIC))
return false; return false;
m_gridArea = header.gridArea; m_gridArea = header.gridArea;
if (!(header.flags&MAP_AREA_NO_AREA)) if (!(header.flags & MAP_AREA_NO_AREA))
{ {
m_area_map = new uint16 [16*16]; m_area_map = new uint16 [16*16];
fread(m_area_map, sizeof(uint16), 16*16, in); fread(m_area_map, sizeof(uint16), 16*16, in);
@ -1149,13 +1151,13 @@ bool GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 size)
map_heightHeader header; map_heightHeader header;
fseek(in, offset, SEEK_SET); fseek(in, offset, SEEK_SET);
fread(&header, sizeof(header), 1, in); fread(&header, sizeof(header), 1, in);
if (header.fourcc != MAP_HEIGTH_MAGIC) if (header.fourcc != uint32(MAP_HEIGTH_MAGIC))
return false; return false;
m_gridHeight = header.gridHeight; m_gridHeight = header.gridHeight;
if (!(header.flags&MAP_HEIGHT_NO_HIGHT)) if (!(header.flags & MAP_HEIGHT_NO_HIGHT))
{ {
if ((header.flags&MAP_HEIGHT_AS_INT16)) if ((header.flags & MAP_HEIGHT_AS_INT16))
{ {
m_uint16_V9 = new uint16 [129*129]; m_uint16_V9 = new uint16 [129*129];
m_uint16_V8 = new uint16 [128*128]; m_uint16_V8 = new uint16 [128*128];
@ -1164,7 +1166,7 @@ bool GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 size)
m_gridIntHeightMultiplier = (header.gridMaxHeight - header.gridHeight) / 65535; m_gridIntHeightMultiplier = (header.gridMaxHeight - header.gridHeight) / 65535;
m_gridGetHeight = &GridMap::getHeightFromUint16; m_gridGetHeight = &GridMap::getHeightFromUint16;
} }
else if ((header.flags&MAP_HEIGHT_AS_INT8)) else if ((header.flags & MAP_HEIGHT_AS_INT8))
{ {
m_uint8_V9 = new uint8 [129*129]; m_uint8_V9 = new uint8 [129*129];
m_uint8_V8 = new uint8 [128*128]; m_uint8_V8 = new uint8 [128*128];
@ -1192,7 +1194,7 @@ bool GridMap::loadLiquidData(FILE *in, uint32 offset, uint32 size)
map_liquidHeader header; map_liquidHeader header;
fseek(in, offset, SEEK_SET); fseek(in, offset, SEEK_SET);
fread(&header, sizeof(header), 1, in); fread(&header, sizeof(header), 1, in);
if (header.fourcc != MAP_LIQUID_MAGIC) if (header.fourcc != uint32(MAP_LIQUID_MAGIC))
return false; return false;
m_liquidType = header.liquidType; m_liquidType = header.liquidType;
@ -1529,7 +1531,7 @@ inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 R
} }
// For speed check as int values // For speed check as int values
int delta = (liquid_level - z) * 10; int delta = int((liquid_level - z) * 10);
// Get position delta // Get position delta
if (delta > 20) // Under water if (delta > 20) // Under water

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7443" #define REVISION_NR "7444"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__