diff --git a/ConvertResources.bat b/ConvertResources.bat index ab63094..a3fbc91 100644 --- a/ConvertResources.bat +++ b/ConvertResources.bat @@ -56,25 +56,27 @@ x64\Release\gpr2gpa.exe "Packaged\Houses\Teddy World.gpr" "DefaultTimestamp.time x64\Release\gpr2gpa.exe "Packaged\Houses\The Asylum Pro.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\The Asylum Pro.gpa" x64\Release\gpr2gpa.exe "Packaged\Houses\Titanic.gpr" "DefaultTimestamp.timestamp" "Packaged\Houses\Titanic.gpa" -x64\Release\FTagData.exe "GliderProData\Houses\Art Museum.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\Art Museum.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\Castle o' the Air.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\Castle o' the Air.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\CD Demo House.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\CD Demo House.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\Davis Station.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\Davis Station.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\Demo House.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\Demo House.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\Grand Prix.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\Grand Prix.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\ImagineHouse PRO II.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\ImagineHouse PRO II.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\Land of Illusion.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\Land of Illusion.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\Leviathan.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\Leviathan.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\Nemo's Market.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\Nemo's Market.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\Rainbow's End.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\Rainbow's End.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\Slumberland.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\Slumberland.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\SpacePods.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\SpacePods.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\Teddy World.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\Teddy World.mov" MooV ozm5 0 0 locked -x64\Release\FTagData.exe "GliderProData\Houses\Titanic.mov" "DefaultTimestamp.timestamp" "Packaged\Houses\Titanic.mov" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Art Museum.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Castle o' the Air.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\CD Demo House.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Davis Station.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Demo House.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Grand Prix.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\ImagineHouse PRO II.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Land of Illusion.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Leviathan.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Nemo's Market.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Rainbow's End.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Slumberland.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\SpacePods.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Teddy World.mov.gpf" MooV ozm5 0 0 locked +x64\Release\FTagData.exe "DefaultTimestamp.timestamp" "Packaged\Houses\Titanic.mov.gpf" MooV ozm5 0 0 locked del /Q Packaged\Houses\*.gpr del /Q Packaged\ApplicationResources.gpr +copy /Y GliderProData\ConvertedMovies\*.mov.gpa Packaged\Houses\ + attrib +R Packaged\Houses\* pause diff --git a/FTagData/FTagData.cpp b/FTagData/FTagData.cpp index c90daf3..b067acc 100644 --- a/FTagData/FTagData.cpp +++ b/FTagData/FTagData.cpp @@ -5,23 +5,22 @@ int main(int argc, const char **argv) { - if (argc < 8) + if (argc < 7) { - fprintf(stderr, "FTagData [flags]"); + fprintf(stderr, "FTagData [flags]"); return -1; } - std::string inPath = argv[1]; - std::string timestampPath = argv[2]; - std::string outPath = argv[3]; + std::string timestampPath = argv[1]; + std::string outPath = argv[2]; - if (strlen(argv[4]) != 4) + if (strlen(argv[3]) != 4) { fprintf(stderr, "File type ID must be 4 characters"); return -2; } - if (strlen(argv[5]) != 4) + if (strlen(argv[4]) != 4) { fprintf(stderr, "File creator ID must be 4 characters"); return -3; @@ -47,10 +46,10 @@ int main(int argc, const char **argv) } PortabilityLayer::MacFileProperties mfp; - memcpy(mfp.m_fileType, argv[4], 4); - memcpy(mfp.m_fileCreator, argv[5], 4); - mfp.m_xPos = atoi(argv[6]); - mfp.m_yPos = atoi(argv[7]); + memcpy(mfp.m_fileType, argv[3], 4); + memcpy(mfp.m_fileCreator, argv[4], 4); + mfp.m_xPos = atoi(argv[5]); + mfp.m_yPos = atoi(argv[6]); mfp.m_finderFlags = 0; mfp.m_protected = 0; mfp.m_modifiedDate = mfp.m_creationDate = timestamp; @@ -76,15 +75,11 @@ int main(int argc, const char **argv) mfp.m_finderFlags |= PortabilityLayer::FINDER_FILE_FLAG_INITED; } - std::string gpdPath = outPath + ".gpd"; - CopyFile(inPath.c_str(), gpdPath.c_str(), 0); - PortabilityLayer::MacFilePropertiesSerialized mps; mps.Serialize(mfp); - std::string gpfPath = outPath + ".gpf"; FILE *file = nullptr; - errno_t err = fopen_s(&file, gpfPath.c_str(), "wb"); + errno_t err = fopen_s(&file, outPath.c_str(), "wb"); if (!err) { fwrite(mps.m_data, PortabilityLayer::MacFilePropertiesSerialized::kSize, 1, file); diff --git a/GliderProData/ConvertedMovies/Art Museum.mov.gpa b/GliderProData/ConvertedMovies/Art Museum.mov.gpa new file mode 100644 index 0000000..2225927 Binary files /dev/null and b/GliderProData/ConvertedMovies/Art Museum.mov.gpa differ diff --git a/GliderProData/ConvertedMovies/Castle o' the Air.mov.gpa b/GliderProData/ConvertedMovies/Castle o' the Air.mov.gpa new file mode 100644 index 0000000..bb84360 Binary files /dev/null and b/GliderProData/ConvertedMovies/Castle o' the Air.mov.gpa differ diff --git a/GliderProData/ConvertedMovies/Davis Station.mov.gpa b/GliderProData/ConvertedMovies/Davis Station.mov.gpa new file mode 100644 index 0000000..5ec9aef Binary files /dev/null and b/GliderProData/ConvertedMovies/Davis Station.mov.gpa differ diff --git a/GliderProData/ConvertedMovies/Demo House.mov.gpa b/GliderProData/ConvertedMovies/Demo House.mov.gpa new file mode 100644 index 0000000..d3220bb Binary files /dev/null and b/GliderProData/ConvertedMovies/Demo House.mov.gpa differ diff --git a/GliderProData/ConvertedMovies/Grand Prix.mov.gpa b/GliderProData/ConvertedMovies/Grand Prix.mov.gpa new file mode 100644 index 0000000..09075fe Binary files /dev/null and b/GliderProData/ConvertedMovies/Grand Prix.mov.gpa differ diff --git a/GliderProData/ConvertedMovies/ImagineHouse PRO II.mov.gpa b/GliderProData/ConvertedMovies/ImagineHouse PRO II.mov.gpa new file mode 100644 index 0000000..02ece18 Binary files /dev/null and b/GliderProData/ConvertedMovies/ImagineHouse PRO II.mov.gpa differ diff --git a/GliderProData/ConvertedMovies/Land of Illusion.mov.gpa b/GliderProData/ConvertedMovies/Land of Illusion.mov.gpa new file mode 100644 index 0000000..388e534 Binary files /dev/null and b/GliderProData/ConvertedMovies/Land of Illusion.mov.gpa differ diff --git a/GliderProData/ConvertedMovies/Leviathan.mov.gpa b/GliderProData/ConvertedMovies/Leviathan.mov.gpa new file mode 100644 index 0000000..88a146c Binary files /dev/null and b/GliderProData/ConvertedMovies/Leviathan.mov.gpa differ diff --git a/GliderProData/ConvertedMovies/Nemo's Market.mov.gpa b/GliderProData/ConvertedMovies/Nemo's Market.mov.gpa new file mode 100644 index 0000000..4f52e2f Binary files /dev/null and b/GliderProData/ConvertedMovies/Nemo's Market.mov.gpa differ diff --git a/GliderProData/ConvertedMovies/Rainbow's End.mov.gpa b/GliderProData/ConvertedMovies/Rainbow's End.mov.gpa new file mode 100644 index 0000000..357694e Binary files /dev/null and b/GliderProData/ConvertedMovies/Rainbow's End.mov.gpa differ diff --git a/GliderProData/ConvertedMovies/Slumberland.mov.gpa b/GliderProData/ConvertedMovies/Slumberland.mov.gpa new file mode 100644 index 0000000..6f6d65b Binary files /dev/null and b/GliderProData/ConvertedMovies/Slumberland.mov.gpa differ diff --git a/GliderProData/ConvertedMovies/SpacePods.mov.gpa b/GliderProData/ConvertedMovies/SpacePods.mov.gpa new file mode 100644 index 0000000..a1f3591 Binary files /dev/null and b/GliderProData/ConvertedMovies/SpacePods.mov.gpa differ diff --git a/GliderProData/ConvertedMovies/Teddy World.mov.gpa b/GliderProData/ConvertedMovies/Teddy World.mov.gpa new file mode 100644 index 0000000..491e64d Binary files /dev/null and b/GliderProData/ConvertedMovies/Teddy World.mov.gpa differ diff --git a/GliderProData/ConvertedMovies/Titanic.mov.gpa b/GliderProData/ConvertedMovies/Titanic.mov.gpa new file mode 100644 index 0000000..68284d2 Binary files /dev/null and b/GliderProData/ConvertedMovies/Titanic.mov.gpa differ diff --git a/GliderProData/Houses/Art Museum.mov b/GliderProData/Houses/Art Museum.mov deleted file mode 100644 index a4bd4a8..0000000 Binary files a/GliderProData/Houses/Art Museum.mov and /dev/null differ diff --git a/GliderProData/Houses/CD Demo House.mov b/GliderProData/Houses/CD Demo House.mov deleted file mode 100644 index 8839406..0000000 Binary files a/GliderProData/Houses/CD Demo House.mov and /dev/null differ diff --git a/GliderProData/Houses/Castle o' the Air.mov b/GliderProData/Houses/Castle o' the Air.mov deleted file mode 100644 index 3bc49c5..0000000 Binary files a/GliderProData/Houses/Castle o' the Air.mov and /dev/null differ diff --git a/GliderProData/Houses/Davis Station.mov b/GliderProData/Houses/Davis Station.mov deleted file mode 100644 index 0fd4115..0000000 Binary files a/GliderProData/Houses/Davis Station.mov and /dev/null differ diff --git a/GliderProData/Houses/Demo House.mov b/GliderProData/Houses/Demo House.mov deleted file mode 100644 index e2fbd0e..0000000 Binary files a/GliderProData/Houses/Demo House.mov and /dev/null differ diff --git a/GliderProData/Houses/Grand Prix.mov b/GliderProData/Houses/Grand Prix.mov deleted file mode 100644 index 5fd19b1..0000000 Binary files a/GliderProData/Houses/Grand Prix.mov and /dev/null differ diff --git a/GliderProData/Houses/ImagineHouse PRO II.mov b/GliderProData/Houses/ImagineHouse PRO II.mov deleted file mode 100644 index 9ba10f6..0000000 Binary files a/GliderProData/Houses/ImagineHouse PRO II.mov and /dev/null differ diff --git a/GliderProData/Houses/Land of Illusion.mov b/GliderProData/Houses/Land of Illusion.mov deleted file mode 100644 index 7c35d47..0000000 Binary files a/GliderProData/Houses/Land of Illusion.mov and /dev/null differ diff --git a/GliderProData/Houses/Leviathan.mov b/GliderProData/Houses/Leviathan.mov deleted file mode 100644 index 3696a07..0000000 Binary files a/GliderProData/Houses/Leviathan.mov and /dev/null differ diff --git a/GliderProData/Houses/Nemo's Market.mov b/GliderProData/Houses/Nemo's Market.mov deleted file mode 100644 index 3885765..0000000 Binary files a/GliderProData/Houses/Nemo's Market.mov and /dev/null differ diff --git a/GliderProData/Houses/Rainbow's End.mov b/GliderProData/Houses/Rainbow's End.mov deleted file mode 100644 index 68db5b2..0000000 Binary files a/GliderProData/Houses/Rainbow's End.mov and /dev/null differ diff --git a/GliderProData/Houses/Slumberland.mov b/GliderProData/Houses/Slumberland.mov deleted file mode 100644 index 65f98f3..0000000 Binary files a/GliderProData/Houses/Slumberland.mov and /dev/null differ diff --git a/GliderProData/Houses/SpacePods.mov b/GliderProData/Houses/SpacePods.mov deleted file mode 100644 index e069d1b..0000000 Binary files a/GliderProData/Houses/SpacePods.mov and /dev/null differ diff --git a/GliderProData/Houses/Teddy World.mov b/GliderProData/Houses/Teddy World.mov deleted file mode 100644 index 238dd8a..0000000 Binary files a/GliderProData/Houses/Teddy World.mov and /dev/null differ diff --git a/GliderProData/Houses/Titanic.mov b/GliderProData/Houses/Titanic.mov deleted file mode 100644 index db4d283..0000000 Binary files a/GliderProData/Houses/Titanic.mov and /dev/null differ