From 326604ae9fa2f88a851957bc966ec9903960e57e Mon Sep 17 00:00:00 2001 From: jonpas Date: Tue, 22 May 2018 20:09:30 +0200 Subject: [PATCH] Fix particles preprocessing for both armake and pboProject --- optionals/particles/script_component.hpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/optionals/particles/script_component.hpp b/optionals/particles/script_component.hpp index 09eced8575..53a4988a8d 100644 --- a/optionals/particles/script_component.hpp +++ b/optionals/particles/script_component.hpp @@ -43,14 +43,13 @@ interval = 1; \ }; \ } -#define MERGE(var1,var2) var1####var2 #define EFFECT_AFTER_WATER(color) class ACE_SmokeAfterWater##color: ACE_SmokeAfterWaterWhite { \ class SmokeAfterWater: SmokeAfterWater { \ - type = QUOTE(MERGE(ACE_SmokeAfterWater,color)); \ + type = QUOTE(ACE_SmokeAfterWater##color); \ }; \ } #define CLOUDLET_UNDERWATER(color) class SmokeShell##color##UW; \ class SmokeShell##color##2UW: SmokeShell##color##UW { \ - postEffects = QUOTE(MERGE(ACE_SmokeAfterWater,color)); \ + postEffects = QUOTE(ACE_SmokeAfterWater##color); \ }