endless detonation bug fixed

chrxh · Oct 25, 2023 · ff98daf · ff98daf
1 parent d6dbc0e
commit ff98daf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/source/EngineGpuKernels/CellFunctionProcessor.cuh b/source/EngineGpuKernels/CellFunctionProcessor.cuh
@@ -37,10 +37,10 @@ __inline__ __device__ void CellFunctionProcessor::collectCellFunctionOperations(
     auto executionOrderNumber = toInt(data.timestep % cudaSimulationParameters.cellNumExecutionOrderNumbers);
     for (int index = partition.startIndex; index <= partition.endIndex; ++index) {
         auto& cell = cells.at(index);
-        if (cell->cellFunction != CellFunction_None && cell->executionOrderNumber == executionOrderNumber && cell->activationTime == 0) {
+        if (cell->cellFunction != CellFunction_None && cell->executionOrderNumber == executionOrderNumber) {
             if (cell->cellFunction == CellFunction_Detonator && cell->cellFunctionData.detonator.state == DetonatorState_Activated) {
                 data.cellFunctionOperations[cell->cellFunction].tryAddEntry(CellFunctionOperation{cell});
-            } else if (cell->livingState == LivingState_Ready) {
+            } else if (cell->livingState == LivingState_Ready && cell->activationTime == 0) {
                 data.cellFunctionOperations[cell->cellFunction].tryAddEntry(CellFunctionOperation{cell});
             }
         }