change type of seconds and clean up opengl includes (#887)

* change type of `seconds`

* fixes to pc pad input (visual only)

* strip down openGL to the version we're actually using for now (4.3 no extensions)

* turn on this opengl message

* really minor inconsequential change

common/type_system/TypeSystem.cpp

@@ -981,7 +981,7 @@ void TypeSystem::add_builtin_types() {
       ->set_runtime_type("float");
   add_builtin_value_type("float", "degrees", 4, false, false, RegClass::FLOAT)
       ->set_runtime_type("float");
-  add_builtin_value_type("uint64", "seconds", 8, false, false)->set_runtime_type("uint64");
+  add_builtin_value_type("int64", "seconds", 8, false, true)->set_runtime_type("int64");
 
   auto int_type = add_builtin_value_type("integer", "int", 8, false, true);
   int_type->disallow_in_runtime();
@@ -1383,7 +1383,7 @@ bool TypeSystem::typecheck_base_types(const std::string& input_expected,
     if (actual == "seconds") {
       return true;
     }
-    expected = "uint";
+    expected = "int";
   }
 
   if (expected == "degrees") {

decompiler/util/DecompilerTypeSystem.cpp

@@ -475,7 +475,7 @@ bool DecompilerTypeSystem::should_attempt_cast_simplify(const TypeSpec& expected
     return true;
   }
 
-  if (expected == TypeSpec("seconds") && actual == TypeSpec("uint64")) {
+  if (expected == TypeSpec("seconds") && actual == TypeSpec("int64")) {
     return true;
   }
 

game/graphics/opengl_renderer/DirectRenderer.cpp

@@ -10,6 +10,7 @@ DirectRenderer::DirectRenderer(const std::string& name, BucketId my_id, int batc
   glGenBuffers(1, &m_ogl.vertex_buffer);
   glGenBuffers(1, &m_ogl.color_buffer);
   glGenBuffers(1, &m_ogl.st_buffer);
+  glGenVertexArrays(1, &m_ogl.vao);
 
   glBindBuffer(GL_ARRAY_BUFFER, m_ogl.vertex_buffer);
   m_ogl.vertex_buffer_bytes = batch_size * 3 * 3 * sizeof(u32);
@@ -29,6 +30,7 @@ DirectRenderer::~DirectRenderer() {
   glDeleteBuffers(1, &m_ogl.color_buffer);
   glDeleteBuffers(1, &m_ogl.vertex_buffer);
   glDeleteBuffers(1, &m_ogl.st_buffer);
+  glDeleteVertexArrays(1, &m_ogl.vao);
 }
 
 /*!
@@ -137,9 +139,7 @@ void DirectRenderer::flush_pending(SharedRenderState* render_state) {
     glDepthFunc(GL_ALWAYS);
   }
 
-  GLuint vao;
-  glGenVertexArrays(1, &vao);
-  glBindVertexArray(vao);
+  glBindVertexArray(m_ogl.vao);
 
   // render!
   // update buffers:
@@ -212,8 +212,6 @@ void DirectRenderer::flush_pending(SharedRenderState* render_state) {
   m_triangles += draw_count * (m_prim_buffer.vert_count / 3);
   m_draw_calls += draw_count;
   m_prim_buffer.vert_count = 0;
-
-  glDeleteVertexArrays(1, &vao);
 }
 
 void DirectRenderer::update_gl_prim(SharedRenderState* render_state) {

game/graphics/opengl_renderer/DirectRenderer.h

@@ -166,6 +166,7 @@ class DirectRenderer : public BucketRenderer {
 
   struct {
     GLuint vertex_buffer, color_buffer, st_buffer;
+    GLuint vao;
     u32 vertex_buffer_bytes = 0;
     u32 color_buffer_bytes = 0;
     u32 st_buffer_bytes = 0;

game/graphics/opengl_renderer/OpenGLRenderer.cpp

@@ -21,7 +21,7 @@ void GLAPIENTRY opengl_error_callback(GLenum source,
                                       const GLchar* message,
                                       const void* /*userParam*/) {
   if (severity == GL_DEBUG_SEVERITY_NOTIFICATION) {
-    return;
+    lg::debug("OpenGL notification 0x{:X} S{:X} T{:X}: {}", id, source, type, message);
   } else if (severity == GL_DEBUG_SEVERITY_LOW) {
     lg::info("OpenGL message 0x{:X} S{:X} T{:X}: {}", id, source, type, message);
   } else if (severity == GL_DEBUG_SEVERITY_MEDIUM) {
@@ -45,6 +45,8 @@ OpenGLRenderer::OpenGLRenderer(std::shared_ptr<TexturePool> texture_pool)
   glDebugMessageControl(GL_DEBUG_SOURCE_API, GL_DEBUG_TYPE_PERFORMANCE, GL_DONT_CARE, 1,
                         &l_gl_error_ignores[0], GL_FALSE);
 
+  lg::debug("OpenGL context information: {}", (const char*)glGetString(GL_VERSION));
+
   // initialize all renderers
   init_bucket_renderers();
 }

game/graphics/pipelines/opengl.cpp

@@ -105,8 +105,8 @@ static int gl_init(GfxSettings& settings) {
     return 1;
   }
 
-  // request an OpenGL 3.3 Core context
-  glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);  // 3.3
+  // request an OpenGL 4.3 Core context
+  glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);  // 4.3
   glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
   glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);  // core profile, not compat
   // debug check
@@ -175,7 +175,7 @@ static std::shared_ptr<GfxDisplay> gl_make_main_display(int width,
   // NOTE: imgui's setup calls functions that may fail intentionally, and attempts to disable error
   // reporting so these errors are invisible. But it does not work, and some weird X11 default
   // cursor error is set here that we clear.
-  glfwGetError(nullptr);
+  glfwGetError(NULL);
 
   // set up the renderer
   ImGui_ImplOpenGL3_Init("#version 130");

goal_src/engine/game/game-info.gc

@@ -528,7 +528,7 @@
 (defmethod reset! fact-info-target ((obj fact-info-target) (arg0 symbol))
   "Reset the facts for a given thing"
   (when (or (not arg0) (= arg0 'eco))
-   (set! (-> obj eco-timeout) (the-as uint 0))
+   (set! (-> obj eco-timeout) 0)
    (set! (-> obj eco-level) 0.0)
    (set! (-> obj eco-pickup-time) (-> *display* game-frame-counter))
    )

goal_src/pc_debug/pc-pad-utils.gc

@@ -85,6 +85,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defconstant PC_PAD_INPUT_NOTICE_TIME (seconds 1.5))
+(defconstant PC_PAD_TOP_Y 40)
 
 
 
@@ -161,7 +162,7 @@
 (defbehavior pc-pi-post pc-pad-proc ()
   (with-dma-buffer-add-bucket ((buf (-> (current-frame) debug-buf))
                                (bucket-id debug-draw1))
-    (draw-string-xy (string-format "MAPPING PAD ~D" (-> self pad-idx)) buf 256 32
+    (draw-string-xy (string-format "MAPPING PAD ~D" (-> self pad-idx)) buf 256 PC_PAD_TOP_Y
           (font-color red) (font-flags shadow kerning large middle))
     )
   )
@@ -184,7 +185,7 @@
                                      (bucket-id debug-draw1))
           (draw-string-xy (string-format "MAPPED ~D TO ~S!"
                                          (pc-pad-input-key-get) (-> *pc-pad-button-names* (1- (-> self input-index))))
-                             buf 256 96 (font-color green) (font-flags shadow kerning large middle))
+                             buf 256 (+ PC_PAD_TOP_Y 64) (font-color green) (font-flags shadow kerning large middle))
           )
         (suspend)
         )
@@ -207,7 +208,7 @@
       (until (time-passed? PC_PAD_INPUT_NOTICE_TIME)
         (with-dma-buffer-add-bucket ((buf (-> (current-frame) debug-buf))
                                      (bucket-id debug-draw1))
-          (draw-string-xy "CANCELED!" buf 256 96 (font-color red-reverse) (font-flags shadow kerning large middle))
+          (draw-string-xy "CANCELED!" buf 256 (+ PC_PAD_TOP_Y 64) (font-color red-reverse) (font-flags shadow kerning large middle))
           )
         (suspend)
         )
@@ -225,7 +226,7 @@
                                      (bucket-id debug-draw1))
           (draw-string-xy (string-format "MAPPED ~D TO ~S!"
                                          (pc-pad-input-key-get) (-> *pc-pad-button-names* (1- (-> self input-index))))
-                             buf 256 96 (font-color green) (font-flags shadow kerning large middle))
+                             buf 256 (+ PC_PAD_TOP_Y 64) (font-color green) (font-flags shadow kerning large middle))
           )
         (suspend)
         )
@@ -233,7 +234,7 @@
       (until (time-passed? PC_PAD_INPUT_NOTICE_TIME)
         (with-dma-buffer-add-bucket ((buf (-> (current-frame) debug-buf))
                                      (bucket-id debug-draw1))
-          (draw-string-xy "KEY MAPPING COMPLETE!~%SETTINGS SAVED." buf 256 96 (font-color green) (font-flags shadow kerning large middle))
+          (draw-string-xy (string-format "KEY MAPPING COMPLETE!~%SETTINGS SAVED.") buf 256 (+ PC_PAD_TOP_Y 64) (font-color green) (font-flags shadow kerning large middle))
           )
         (suspend)
         )
@@ -246,9 +247,9 @@
       (loop
         (with-dma-buffer-add-bucket ((buf (-> (current-frame) debug-buf))
                                      (bucket-id debug-draw1))
-          (draw-string-xy "PRESS ESCAPE TO EXIT" buf 256 64 (font-color default) (font-flags shadow kerning large middle))
+          (draw-string-xy "PRESS ESCAPE TO EXIT" buf 256 (+ PC_PAD_TOP_Y 32) (font-color default) (font-flags shadow kerning large middle))
           (draw-string-xy (string-format "PRESS KEY FOR ~S" (-> *pc-pad-button-names* (-> self input-index)))
-                              buf 256 96 (font-color default) (font-flags shadow kerning large middle))
+                              buf 256 (+ PC_PAD_TOP_Y 64) (font-color default) (font-flags shadow kerning large middle))
           )
         (suspend)
         )

test/decompiler/reference/engine/game/game-info_REF.gc

@@ -540,7 +540,7 @@
 ;; INFO: Return type mismatch float vs none.
 (defmethod reset! fact-info-target ((obj fact-info-target) (arg0 symbol))
   (when (or (not arg0) (= arg0 'eco))
-   (set! (-> obj eco-timeout) (the-as seconds 0))
+   (set! (-> obj eco-timeout) 0)
    (set! (-> obj eco-level) 0.0)
    (set!
     (-> obj eco-pickup-time)
@@ -776,7 +776,7 @@
       )
      (when (!= (-> obj eco-type) kind)
       (set! (-> obj eco-level) 0.0)
-      (set! (-> obj eco-timeout) (the-as seconds 0))
+      (set! (-> obj eco-timeout) 0)
       0
       )
      (set! (-> obj eco-type) (the-as int kind))
@@ -796,24 +796,21 @@
        )
       (set!
        (-> obj eco-timeout)
-       (the-as
-        seconds
-        (min
-         (the-as
-          int
-          (+
-           (-> obj eco-timeout)
-           (* (the-as int (-> *FACT-bank* eco-single-timeout)) (the int amount))
-           )
+       (min
+        (the-as
+         int
+         (+
+          (-> obj eco-timeout)
+          (* (the-as int (-> *FACT-bank* eco-single-timeout)) (the int amount))
           )
-         (the-as
-          int
-          (+
-           (-> *FACT-bank* eco-full-timeout)
-           (-
-            (-> *display* game-frame-counter)
-            (the-as int (-> obj eco-pickup-time))
-            )
+         )
+        (the-as
+         int
+         (+
+          (-> *FACT-bank* eco-full-timeout)
+          (-
+           (-> *display* game-frame-counter)
+           (the-as int (-> obj eco-pickup-time))
            )
           )
          )

test/decompiler/reference/engine/game/projectiles_REF.gc

@@ -1009,10 +1009,7 @@
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (none)
    )
   :code
@@ -1947,7 +1944,3 @@
    (none)
    )
   )
-
-
-
-

test/decompiler/reference/engine/game/task/process-taskable_REF.gc

@@ -456,10 +456,7 @@
   :virtual #t
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (none)
    )
   :trans
@@ -1013,7 +1010,7 @@
 ;; definition for function process-taskable-hide-enter
 ;; INFO: Return type mismatch none vs int.
 (defbehavior process-taskable-hide-enter process-taskable ()
-  (set! (-> self state-time) (the-as seconds (-> *display* base-frame-counter)))
+  (set! (-> self state-time) (-> *display* base-frame-counter))
   (let ((v1-3 (-> self draw shadow-ctrl)))
    (logior! (-> v1-3 settings flags) 32)
    )
@@ -1319,10 +1316,7 @@
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (process-taskable-clean-up-after-talking)
    (none)
    )

test/decompiler/reference/levels/beach/lurkercrab_REF.gc

@@ -1049,10 +1049,7 @@ nav-enemy-default-event-handler
    )
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (ja-channel-push! 1 22)
    (let ((v1-4 (-> self skel root-channel 0)))
     (set!
@@ -1268,7 +1265,3 @@ nav-enemy-default-event-handler
   (go (method-of-object obj nav-enemy-idle))
   (none)
   )
-
-
-
-

test/decompiler/reference/levels/citadel/citb-drop-plat-CIT_REF.gc

@@ -175,10 +175,7 @@
   (behavior ()
    (suspend)
    (dummy-47 (-> self root-override))
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (logior! (-> self mask) (process-mask actor-pause))
    (while #t
     (if
@@ -241,10 +238,7 @@
     )
    (logior! (-> self draw status) 2)
    (ja-post)
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (while #t
     (when
      (>=
@@ -278,10 +272,7 @@
   :code
   (behavior ((arg0 draw-control))
    (set! (-> self interp) 1.0)
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self spin-angle) 0.0)
    (set!
     (-> self root-override trans y)
@@ -375,10 +366,7 @@
      (-> (the-as process-drawable (-> self parent 0)) root trans y)
      (-> self root-override trans y)
      )
-    (set!
-     (-> self state-time)
-     (the-as seconds (-> *display* base-frame-counter))
-     )
+    (set! (-> self state-time) (-> *display* base-frame-counter))
     (sound-play-by-name
      (static-sound-name "bridge-piece-dn")
      (new-sound-id)
@@ -860,10 +848,7 @@
    )
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (citb-drop-plat-spawn-children)
    (while #t
     (if

test/decompiler/reference/levels/common/babak-with-cannon_REF.gc

@@ -196,10 +196,7 @@ nav-enemy-default-event-handler
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self nav destination-pos quad) (-> self entity extra trans quad))
    (set! (-> self nav target-pos quad) (-> self entity extra trans quad))
    (none)
@@ -342,10 +339,7 @@ nav-enemy-default-event-handler
    )
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self rotate-speed) (-> self nav-info run-rotate-speed))
    (set! (-> self turn-time) (the-as int (-> self nav-info run-turn-time)))
    (set! (-> self nav-enemy-flags) (logand -25 (-> self nav-enemy-flags)))
@@ -476,10 +470,7 @@ nav-enemy-default-event-handler
    )
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (nav-enemy-initialize-jump (-> self entity extra trans))
    (nav-enemy-neck-control-look-at)
    (set! (-> self nav-enemy-flags) (logand -25 (-> self nav-enemy-flags)))
@@ -548,10 +539,7 @@ nav-enemy-default-event-handler
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (let ((v1-2 (entity-actor-lookup (-> self entity) 'alt-actor 0)))
     (if v1-2
      (logior! (-> v1-2 extra perm status) (entity-perm-status complete))

test/decompiler/reference/levels/common/basebutton_REF.gc

@@ -309,10 +309,7 @@
    )
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (cond
     ((= (-> self timeout) 0.0)
      (anim-loop)
@@ -761,10 +758,7 @@
    )
   :code
   (behavior ((arg0 int) (arg1 level))
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (when (not arg1)
     (process-release? *target*)
     (go-virtual unknown-state00)
@@ -857,10 +851,7 @@
    )
   :enter
   (behavior ((arg0 vector) (arg1 vector))
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self control status) (logand -8 (-> self control status)))
    (set! (-> self control unknown-surface00) *warp-jump-mods*)
    (set! (-> self control unknown-vector102 quad) (-> arg0 quad))
@@ -973,10 +964,7 @@
      )
     )
    (dummy-48 (-> self control))
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set!
     (-> self trans-hook)
     (lambda :behavior target () (let ((gp-0 (new-stack-vector0))

test/decompiler/reference/levels/common/baseplat_REF.gc

@@ -378,10 +378,7 @@ eco-door-event-handler
   eco-door-event-handler
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (process-entity-status! self (entity-perm-status complete) #t)
    (dummy-48 (-> self root-override))
    (let ((v1-6 (-> self skel root-channel 0)))

test/decompiler/reference/levels/common/battlecontroller_REF.gc

@@ -596,10 +596,7 @@ battlecontroller-default-event-handler
    )
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (if (-> self prespawn)
     (battlecontroller-fill-all-spawners)
     )
@@ -609,10 +606,7 @@ battlecontroller-default-event-handler
       (- (-> *display* base-frame-counter) (the-as int (-> self state-time)))
       30
       )
-     (set!
-      (-> self state-time)
-      (the-as seconds (-> *display* base-frame-counter))
-      )
+     (set! (-> self state-time) (-> *display* base-frame-counter))
      (when
       (and
        *target*
@@ -703,10 +697,7 @@ battlecontroller-default-event-handler
    )
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (battlecontroller-camera-on)
    (while #t
     (when
@@ -714,10 +705,7 @@ battlecontroller-default-event-handler
       (- (-> *display* base-frame-counter) (the-as int (-> self state-time)))
       30
       )
-     (set!
-      (-> self state-time)
-      (the-as seconds (-> *display* base-frame-counter))
-      )
+     (set! (-> self state-time) (-> *display* base-frame-counter))
      (let ((gp-0 0))
       (let ((v1-8 (-> self child)))
        (while v1-8

test/decompiler/reference/levels/common/nav-enemy_REF.gc

@@ -936,10 +936,7 @@ nav-enemy-default-event-handler
      (set! (-> v1-14 num-func) num-func-identity)
      (set! (-> v1-14 frame-num) 0.0)
      )
-    (set!
-     (-> self state-time)
-     (the-as seconds (-> *display* base-frame-counter))
-     )
+    (set! (-> self state-time) (-> *display* base-frame-counter))
     (set!
      (-> self collide-info status)
      (logand -8 (-> self collide-info status))
@@ -1105,10 +1102,7 @@ nav-enemy-default-event-handler
   :enter
   (behavior ()
    (nav-enemy-neck-control-inactive)
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (if (-> self nav-info move-to-ground)
     (dummy-60
      (-> self collide-info)
@@ -1192,10 +1186,7 @@ nav-enemy-default-event-handler
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set!
     (-> self nav flags)
     (the-as
@@ -1643,10 +1634,7 @@ nav-enemy-default-event-handler
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (none)
    )
   :trans
@@ -1846,10 +1834,7 @@ nav-enemy-default-event-handler
   :enter
   (behavior ()
    (nav-enemy-neck-control-look-at)
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self free-time) (-> *display* base-frame-counter))
    (logior! (-> self nav-enemy-flags) 4)
    (set! (-> self target-speed) (-> self nav-info run-travel-speed))
@@ -1954,10 +1939,7 @@ nav-enemy-default-event-handler
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (let*
     ((f30-0
       (vector-vector-distance (-> self collide-info trans) (target-pos 0))
@@ -2068,10 +2050,7 @@ nav-enemy-default-event-handler
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self nav-enemy-flags) (logand -17 (-> self nav-enemy-flags)))
    (let
     ((f0-0 (vector-vector-distance (-> self collide-info trans) (target-pos 0)))
@@ -2197,10 +2176,7 @@ nav-enemy-default-event-handler
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (nav-enemy-neck-control-inactive)
    (set! (-> self nav-enemy-flags) (logand -5 (-> self nav-enemy-flags)))
    (none)
@@ -2754,10 +2730,7 @@ nav-enemy-default-event-handler
   nav-enemy-jump-event-handler
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (if
     (and
      (-> self nav-info use-jump-blocked)
@@ -2864,10 +2837,7 @@ nav-enemy-default-event-handler
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (logclear! (-> self nav flags) (nav-control-flags bit19))
    (let ((gp-0 (new 'stack-no-clear 'vector)))
     (set! (-> gp-0 quad) (-> self collide-info transv quad))
@@ -2913,10 +2883,7 @@ nav-enemy-default-event-handler
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (none)
    )
   :trans
@@ -2995,10 +2962,7 @@ nav-enemy-default-event-handler
    )
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (logior! (-> self nav-enemy-flags) 2048)
    (ja-channel-push! 1 30)
    (let ((f30-0 (nav-enemy-rnd-float-range 0.8 1.2)))
@@ -3068,10 +3032,7 @@ nav-enemy-default-event-handler
    )
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (nav-enemy-initialize-jump (-> self event-param-point))
    (nav-enemy-neck-control-look-at)
    (logior! (-> self nav-enemy-flags) 16)

test/decompiler/reference/levels/common/plat-button_REF.gc

@@ -326,20 +326,14 @@
   :event
   (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
    (the-as object (when (or (= arg2 'touch) (= arg2 'attack))
-                   (set!
-                    (-> self state-time)
-                    (the-as seconds (-> *display* base-frame-counter))
-                    )
+                   (set! (-> self state-time) (-> *display* base-frame-counter))
                    #f
                    )
     )
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (process-entity-status! self (entity-perm-status bit-3) #t)
    (plat-button-camera-on)
    (set-setting! *setting-control* self 'allow-look-around #f 0.0 0)
@@ -448,20 +442,14 @@
   :event
   (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
    (the-as object (when (or (= arg2 'touch) (= arg2 'attack))
-                   (set!
-                    (-> self state-time)
-                    (the-as seconds (-> *display* base-frame-counter))
-                    )
+                   (set! (-> self state-time) (-> *display* base-frame-counter))
                    #f
                    )
     )
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (process-entity-status! self (entity-perm-status bit-3) #t)
    (plat-button-camera-on)
    (set-setting! *setting-control* self 'allow-look-around #f 0.0 0)

test/decompiler/reference/levels/common/sharkey_REF.gc

@@ -339,10 +339,7 @@ nav-enemy-default-event-handler
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self nav-enemy-flags) (logand -2 (-> self nav-enemy-flags)))
    (none)
    )
@@ -605,10 +602,7 @@ nav-enemy-default-event-handler
      (the-as uint 1)
      (the-as vector #t)
      )
-    (set!
-     (-> self state-time)
-     (the-as seconds (-> *display* base-frame-counter))
-     )
+    (set! (-> self state-time) (-> *display* base-frame-counter))
     (set! (-> gp-0 quad) (-> self collide-info trans quad))
     (ja-channel-push! 1 30)
     (let ((s4-1 (-> self skel root-channel 0)))
@@ -664,10 +658,7 @@ nav-enemy-default-event-handler
       (-> self collide-info transv)
       8.0
       )
-     (set!
-      (-> self state-time)
-      (the-as seconds (-> *display* base-frame-counter))
-      )
+     (set! (-> self state-time) (-> *display* base-frame-counter))
      (let ((f30-0 -409600.0)
            (f28-0 (-> self collide-info transv y))
            (f26-0 (-> self collide-info trans y))
@@ -1303,7 +1294,3 @@ nav-enemy-default-event-handler
   (go (method-of-object obj nav-enemy-idle))
   (none)
   )
-
-
-
-

test/decompiler/reference/levels/finalboss/final-door_REF.gc

@@ -481,10 +481,7 @@
      300.0
      -2.2755556
      )
-    (set!
-     (-> self state-time)
-     (the-as seconds (-> *display* base-frame-counter))
-     )
+    (set! (-> self state-time) (-> *display* base-frame-counter))
     (until
      (>=
       (- (-> *display* base-frame-counter) (the-as int (-> self state-time)))

test/decompiler/reference/levels/firecanyon/assistant-firecanyon_REF.gc

@@ -144,10 +144,7 @@
                 #t
                 )
                (else
-                (set!
-                 (-> self state-time)
-                 (the-as seconds (-> *display* base-frame-counter))
-                 )
+                (set! (-> self state-time) (-> *display* base-frame-counter))
                 #f
                 )
                )

test/decompiler/reference/levels/jungle/bouncer_REF.gc

@@ -140,10 +140,7 @@
   (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
    (case arg2 
     (('touch)
-      (set!
-       (-> self state-time)
-       (the-as seconds (-> *display* base-frame-counter))
-       )
+      (set! (-> self state-time) (-> *display* base-frame-counter))
       #f
       )
     (else
@@ -153,10 +150,7 @@
    )
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self smush) 0.0)
    (while #t
     (cond
@@ -304,7 +298,3 @@
   (go bouncer-wait)
   (none)
   )
-
-
-
-

test/decompiler/reference/levels/jungle/hopper_REF.gc

@@ -388,10 +388,7 @@ nav-enemy-default-event-handler
       (ja-channel-push! 1 22)
       )
      )
-    (set!
-     (-> self state-time)
-     (the-as seconds (-> *display* base-frame-counter))
-     )
+    (set! (-> self state-time) (-> *display* base-frame-counter))
     (let ((gp-0 (-> self skel root-channel 0)))
      (joint-control-channel-group-eval!
       gp-0
@@ -576,10 +573,7 @@ nav-enemy-default-event-handler
       (ja-channel-push! 1 22)
       )
      )
-    (set!
-     (-> self state-time)
-     (the-as seconds (-> *display* base-frame-counter))
-     )
+    (set! (-> self state-time) (-> *display* base-frame-counter))
     (let ((gp-0 (-> self skel root-channel 0)))
      (joint-control-channel-group-eval!
       gp-0

test/decompiler/reference/levels/lavatube/assistant-lavatube_REF.gc

@@ -107,10 +107,7 @@
                 #t
                 )
                (else
-                (set!
-                 (-> self state-time)
-                 (the-as seconds (-> *display* base-frame-counter))
-                 )
+                (set! (-> self state-time) (-> *display* base-frame-counter))
                 #f
                 )
                )

test/decompiler/reference/levels/misty/bonelurker_REF.gc

@@ -97,7 +97,7 @@
   bonelurker
   ((obj bonelurker) (arg0 process) (arg1 event-message-block))
   (with-pp
-   (set! (-> obj state-time) (the-as seconds (-> *display* base-frame-counter)))
+   (set! (-> obj state-time) (-> *display* base-frame-counter))
    (let ((a1-1 (new 'stack-no-clear 'event-message-block)))
     (set! (-> a1-1 from) pp)
     (set! (-> a1-1 num-params) 2)

test/decompiler/reference/levels/misty/misty-conveyor_REF.gc

@@ -325,10 +325,7 @@
      (vector<-cspace! (-> self root-override trans) gp-0)
      )
     (set! (-> self path-position quad) (-> self root-override trans quad))
-    (set!
-     (-> self state-time)
-     (the-as seconds (-> *display* base-frame-counter))
-     )
+    (set! (-> self state-time) (-> *display* base-frame-counter))
     (suspend)
     )
    (none)
@@ -656,10 +653,7 @@
     0
     (dummy-48 (-> self root-override))
     (vector-normalize! gp-0 1.0)
-    (set!
-     (-> self state-time)
-     (the-as seconds (-> *display* base-frame-counter))
-     )
+    (set! (-> self state-time) (-> *display* base-frame-counter))
     (while #t
      (if
       (>=

test/decompiler/reference/levels/misty/misty-warehouse_REF.gc

@@ -138,10 +138,7 @@
           )
     (save-reminder gp-0 (logior v1-1 2) 0)
     )
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (let ((gp-1 (-> *display* base-frame-counter)))
     (until (>= (- (-> *display* base-frame-counter) gp-1) 300)
      (suspend)

test/decompiler/reference/levels/misty/muse_REF.gc

@@ -442,10 +442,7 @@ nav-enemy-default-event-handler
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (none)
    )
   :trans

test/decompiler/reference/levels/snow/yeti_REF.gc

@@ -290,10 +290,7 @@
   :enter
   (behavior ()
    (nav-enemy-neck-control-inactive)
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (if (-> self nav-info move-to-ground)
     (dummy-60 (-> self collide-info) 40960.0 40960.0 #t (the-as uint 1))
     )
@@ -1416,10 +1413,7 @@
         )
        (when (< v1-1 (-> self desired-num-children))
         (set! (-> self spawn-delay) (rand-vu-int-range 150 1200))
-        (set!
-         (-> self state-time)
-         (the-as seconds (-> *display* base-frame-counter))
-         )
+        (set! (-> self state-time) (-> *display* base-frame-counter))
         )
        )
       )

test/decompiler/reference/levels/sunken/qbert-plat_REF.gc

@@ -816,10 +816,7 @@
      )
     (go qbert-plat-master-idle)
     )
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (cond
     (arg0
      (ambient-hint-spawn "gamcam08" (the-as vector #f) *entity-pool* 'camera)

test/decompiler/reference/levels/sunken/square-platform_REF.gc

@@ -762,10 +762,7 @@
 (defstate square-platform-master-activate (square-platform-master)
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self wiggled?) #f)
    (sleep (-> self ticker) (-> self timeout))
    (set! (-> self plat-id) -1)

test/decompiler/reference/levels/sunken/wall-plat_REF.gc

@@ -108,10 +108,7 @@
   :code
   (behavior ()
    (dummy-49 (-> self root-override))
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (while #t
     (set!
      (-> self extended-amount)
@@ -200,10 +197,7 @@
   (the-as (function none :behavior wall-plat) rider-trans)
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (while #t
     (set!
      (-> self extended-amount)

test/decompiler/reference/levels/sunken/wedge-plats_REF.gc

@@ -296,10 +296,7 @@
       )
      )
     )
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (until
     (>=
      (- (-> *display* base-frame-counter) (the-as int (-> self state-time)))
@@ -591,10 +588,7 @@
       )
      )
     )
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (until
     (>=
      (- (-> *display* base-frame-counter) (the-as int (-> self state-time)))
@@ -694,7 +688,3 @@
   (go wedge-plat-outer-idle)
   (none)
   )
-
-
-
-

test/decompiler/reference/levels/swamp/swamp-bat_REF.gc

@@ -324,10 +324,7 @@ swamp-bat-slave-event-handler
   swamp-bat-slave-event-handler
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self launch-ready) #f)
    (ja-channel-push! 1 49)
    (let ((v1-4 (-> self skel root-channel 0)))
@@ -469,10 +466,7 @@ swamp-bat-slave-event-handler
   swamp-bat-slave-event-handler
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self launch-ready) #f)
    (ja-channel-push! 1 30)
    (let ((gp-0 (new-stack-vector0)))
@@ -974,10 +968,7 @@ swamp-bat-slave-event-handler
   swamp-bat-debug
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (while #t
     (swamp-bat-update-path)
     (when
@@ -985,10 +976,7 @@ swamp-bat-slave-event-handler
       (- (-> *display* base-frame-counter) (the-as int (-> self state-time)))
       150
       )
-     (set!
-      (-> self state-time)
-      (the-as seconds (-> *display* base-frame-counter))
-      )
+     (set! (-> self state-time) (-> *display* base-frame-counter))
      (if (not (swamp-bat-launch-slave))
       (go swamp-bat-idle)
       )

test/decompiler/reference/levels/swamp/swamp-rat-nest_REF.gc

@@ -1038,10 +1038,7 @@
   swamp-rat-nest-dummy-event-handler
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (if (<= (-> self parent-process 0 hit-points) 0)
     (go swamp-rat-nest-dummy-die)
     )
@@ -1187,10 +1184,7 @@
    )
   :code
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set!
     (-> self parent-process 0 dummy)
     (the-as (pointer swamp-rat-nest-dummy) #f)
@@ -1542,10 +1536,7 @@ swamp-rat-nest-default-event-handler
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (none)
    )
   :trans
@@ -1580,10 +1571,7 @@ swamp-rat-nest-default-event-handler
   swamp-rat-nest-default-event-handler
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (none)
    )
   :trans
@@ -1594,10 +1582,7 @@ swamp-rat-nest-default-event-handler
      (- (-> *display* base-frame-counter) (the-as int (-> self state-time)))
      (the-as int (-> self test-interval))
      )
-    (set!
-     (-> self state-time)
-     (the-as seconds (-> *display* base-frame-counter))
-     )
+    (set! (-> self state-time) (-> *display* base-frame-counter))
     (set! (-> self test-interval) (the-as uint 60))
     (let ((v1-6 0))
      (let ((a0-2 (the-as (pointer process-tree) (-> self child-process))))
@@ -1632,10 +1617,7 @@ swamp-rat-nest-default-event-handler
   swamp-rat-nest-default-event-handler
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (none)
    )
   :trans

test/decompiler/reference/levels/swamp/swamp-rat_REF.gc

@@ -710,10 +710,7 @@ swamp-rat-default-event-handler
     (set! (-> gp-0 z) 0.0)
     (set! (-> gp-0 w) 1.0)
     (let ((f30-0 0.125))
-     (set!
-      (-> self state-time)
-      (the-as seconds (-> *display* base-frame-counter))
-      )
+     (set! (-> self state-time) (-> *display* base-frame-counter))
      (let ((s5-0 (-> self skel root-channel 0)))
       (joint-control-channel-group-eval!
        s5-0

test/decompiler/reference/levels/village1/fishermans-boat_REF.gc

@@ -1322,10 +1322,7 @@
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (none)
    )
   :trans
@@ -1564,10 +1561,7 @@
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (none)
    )
   :trans
@@ -2000,10 +1994,7 @@
      (let ((f30-0 (* (the float s5-0) (-> self controller table-step))))
       (set! (-> self measure-parameters) #t)
       (set! (-> self controller steering) 1.0)
-      (set!
-       (-> self state-time)
-       (the-as seconds (-> *display* base-frame-counter))
-       )
+      (set! (-> self state-time) (-> *display* base-frame-counter))
       (until
        (>=
         (- (-> *display* base-frame-counter) (the-as int (-> self state-time)))
@@ -2018,10 +2009,7 @@
           )
          )
         (if (< 0.05 f0-6)
-         (set!
-          (-> self state-time)
-          (the-as seconds (-> *display* base-frame-counter))
-          )
+         (set! (-> self state-time) (-> *display* base-frame-counter))
          )
         )
        (fishermans-boat-set-throttle-by-speed f30-0)

test/decompiler/reference/levels/village1/yakow_REF.gc

@@ -768,10 +768,7 @@ yakow-default-event-handler
   yakow-default-event-handler
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self travel-speed) 0.0)
    (none)
    )
@@ -916,10 +913,7 @@ yakow-default-event-handler
   yakow-default-event-handler
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self travel-speed) 0.0)
    (none)
    )
@@ -938,10 +932,7 @@ yakow-default-event-handler
   yakow-default-event-handler
   :enter
   (behavior ((arg0 vector))
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (logior! (-> self nav flags) (nav-control-flags bit10))
    (set! (-> self nav destination-pos quad) (-> arg0 quad))
    (set! (-> self rotate-speed) (-> *YAKOW-bank* walk-rotate-speed))
@@ -1028,10 +1019,7 @@ yakow-default-event-handler
   yakow-default-event-handler
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (set! (-> self travel-speed) 0.0)
    (set! (-> self grazing) #t)
    (let ((v1-3 (entity-actor-lookup (-> self entity) 'alt-actor 0))
@@ -1247,10 +1235,7 @@ yakow-default-event-handler
   yakow-default-event-handler
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (logior! (-> self nav flags) (nav-control-flags bit10))
    (set! (-> self rotate-speed) (-> *YAKOW-bank* run-rotate-speed))
    (set! (-> self turn-time) (-> *YAKOW-bank* run-turn-time))
@@ -1324,10 +1309,7 @@ yakow-default-event-handler
    )
   :enter
   (behavior ()
-   (set!
-    (-> self state-time)
-    (the-as seconds (-> *display* base-frame-counter))
-    )
+   (set! (-> self state-time) (-> *display* base-frame-counter))
    (if (-> self grazing)
     (go yakow-graze-kicked)
     )

test/decompiler/reference/levels/village2/assistant-village2_REF.gc

@@ -2707,10 +2707,7 @@
                 #t
                 )
                (else
-                (set!
-                 (-> self state-time)
-                 (the-as seconds (-> *display* base-frame-counter))
-                 )
+                (set! (-> self state-time) (-> *display* base-frame-counter))
                 #f
                 )
                )