Support mods with UNPACKED_MPQS

[glebm]

This unifies a lot of the code between the MPQ and UNPACKED_MPQS versions, so we actually end up with less code as a result.

[glebm]

I have no idea why the Amiga build fails to link 🤔

/opt/m68k-amigaos/lib/gcc/m68k-amigaos/13.2.0/../../../../m68k-amigaos/bin/ld: Source/CMakeFiles/libdevilutionx_init.dir/init.cpp.obj:(.text._ZN10devilution12_GLOBAL__N_115AssetContentsEqEONS_8AssetRefESt17basic_string_viewIcSt11char_traitsIcEE.constprop.0+0x26): undefined reference to devilution::MpqArchive::GetUnpackedFileSize(unsigned int, int&)' /opt/m68k-amigaos/lib/gcc/m68k-amigaos/13.2.0/../../../../m68k-amigaos/bin/ld: Source/CMakeFiles/libdevilutionx_init.dir/init.cpp.obj:(.text._ZN10devilution22AreExtraFontsOutOfDateERNS_10MpqArchiveE+0x54): undefined reference to devilution::MpqArchive::GetFileNumber(std::array<unsigned int, 3ul>, unsigned int&)'

[glebm]

The symbol is there but the arguments are unsigned long rather than an unsigned int. Interesting

$ /opt/m68k-amigaos/bin/m68k-amigaos-nm -C mpq_reader.cpp.obj
...
00000000 T devilution::MpqArchive::GetFileNumber(std::array<unsigned long, 3ul>, unsigned long&)
00000000 T devilution::MpqArchive::GetUnpackedFileSize(unsigned long, long&)

vs init.cpp.obj:

$ /opt/m68k-amigaos/bin/m68k-amigaos-nm -C libdevilutionx_init.dir/init.cpp.obj
...
         U devilution::MpqArchive::GetFileNumber(std::array<unsigned int, 3ul>, unsigned int&)
         U devilution::MpqArchive::GetUnpackedFileSize(unsigned int, int&)

[StephenCWills]

It's because you included SDL.h before cstdint.

root@4e48afd807d8:~# cat test-nosdl.cpp
#include <cstdint>

void test(uint32_t *num) { num = 0; }

int main()
{
    uint32_t num;
    test(&num);
    return num;
}
root@4e48afd807d8:~# g++ -c test-nosdl.cpp 
root@4e48afd807d8:~# m68k-amigaos-nm -C test-nosdl.o
00000000 T test(unsigned long*)
0000000e T main

root@4e48afd807d8:~# cat test-sdl.cpp 
#include <SDL.h>
#include <cstdint>

void test(uint32_t *num) { num = 0; }

int main()
{
    uint32_t num;
    test(&num);
    return num;
}
root@4e48afd807d8:~# g++ -c test-sdl.cpp 
root@4e48afd807d8:~# m68k-amigaos-nm -C test-sdl.o
00000000 T test(unsigned int*)
0000000e T main

[glebm]

Thanks! I remember encountering a similar issue in the past. Need to look into SDL to see why it does that.

[glebm]

@MBeijer We're using https://github.com/AmigaPorts/libSDL12, should we be using something else these days?

[AJenbo]

Nice that things could be unified a bit :)