diff --git a/radiant/ui/colourscheme/ColourSchemeEditor.cpp b/radiant/ui/colourscheme/ColourSchemeEditor.cpp index 4ea5df9153..b7a0b711c1 100644 --- a/radiant/ui/colourscheme/ColourSchemeEditor.cpp +++ b/radiant/ui/colourscheme/ColourSchemeEditor.cpp @@ -135,7 +135,7 @@ void ColourSchemeEditor::selectActiveScheme() { // Find a row matching the active colour scheme name wxString name = GlobalColourSchemeManager().getActiveScheme().getName(); - unsigned r = 0; + int r = 0; for ( ; r < _schemeList->GetItemCount(); ++r) { wxString rowName = _schemeList->GetTextValue(r, 0); diff --git a/radiantcore/grid/GridManager.cpp b/radiantcore/grid/GridManager.cpp index e1cef7fd40..c1fa171f30 100644 --- a/radiantcore/grid/GridManager.cpp +++ b/radiantcore/grid/GridManager.cpp @@ -227,7 +227,7 @@ void GridManager::setGridSize(GridSize gridSize) float GridManager::getGridSize() const { - return pow(2.0f, static_cast(_activeGridSize)); + return pow(2.0f, static_cast(_activeGridSize)); } int GridManager::getGridPower() const diff --git a/radiantcore/map/format/primitiveparsers/BrushDef.cpp b/radiantcore/map/format/primitiveparsers/BrushDef.cpp index 717be50a16..fc25f41c6f 100644 --- a/radiantcore/map/format/primitiveparsers/BrushDef.cpp +++ b/radiantcore/map/format/primitiveparsers/BrushDef.cpp @@ -250,8 +250,8 @@ Matrix4 LegacyBrushDefParser::getTexDef(std::string shader, float shiftS, float TexturePtr texture = GlobalMaterialManager().getMaterial( shader )->getEditorImage(); if (texture) { - image_width = texture->getWidth(); - image_height = texture->getHeight(); + image_width = static_cast(texture->getWidth()); + image_height = static_cast(texture->getHeight()); } if (image_width == 0 || image_height == 0) {