MacOS ZAPD fixes (#606)

* Adding -Wno-return-type to GCC check for MacOS

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0325ec161"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0325ec161"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "605f6972e"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "605f6972e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "6e6ad445a"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "6e6ad445a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Rewrote func to avoid returns without values

src/code/z_camera.c

@@ -7160,26 +7160,24 @@ s32 Camera_CheckWater(Camera* camera) {
         if (camera->unk_150 > 0) {
             camera->unk_150--;
             camera->unk_152 |= 8;
-            return;
         } else if (camera->globalCtx->sceneNum == 0x49) {
             camera->unk_152 |= 0x10;
-            return;
         } else {
             camera->unk_152 |= 2;
-            return;
         }
-    }
+    } else {
-    if (camera->unk_14C & 0x100) {
+        if (camera->unk_14C & 0x100) {
-        camera->unk_14C &= ~0x100;
+            camera->unk_14C &= ~0x100;
-        osSyncPrintf("kankyo changed water off, sound off\n");
+            osSyncPrintf("kankyo changed water off, sound off\n");
-        func_800706A0(camera->globalCtx);
+            func_800706A0(camera->globalCtx);
-        if (*quakeId != 0) {
+            if (*quakeId != 0) {
-            Quake_RemoveFromIdx(*quakeId);
+                Quake_RemoveFromIdx(*quakeId);
+            }
+            camera->unk_150 = 0;
+            camera->unk_152 = 0;
         }
-        camera->unk_150 = 0;
+        func_800F6828(0);
-        camera->unk_152 = 0;
     }
-    func_800F6828(0);
     // @BUG: doesn't always return a value, but sometimes does.
 }
 

tools/ZAPD/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/zeldaret/ZAPD.git
 	branch = master
-	commit = fd4d53a2684871a1ac28668515d025470a45ef7f
+	commit = 6e6ad445a69089b721bea75f6e43b23b14a553b6
-	parent = cbe216b1810f9274242d0088a7e3b15b0f95f55d
+	parent = cf6d96f133d98c6b69066c5ff195dc8a4d029444
 	method = merge
 	cmdver = 0.4.3

tools/ZAPD/ZAPD/ZRoom/Commands/SetPathways.cpp

@@ -59,6 +59,15 @@ string SetPathways::GenerateSourceCodePass1(string roomName, int baseAddress)
 		currentPtr += 6;
 	}
 
+	if (numPoints == 0) // Hack for SharpOcarina
+	{
+		for (int i = 0; i < 3; i++)
+		{
+			PathwayEntry* entry = new PathwayEntry();
+			pathways.push_back(entry);
+		}
+	}
+
 	return "";
 }
 
@@ -82,7 +91,11 @@ string SetPathways::GenerateSourceCodePass2(string roomName, int baseAddress)
 		int index = 0;
 		for (PathwayEntry* entry : pathways)
 		{
-			declaration += StringHelper::Sprintf("{ %i, %i, %i }, //0x%06X \n", entry->x, entry->y, entry->z, listSegmentOffset + (index * 6));
+			declaration += StringHelper::Sprintf("    { %i, %i, %i }, //0x%06X", entry->x, entry->y, entry->z, listSegmentOffset + (index * 6));
+
+			if (index < pathways.size() - 1)
+				declaration += "\n";
+			
 			index++;
 		}
 
@@ -111,4 +124,11 @@ string SetPathways::GetCommandCName()
 RoomCommand SetPathways::GetRoomCommand()
 {
 	return RoomCommand::SetPathways;
-}
+}
+
+PathwayEntry::PathwayEntry()
+{
+	x = 0;
+	y = 0;
+	z = 0;
+}

tools/ZAPD/ZAPD/ZRoom/Commands/SetPathways.h

@@ -7,6 +7,8 @@ class PathwayEntry
 {
 public:
 	int16_t x, y, z;
+
+	PathwayEntry();
 };
 
 class SetPathways : public ZRoomCommand

tools/ZAPD/ZAPD/ZVector.cpp

@@ -80,7 +80,7 @@ std::string ZVector::GetSourceTypeName()
 	}
 	else
 	{
-		std::string output = StringHelper::Sprintf("Encountered unsupported vector type: %d dimensions, %s type", dimensions, ZScalar::MapScalarTypeToOutputType(scalarType));
+		std::string output = StringHelper::Sprintf("Encountered unsupported vector type: %d dimensions, %s type", dimensions, ZScalar::MapScalarTypeToOutputType(scalarType).c_str());
 
 		if (Globals::Instance->verbosity >= VERBOSITY_DEBUG)
 			printf("%s\n", output.c_str());