From 6e4b34be0b55ecec575d505bc2cf61f4d8674ddb Mon Sep 17 00:00:00 2001
From: water111 <48171810+water111@users.noreply.github.com>
Date: Sun, 2 Jan 2022 16:10:09 -0500
Subject: [PATCH] fix goal build error and a few c++ warnings (#1044)

---
 decompiler/config/jak1_ntsc_black_label.jsonc    |  2 +-
 decompiler/data/game_text.cpp                    |  2 +-
 game/graphics/opengl_renderer/DirectRenderer.cpp |  6 +++---
 game/graphics/opengl_renderer/OpenGLRenderer.cpp |  5 ++---
 game/graphics/opengl_renderer/SkyBlendCPU.cpp    |  2 +-
 goal_src/game.gp                                 | 11 +++--------
 6 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/decompiler/config/jak1_ntsc_black_label.jsonc b/decompiler/config/jak1_ntsc_black_label.jsonc
index 6c599c4b63..3017f6d472 100644
--- a/decompiler/config/jak1_ntsc_black_label.jsonc
+++ b/decompiler/config/jak1_ntsc_black_label.jsonc
@@ -5,7 +5,7 @@
   // if you want to filter to only some object names.
   // it will make the decompiler much faster.
   "allowed_objects": [],
-  "banned_objects": [],
+  "banned_objects": ["collide-mesh"],
 
   ////////////////////////////
   // CODE ANALYSIS OPTIONS
diff --git a/decompiler/data/game_text.cpp b/decompiler/data/game_text.cpp
index 2b0bcebf2e..2ef704be97 100644
--- a/decompiler/data/game_text.cpp
+++ b/decompiler/data/game_text.cpp
@@ -107,7 +107,7 @@ GameTextResult process_game_text(ObjectFileData& data, GameTextVersion version)
     auto string_start = (text_label.offset / 4) - 1;
     // 8 for type tag and length fields, 1 for null char.
     for (int j = 0, m = align16(8 + 1 + (int)text.length()) / 4;
-         j < m && string_start + j < read_words.size(); j++) {
+         j < m && string_start + j < (int)read_words.size(); j++) {
       read_words.at(string_start + j)++;
     }
   }
diff --git a/game/graphics/opengl_renderer/DirectRenderer.cpp b/game/graphics/opengl_renderer/DirectRenderer.cpp
index 53a81a5329..58e9662c1e 100644
--- a/game/graphics/opengl_renderer/DirectRenderer.cpp
+++ b/game/graphics/opengl_renderer/DirectRenderer.cpp
@@ -1074,9 +1074,9 @@ void DirectRenderer::PrimitiveBuffer::push(const math::Vector<u8, 4>& rgba,
                                            const math::Vector<float, 3>& st) {
   auto& v = vertices[vert_count];
   v.rgba = rgba;
-  v.xyz[0] = (float)vert[0] / UINT32_MAX;
-  v.xyz[1] = (float)vert[1] / UINT32_MAX;
-  v.xyz[2] = (float)vert[2] / UINT32_MAX;
+  v.xyz[0] = (float)vert[0] / (float)UINT32_MAX;
+  v.xyz[1] = (float)vert[1] / (float)UINT32_MAX;
+  v.xyz[2] = (float)vert[2] / (float)UINT32_MAX;
   v.stq = st;
   vert_count++;
 }
diff --git a/game/graphics/opengl_renderer/OpenGLRenderer.cpp b/game/graphics/opengl_renderer/OpenGLRenderer.cpp
index 839acf7c54..ee03197c90 100644
--- a/game/graphics/opengl_renderer/OpenGLRenderer.cpp
+++ b/game/graphics/opengl_renderer/OpenGLRenderer.cpp
@@ -29,7 +29,6 @@ void GLAPIENTRY opengl_error_callback(GLenum source,
                                       const GLchar* message,
                                       const void* /*userParam*/) {
   if (severity == GL_DEBUG_SEVERITY_NOTIFICATION) {
-    // On some drivers this prints on every single texture upload, which is too much spam
     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}: {}", g_current_render, id, source, type,
@@ -338,8 +337,8 @@ void OpenGLRenderer::finish_screenshot(const std::string& output_name,
   }
 
   // set alpha. For some reason, image viewers do weird stuff with alpha.
-  for (auto& x : buffer) {
-    x |= 0xff000000;
+  for (auto& px : buffer) {
+    px |= 0xff000000;
   }
   file_util::write_rgba_png(output_name, buffer.data(), width, height);
 }
diff --git a/game/graphics/opengl_renderer/SkyBlendCPU.cpp b/game/graphics/opengl_renderer/SkyBlendCPU.cpp
index cc00270e18..4b87cfaed2 100644
--- a/game/graphics/opengl_renderer/SkyBlendCPU.cpp
+++ b/game/graphics/opengl_renderer/SkyBlendCPU.cpp
@@ -47,7 +47,7 @@ void blend_sky_fast(u8 intensity, u8* out, const u8* in, u32 size) {
 
 SkyBlendStats SkyBlendCPU::do_sky_blends(DmaFollower& dma,
                                          SharedRenderState* render_state,
-                                         ScopedProfilerNode& prof) {
+                                         ScopedProfilerNode& /*prof*/) {
   SkyBlendStats stats;
 
   Timer sky_timer;
diff --git a/goal_src/game.gp b/goal_src/game.gp
index 58ce5a721d..3db4a53951 100644
--- a/goal_src/game.gp
+++ b/goal_src/game.gp
@@ -1013,13 +1013,15 @@
 
 (copy-vis-files "MAI")
 
+
+
 (goal-src-sequence
  "levels/"
  :deps ;; no idea what these depend on, make it depend on the whole engine
  ("out/obj/default-menu.o"
-  ;;"out/obj/darkcave-obs.o"
   )
  "maincave/cavecrystal-light.gc"
+ "darkcave/darkcave-obs.gc"
  "maincave/maincave-obs.gc"
  "maincave/maincave-part.gc"
  "maincave/spiderwebs.gc"
@@ -1053,13 +1055,6 @@
   "maincave-vis"
   )
 
-; (goal-src-sequence
-;  "levels/"
-;  :deps ;; no idea what these depend on, make it depend on the whole engine
-;  ("out/obj/default-menu.o" "out/obj/cavecrystal-light.o")
-;  "darkcave/darkcave-obs.gc"
-;  )
-
 
 ;;;;;;;;;;;;;;;;;;;;;
 ;; snow mountain