[decompiler] do not use time-elapsed? on unsigned comps (#3031)

decompiler/IR2/FormExpressionAnalysis.cpp

@@ -5284,14 +5284,14 @@ FormElement* ConditionElement::make_time_elapsed(const Env& env,
     std::vector<Form*> args;
     args.push_back(time_elapsed);
     args.push_back(time);
-    if (m_kind == IR2_Condition::Kind::LESS_THAN_SIGNED ||
-        m_kind == IR2_Condition::Kind::LESS_THAN_UNSIGNED) {
+    // TODO - how to handle unsigned case?
+    if (m_kind == IR2_Condition::Kind::LESS_THAN_SIGNED) {
       return pool.alloc_element<GenericElement>(
           GenericOperator::make_compare(IR2_Condition::Kind::FALSE),
           pool.form<GenericElement>(
               GenericOperator::make_function(pool.form<ConstantTokenElement>("time-elapsed?")),
               make_casts_if_needed(args, types, TypeSpec("time-frame"), pool, env)));
-    } else {
+    } else if (m_kind == IR2_Condition::Kind::GEQ_SIGNED) {
       return pool.alloc_element<GenericElement>(
           GenericOperator::make_function(pool.form<ConstantTokenElement>("time-elapsed?")),
           make_casts_if_needed(args, types, TypeSpec("time-frame"), pool, env));

goal_src/jak1/engine/entity/ambient.gc

@@ -737,7 +737,7 @@
                       )
               )
         )
-      (when (not (time-elapsed? (the-as int s4-0) (seconds 1)))
+      (when (< (the-as uint (- (current-time) (the-as int s4-0))) (the-as uint 300))
         (let ((f30-0 (the float (rand-vu-int-count (the-as int (-> s5-0 ambient-data user-float 2))))))
           (set! sv-16 (symbol->string (res-lump-struct s5-0 'effect-name symbol :time f30-0)))
           (let ((s4-2 (new 'stack 'sound-spec)))

goal_src/jak1/engine/target/logic-target.gc

@@ -555,7 +555,7 @@
         (if (logtest? (-> self control unknown-surface01 flags) (surface-flags no-turn-around))
             (set! (-> v1-6 0) (the-as uint (current-time)))
             )
-        (and (time-elapsed? (the-as int (-> v1-6 0)) (seconds 1))
+        (and (>= (the-as uint (- (current-time) (the-as int (-> v1-6 0)))) (the-as uint 300))
              (< f0-1 0.0)
              (< 32768.0 f1-1)
              (< 0.7 (-> self control unknown-float20))

goal_src/jak1/engine/target/target.gc

@@ -2104,7 +2104,7 @@
                  #t
                  )
                (or (zero? (-> self control unknown-uint20))
-                   (time-elapsed? (the-as int (-> self control unknown-uint20)) (seconds 0.04))
+                   (>= (the-as uint (- (current-time) (the-as int (-> self control unknown-uint20)))) (the-as uint 12))
                    )
                (!= (-> self control unknown-uint31) 1)
                )
@@ -2189,13 +2189,13 @@
                                   )
                               )
                             )
-                       (time-elapsed? (the-as int (-> self control unknown-uint20)) (seconds 0.04))
+                       (>= (the-as uint (- (current-time) (the-as int (-> self control unknown-uint20)))) (the-as uint 12))
                        )
                   )
              (go target-falling #f)
              )
             ((and (nonzero? (-> self control unknown-uint30))
-                  (time-elapsed? (the-as int (-> self control unknown-uint30)) (seconds 0.04))
+                  (>= (the-as uint (- (current-time) (the-as int (-> self control unknown-uint30)))) (the-as uint 12))
                   )
              (set-forward-vel (the-as float 0.0))
              )
@@ -2916,7 +2916,7 @@
               (set! gp-0 (the-as int (current-time)))
               )
           (when (and (or (smack-surface? #f) (>= (-> self control unknown-float63) 0.7))
-                     (time-elapsed? (the-as int (-> self control unknown-uint20)) (seconds 0.01))
+                     (>= (the-as uint (- (current-time) (the-as int (-> self control unknown-uint20)))) (the-as uint 3))
                      (time-elapsed? (-> self state-time) 1)
                      )
             (if (>= 6.0 (ja-aframe-num 0))

goal_src/jak1/engine/target/target2.gc

@@ -1383,7 +1383,7 @@
         )
       (ja-no-eval :group! eichar-yellow-running-blast-ja :num! (seek!) :frame-num (ja-aframe (the-as float 9.0) 0))
       (until (ja-done? 0)
-        (if (or (not (time-elapsed? (the-as int (-> self control unknown-uint30)) (seconds 0.1)))
+        (if (or (< (the-as uint (- (current-time) (the-as int (-> self control unknown-uint30)))) (the-as uint 30))
                 (= (-> self control unknown-uint31) 1)
                 )
             (send-event (handle->process gp-0) 'die)
@@ -2072,7 +2072,7 @@
         )
     (cond
       ((= (-> *cpad-list* cpads (-> self control unknown-cpad-info00 number) stick0-speed) 0.0)
-       (if (time-elapsed? (the-as int (-> self control unknown-uint20)) (seconds 0.05))
+       (if (>= (the-as uint (- (current-time) (the-as int (-> self control unknown-uint20)))) (the-as uint 15))
            (go target-swim-stance)
            )
        )

goal_src/jak1/levels/flut_common/target-flut.gc

@@ -1255,7 +1255,7 @@
                  #t
                  )
                (or (zero? (-> self control unknown-uint20))
-                   (time-elapsed? (the-as int (-> self control unknown-uint20)) (seconds 0.04))
+                   (>= (the-as uint (- (current-time) (the-as int (-> self control unknown-uint20)))) (the-as uint 12))
                    )
                (!= (-> self control unknown-uint31) 1)
                )
@@ -1306,13 +1306,13 @@
                                   )
                               )
                             )
-                       (time-elapsed? (the-as int (-> self control unknown-uint20)) (seconds 0.04))
+                       (>= (the-as uint (- (current-time) (the-as int (-> self control unknown-uint20)))) (the-as uint 12))
                        )
                   )
              (go target-flut-falling #f)
              )
             ((and (nonzero? (-> self control unknown-uint30))
-                  (time-elapsed? (the-as int (-> self control unknown-uint30)) (seconds 0.04))
+                  (>= (the-as uint (- (current-time) (the-as int (-> self control unknown-uint30)))) (the-as uint 12))
                   )
              (set-forward-vel (the-as float 0.0))
              (set! f30-0 0.0)

goal_src/jak2/engine/target/logic-target.gc

@@ -641,7 +641,7 @@
         (if (logtest? (-> self control current-surface flags) (surface-flag no-turn-around))
             (set-time! (-> v1-7 0))
             )
-        (and (time-elapsed? (-> v1-7 0) (seconds 1))
+        (and (>= (the-as uint (- (current-time) (-> v1-7 0))) (the-as uint 300))
              (< f0-1 0.0)
              (< 32768.0 f1-1)
              (< 0.7 (-> self control pad-magnitude))

goal_src/jak2/engine/target/target-swim.gc

@@ -553,7 +553,7 @@
       )
     (cond
       ((= (-> *cpad-list* cpads (-> self control cpad number) stick0-speed) 0.0)
-       (if (time-elapsed? (the-as int (-> self control unknown-word04)) (seconds 0.05))
+       (if (>= (the-as uint (- (current-time) (the-as int (-> self control unknown-word04)))) (the-as uint 15))
            (go target-swim-stance)
            )
        )

goal_src/jak2/engine/target/target.gc

@@ -3608,7 +3608,7 @@
             (set! (-> self gun combo-window-state) (-> self state name))
             )
           (when (and (or (smack-surface? #f) (>= (-> self control surface-slope-z) 0.7))
-                     (time-elapsed? (the-as int (-> self control unknown-word04)) (seconds 0.01))
+                     (>= (the-as uint (- (current-time) (the-as int (-> self control unknown-word04)))) (the-as uint 3))
                      (time-elapsed? (-> self state-time) 1)
                      )
             (when (>= 6.0 (ja-aframe-num 0))

goal_src/jak2/levels/common/race/race-manager.gc

@@ -641,7 +641,7 @@
            )
      )
     (((race-state-enum countdown-scene-start))
-     (when (time-elapsed? (the-as int (-> this countdown-start-time)) (seconds 1))
+     (when (>= (the-as uint (- (current-time) (the-as int (-> this countdown-start-time)))) (the-as uint 300))
        (set! (-> this state) (race-state-enum countdown-scene))
        (set! (-> this scene-player)
              (ppointer->handle (process-spawn scene-player :init scene-player-init (-> this info countdown-scene) #t #f))