From 12727b66eab7665e766f9ce0b1cc0b3a38caaca0 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Thu, 10 May 2018 07:44:08 +0300 Subject: [PATCH] [Server] Use consistent variable names in map tile script functions --- apps/openmw-mp/Script/Functions/Cells.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/openmw-mp/Script/Functions/Cells.cpp b/apps/openmw-mp/Script/Functions/Cells.cpp index acb61013b..6e3c5d239 100644 --- a/apps/openmw-mp/Script/Functions/Cells.cpp +++ b/apps/openmw-mp/Script/Functions/Cells.cpp @@ -113,9 +113,9 @@ void CellFunctions::SaveMapTileImageFile(unsigned short pid, unsigned int i, con const std::vector& imageData = player->mapChanges.mapTiles.at(i).imageData; - std::ofstream output_file(filePath, std::ios::binary); - std::ostream_iterator output_iterator(output_file); - std::copy(imageData.begin(), imageData.end(), output_iterator); + std::ofstream outputFile(filePath, std::ios::binary); + std::ostream_iterator outputIterator(outputFile); + std::copy(imageData.begin(), imageData.end(), outputIterator); } int CellFunctions::GetMapTileCellX(unsigned short pid, unsigned int i) noexcept @@ -169,8 +169,8 @@ void CellFunctions::LoadMapTileImageFile(unsigned short pid, int cellX, int cell mapTile.x = cellX; mapTile.y = cellY; - std::ifstream fin(filePath, std::ios::binary); - mapTile.imageData = std::vector(std::istreambuf_iterator(fin), std::istreambuf_iterator()); + std::ifstream inputFile(filePath, std::ios::binary); + mapTile.imageData = std::vector(std::istreambuf_iterator(inputFile), std::istreambuf_iterator()); player->mapChanges.mapTiles.push_back(mapTile); }