Changeset 1647

Timestamp:

02/06/12 03:29:30 (16 months ago)

Author:

reyalp

Message:

cosmetic cleanup in action_stack

File:

• trunk/core/action_stack.c (modified) (5 diffs)

trunk/core/action_stack.c

@@ -52 +52 @@
     
     action_stack_t* stack = tmp[num_stacks];
-    stack->action_process = proc_func;
+    if(proc_func) {
+        stack->action_process = proc_func;
+    } else {
+        stack->action_process = action_stack_standard;
+    }
+
     stack->stack_ptr = 0;
     stack->comp_id = task_comp_id;
@@ -184 +189 @@
     {
         /* setup timer */
-        long action = action_get_prev(p);
-        /* delay of -1 signals indefinite (actually 1 day) delay*/ 
-        action_stacks[active_stack]->delay_target_ticks = t+((action == -1)?86400000:action);
+        long delay = action_get_prev(p);
+        /* delay of -1 signals indefinite (actually 1 day) delay*/
+        if(delay == -1) {
+            delay = 86400000;
+        }
+        action_stacks[active_stack]->delay_target_ticks = t+delay;
         return 0;
     }
@@ -204 +212 @@
 // Can only be called from an action stack
 int action_stack_standard(long p)
-{        
-    long t;
-    
+{
     switch (p)
     {
@@ -275 +281 @@
     if (stack->stack_ptr > -1)
     {
-        long stack_arg = action_get_prev(1);
-        if (stack->action_process)
-            stack->action_process(stack_arg);
-        else
-            action_stack_standard(stack_arg);
+        stack->action_process(action_get_prev(1));
     }
     else
@@ -289 +291 @@
 void action_stack_process_all()
 {
-    int i;
-    for (i = num_stacks - 1; i >= 0; --i)
-    {
-        active_stack = i;
-        action_stack_process(i);
-    }
-    
+    for (active_stack = num_stacks - 1; active_stack >= 0; --active_stack)
+    {
+        action_stack_process(active_stack);
+    }
+
     active_stack = -1;
 }