mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-11 06:40:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix shadowing warnings

Browse Source
This commit is contained in:
scrawl 2016-08-29 12:38:24 +02:00
parent a5da3a269e
commit 4322e76cb6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/fontloader/fontloader.cpp
View File

@ -58,7 +58,7 @@ namespace
} }
for (size_t j = 0; j < numbytes; ++j) for (size_t j = 0; j < numbytes; ++j)
{ {
unsigned char ch = utf8[i++]; ch = utf8[i++];
if (ch < 0x80 || ch > 0xBF) if (ch < 0x80 || ch > 0xBF)
throw std::logic_error("not a UTF-8 string"); throw std::logic_error("not a UTF-8 string");
unicode <<= 6; unicode <<= 6;
@ -374,7 +374,7 @@ namespace Gui
if (it->first != i) if (it->first != i)
continue; continue;
MyGUI::xml::ElementPtr code = codes->createChild("Code"); code = codes->createChild("Code");
code->addAttribute("index", it->second); code->addAttribute("index", it->second);
code->addAttribute("coord", MyGUI::utility::toString(x1) + " " code->addAttribute("coord", MyGUI::utility::toString(x1) + " "
+ MyGUI::utility::toString(y1) + " " + MyGUI::utility::toString(y1) + " "

2
components/interpreter/defines.cpp
View File

@ -172,7 +172,7 @@ namespace Interpreter{
for(unsigned int j = 0; j < globals.size(); j++){ for(unsigned int j = 0; j < globals.size(); j++){
if(globals[j].length() > temp.length()){ // Just in case there's a global with a huuuge name if(globals[j].length() > temp.length()){ // Just in case there's a global with a huuuge name
std::string temp = text.substr(i+1, globals[j].length()); temp = text.substr(i+1, globals[j].length());
transform(temp.begin(), temp.end(), temp.begin(), ::tolower); transform(temp.begin(), temp.end(), temp.begin(), ::tolower);
} }

4
components/terrain/buffercache.cpp
View File

@ -124,7 +124,7 @@ osg::ref_ptr<IndexArrayType> createIndexBuffer(unsigned int flags, unsigned int
// West // West
size_t col = 0; size_t col = 0;
outerStep = size_t(1) << (lodDeltas[Terrain::West] + lodLevel); outerStep = size_t(1) << (lodDeltas[Terrain::West] + lodLevel);
for (size_t row = 0; row < verts-1; row += outerStep) for (row = 0; row < verts-1; row += outerStep)
{ {
indices->push_back(verts*col+row+outerStep); indices->push_back(verts*col+row+outerStep);
indices->push_back(verts*col+row); indices->push_back(verts*col+row);
@ -148,7 +148,7 @@ osg::ref_ptr<IndexArrayType> createIndexBuffer(unsigned int flags, unsigned int
// East // East
col = verts-1; col = verts-1;
outerStep = size_t(1) << (lodDeltas[Terrain::East] + lodLevel); outerStep = size_t(1) << (lodDeltas[Terrain::East] + lodLevel);
for (size_t row = 0; row < verts-1; row += outerStep) for (row = 0; row < verts-1; row += outerStep)
{ {
indices->push_back(verts*col+row); indices->push_back(verts*col+row);
indices->push_back(verts*col+row+outerStep); indices->push_back(verts*col+row+outerStep);