CRAY can now mark PAPR

Author: Rebmiami

src/simulation/elements/CRAY.cpp

@@ -1,5 +1,6 @@
 #include "simulation/ElementCommon.h"
 #include "FILT.h"
+#include "PAPR.h"
 
 static int update(UPDATE_FUNC_ARGS);
 static bool ctypeDraw(CTYPEDRAW_FUNC_ARGS);
@@ -122,6 +123,21 @@ static int update(UPDATE_FUNC_ARGS)
 								else if (colored==0xFF000000)
 									colored = 0;
 								parts[ID(r)].life = 4;
+							} else if (TYP(r) == PT_PAPR) {
+								if (TYP(parts[i].ctype == PT_COAL) || TYP(parts[i].ctype) == PT_BCOL) {
+									sim->parts[ID(r)].life = 1;
+									if (colored)
+										sim->parts[ID(r)].dcolour = colored;
+									else
+										sim->parts[ID(r)].dcolour = MARK_COLOR_COAL;
+									if(!--partsRemaining)
+										docontinue = 0;
+								} else if (TYP(parts[i].ctype == PT_SOAP)) {
+									sim->parts[ID(r)].life = 0;
+									sim->parts[ID(r)].dcolour = 0x00000000;
+									if(!--partsRemaining)
+										docontinue = 0;
+								}
 							} else if (TYP(r) == PT_CRAY || nostop) {
 								docontinue = 1;
 							} else if(destroy && r && (TYP(r) != PT_DMND)) {

src/simulation/elements/PAPR.cpp

@@ -1,4 +1,5 @@
 #include "simulation/ElementCommon.h"
+#include "PAPR.h"
 
 static int update(UPDATE_FUNC_ARGS);
 static int graphics(GRAPHICS_FUNC_ARGS);
@@ -86,7 +87,7 @@ static int update(UPDATE_FUNC_ARGS)
 		// Get marked by BCOL
 		case PT_BCOL:
 			parts[i].life = 1;
-			parts[i].dcolour = 0xFF22222A;
+			parts[i].dcolour = MARK_COLOR_COAL;
 			break;
 
 		// Acts as a smoke filter
@@ -205,7 +206,7 @@ static bool ctypeDraw(CTYPEDRAW_FUNC_ARGS)
 	if (t == PT_BCOL || t == PT_COAL)
 	{
 		sim->parts[i].life = 1;
-		sim->parts[i].dcolour = 0xFF22222A;
+		sim->parts[i].dcolour = MARK_COLOR_COAL;
 	}
 	// Similarly, erase with SOAP
 	if (t == PT_SOAP)

src/simulation/elements/PAPR.h

@@ -0,0 +1,3 @@
+#pragma once
+
+constexpr unsigned int MARK_COLOR_COAL = 0xFF22222A;