Keep LOADED/READY state in Load/Init lower bit (backported from dd7cba0)

cahirwpz · Dec 16, 2023 · 963eb7b · 963eb7b
1 parent e679bcd
commit 963eb7b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/include/effect.h b/include/effect.h
@@ -40,17 +40,10 @@ extern int lastFrameCount;
  */
 extern bool exitLoop;
 
-typedef enum {
-  EFFECT_LOADED = 1,
-  EFFECT_READY = 2,
-  EFFECT_RUNNING = 4,
-} EffectStateT;
-
 typedef void (*EffectFuncT)(void);
 
 typedef struct Effect {
   const char *name;
-  EffectStateT state;
   /*
    * Executed in background task when other effect is running.
    * Precalculates data for the effect to be launched.
@@ -92,7 +85,6 @@ void EffectRun(EffectT *effect);
 #define EFFECT(NAME, L, U, I, K, R, V)                                         \
   EffectT NAME##Effect = {                                                     \
     .name = #NAME,                                                             \
-    .state = 0,                                                                \
     .Load = (L),                                                               \
     .UnLoad = (U),                                                             \
     .Init = (I),                                                               \

diff --git a/system/effect.c b/system/effect.c
@@ -29,8 +29,10 @@ static void SendEffectStatus(EffectT *effect) {
 # define SendEffectStatus(x)
 #endif
 
+#define DONE 1
+
 void EffectLoad(EffectT *effect) {
-  if (effect->state & EFFECT_LOADED)
+  if ((intptr_t)effect->Load & DONE)
     return;
 
   if (effect->Load) {
@@ -39,12 +41,12 @@ void EffectLoad(EffectT *effect) {
     ShowMemStats();
   }
 
-  effect->state |= EFFECT_LOADED;
+  (intptr_t)effect->Load |= DONE; 
   SendEffectStatus(effect);
 }
 
 void EffectInit(EffectT *effect) {
-  if (effect->state & EFFECT_READY)
+  if ((intptr_t)effect->Init & DONE)
     return;
 
   if (effect->Init) {
@@ -53,12 +55,12 @@ void EffectInit(EffectT *effect) {
     ShowMemStats();
   }
 
-  effect->state |= EFFECT_READY;
+  (intptr_t)effect->Init |= DONE;
   SendEffectStatus(effect);
 }
 
 void EffectKill(EffectT *effect) {
-  if (!(effect->state & EFFECT_READY))
+  if (!((intptr_t)effect->Init & DONE))
     return;
 
   if (effect->Kill) {
@@ -67,12 +69,12 @@ void EffectKill(EffectT *effect) {
     ShowMemStats();
   }
 
-  effect->state &= ~EFFECT_READY;
+  (intptr_t)effect->Init ^= DONE;
   SendEffectStatus(effect);
 }
 
 void EffectUnLoad(EffectT *effect) {
-  if (!(effect->state & EFFECT_LOADED))
+  if (!((intptr_t)effect->Load & DONE))
     return;
 
   if (effect->UnLoad) {
@@ -81,7 +83,7 @@ void EffectUnLoad(EffectT *effect) {
     ShowMemStats();
   }
 
-  effect->state &= ~EFFECT_LOADED;
+  (intptr_t)effect->Load ^= DONE;
   SendEffectStatus(effect);
 }