Defined more in-dungeon structs and enums (#53)

* Defined DungeonEntity

* Rename EntityType enums

* Revert EntityType rename

* Defined more in-dungeon structs and enums

* Added more dungeon global structs/enums

* Prefixed dungeonGlobalData with g

* Fixed compile errors

* Removed some CRLFs

* Fixed compile after merge

* Revert Makefile

* Rename DungeonEntityData.entityType

Co-authored-by: Seth Barberee <seth.barberee@gmail.com>

* Renamed symbols per PR comments

Co-authored-by: Cheng Hann Gan <chenghann_gan@ultimatesoftware.com>
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>

1 files changed, 233 insertions, 233 deletions

diff --git a/tools/mid2agb/main.cpp b/tools/mid2agb/main.cpp
index d1f1960..ea2b294 100644
--- a/tools/mid2agb/main.cpp
+++ b/tools/mid2agb/main.cpp
@@ -1,233 +1,233 @@
-// Copyright(c) 2016 YamaArashi

-//

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

-//

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

-//

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

-

-#include <cstdio>

-#include <cstdlib>

-#include <cstring>

-#include <cctype>

-#include <cassert>

-#include <string>

-#include <set>

-#include "main.h"

-#include "error.h"

-#include "midi.h"

-#include "agb.h"

-

-FILE* g_inputFile = nullptr;

-FILE* g_outputFile = nullptr;

-

-std::string g_asmLabel;

-int g_masterVolume = 127;

-int g_voiceGroup = 0;

-int g_priority = 0;

-int g_reverb = -1;

-int g_clocksPerBeat = 1;

-bool g_exactGateTime = false;

-bool g_compressionEnabled = true;

-

-[[noreturn]] static void PrintUsage()

-{

-    std::printf(

-        "Usage: MID2AGB name [options]\n"

-        "\n"

-        "    input_file  filename(.mid) of MIDI file\n"

-        "   output_file  filename(.s) for AGB file (default:input_file)\n"

-        "\n"

-        "options  -L???  label for assembler (default:output_file)\n"

-        "         -V???  master volume (default:127)\n"

-        "         -G???  voice group number (default:0)\n"

-        "         -P???  priority (default:0)\n"

-        "         -R???  reverb (default:off)\n"

-        "            -X  48 clocks/beat (default:24 clocks/beat)\n"

-        "            -E  exact gate-time\n"

-        "            -N  no compression\n"

-    );

-    std::exit(1);

-}

-

-static std::string StripExtension(std::string s)

-{

-    std::size_t pos = s.find_last_of('.');

-

-    if (pos > 0 && pos != std::string::npos)

-    {

-        s = s.substr(0, pos);

-    }

-

-    return s;

-}

-

-static std::string GetExtension(std::string s)

-{

-    std::size_t pos = s.find_last_of('.');

-

-    if (pos > 0 && pos != std::string::npos)

-    {

-        return s.substr(pos + 1);

-    }

-

-    return "";

-}

-

-static std::string BaseName(std::string s)

-{

-    std::size_t posAfterSlash = s.find_last_of("/\\");

-

-    if (posAfterSlash == std::string::npos)

-        posAfterSlash = 0;

-    else

-        posAfterSlash++;

-

-    std::size_t dotPos = s.find_first_of('.', posAfterSlash);

-    if (dotPos > posAfterSlash && dotPos != std::string::npos)

-        s = s.substr(posAfterSlash, dotPos - posAfterSlash);

-

-    return s;

-}

-

-static const char *GetArgument(int argc, char **argv, int& index)

-{

-    assert(index >= 0 && index < argc);

-

-    const char *option = argv[index];

-

-    assert(option != nullptr);

-    assert(option[0] == '-');

-

-    // If there is text following the letter, return that.

-    if (std::strlen(option) >= 3)

-        return option + 2;

-

-    // Otherwise, try to get the next arg.

-    if (index + 1 < argc)

-    {

-        index++;

-        return argv[index];

-    }

-    else

-    {

-        return nullptr;

-    }

-}

-

-int main(int argc, char** argv)

-{

-    std::string inputFilename;

-    std::string outputFilename;

-

-    for (int i = 1; i < argc; i++)

-    {

-        const char *option = argv[i];

-

-        if (option[0] == '-' && option[1] != '\0')

-        {

-            const char *arg;

-

-            switch (std::toupper(option[1]))

-            {

-            case 'E':

-                g_exactGateTime = true;

-                break;

-            case 'G':

-                arg = GetArgument(argc, argv, i);

-                if (arg == nullptr)

-                    PrintUsage();

-                g_voiceGroup = std::stoi(arg);

-                break;

-            case 'L':

-                arg = GetArgument(argc, argv, i);

-                if (arg == nullptr)

-                    PrintUsage();

-                g_asmLabel = arg;

-                break;

-            case 'N':

-                g_compressionEnabled = false;

-                break;

-            case 'P':

-                arg = GetArgument(argc, argv, i);

-                if (arg == nullptr)

-                    PrintUsage();

-                g_priority = std::stoi(arg);

-                break;

-            case 'R':

-                arg = GetArgument(argc, argv, i);

-                if (arg == nullptr)

-                    PrintUsage();

-                g_reverb = std::stoi(arg);

-                break;

-            case 'V':

-                arg = GetArgument(argc, argv, i);

-                if (arg == nullptr)

-                    PrintUsage();

-                g_masterVolume = std::stoi(arg);

-                break;

-            case 'X':

-                g_clocksPerBeat = 2;

-                break;

-            default:

-                PrintUsage();

-            }

-        }

-        else

-        {

-            if (inputFilename.empty())

-                inputFilename = argv[i];

-            else if (outputFilename.empty())

-                outputFilename = argv[i];

-            else

-                PrintUsage();

-        }

-    }

-

-    if (inputFilename.empty())

-        PrintUsage();

-

-    if (GetExtension(inputFilename) != "mid")

-        RaiseError("input filename extension is not \"mid\"");

-

-    if (outputFilename.empty())

-        outputFilename = StripExtension(inputFilename) + ".s";

-

-    if (GetExtension(outputFilename) != "s")

-        RaiseError("output filename extension is not \"s\"");

-

-    if (g_asmLabel.empty())

-        g_asmLabel = BaseName(outputFilename);

-

-    g_inputFile = std::fopen(inputFilename.c_str(), "rb");

-

-    if (g_inputFile == nullptr)

-        RaiseError("failed to open \"%s\" for reading", inputFilename.c_str());

-

-    g_outputFile = std::fopen(outputFilename.c_str(), "w");

-

-    if (g_outputFile == nullptr)

-        RaiseError("failed to open \"%s\" for writing", outputFilename.c_str());

-

-    ReadMidiFileHeader();

-    PrintAgbHeader();

-    ReadMidiTracks();

-    PrintAgbFooter();

-

-    std::fclose(g_inputFile);

-    std::fclose(g_outputFile);

-

-    return 0;

-}

+// Copyright(c) 2016 YamaArashi
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
+#include <cassert>
+#include <string>
+#include <set>
+#include "main.h"
+#include "error.h"
+#include "midi.h"
+#include "agb.h"
+
+FILE* g_inputFile = nullptr;
+FILE* g_outputFile = nullptr;
+
+std::string g_asmLabel;
+int g_masterVolume = 127;
+int g_voiceGroup = 0;
+int g_priority = 0;
+int g_reverb = -1;
+int g_clocksPerBeat = 1;
+bool g_exactGateTime = false;
+bool g_compressionEnabled = true;
+
+[[noreturn]] static void PrintUsage()
+{
+    std::printf(
+        "Usage: MID2AGB name [options]\n"
+        "\n"
+        "    input_file  filename(.mid) of MIDI file\n"
+        "   output_file  filename(.s) for AGB file (default:input_file)\n"
+        "\n"
+        "options  -L???  label for assembler (default:output_file)\n"
+        "         -V???  master volume (default:127)\n"
+        "         -G???  voice group number (default:0)\n"
+        "         -P???  priority (default:0)\n"
+        "         -R???  reverb (default:off)\n"
+        "            -X  48 clocks/beat (default:24 clocks/beat)\n"
+        "            -E  exact gate-time\n"
+        "            -N  no compression\n"
+    );
+    std::exit(1);
+}
+
+static std::string StripExtension(std::string s)
+{
+    std::size_t pos = s.find_last_of('.');
+
+    if (pos > 0 && pos != std::string::npos)
+    {
+        s = s.substr(0, pos);
+    }
+
+    return s;
+}
+
+static std::string GetExtension(std::string s)
+{
+    std::size_t pos = s.find_last_of('.');
+
+    if (pos > 0 && pos != std::string::npos)
+    {
+        return s.substr(pos + 1);
+    }
+
+    return "";
+}
+
+static std::string BaseName(std::string s)
+{
+    std::size_t posAfterSlash = s.find_last_of("/\\");
+
+    if (posAfterSlash == std::string::npos)
+        posAfterSlash = 0;
+    else
+        posAfterSlash++;
+
+    std::size_t dotPos = s.find_first_of('.', posAfterSlash);
+    if (dotPos > posAfterSlash && dotPos != std::string::npos)
+        s = s.substr(posAfterSlash, dotPos - posAfterSlash);
+
+    return s;
+}
+
+static const char *GetArgument(int argc, char **argv, int& index)
+{
+    assert(index >= 0 && index < argc);
+
+    const char *option = argv[index];
+
+    assert(option != nullptr);
+    assert(option[0] == '-');
+
+    // If there is text following the letter, return that.
+    if (std::strlen(option) >= 3)
+        return option + 2;
+
+    // Otherwise, try to get the next arg.
+    if (index + 1 < argc)
+    {
+        index++;
+        return argv[index];
+    }
+    else
+    {
+        return nullptr;
+    }
+}
+
+int main(int argc, char** argv)
+{
+    std::string inputFilename;
+    std::string outputFilename;
+
+    for (int i = 1; i < argc; i++)
+    {
+        const char *option = argv[i];
+
+        if (option[0] == '-' && option[1] != '\0')
+        {
+            const char *arg;
+
+            switch (std::toupper(option[1]))
+            {
+            case 'E':
+                g_exactGateTime = true;
+                break;
+            case 'G':
+                arg = GetArgument(argc, argv, i);
+                if (arg == nullptr)
+                    PrintUsage();
+                g_voiceGroup = std::stoi(arg);
+                break;
+            case 'L':
+                arg = GetArgument(argc, argv, i);
+                if (arg == nullptr)
+                    PrintUsage();
+                g_asmLabel = arg;
+                break;
+            case 'N':
+                g_compressionEnabled = false;
+                break;
+            case 'P':
+                arg = GetArgument(argc, argv, i);
+                if (arg == nullptr)
+                    PrintUsage();
+                g_priority = std::stoi(arg);
+                break;
+            case 'R':
+                arg = GetArgument(argc, argv, i);
+                if (arg == nullptr)
+                    PrintUsage();
+                g_reverb = std::stoi(arg);
+                break;
+            case 'V':
+                arg = GetArgument(argc, argv, i);
+                if (arg == nullptr)
+                    PrintUsage();
+                g_masterVolume = std::stoi(arg);
+                break;
+            case 'X':
+                g_clocksPerBeat = 2;
+                break;
+            default:
+                PrintUsage();
+            }
+        }
+        else
+        {
+            if (inputFilename.empty())
+                inputFilename = argv[i];
+            else if (outputFilename.empty())
+                outputFilename = argv[i];
+            else
+                PrintUsage();
+        }
+    }
+
+    if (inputFilename.empty())
+        PrintUsage();
+
+    if (GetExtension(inputFilename) != "mid")
+        RaiseError("input filename extension is not \"mid\"");
+
+    if (outputFilename.empty())
+        outputFilename = StripExtension(inputFilename) + ".s";
+
+    if (GetExtension(outputFilename) != "s")
+        RaiseError("output filename extension is not \"s\"");
+
+    if (g_asmLabel.empty())
+        g_asmLabel = BaseName(outputFilename);
+
+    g_inputFile = std::fopen(inputFilename.c_str(), "rb");
+
+    if (g_inputFile == nullptr)
+        RaiseError("failed to open \"%s\" for reading", inputFilename.c_str());
+
+    g_outputFile = std::fopen(outputFilename.c_str(), "w");
+
+    if (g_outputFile == nullptr)
+        RaiseError("failed to open \"%s\" for writing", outputFilename.c_str());
+
+    ReadMidiFileHeader();
+    PrintAgbHeader();
+    ReadMidiTracks();
+    PrintAgbFooter();
+
+    std::fclose(g_inputFile);
+    std::fclose(g_outputFile);
+
+    return 0;
+}