AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-24 05:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Style: Make it clearer what fast lava does.

Browse Source
This commit is contained in:
UnknownShadow200 2016-09-16 12:39:45 +10:00
parent ce7077b764
commit cdbb58f3a3
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Levels/Physics/SimpleLiquidPhysics.cs
View File

@ -23,7 +23,7 @@ namespace MCGalaxy.BlockPhysics {
const StringComparison comp = StringComparison.Ordinal; const StringComparison comp = StringComparison.Ordinal;
public static void DoWater(Level lvl, ref Check C) { public static void DoWater(Level lvl, ref Check C) {
Random rand = lvl.physRandom; Random rand = lvl.physRandom;
if (lvl.finite) { if (lvl.finite) {
lvl.liquids.Remove(C.b); lvl.liquids.Remove(C.b);
FinitePhysics.DoWaterOrLava(lvl, ref C); FinitePhysics.DoWaterOrLava(lvl, ref C);
@ -44,25 +44,26 @@ namespace MCGalaxy.BlockPhysics {
FinitePhysics.DoWaterOrLava(lvl, ref C); FinitePhysics.DoWaterOrLava(lvl, ref C);
return; return;
} }
if (lvl.randomFlow)
if (lvl.randomFlow) {
DoLavaRandowFlow(lvl, ref C, true); DoLavaRandowFlow(lvl, ref C, true);
else } else {
DoLavaUniformFlow(lvl, ref C, true); DoLavaUniformFlow(lvl, ref C, true);
}
} }
public static void DoFastLava(Level lvl, ref Check C) { public static void DoFastLava(Level lvl, ref Check C) {
if (lvl.randomFlow) { if (lvl.randomFlow) {
byte oldTime = C.data.Data;
DoLavaRandowFlow(lvl, ref C, false); DoLavaRandowFlow(lvl, ref C, false);
if (C.data.Data != 255) if (C.data.Data != 255)
C.data.Data = oldTime; C.data.Data = 0; // no lava delay
} else { } else {
DoLavaUniformFlow(lvl, ref C, false); DoLavaUniformFlow(lvl, ref C, false);
} }
} }
static void DoWaterRandowFlow(Level lvl, ref Check C) { static void DoWaterRandowFlow(Level lvl, ref Check C) {
Random rand = lvl.physRandom; Random rand = lvl.physRandom;
bool[] blocked = null; bool[] blocked = null;
ushort x, y, z; ushort x, y, z;
lvl.IntToPos(C.b, out x, out y, out z); lvl.IntToPos(C.b, out x, out y, out z);
@ -110,7 +111,7 @@ namespace MCGalaxy.BlockPhysics {
blocked[4] = true; blocked[4] = true;
} else { //was placed near sponge } else { //was placed near sponge
lvl.liquids.TryGetValue(C.b, out blocked); lvl.liquids.TryGetValue(C.b, out blocked);
lvl.AddUpdate(C.b, Block.air); lvl.AddUpdate(C.b, Block.air);
if (!C.data.HasWait) C.data.Data = 255; if (!C.data.HasWait) C.data.Data = 255;
} }
@ -123,7 +124,7 @@ namespace MCGalaxy.BlockPhysics {
} }
static void DoWaterUniformFlow(Level lvl, ref Check C) { static void DoWaterUniformFlow(Level lvl, ref Check C) {
Random rand = lvl.physRandom; Random rand = lvl.physRandom;
lvl.liquids.Remove(C.b); lvl.liquids.Remove(C.b);
ushort x, y, z; ushort x, y, z;
lvl.IntToPos(C.b, out x, out y, out z); lvl.IntToPos(C.b, out x, out y, out z);
@ -175,7 +176,7 @@ namespace MCGalaxy.BlockPhysics {
} }
static void DoLavaRandowFlow(Level lvl, ref Check C, bool checkWait) { static void DoLavaRandowFlow(Level lvl, ref Check C, bool checkWait) {
Random rand = lvl.physRandom; Random rand = lvl.physRandom;
bool[] blocked = null; bool[] blocked = null;
ushort x, y, z; ushort x, y, z;
lvl.IntToPos(C.b, out x, out y, out z); lvl.IntToPos(C.b, out x, out y, out z);