summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-04-03 09:27:17 +0200
committerMattes D <github@xoft.cz>2014-04-03 09:27:17 +0200
commit25529ba62f949b98ed30e905ee4921c737d7df87 (patch)
tree773b1c615cd4147f1910bb396441186a8a0151a0 /src
parentRemoved the bindings to set old g_BlockXXX arrays. (diff)
downloadcuberite-25529ba62f949b98ed30e905ee4921c737d7df87.tar
cuberite-25529ba62f949b98ed30e905ee4921c737d7df87.tar.gz
cuberite-25529ba62f949b98ed30e905ee4921c737d7df87.tar.bz2
cuberite-25529ba62f949b98ed30e905ee4921c737d7df87.tar.lz
cuberite-25529ba62f949b98ed30e905ee4921c737d7df87.tar.xz
cuberite-25529ba62f949b98ed30e905ee4921c737d7df87.tar.zst
cuberite-25529ba62f949b98ed30e905ee4921c737d7df87.zip
Diffstat (limited to 'src')
-rw-r--r--src/BlockArea.cpp2
-rw-r--r--src/BlockEntities/CommandBlockEntity.cpp2
-rw-r--r--src/Globals.h3
3 files changed, 5 insertions, 2 deletions
diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp
index 60e4f11e5..40cca8882 100644
--- a/src/BlockArea.cpp
+++ b/src/BlockArea.cpp
@@ -530,7 +530,7 @@ void cBlockArea::DumpToRawFile(const AString & a_FileName)
f.Write(&SizeX, 4);
f.Write(&SizeY, 4);
f.Write(&SizeZ, 4);
- unsigned char DataTypes = GetDataTypes();
+ unsigned char DataTypes = (unsigned char)GetDataTypes();
f.Write(&DataTypes, 1);
int NumBlocks = GetBlockCount();
if (HasBlockTypes())
diff --git a/src/BlockEntities/CommandBlockEntity.cpp b/src/BlockEntities/CommandBlockEntity.cpp
index d395997a6..96ca0ac37 100644
--- a/src/BlockEntities/CommandBlockEntity.cpp
+++ b/src/BlockEntities/CommandBlockEntity.cpp
@@ -160,7 +160,7 @@ bool cCommandBlockEntity::LoadFromJson(const Json::Value & a_Value)
m_Command = a_Value.get("Command", "").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;
}
diff --git a/src/Globals.h b/src/Globals.h
index a1cee5c2f..26a0d87a9 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -29,6 +29,9 @@
// Disabling this warning, because we know what we're doing when we're doing this:
#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
// #pragma warning(3 : 4244) // Conversion from 'type1' to 'type2', possible loss of data