[game] fix bad resolutions menu options (#1448)

* Fix bad aspect ratios in resolutions menu

* fix typos

* hide resolutions that are too wide

* Update crates.gc

decompiler/config/all-types.gc

@@ -10392,7 +10392,7 @@
   (can-collect 8)
   (fade 9)
   (large 10)
-  (rqeuire-zoomer 11) ;; iron, but need to be riding zoomer to break it. unused?
+  (require-zoomer 11) ;; iron, but need to be riding zoomer to break it. only used in demo?
   (powerup 12)
   ;; strengths
   (touch 13)

goal_src/engine/collide/collide-shape-h.gc

@@ -42,7 +42,7 @@
 ;;  - does not support a few of the weirder collision checks
 
 ;; There is some duplicate implemenations because both the new and old system collide
-;; foreground meshes. The new system can just import foreground collision meshses
+;; foreground meshes. The new system can just import foreground collision meshes
 ;; into its collide cache.
 
 
@@ -230,7 +230,7 @@
 ;; Collision Primitive Base
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;; These are the settings that can be set per primtive.
+;; These are the settings that can be set per primitive.
 
 
 (defenum collide-kind

goal_src/engine/game/crates.gc

@@ -490,7 +490,7 @@
          (('iron)
           (case (-> arg3 param 1)
             (('flop 'uppercut 'explode 'darkeco 'eco-yellow 'bonk 'racer 'tube 'flut-bonk 'flut-attack)
-             (if (and (logtest? (-> self fact options) (fact-options rqeuire-zoomer))
+             (if (and (logtest? (-> self fact options) (fact-options require-zoomer))
                       *target*
                       (zero? (logand (-> *target* control root-prim prim-core action) (collide-action ca-9)))
                       )

goal_src/engine/game/fact-h.gc

@@ -79,7 +79,7 @@
   (can-collect 8)
   (fade 9)
   (large 10)
-  (rqeuire-zoomer 11) ;; iron, but need to be riding zoomer to break it. unused?
+  (require-zoomer 11) ;; iron, but need to be riding zoomer to break it. only used in demo?
   (powerup 12)
   ;; strengths
   (touch 13)

goal_src/engine/game/game-info-h.gc

@@ -1,9 +1,9 @@
-; ;;-*-Lisp-*-
-; (in-package goal)
+;;-*-Lisp-*-
+(in-package goal)
 
-; ;; name: game-info-h.gc
-; ;; name in dgo: game-info-h
-; ;; dgos: GAME, ENGINE
+;; name: game-info-h.gc
+;; name in dgo: game-info-h
+;; dgos: GAME, ENGINE
 
 ;; This file contains types for:
 ;; - the full game state (game-info)

goal_src/levels/beach/seagull.gc

@@ -1,4 +1,3 @@
-
 ;;-*-Lisp-*-
 (in-package goal)
 

goal_src/levels/flut_common/target-flut.gc

@@ -1,4 +1,3 @@
-
 ;;-*-Lisp-*-
 (in-package goal)
 

goal_src/levels/village1/assistant.gc

@@ -1,4 +1,3 @@
-
 ;;-*-Lisp-*-
 (in-package goal)
 

goal_src/pc/anim-tester-x.gc

@@ -520,7 +520,8 @@
               )
             )
           (compute-alignment! (-> self align))
-          (align! (-> self align) (the align-opts 31) 1.0 1.0 1.0)
+          (align! (-> self align) (align-opts adjust-x-vel adjust-y-vel adjust-xz-vel keep-other-velocities adjust-quat)
+                  1.0 1.0 1.0)
           )
         (else
           (if (!= *master-mode* 'menu)

goal_src/pc/progress-pc.gc

@@ -381,10 +381,15 @@
         
         (until (or done? (= (length *temp-options*) max-options))
           (countdown (i RESOLUTIONS)
-            (let ((thisr (the int (* mult (the float (-> *resolutions* i))))))
+            (let* ((thisr (the int (* mult (the float (-> *resolutions* i)))))
+                  (thisx (the int (* aspect (the float thisr))))
+                  (thisy thisr)
+                  )
               
-              (when (and (< (length *temp-options*) max-options) (<= thisr sy) (not skip?))
-                (add-resolution-option (* aspect (the float thisr)) thisr)
+              (when (and (not skip?) (< (length *temp-options*) max-options)
+                         (<= thisy sy) (<= thisx sx)
+                         (= aspect (/ (the float thisx) (the float thisy))))
+                (add-resolution-option thisx thisy)
                 ))
             (false! skip?)
             )
@@ -1030,7 +1035,7 @@
                (set! (-> obj next-display-state) (progress-screen invalid))
                )
               ((= (-> options (-> obj option-index) option-type) (game-option-type aspect-new))
-               ;; resolution button. change resolution!
+               ;; aspect ratio button.
                (let ((newx (the int (-> options (-> obj option-index) param1)))
                      (newy (the int (-> options (-> obj option-index) param2))))
                    (if (= (-> options (-> obj option-index) name) (game-text-id fit-to-screen))