Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Particles - Fix macro (#8214)

Browse Source 
* initial push

* Update script_component.hpp

* Update script_component.hpp

* Update script_component.hpp
This commit is contained in:
TyroneMF 2021-04-19 17:31:07 +01:00 committed by GitHub
parent 72b88cc6dc
commit 46c7bff1de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -158,6 +158,7 @@ Toaster <jonathan.pereira@gmail.com>
Tonic
Tourorist <tourorist@gmail.com>
Tuupertunut
TyroneMF <TyroneMF@hotmail.com>
Valentin Torikian <valentin.torikian@gmail.com>
voiper
VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>

9
optionals/particles/script_component.hpp
View File

@ -27,17 +27,18 @@
type = "ACE_SmokeBaseMedium"; \
}; \
}
#define MERGE(var1,var2) var1####var2
#define EFFECT_40MM(color) class ACE_40mmSmokeShell##color##Effect: ACE_40mmSmokeShellWhiteEffect { \
class SmokeShellUW { \
simulation = "particles"; \
type = QUOTE(SmokeShell##color##UW); \
type = QUOTE(MERGE(SmokeShell,MERGE(color,UW))); \
position[] = {0, 0, 0}; \
intensity = 1; \
interval = 1; \
}; \
class SmokeShell2UW { \
simulation = "particles"; \
type = QUOTE(SmokeShell##color##2UW); \
type = QUOTE(MERGE(SmokeShell,MERGE(color,2UW))); \
position[] = {0, 0, 0}; \
intensity = 1; \
interval = 1; \
@ -45,11 +46,11 @@
}
#define EFFECT_AFTER_WATER(color) class ACE_SmokeAfterWater##color: ACE_SmokeAfterWaterWhite { \
class SmokeAfterWater: SmokeAfterWater { \
type = QUOTE(ACE_SmokeAfterWater##color); \
type = QUOTE(MERGE(ACE_SmokeAfterWater,color)); \
}; \
}
#define CLOUDLET_UNDERWATER(color) class SmokeShell##color##UW; \
class SmokeShell##color##2UW: SmokeShell##color##UW { \
postEffects = QUOTE(ACE_SmokeAfterWater##color); \
postEffects = QUOTE(MERGE(ACE_SmokeAfterWater,color)); \
}