diff options
| -rw-r--r-- | GNUmakefile | 20 | ||||
| -rw-r--r-- | Install/Zip2008.list | 1 | ||||
| -rw-r--r-- | MCServer/.gitignore | 4 | ||||
| -rw-r--r-- | MCServer/Plugins/APIDump/Hooks/OnPlayerRightClick.lua | 3 | ||||
| -rw-r--r-- | Tools/ProtoProxy/Connection.cpp | 36 | ||||
| -rw-r--r-- | VC2008/.gitignore | 1 | ||||
| -rw-r--r-- | VC2008/CryptoPP.vcproj | 739 | ||||
| -rw-r--r-- | VC2008/JsonCpp.vcproj | 62 | ||||
| -rw-r--r-- | VC2008/Lua.vcproj | 112 | ||||
| -rw-r--r-- | VC2008/MCServer.sln | 15 | ||||
| -rw-r--r-- | VC2008/MCServer.vcproj | 207 | ||||
| -rw-r--r-- | VC2008/ToLua.vcproj | 62 | ||||
| -rw-r--r-- | VC2008/expat.vcproj | 61 | ||||
| -rw-r--r-- | VC2008/zlib.vcproj | 62 | ||||
| -rw-r--r-- | src/Blocks/BlockFluid.h | 81 | ||||
| -rw-r--r-- | src/Blocks/BlockHandler.cpp | 12 | ||||
| -rw-r--r-- | src/ByteBuffer.cpp | 4 | ||||
| -rw-r--r-- | src/ByteBuffer.h | 2 | ||||
| -rw-r--r-- | src/Chunk.cpp | 4 | ||||
| -rw-r--r-- | src/World.cpp | 1 | ||||
| -rw-r--r-- | src/World.h | 3 |
21 files changed, 1454 insertions, 38 deletions
diff --git a/GNUmakefile b/GNUmakefile index e0e606d90..c8cdd35e1 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -47,8 +47,8 @@ ifeq ($(release),1) # release build - fastest run-time, no gdb support ################ -CC_OPTIONS = -O3 -DNDEBUG -CXX_OPTIONS = -O3 -DNDEBUG +CC_OPTIONS = -O3 -DNDEBUG -DLUA_USE_DLOPEN +CXX_OPTIONS = -O3 -DNDEBUG -DLUA_USE_DLOPEN LNK_OPTIONS = -pthread -O3 BUILDDIR = build/release/ @@ -59,8 +59,8 @@ ifeq ($(profile),1) # profile build - a release build with symbols and profiling engine built in ################ -CC_OPTIONS = -g -ggdb -O3 -pg -DNDEBUG -CXX_OPTIONS = -g -ggdb -O3 -pg -DNDEBUG +CC_OPTIONS = -g -ggdb -O3 -pg -DNDEBUG -DLUA_USE_DLOPEN +CXX_OPTIONS = -g -ggdb -O3 -pg -DNDEBUG -DLUA_USE_DLOPEN LNK_OPTIONS = -pthread -ggdb -O3 -pg BUILDDIR = build/profile/ @@ -71,8 +71,8 @@ else # Since C code is used only for supporting libraries (zlib, lua), it is still Ofast-optimized ################ -CC_OPTIONS = -ggdb -g -D_DEBUG -O3 -CXX_OPTIONS = -ggdb -g -D_DEBUG -O1 +CC_OPTIONS = -ggdb -g -D_DEBUG -O3 -DLUA_USE_DLOPEN +CXX_OPTIONS = -ggdb -g -D_DEBUG -O1 -DLUA_USE_DLOPEN LNK_OPTIONS = -pthread -g -ggdb -O1 BUILDDIR = build/debug/ @@ -112,6 +112,14 @@ endif ################################################### +# Export all symbols from the executable, so that LuaRocks may bind to Lua routines: +LNK_OPTIONS += -rdynamic + + + + + +################################################### # 32-bit build override in 64-bit build environments ifeq ($(addm32),1) diff --git a/Install/Zip2008.list b/Install/Zip2008.list index fbfc06e0c..b118ccbf9 100644 --- a/Install/Zip2008.list +++ b/Install/Zip2008.list @@ -1,4 +1,5 @@ ..\MCServer\MCServer.exe +..\MCServer\*.dll ..\MCServer\Plugins ..\MCServer\webadmin ..\MCServer\crafting.txt diff --git a/MCServer/.gitignore b/MCServer/.gitignore index c03bcbe99..1fed134fe 100644 --- a/MCServer/.gitignore +++ b/MCServer/.gitignore @@ -1,4 +1,7 @@ *.exe +*.dll +*.exp +*.lib *.ini MCServer logs @@ -20,3 +23,4 @@ valgrind.log motd.txt *.deuser *.dmp +*.xml diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerRightClick.lua b/MCServer/Plugins/APIDump/Hooks/OnPlayerRightClick.lua index d767b449d..de9b3662c 100644 --- a/MCServer/Plugins/APIDump/Hooks/OnPlayerRightClick.lua +++ b/MCServer/Plugins/APIDump/Hooks/OnPlayerRightClick.lua @@ -21,6 +21,9 @@ return { Name = "BlockY", Type = "number", Notes = "Y-coord of the block" }, { Name = "BlockZ", Type = "number", Notes = "Z-coord of the block" }, { Name = "BlockFace", Type = "number", Notes = "Face of the block upon which the player interacted. One of the BLOCK_FACE_ constants" }, + { Name = "CursorX", Type = "number", Notes = "X-coord of the mouse crosshair on the block" }, + { Name = "CursorY", Type = "number", Notes = "Y-coord of the mouse crosshair on the block" }, + { Name = "CursorZ", Type = "number", Notes = "Z-coord of the mouse crosshair on the block" }, }, Returns = [[ If the function returns false or no value, MCServer calls other plugins' callbacks and finally sends diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp index 385caa2ce..0b49859cb 100644 --- a/Tools/ProtoProxy/Connection.cpp +++ b/Tools/ProtoProxy/Connection.cpp @@ -260,6 +260,9 @@ void cConnection::Log(const char * a_Format, ...) // Log to file: cCSLock Lock(m_CSLog); fputs(FullMsg.c_str(), m_LogFile); + #ifdef _DEBUG + fflush(m_LogFile); + #endif // _DEBUG // Log to screen: // std::cout << FullMsg; @@ -2678,15 +2681,20 @@ bool cConnection::ParseMetadata(cByteBuffer & a_Buffer, AString & a_Metadata) case 1: Length = 2; break; // short case 2: Length = 4; break; // int case 3: Length = 4; break; // float - case 4: // string16 + case 4: // UTF-8 string with VarInt length { - short Len = 0; - if (!a_Buffer.ReadBEShort(Len)) + UInt32 Len; + int rs = a_Buffer.GetReadableSpace(); + if (!a_Buffer.ReadVarInt(Len)) { return false; } - short NetLen = htons(Len); - a_Metadata.append((char *)&NetLen, 2); + rs = rs - a_Buffer.GetReadableSpace(); + cByteBuffer LenBuf(8); + LenBuf.WriteVarInt(Len); + AString VarLen; + LenBuf.ReadAll(VarLen); + a_Metadata.append(VarLen); Length = Len; break; } @@ -2766,11 +2774,21 @@ void cConnection::LogMetadata(const AString & a_Metadata, size_t a_IndentCount) pos += 4; break; } - case 4: // string16 + case 4: // UTF-8 string with VarInt length { - short Length = (a_Metadata[pos + 1] << 8) | a_Metadata[pos + 2]; - Log("%sstring[%d] = \"%*s\"", Indent.c_str(), Index, Length, a_Metadata.c_str() + pos + 3); - pos += Length + 2; + cByteBuffer bb(10); + int RestLen = (int)a_Metadata.size() - pos - 1; + if (RestLen > 8) + { + RestLen = 8; + } + bb.Write(a_Metadata.data() + pos + 1, RestLen); + UInt32 Length; + int rs = bb.GetReadableSpace(); + bb.ReadVarInt(Length); + rs = rs - bb.GetReadableSpace(); + Log("%sstring[%d] = \"%*s\"", Indent.c_str(), Index, Length, a_Metadata.c_str() + pos + rs + 1); + pos += Length + rs + 2; break; } case 5: diff --git a/VC2008/.gitignore b/VC2008/.gitignore index 27d2f5ebe..e31475ed0 100644 --- a/VC2008/.gitignore +++ b/VC2008/.gitignore @@ -1,5 +1,6 @@ Debug/ Debug profiled/ +Debug_LuaStatic/ Release/ Release profiled/ *.user diff --git a/VC2008/CryptoPP.vcproj b/VC2008/CryptoPP.vcproj index 530467eeb..a818e9aa1 100644 --- a/VC2008/CryptoPP.vcproj +++ b/VC2008/CryptoPP.vcproj @@ -160,6 +160,74 @@ /> </Configuration> <Configuration + Name="Debug_LuaStatic|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\CryptoPP" + IntermediateDirectory="$(ConfigurationName)\CryptoPP" + ConfigurationType="4" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="_DEBUG;_WINDOWS;USE_PRECOMPILED_HEADERS;WIN32" + RuntimeLibrary="1" + EnableEnhancedInstructionSet="1" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="pch.h" + ProgramDataBaseFileName="$(OutDir)\vc80.pdb" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|x64" OutputDirectory="$(PlatformName)\Output\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ProjectName)\$(ConfigurationName)" @@ -459,6 +527,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -515,6 +592,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -571,6 +657,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -627,6 +722,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -687,6 +791,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -743,6 +856,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -799,6 +921,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -855,6 +986,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -915,6 +1055,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -979,6 +1128,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1035,6 +1193,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1091,6 +1258,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1155,6 +1331,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1211,6 +1396,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1269,6 +1463,16 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1329,6 +1533,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1389,6 +1602,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1447,6 +1669,16 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" > @@ -1507,6 +1739,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1563,6 +1804,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1625,6 +1875,16 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" > @@ -1685,6 +1945,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1741,6 +2010,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1797,6 +2075,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1853,6 +2140,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1913,6 +2209,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -1969,6 +2274,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2025,6 +2339,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2081,6 +2404,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2137,6 +2469,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2193,6 +2534,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2249,6 +2599,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2305,6 +2664,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2364,6 +2732,16 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2424,6 +2802,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2480,6 +2867,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2536,6 +2932,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2592,6 +2997,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2648,6 +3062,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2704,6 +3127,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2760,6 +3192,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2816,6 +3257,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2872,6 +3322,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2928,6 +3387,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2984,6 +3452,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3040,6 +3517,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3098,6 +3584,16 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3158,6 +3654,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3214,6 +3719,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3274,6 +3788,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3330,6 +3853,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3386,6 +3918,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3442,6 +3983,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3498,6 +4048,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3554,6 +4113,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3610,6 +4178,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3666,6 +4243,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3722,6 +4308,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3778,6 +4373,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3834,6 +4438,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3894,6 +4507,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -3950,6 +4572,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -4006,6 +4637,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -4062,6 +4702,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -4118,6 +4767,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -4174,6 +4832,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -4230,6 +4897,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -4286,6 +4962,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -4342,6 +5027,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -4398,6 +5092,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -4454,6 +5157,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -4510,6 +5222,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -4570,6 +5291,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -4626,6 +5356,15 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool diff --git a/VC2008/JsonCpp.vcproj b/VC2008/JsonCpp.vcproj index 8b35f170b..6fae46445 100644 --- a/VC2008/JsonCpp.vcproj +++ b/VC2008/JsonCpp.vcproj @@ -266,6 +266,68 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Debug_LuaStatic|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\JsonCpp" + IntermediateDirectory="$(ConfigurationName)\JsonCpp" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../jsoncpp-src-0.5.0/include" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> diff --git a/VC2008/Lua.vcproj b/VC2008/Lua.vcproj index 326ba6411..d08d738ea 100644 --- a/VC2008/Lua.vcproj +++ b/VC2008/Lua.vcproj @@ -20,7 +20,7 @@ Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)\Lua" IntermediateDirectory="$(ConfigurationName)\Lua" - ConfigurationType="4" + ConfigurationType="2" CharacterSet="1" > <Tool @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LUA_BUILD_AS_DLL" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -59,12 +59,17 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLibrarianTool" + Name="VCLinkerTool" + OutputFile="$(ProjectDir)\..\MCServer\lua5.1.dll" + GenerateDebugInformation="true" /> <Tool Name="VCALinkTool" /> <Tool + Name="VCManifestTool" + /> + <Tool Name="VCXDCMakeTool" /> <Tool @@ -74,6 +79,9 @@ Name="VCFxCopTool" /> <Tool + Name="VCAppVerifierTool" + /> + <Tool Name="VCPostBuildEventTool" /> </Configuration> @@ -81,7 +89,7 @@ Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)\Lua" IntermediateDirectory="$(ConfigurationName)\Lua" - ConfigurationType="4" + ConfigurationType="2" CharacterSet="1" WholeProgramOptimization="1" > @@ -104,7 +112,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LUA_BUILD_AS_DLL" RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -121,12 +129,16 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLibrarianTool" + Name="VCLinkerTool" + OutputFile="$(ProjectDir)\..\MCServer\lua5.1.dll" /> <Tool Name="VCALinkTool" /> <Tool + Name="VCManifestTool" + /> + <Tool Name="VCXDCMakeTool" /> <Tool @@ -136,6 +148,9 @@ Name="VCFxCopTool" /> <Tool + Name="VCAppVerifierTool" + /> + <Tool Name="VCPostBuildEventTool" /> </Configuration> @@ -143,7 +158,7 @@ Name="Release profiled|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)\Lua" IntermediateDirectory="$(ConfigurationName)\Lua" - ConfigurationType="4" + ConfigurationType="2" CharacterSet="1" WholeProgramOptimization="1" > @@ -166,7 +181,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LUA_BUILD_AS_DLL" RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -183,12 +198,16 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLibrarianTool" + Name="VCLinkerTool" + OutputFile="$(ProjectDir)\..\MCServer\lua5.1.dll" /> <Tool Name="VCALinkTool" /> <Tool + Name="VCManifestTool" + /> + <Tool Name="VCXDCMakeTool" /> <Tool @@ -198,6 +217,9 @@ Name="VCFxCopTool" /> <Tool + Name="VCAppVerifierTool" + /> + <Tool Name="VCPostBuildEventTool" /> </Configuration> @@ -205,6 +227,74 @@ Name="Debug profiled|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)\Lua" IntermediateDirectory="$(ConfigurationName)\Lua" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LUA_BUILD_AS_DLL" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(ProjectDir)\..\MCServer\lua5.1.dll" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_LuaStatic|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\Lua" + IntermediateDirectory="$(ConfigurationName)\Lua" ConfigurationType="4" CharacterSet="1" > @@ -376,10 +466,6 @@ > </File> <File - RelativePath="..\lib\lua\src\lua.c" - > - </File> - <File RelativePath="..\lib\lua\src\luac.c" > </File> diff --git a/VC2008/MCServer.sln b/VC2008/MCServer.sln index aeabaf252..a36150483 100644 --- a/VC2008/MCServer.sln +++ b/VC2008/MCServer.sln @@ -25,6 +25,7 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug profiled|Win32 = Debug profiled|Win32 + Debug_LuaStatic|Win32 = Debug_LuaStatic|Win32 Debug|Win32 = Debug|Win32 Release profiled|Win32 = Release profiled|Win32 Release|Win32 = Release|Win32 @@ -32,6 +33,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {32012054-0C96-4C43-AB27-174FF8E72D66}.Debug profiled|Win32.ActiveCfg = Debug profiled|Win32 {32012054-0C96-4C43-AB27-174FF8E72D66}.Debug profiled|Win32.Build.0 = Debug profiled|Win32 + {32012054-0C96-4C43-AB27-174FF8E72D66}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {32012054-0C96-4C43-AB27-174FF8E72D66}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {32012054-0C96-4C43-AB27-174FF8E72D66}.Debug|Win32.ActiveCfg = Debug|Win32 {32012054-0C96-4C43-AB27-174FF8E72D66}.Debug|Win32.Build.0 = Debug|Win32 {32012054-0C96-4C43-AB27-174FF8E72D66}.Release profiled|Win32.ActiveCfg = Release profiled|Win32 @@ -40,6 +43,8 @@ Global {32012054-0C96-4C43-AB27-174FF8E72D66}.Release|Win32.Build.0 = Release|Win32 {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Debug profiled|Win32.ActiveCfg = Debug profiled|Win32 {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Debug profiled|Win32.Build.0 = Debug profiled|Win32 + {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Debug|Win32.ActiveCfg = Debug|Win32 {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Debug|Win32.Build.0 = Debug|Win32 {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Release profiled|Win32.ActiveCfg = Release profiled|Win32 @@ -48,6 +53,8 @@ Global {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}.Release|Win32.Build.0 = Release|Win32 {5AAA90B9-946D-4034-83F3-676B06A6E326}.Debug profiled|Win32.ActiveCfg = Debug profiled|Win32 {5AAA90B9-946D-4034-83F3-676B06A6E326}.Debug profiled|Win32.Build.0 = Debug profiled|Win32 + {5AAA90B9-946D-4034-83F3-676B06A6E326}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {5AAA90B9-946D-4034-83F3-676B06A6E326}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {5AAA90B9-946D-4034-83F3-676B06A6E326}.Debug|Win32.ActiveCfg = Debug|Win32 {5AAA90B9-946D-4034-83F3-676B06A6E326}.Debug|Win32.Build.0 = Debug|Win32 {5AAA90B9-946D-4034-83F3-676B06A6E326}.Release profiled|Win32.ActiveCfg = Release profiled|Win32 @@ -56,6 +63,8 @@ Global {5AAA90B9-946D-4034-83F3-676B06A6E326}.Release|Win32.Build.0 = Release|Win32 {082E8185-7B3A-4945-8C82-9132341A329D}.Debug profiled|Win32.ActiveCfg = Debug profiled|Win32 {082E8185-7B3A-4945-8C82-9132341A329D}.Debug profiled|Win32.Build.0 = Debug profiled|Win32 + {082E8185-7B3A-4945-8C82-9132341A329D}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {082E8185-7B3A-4945-8C82-9132341A329D}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {082E8185-7B3A-4945-8C82-9132341A329D}.Debug|Win32.ActiveCfg = Debug|Win32 {082E8185-7B3A-4945-8C82-9132341A329D}.Debug|Win32.Build.0 = Debug|Win32 {082E8185-7B3A-4945-8C82-9132341A329D}.Release profiled|Win32.ActiveCfg = Release profiled|Win32 @@ -64,6 +73,8 @@ Global {082E8185-7B3A-4945-8C82-9132341A329D}.Release|Win32.Build.0 = Release|Win32 {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Debug profiled|Win32.ActiveCfg = Debug profiled|Win32 {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Debug profiled|Win32.Build.0 = Debug profiled|Win32 + {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Debug|Win32.ActiveCfg = Debug|Win32 {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Debug|Win32.Build.0 = Debug|Win32 {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Release profiled|Win32.ActiveCfg = Release profiled|Win32 @@ -72,6 +83,8 @@ Global {EEAB54AD-114C-4AB8-8482-0A52D502BD35}.Release|Win32.Build.0 = Release|Win32 {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug profiled|Win32.ActiveCfg = Debug|Win32 {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug profiled|Win32.Build.0 = Debug|Win32 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32 {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32 {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release profiled|Win32.ActiveCfg = Release|Win32 @@ -80,6 +93,8 @@ Global {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32 {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Debug profiled|Win32.ActiveCfg = Debug|Win32 {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Debug profiled|Win32.Build.0 = Debug|Win32 + {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Debug_LuaStatic|Win32.ActiveCfg = Debug_LuaStatic|Win32 + {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Debug_LuaStatic|Win32.Build.0 = Debug_LuaStatic|Win32 {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Debug|Win32.ActiveCfg = Debug|Win32 {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Debug|Win32.Build.0 = Debug|Win32 {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}.Release profiled|Win32.ActiveCfg = Release|Win32 diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index 95e10ba40..c5dedb677 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -327,6 +327,82 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Debug_LuaStatic|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories=""../lib/jsoncpp/include";../lib" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;XML_STATIC" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="Globals.h" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib Psapi.lib" + OutputFile="$(ProjectDir)\..\MCServer\$(ProjectName)_debug_luastatic.exe" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> @@ -549,6 +625,14 @@ UsePrecompiledHeader="1" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> </File> <File RelativePath="..\src\Globals.h" @@ -637,6 +721,15 @@ WarningLevel="3" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + WarningLevel="3" + /> + </FileConfiguration> </File> <File RelativePath="..\src\LeakFinder.h" @@ -775,6 +868,19 @@ UsePrecompiledHeader="0" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" + BasicRuntimeChecks="0" + UsePrecompiledHeader="0" + /> + </FileConfiguration> </File> <File RelativePath="..\src\Noise.h" @@ -871,6 +977,15 @@ WarningLevel="3" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + WarningLevel="3" + /> + </FileConfiguration> </File> <File RelativePath="..\src\StackWalker.h" @@ -1545,6 +1660,14 @@ Name="VCCustomBuildTool" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> <File RelativePath="..\Android\jni\app-android.cpp" @@ -1581,6 +1704,14 @@ Name="VCCLCompilerTool" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> </File> <File RelativePath="..\Android\jni\Application.mk" @@ -1617,6 +1748,14 @@ Name="VCCustomBuildTool" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> <File RelativePath="..\Android\jni\ToJava.cpp" @@ -1653,6 +1792,14 @@ Name="VCCLCompilerTool" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> </File> <File RelativePath="..\Android\jni\ToJava.h" @@ -1689,6 +1836,14 @@ Name="VCCustomBuildTool" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> </Filter> </Filter> @@ -1742,6 +1897,17 @@ Outputs="Bindings.cpp" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + CommandLine="GenerateBindings.cmd
" + AdditionalDependencies=""cTorch.h";"cStairs.h";"cLadder.h";"../lib/inifile/iniFile.h";"BlockID.h";"PacketID.h";"Defines.h";"LuaFunctions.h";"cStringMap.h";"cChatColor.h";"cClientHandle.h";"cEntity.h";"cPawn.h";"cPlayer.h";"cPluginManager.h";"cPlugin.h";"cPlugin_NewLua.h";"cPlugin_Lua.h";"cServer.h";"cWorld.h";"cInventory.h";"cItem.h";"cWebAdmin.h";"cWebPlugin.h";"cWebPlugin_Lua.h";"cPickup.h";"cRoot.h";"cTCPLink.h";"Vector3f.h";"Vector3d.h";"Vector3i.h";"Matrix4f.h";"cCuboid.h";"cMCLogger.h";"cTracer.h";"cGroup.h";"BlockArea.h";"packets/cPacket_Login.h";"packets/cPacket_BlockDig.h";"packets/cPacket_BlockPlace.h"" + Outputs="Bindings.cpp" + /> + </FileConfiguration> </File> <File RelativePath="..\MCServer\API.txt" @@ -1782,6 +1948,14 @@ UsePrecompiledHeader="0" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </FileConfiguration> </File> <File RelativePath="..\src\Bindings.h" @@ -1906,6 +2080,15 @@ UsePrecompiledHeader="0" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS" + UsePrecompiledHeader="0" + /> + </FileConfiguration> </File> <File RelativePath="..\lib\md5\md5.h" @@ -2582,6 +2765,14 @@ UsePrecompiledHeader="0" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </FileConfiguration> </File> <File RelativePath="..\lib\sqlite\sqlite3.c" @@ -2618,6 +2809,14 @@ UsePrecompiledHeader="0" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </FileConfiguration> </File> <File RelativePath="..\lib\sqlite\sqlite3.h" @@ -2666,6 +2865,14 @@ UsePrecompiledHeader="0" /> </FileConfiguration> + <FileConfiguration + Name="Debug_LuaStatic|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </FileConfiguration> </File> <File RelativePath="..\lib\luaexpat\lxplib.h" diff --git a/VC2008/ToLua.vcproj b/VC2008/ToLua.vcproj index 24a5d8b4f..428591638 100644 --- a/VC2008/ToLua.vcproj +++ b/VC2008/ToLua.vcproj @@ -266,6 +266,68 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Debug_LuaStatic|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\ToLua" + IntermediateDirectory="$(ConfigurationName)\ToLua" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../lib/tolua++/include;../lib/lua/src" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> diff --git a/VC2008/expat.vcproj b/VC2008/expat.vcproj index a02549192..b92b95737 100644 --- a/VC2008/expat.vcproj +++ b/VC2008/expat.vcproj @@ -139,6 +139,67 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Debug_LuaStatic|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\expat" + IntermediateDirectory="$(ConfigurationName)\expat" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;COMPILED_FROM_DSP" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> diff --git a/VC2008/zlib.vcproj b/VC2008/zlib.vcproj index 1e07afc4c..cdc5bab8c 100644 --- a/VC2008/zlib.vcproj +++ b/VC2008/zlib.vcproj @@ -266,6 +266,68 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Debug_LuaStatic|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\zlib" + IntermediateDirectory="$(ConfigurationName)\zlib" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + DisableSpecificWarnings="4996" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> diff --git a/src/Blocks/BlockFluid.h b/src/Blocks/BlockFluid.h index 0db2f60c4..bce5064bc 100644 --- a/src/Blocks/BlockFluid.h +++ b/src/Blocks/BlockFluid.h @@ -54,3 +54,84 @@ public: + +class cBlockLavaHandler : + public cBlockFluidHandler +{ + typedef cBlockFluidHandler super; +public: + + cBlockLavaHandler(BLOCKTYPE a_BlockType) : + super(a_BlockType) + { + } + + + /// Called to tick the block + virtual void OnUpdate(cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override + { + if (a_Chunk.GetWorld()->ShouldLavaSpawnFire()) + { + // Try to start up to 5 fires: + for (int i = 0; i < 5; i++) + { + TryStartFireNear(a_RelX, a_RelY, a_RelZ, a_Chunk); + } + } + } + + + /// Tries to start a fire near the lava at given coords. Returns true if fire started. + static bool TryStartFireNear(int a_RelX, int a_RelY, int a_RelZ, cChunk & a_Chunk) + { + // Pick a block next to this lava block: + int rnd = a_Chunk.GetWorld()->GetTickRandomNumber(cChunkDef::NumBlocks * 8) / 7; + int x = (rnd % 3) - 1; // -1 .. 1 + int y = ((rnd / 4) % 4) - 1; // -1 .. 2 + int z = ((rnd / 16) % 3) - 1; // -1 .. 1 + + // Check if it's fuel: + BLOCKTYPE BlockType; + if ( + !a_Chunk.UnboundedRelGetBlockType(a_RelX + x, a_RelY + y, a_RelZ + z, BlockType) || + !cFireSimulator::IsFuel(BlockType) + ) + { + return false; + } + + // Try to set it on fire: + static struct + { + int x, y, z; + } CrossCoords[] = + { + {-1, 0, 0}, + { 1, 0, 0}, + { 0, -1, 0}, + { 0, 1, 0}, + { 0, 0, -1}, + { 0, 0, 1}, + } ; + int RelX = a_RelX + x; + int RelY = a_RelY + y; + int RelZ = a_RelZ + z; + for (size_t i = 0; i < ARRAYCOUNT(CrossCoords); i++) + { + if ( + a_Chunk.UnboundedRelGetBlockType(RelX + CrossCoords[i].x, RelY + CrossCoords[i].y, RelZ + CrossCoords[i].z, BlockType) && + (BlockType == E_BLOCK_AIR) + ) + { + // This is an air block next to a fuel next to lava, light it up: + a_Chunk.UnboundedRelSetBlock(RelX + CrossCoords[i].x, RelY + CrossCoords[i].y, RelZ + CrossCoords[i].z, E_BLOCK_FIRE, 0); + return true; + } + } // for i - CrossCoords[] + return false; + } +} ; + + + + diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp index 7bb35efeb..4a6d49449 100644 --- a/src/Blocks/BlockHandler.cpp +++ b/src/Blocks/BlockHandler.cpp @@ -144,6 +144,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType) case E_BLOCK_INACTIVE_COMPARATOR: return new cBlockComparatorHandler (a_BlockType); case E_BLOCK_IRON_DOOR: return new cBlockDoorHandler (a_BlockType); case E_BLOCK_IRON_ORE: return new cBlockOreHandler (a_BlockType); + case E_BLOCK_JACK_O_LANTERN: return new cBlockPumpkinHandler (a_BlockType); case E_BLOCK_JUKEBOX: return new cBlockEntityHandler (a_BlockType); case E_BLOCK_JUNGLE_WOOD_STAIRS: return new cBlockStairsHandler (a_BlockType); case E_BLOCK_LADDER: return new cBlockLadderHandler (a_BlockType); @@ -157,18 +158,17 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType) case E_BLOCK_MELON_STEM: return new cBlockStemsHandler (a_BlockType); case E_BLOCK_MYCELIUM: return new cBlockMyceliumHandler (a_BlockType); case E_BLOCK_NETHER_BRICK_STAIRS: return new cBlockStairsHandler (a_BlockType); + case E_BLOCK_NETHER_PORTAL: return new cBlockPortalHandler (a_BlockType); case E_BLOCK_NOTE_BLOCK: return new cBlockNoteHandler (a_BlockType); case E_BLOCK_PISTON: return new cBlockPistonHandler (a_BlockType); case E_BLOCK_PISTON_EXTENSION: return new cBlockPistonHeadHandler ( ); case E_BLOCK_PLANKS: return new cBlockPlanksHandler (a_BlockType); - case E_BLOCK_NETHER_PORTAL: return new cBlockPortalHandler (a_BlockType); + case E_BLOCK_POTATOES: return new cBlockCropsHandler (a_BlockType); + case E_BLOCK_POWERED_RAIL: return new cBlockRailHandler (a_BlockType); case E_BLOCK_PUMPKIN: return new cBlockPumpkinHandler (a_BlockType); - case E_BLOCK_JACK_O_LANTERN: return new cBlockPumpkinHandler (a_BlockType); case E_BLOCK_PUMPKIN_STEM: return new cBlockStemsHandler (a_BlockType); case E_BLOCK_QUARTZ_STAIRS: return new cBlockStairsHandler (a_BlockType); case E_BLOCK_RAIL: return new cBlockRailHandler (a_BlockType); - case E_BLOCK_POTATOES: return new cBlockCropsHandler (a_BlockType); - case E_BLOCK_POWERED_RAIL: return new cBlockRailHandler (a_BlockType); case E_BLOCK_REDSTONE_ORE: return new cBlockOreHandler (a_BlockType); case E_BLOCK_REDSTONE_ORE_GLOWING: return new cBlockOreHandler (a_BlockType); case E_BLOCK_REDSTONE_REPEATER_OFF: return new cBlockRedstoneRepeaterHandler(a_BlockType); @@ -184,8 +184,8 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType) case E_BLOCK_SIGN_POST: return new cBlockSignHandler (a_BlockType); case E_BLOCK_SNOW: return new cBlockSnowHandler (a_BlockType); case E_BLOCK_SPRUCE_WOOD_STAIRS: return new cBlockStairsHandler (a_BlockType); - case E_BLOCK_STATIONARY_LAVA: return new cBlockFluidHandler (a_BlockType); - case E_BLOCK_STATIONARY_WATER: return new cBlockFluidHandler (a_BlockType); + case E_BLOCK_STATIONARY_LAVA: return new cBlockLavaHandler (a_BlockType); + case E_BLOCK_STATIONARY_WATER: return new cBlockLavaHandler (a_BlockType); case E_BLOCK_STICKY_PISTON: return new cBlockPistonHandler (a_BlockType); case E_BLOCK_STONE: return new cBlockStoneHandler (a_BlockType); case E_BLOCK_STONE_BRICK_STAIRS: return new cBlockStairsHandler (a_BlockType); diff --git a/src/ByteBuffer.cpp b/src/ByteBuffer.cpp index a6be09ad3..29f3afbfc 100644 --- a/src/ByteBuffer.cpp +++ b/src/ByteBuffer.cpp @@ -26,7 +26,9 @@ (defined(_WIN32) && defined(__ARM__) && defined(_MSC_VER)) \ ) #define IS_LITTLE_ENDIAN -#elif defined (__ARMEB__) +#elif ( \ + defined (__ARMEB__) || defined(__sparc) \ +) #define IS_BIG_ENDIAN #else #error Cannot determine endianness of this platform diff --git a/src/ByteBuffer.h b/src/ByteBuffer.h index a9dd7f5ea..95c690203 100644 --- a/src/ByteBuffer.h +++ b/src/ByteBuffer.h @@ -123,7 +123,7 @@ protected: int m_BufferSize; // Total size of the ringbuffer #ifdef _DEBUG - unsigned long m_ThreadID; // Thread that is currently accessing the object, checked via cSingleThreadAccessChecker + volatile unsigned long m_ThreadID; // Thread that is currently accessing the object, checked via cSingleThreadAccessChecker #endif // _DEBUG int m_DataStart; // Where the data starts in the ringbuffer diff --git a/src/Chunk.cpp b/src/Chunk.cpp index 45825a30f..5c9eb892b 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -641,7 +641,7 @@ void cChunk::TickBlock(int a_RelX, int a_RelY, int a_RelZ) } cBlockHandler * Handler = BlockHandler(m_BlockTypes[Index]); ASSERT(Handler != NULL); // Happenned on server restart, FS #243 - Handler->OnUpdate(*this, a_RelX + m_PosX * Width, a_RelY, a_RelZ + m_PosZ * Width); + Handler->OnUpdate(*this, a_RelX, a_RelY, a_RelZ); } @@ -794,7 +794,7 @@ void cChunk::TickBlocks(void) unsigned int Index = MakeIndexNoCheck(m_BlockTickX, m_BlockTickY, m_BlockTickZ); cBlockHandler * Handler = BlockHandler(m_BlockTypes[Index]); ASSERT(Handler != NULL); // Happenned on server restart, FS #243 - Handler->OnUpdate(*this, m_BlockTickX + m_PosX * Width, m_BlockTickY, m_BlockTickZ + m_PosZ * Width); + Handler->OnUpdate(*this, m_BlockTickX, m_BlockTickY, m_BlockTickZ); } // for i - tickblocks } diff --git a/src/World.cpp b/src/World.cpp index bed5d6701..7982924ae 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -522,6 +522,7 @@ void cWorld::Start(void) m_IsSugarcaneBonemealable = IniFile.GetValueSetB("Plants", "IsSugarcaneBonemealable", false); m_bEnabledPVP = IniFile.GetValueSetB("PVP", "Enabled", true); m_IsDeepSnowEnabled = IniFile.GetValueSetB("Physics", "DeepSnow", false); + m_ShouldLavaSpawnFire = IniFile.GetValueSetB("Physics", "ShouldLavaSpawnFire", true); m_GameMode = (eGameMode)IniFile.GetValueSetI("GameMode", "GameMode", m_GameMode); diff --git a/src/World.h b/src/World.h index a6b61f2e2..ea0db53e6 100644 --- a/src/World.h +++ b/src/World.h @@ -129,6 +129,8 @@ public: bool IsPVPEnabled(void) const { return m_bEnabledPVP; } bool IsDeepSnowEnabled(void) const { return m_IsDeepSnowEnabled; } + bool ShouldLavaSpawnFire(void) const { return m_ShouldLavaSpawnFire; } + eDimension GetDimension(void) const { return m_Dimension; } /// Returns the world height at the specified coords; waits for the chunk to get loaded / generated @@ -654,6 +656,7 @@ private: eGameMode m_GameMode; bool m_bEnabledPVP; bool m_IsDeepSnowEnabled; + bool m_ShouldLavaSpawnFire; // The cRedstone class simulates redstone and needs access to m_RSList // friend class cRedstone; |