games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Always use std::vector<uint8_t> to store binary map

Browse Source
This commit is contained in:
Ivan Savenko
2023-06-27 16:27:35 +03:00
parent 96eab03b16
commit 4a5c1556a1
5 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/campaign/CampaignHandler.cpp
View File

@@ -87,28 +87,23 @@ std::shared_ptr<CampaignState> CampaignHandler::getCampaign( const std::string &
readCampaign(ret.get(), files[0], resourceID.getName(), modName, encoding); readCampaign(ret.get(), files[0], resourceID.getName(), modName, encoding);
//first entry is campaign header. start loop from 1 //first entry is campaign header. start loop from 1
for(int scenarioID = 0, g = 1; g < files.size() && scenarioID < ret->numberOfScenarios; ++g) for(int scenarioIndex = 0, fileIndex = 1; fileIndex < files.size() && scenarioIndex < ret->numberOfScenarios; scenarioIndex++)
{ {
auto id = static_cast<CampaignScenarioID>(scenarioID); auto scenarioID = static_cast<CampaignScenarioID>(scenarioIndex);
while(!ret->scenarios[id].isNotVoid()) //skip void scenarios if(!ret->scenarios[scenarioID].isNotVoid()) //skip void scenarios
scenarioID++; continue;
std::string scenarioName = resourceID.getName(); std::string scenarioName = resourceID.getName();
boost::to_lower(scenarioName); boost::to_lower(scenarioName);
scenarioName += ':' + std::to_string(g - 1); scenarioName += ':' + std::to_string(fileIndex - 1);
//set map piece appropriately, convert vector to string //set map piece appropriately, convert vector to string
ret->mapPieces[id].assign(reinterpret_cast<const char*>(files[g].data()), files[g].size()); ret->mapPieces[scenarioID] = files[fileIndex];
CMapService mapService;
auto hdr = mapService.loadMapHeader( auto hdr = ret->getMapHeader(scenarioID);
reinterpret_cast<const ui8 *>(ret->mapPieces[id].c_str()), ret->scenarios[scenarioID].scenarioName = hdr->name;
static_cast<int>(ret->mapPieces[id].size()), fileIndex++;
scenarioName,
modName,
encoding);
ret->scenarios[id].scenarioName = hdr->name;
scenarioID++;
} }
return ret; return ret;
@@ -585,6 +580,7 @@ std::vector< std::vector<ui8> > CampaignHandler::getFile(std::unique_ptr<CInputS
std::vector<ui8> block(stream.getSize()); std::vector<ui8> block(stream.getSize());
stream.read(block.data(), block.size()); stream.read(block.data(), block.size());
ret.push_back(block); ret.push_back(block);
ret.back().shrink_to_fit();
} }
while (!headerOnly && stream.getNextBlock()); while (!headerOnly && stream.getNextBlock());

10
lib/campaign/CampaignState.cpp
View File

@@ -307,9 +307,8 @@ std::unique_ptr<CMap> CampaignState::getMap(CampaignScenarioID scenarioId) const
std::string scenarioName = filename.substr(0, filename.find('.')); std::string scenarioName = filename.substr(0, filename.find('.'));
boost::to_lower(scenarioName); boost::to_lower(scenarioName);
scenarioName += ':' + std::to_string(static_cast<int>(scenarioId)); scenarioName += ':' + std::to_string(static_cast<int>(scenarioId));
const std::string & mapContent = mapPieces.find(scenarioId)->second; const auto & mapContent = mapPieces.find(scenarioId)->second;
const auto * buffer = reinterpret_cast<const ui8 *>(mapContent.data()); return mapService.loadMap(mapContent.data(), mapContent.size(), scenarioName, modName, encoding);
return mapService.loadMap(buffer, static_cast<int>(mapContent.size()), scenarioName, modName, encoding);
} }
std::unique_ptr<CMapHeader> CampaignState::getMapHeader(CampaignScenarioID scenarioId) const std::unique_ptr<CMapHeader> CampaignState::getMapHeader(CampaignScenarioID scenarioId) const
@@ -321,9 +320,8 @@ std::unique_ptr<CMapHeader> CampaignState::getMapHeader(CampaignScenarioID scena
std::string scenarioName = filename.substr(0, filename.find('.')); std::string scenarioName = filename.substr(0, filename.find('.'));
boost::to_lower(scenarioName); boost::to_lower(scenarioName);
scenarioName += ':' + std::to_string(static_cast<int>(scenarioId)); scenarioName += ':' + std::to_string(static_cast<int>(scenarioId));
const std::string & mapContent = mapPieces.find(scenarioId)->second; const auto & mapContent = mapPieces.find(scenarioId)->second;
const auto * buffer = reinterpret_cast<const ui8 *>(mapContent.data()); return mapService.loadMapHeader(mapContent.data(), mapContent.size(), scenarioName, modName, encoding);
return mapService.loadMapHeader(buffer, static_cast<int>(mapContent.size()), scenarioName, modName, encoding);
} }
std::shared_ptr<CMapInfo> CampaignState::getMapInfo(CampaignScenarioID scenarioId) const std::shared_ptr<CMapInfo> CampaignState::getMapInfo(CampaignScenarioID scenarioId) const

2
lib/campaign/CampaignState.h
View File

@@ -230,7 +230,7 @@ class DLL_LINKAGE CampaignState : public Campaign
/// List of all maps completed by player, in order of their completion /// List of all maps completed by player, in order of their completion
std::vector<CampaignScenarioID> mapsConquered; std::vector<CampaignScenarioID> mapsConquered;
std::map<CampaignScenarioID, std::string > mapPieces; //binary h3ms, scenario number -> map data std::map<CampaignScenarioID, std::vector<uint8_t> > mapPieces; //binary h3ms, scenario number -> map data
std::map<CampaignScenarioID, ui8> chosenCampaignBonuses; std::map<CampaignScenarioID, ui8> chosenCampaignBonuses;
std::optional<CampaignScenarioID> currentMap; std::optional<CampaignScenarioID> currentMap;

6
lib/mapping/CMapService.cpp
View File

@@ -48,7 +48,7 @@ std::unique_ptr<CMapHeader> CMapService::loadMapHeader(const ResourceID & name)
return getMapLoader(stream, name.getName(), modName, encoding)->loadMapHeader(); return getMapLoader(stream, name.getName(), modName, encoding)->loadMapHeader();
} }
std::unique_ptr<CMap> CMapService::loadMap(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const std::unique_ptr<CMap> CMapService::loadMap(const uint8_t * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const
{ {
auto stream = getStreamFromMem(buffer, size); auto stream = getStreamFromMem(buffer, size);
std::unique_ptr<CMap> map(getMapLoader(stream, name, modName, encoding)->loadMap()); std::unique_ptr<CMap> map(getMapLoader(stream, name, modName, encoding)->loadMap());
@@ -61,7 +61,7 @@ std::unique_ptr<CMap> CMapService::loadMap(const ui8 * buffer, int size, const s
return map; return map;
} }
std::unique_ptr<CMapHeader> CMapService::loadMapHeader(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const std::unique_ptr<CMapHeader> CMapService::loadMapHeader(const uint8_t * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const
{ {
auto stream = getStreamFromMem(buffer, size); auto stream = getStreamFromMem(buffer, size);
std::unique_ptr<CMapHeader> header = getMapLoader(stream, name, modName, encoding)->loadMapHeader(); std::unique_ptr<CMapHeader> header = getMapLoader(stream, name, modName, encoding)->loadMapHeader();
@@ -111,7 +111,7 @@ std::unique_ptr<CInputStream> CMapService::getStreamFromFS(const ResourceID & na
return CResourceHandler::get()->load(name); return CResourceHandler::get()->load(name);
} }
std::unique_ptr<CInputStream> CMapService::getStreamFromMem(const ui8 * buffer, int size) std::unique_ptr<CInputStream> CMapService::getStreamFromMem(const uint8_t * buffer, int size)
{ {
return std::unique_ptr<CInputStream>(new CMemoryStream(buffer, size)); return std::unique_ptr<CInputStream>(new CMemoryStream(buffer, size));
} }

10
lib/mapping/CMapService.h
View File

@@ -56,7 +56,7 @@ public:
* @param name indicates name of file that will be used during map header patching * @param name indicates name of file that will be used during map header patching
* @return a unique ptr to the loaded map class * @return a unique ptr to the loaded map class
*/ */
virtual std::unique_ptr<CMap> loadMap(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const = 0; virtual std::unique_ptr<CMap> loadMap(const uint8_t * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const = 0;
/** /**
* Loads the VCMI/H3 map header from a buffer. This method is temporarily * Loads the VCMI/H3 map header from a buffer. This method is temporarily
@@ -65,7 +65,7 @@ public:
* @param name indicates name of file that will be used during map header patching * @param name indicates name of file that will be used during map header patching
* @return a unique ptr to the loaded map class * @return a unique ptr to the loaded map class
*/ */
virtual std::unique_ptr<CMapHeader> loadMapHeader(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const = 0; virtual std::unique_ptr<CMapHeader> loadMapHeader(const uint8_t * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const = 0;
/** /**
* Saves map into VCMI format with name specified * Saves map into VCMI format with name specified
@@ -83,8 +83,8 @@ public:
std::unique_ptr<CMap> loadMap(const ResourceID & name) const override; std::unique_ptr<CMap> loadMap(const ResourceID & name) const override;
std::unique_ptr<CMapHeader> loadMapHeader(const ResourceID & name) const override; std::unique_ptr<CMapHeader> loadMapHeader(const ResourceID & name) const override;
std::unique_ptr<CMap> loadMap(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const override; std::unique_ptr<CMap> loadMap(const uint8_t * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const override;
std::unique_ptr<CMapHeader> loadMapHeader(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const override; std::unique_ptr<CMapHeader> loadMapHeader(const uint8_t * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const override;
void saveMap(const std::unique_ptr<CMap> & map, boost::filesystem::path fullPath) const override; void saveMap(const std::unique_ptr<CMap> & map, boost::filesystem::path fullPath) const override;
/** /**
@@ -110,7 +110,7 @@ private:
* @param size the size of the buffer * @param size the size of the buffer
* @return a unique ptr to the input stream class * @return a unique ptr to the input stream class
*/ */
static std::unique_ptr<CInputStream> getStreamFromMem(const ui8 * buffer, int size); static std::unique_ptr<CInputStream> getStreamFromMem(const uint8_t * buffer, int size);
/** /**
* Gets a map loader from the given stream. It performs checks to test * Gets a map loader from the given stream. It performs checks to test