flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed a few MSVC type warnings.

Browse Source
This commit is contained in:
Mattes D 2014-04-03 09:27:17 +02:00
parent 12b82de502
commit 25529ba62f
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BlockArea.cpp
View File

@ -530,7 +530,7 @@ void cBlockArea::DumpToRawFile(const AString & a_FileName)
f.Write(&SizeX, 4); f.Write(&SizeX, 4);
f.Write(&SizeY, 4); f.Write(&SizeY, 4);
f.Write(&SizeZ, 4); f.Write(&SizeZ, 4);
unsigned char DataTypes = GetDataTypes(); unsigned char DataTypes = (unsigned char)GetDataTypes();
f.Write(&DataTypes, 1); f.Write(&DataTypes, 1);
int NumBlocks = GetBlockCount(); int NumBlocks = GetBlockCount();
if (HasBlockTypes()) if (HasBlockTypes())

2
src/BlockEntities/CommandBlockEntity.cpp
View File

@ -160,7 +160,7 @@ bool cCommandBlockEntity::LoadFromJson(const Json::Value & a_Value)
m_Command = a_Value.get("Command", "").asString(); m_Command = a_Value.get("Command", "").asString();
m_LastOutput = a_Value.get("LastOutput", "").asString(); m_LastOutput = a_Value.get("LastOutput", "").asString();
m_Result = a_Value.get("SuccessCount", 0).asInt(); m_Result = (NIBBLETYPE)a_Value.get("SuccessCount", 0).asInt();
return true; return true;
} }

3
src/Globals.h
View File

@ -29,6 +29,9 @@
// Disabling this warning, because we know what we're doing when we're doing this: // Disabling this warning, because we know what we're doing when we're doing this:
#pragma warning(disable: 4355) // 'this' used in initializer list #pragma warning(disable: 4355) // 'this' used in initializer list
// Disabled because it's useless:
#pragma warning(disable: 4512) // 'class': assignment operator could not be generated - reported for each class that has a reference-type member
// 2014_01_06 xoft: Disabled this warning because MSVC is stupid and reports it in obviously wrong places // 2014_01_06 xoft: Disabled this warning because MSVC is stupid and reports it in obviously wrong places
// #pragma warning(3 : 4244) // Conversion from 'type1' to 'type2', possible loss of data // #pragma warning(3 : 4244) // Conversion from 'type1' to 'type2', possible loss of data