PROT goes through portals

The-Powder-Toy · Apr 26, 2014 · 270a383 · 270a383
1 parent d87e21c
commit 270a383
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
@@ -2043,7 +2043,7 @@ void Simulation::init_can_move()
 		 || destinationType == PT_ISOZ || destinationType == PT_ISZS || destinationType == PT_QRTZ || destinationType == PT_PQRT
 		 || destinationType == PT_H2)
 			can_move[PT_PHOT][destinationType] = 2;
-		if (destinationType != PT_DMND && destinationType != PT_INSL && destinationType != PT_VOID && destinationType != PT_PVOD && destinationType != PT_VIBR)
+		if (destinationType != PT_DMND && destinationType != PT_INSL && destinationType != PT_VOID && destinationType != PT_PVOD && destinationType != PT_VIBR && destinationType != PT_PRTI && destinationType != PT_PRTO)
 			can_move[PT_PROT][destinationType] = 2;
 	}
 

diff --git a/src/simulation/elements/PROT.cpp b/src/simulation/elements/PROT.cpp
@@ -91,6 +91,7 @@ int Element_PROT::update(UPDATE_FUNC_ARGS)
 	//make temp of other things closer to it's own temperature. This will change temp of things that don't conduct, and won't change the PROT's temperature
 	if (under)
 	{
+		//now changed so that PROT goes through portal, so only the WIFI part applies
 		if ((under&0xFF) == PT_WIFI || (under&0xFF) == PT_PRTI || (under&0xFF) == PT_PRTO)
 		{
 			float change;