Merge branch 'develop' of https://github.com/ZoneTool/zonetool into d…

…evelop

README.md

@@ -3,7 +3,6 @@
 ![stars](https://img.shields.io/github/stars/ZoneTool/zonetool.svg)
 ![GitHub forks](https://img.shields.io/github/forks/ZoneTool/zonetool)
 ![GitHub issues](https://img.shields.io/github/issues/ZoneTool/zonetool)
-[![discord](https://discordapp.com/api/guilds/290238678352134145/widget.png)](https://discord.gg/a6JM2Tv)
 <p align="center"><img src="plutonium_logo.jpg" alt="Plutonium"/>
 
 # zonetool
@@ -125,6 +124,9 @@ Special thanks to the following people:
 * homura
 * Sofika
 
+## Discord
+Join our discord server at https://discord.gg/a6JM2Tv or https://discord.gg/plutonium
+
 ## Donate
 If you like my work, feel free to contribute!
 

src/IW4/Assets/RawFile.cpp

@@ -122,7 +122,7 @@ namespace ZoneTool
 
 			if (fp)
 			{
-				if (asset->compressedLen)
+				if (asset->compressedLen > 0)
 				{
 					std::vector<std::uint8_t> uncompressed;
 					uncompressed.resize(asset->len);
@@ -132,6 +132,10 @@ namespace ZoneTool
 
 					fwrite(uncompressed.data(), uncompressed.size(), 1, fp);
 				}
+				else if (asset->len > 0)
+				{
+					fwrite(asset->buffer, asset->len, 1, fp);
+				}
 			}
 
 			FileSystem::FileClose(fp);

src/IW4/IW4.cpp

@@ -193,11 +193,12 @@ char**>(0x00799278)[type]);
 			auto fastfile = static_cast<std::string>((char*)(*(DWORD*)0x112A680 + 4));
 
 			// generate CSV for fastfile
+			static FILE* csvFile = nullptr;
+
 			if (isVerifying || isDumping)
 			{
 				FileSystem::SetFastFile(fastfile);
 
-				static FILE* csvFile;
 
 				// open csv file for dumping 
 				if (!csvFile)
@@ -247,6 +248,10 @@ char**>(0x00799278)[type]);
 					// clear referenced assets array because we are done dumping
 					referencedAssets.clear();
 
+					// clear csv file static variable for next dumps
+					FileSystem::FileClose(csvFile);
+					csvFile = nullptr;
+
 					// mark dumping as complete to exit the process if it has been started using the command line
 					if (currentDumpingZone == fastfile)
 					{

src/IW4/Zone.cpp

@@ -175,7 +175,8 @@ namespace ZoneTool
 
 			// write zone header
 			auto mem_ptr = buf->at<XZoneMemory<num_streams>>();
-			buf->write_stream(&mem, 4, target_ == zone_target::pc ? 10 : 8);			// write correct amount of streams, skip last 2 streams for console
+
+			buf->write_stream(&mem, 4, target_ == zone_target::pc ? 10 : target_ == zone_target::ps3 ? 9 : 8);			// write correct amount of streams, skip last 2 streams for console
 
 			std::uintptr_t pad = 0xFFFFFFFF;
 			std::uintptr_t zero = 0;
@@ -273,11 +274,11 @@ namespace ZoneTool
 			buf->pop_stream();
 
 			// update zone header
-			zone->size = buf->size() - header_size;
+			zone->size = buf->size() - (target_ == zone_target::pc ? 0x28 : target_ == zone_target::ps3 ? 0x24 : 0x20);
 			zone->externalsize = 0;
 
 			// Update stream data
-			for (int i = 0; i < (target_ != zone_target::pc ? 6 : 8); i++)
+			for (int i = 0; i < (target_ == zone_target::pc ? 8 : target_ == zone_target::ps3 ? 7 : 6); i++)
 			{
 				zone->streams[i] = buf->stream_offset(i);
 			}
@@ -296,11 +297,18 @@ namespace ZoneTool
 				}
 			}
 
+			if (this->get_target() == zone_target::ps3)
+			{
+				auto zoneSize = ((buf->size() + (0x10000 - 1)) & ~(0x10000 - 1));
+				std::vector<uint8_t> pad(zoneSize - buf->size(), 0);
+				buf->write(pad.data(), zoneSize - buf->size());
+			}
+
 			// Dump zone to disk (DEBUGGING PURPOSES)
 			buf->save("debug\\" + this->name_ + ".zone");
 
 			// Compress buffer
-			auto buf_compressed = buf->compress_zlib();
+			auto buf_compressed = buf->compress_zlib(this->get_target() == zone_target::ps3 ? true : false);
 
 			// Generate FF header
 			auto header = this->m_zonemem->Alloc<XFileHeader>();

src/IW5/Assets/RawFile.cpp

@@ -110,7 +110,7 @@ namespace ZoneTool
 
 			if (fp)
 			{
-				if (asset->compressedLen)
+				if (asset->compressedLen > 0)
 				{
 					std::vector<std::uint8_t> uncompressed;
 					uncompressed.resize(asset->len);
@@ -120,6 +120,10 @@ namespace ZoneTool
 
 					fwrite(uncompressed.data(), uncompressed.size(), 1, fp);
 				}
+				else if (asset->len > 0)
+				{
+					fwrite(asset->buffer, asset->len, 1, fp);
+				}
 			}
 
 			FileSystem::FileClose(fp);

src/IW5/Patches/AssetHandler.cpp

@@ -124,7 +124,7 @@ namespace ZoneTool
 			{
 				FileSystem::SetFastFile(fastfile);
 
-				static FILE* csvFile;
+				static FILE* csvFile = nullptr;
 
 				// open csv file for dumping 
 				if (!csvFile)
@@ -167,6 +167,7 @@ namespace ZoneTool
 
 					referencedAssets.clear();
 					FileSystem::FileClose(csvFile);
+					csvFile = nullptr;
 
 					is_dumping_complete = true;
 				}

src/ZoneTool/ZoneTool.cpp

@@ -238,7 +238,7 @@ namespace ZoneTool
 			{
 				if (row->fields_[0] == "localize"s && row->numOfFields_ >= 3)
 				{
-					ZONETOOL_INFO("Adding lcoalized string to zone...");
+					ZONETOOL_INFO("Adding localized string to zone...");
 
 					struct LocalizeStruct
 					{

src/ZoneUtils/Zone/ZoneBuffer.cpp

@@ -257,31 +257,86 @@ namespace ZoneTool
 		this->image_pak()->save(filename);
 	}
 
-	std::vector<std::uint8_t> ZoneBuffer::compress_zlib(const std::uint8_t* data, const std::size_t data_size)
+	std::vector<std::uint8_t> ZoneBuffer::compress_zlib(const std::uint8_t* data, const std::size_t data_size, bool compress_blocks)
 	{
 		auto compressBound = [](unsigned long sourceLen)
 		{
 			return static_cast<unsigned long>((ceil(sourceLen * 1.001)) + 12);
 		};
 
-		// calculate buffer size needed for current zone
-		auto size = compressBound(data_size);
+		if (compress_blocks == false)
+		{
+			// calculate buffer size needed for current zone
+			auto size = compressBound(data_size);
 
-		// alloc array for compressed data
-		std::vector<std::uint8_t> compressed;
-		compressed.resize(size);
+			// alloc array for compressed data
+			std::vector<std::uint8_t> compressed;
+			compressed.resize(size);
 
-		// compress buffer
-		auto status = compress2(compressed.data(), &size, data, data_size, ZLIB_BEST_COMPRESSION);
-		compressed.resize(size);
+			// compress buffer
+			auto status = compress2(compressed.data(), &size, data, data_size, ZLIB_BEST_COMPRESSION);
+			compressed.resize(size);
 
-		// return compressed buffer
-		return compressed;
+			// return compressed buffer
+			return compressed;
+		}
+		else
+		{
+			// data should be 0x10000 byte aligned
+			const auto block_size = 0x10000;
+			auto bound_size = compressBound(block_size);
+			auto num_blocks = data_size / block_size;
+
+			std::vector<std::vector<std::uint8_t>> blocks;
+			blocks.resize(num_blocks);
+
+			auto data_ptr = data;
+			for (auto& block : blocks)
+			{
+				// allocate for compressed data
+				block.resize(bound_size);
+
+				// compress block buffer
+				unsigned long size;
+				auto status = compress2(block.data(), &size, data_ptr, block_size, ZLIB_BEST_COMPRESSION);
+				if (size >= block_size)
+				{
+					// discard compressed data and just store uncompressed data
+					block.resize(block_size + 2);
+
+					// 0 block size is uncompressed
+					block[0] = 0;
+					block[1] = 0;
+					memcpy(block.data() + 2, data_ptr, block_size);
+				}
+				else
+				{
+					block.resize(size);
+
+					// overwrite zlib header with block size
+					size -= 2;
+					block[0] = (size & 0xff00) >> 8;
+					block[1] = size & 0xff;
+				}
+
+				// go to next block
+				data_ptr += block_size;
+			}
+
+			std::vector<uint8_t> compressed;
+			for (auto& block : blocks)
+			{
+				compressed.insert(compressed.end(), block.begin(), block.end());
+			}
+
+
+			return compressed;
+		}
 	}
 
-	std::vector<std::uint8_t> ZoneBuffer::compress_zlib(const std::vector<std::uint8_t>& data)
+	std::vector<std::uint8_t> ZoneBuffer::compress_zlib(const std::vector<std::uint8_t>& data, bool compress_blocks)
 	{
-		return ZoneBuffer::compress_zlib(data.data(), data.size());
+		return ZoneBuffer::compress_zlib(data.data(), data.size(), compress_blocks);
 	}
 
 	std::vector<std::uint8_t> ZoneBuffer::compress_zstd()
@@ -307,9 +362,9 @@ namespace ZoneTool
 		return compressed;
 	}
 
-	std::vector<std::uint8_t> ZoneBuffer::compress_zlib()
+	std::vector<std::uint8_t> ZoneBuffer::compress_zlib(bool compress_blocks)
 	{
-		return ZoneBuffer::compress_zlib(this->m_buf.data(), this->m_pos);
+		return ZoneBuffer::compress_zlib(this->m_buf.data(), this->m_pos, compress_blocks);
 	}
 
 	void GenerateKeys(XZoneKey* key)

src/ZoneUtils/Zone/ZoneBuffer.hpp

@@ -346,11 +346,11 @@ namespace ZoneTool
 		void save(const std::string& filename);
 		void save_image_pak(const std::string& filename);
 
-		static std::vector<std::uint8_t> compress_zlib(const std::uint8_t* data, const std::size_t size);
-		static std::vector<std::uint8_t> compress_zlib(const std::vector<std::uint8_t>& data);
+		static std::vector<std::uint8_t> compress_zlib(const std::uint8_t* data, const std::size_t size, bool compress_blocks = false);
+		static std::vector<std::uint8_t> compress_zlib(const std::vector<std::uint8_t>& data, bool compress_blocks = false);
 
 		std::vector<std::uint8_t> compress_zstd();
-		std::vector<std::uint8_t> compress_zlib();
+		std::vector<std::uint8_t> compress_zlib(bool compress_blocks = false);
 		void encrypt();
 	};
 }