diff --git a/plugins/dm.conversation/ConversationDialog.cpp b/plugins/dm.conversation/ConversationDialog.cpp index 71dfe575ff..a1f3000845 100644 --- a/plugins/dm.conversation/ConversationDialog.cpp +++ b/plugins/dm.conversation/ConversationDialog.cpp @@ -46,7 +46,7 @@ ConversationDialog::ConversationDialog() : void ConversationDialog::populateWindow() { - wxPanel* mainPanel = loadNamedPanel(this, "ConvDialogMainPanel"); + loadNamedPanel(this, "ConvDialogMainPanel"); wxPanel* entityPanel = findNamedObject(this, "ConvDialogEntityPanel"); diff --git a/plugins/dm.stimresponse/EffectEditor.cpp b/plugins/dm.stimresponse/EffectEditor.cpp index 340dbf02b7..15b3b25b49 100644 --- a/plugins/dm.stimresponse/EffectEditor.cpp +++ b/plugins/dm.stimresponse/EffectEditor.cpp @@ -167,7 +167,7 @@ void EffectEditor::createArgumentWidgets(ResponseEffect& effect) for (ResponseEffect::ArgumentList::iterator i = list.begin(); i != list.end(); ++i) { - int index = i->first; + //int index = i->first; ResponseEffect::Argument& arg = i->second; ArgumentItemPtr item; diff --git a/plugins/fonts/GlyphSet.cpp b/plugins/fonts/GlyphSet.cpp index 52a5724c2b..1f5417955e 100644 --- a/plugins/fonts/GlyphSet.cpp +++ b/plugins/fonts/GlyphSet.cpp @@ -68,7 +68,7 @@ GlyphSetPtr GlyphSet::createFromDatFile(const std::string& vfsPath, q3font::Q3FontInfoPtr buf(new q3font::Q3FontInfo); InputStream& stream = file->getInputStream(); - StreamBase::size_type bytesRead = stream.read( + stream.read( reinterpret_cast(buf.get()), sizeof(q3font::Q3FontInfo) ); diff --git a/plugins/mapdoom3/aas/Doom3AasFile.cpp b/plugins/mapdoom3/aas/Doom3AasFile.cpp index 1758955bce..5e7d4b007d 100644 --- a/plugins/mapdoom3/aas/Doom3AasFile.cpp +++ b/plugins/mapdoom3/aas/Doom3AasFile.cpp @@ -244,7 +244,7 @@ void Doom3AasFile::parseFromTokens(parser::DefTokeniser& tok) tok.assertNextToken(")"); // Skip over reachabilities for the moment being - std::size_t reachCount = string::convert(tok.nextToken()); + /*std::size_t reachCount = */string::convert(tok.nextToken()); tok.assertNextToken("{"); while (tok.nextToken() != "}") diff --git a/plugins/mapdoom3/compiler/OptIsland.cpp b/plugins/mapdoom3/compiler/OptIsland.cpp index 680488a7d0..3a7b11d911 100644 --- a/plugins/mapdoom3/compiler/OptIsland.cpp +++ b/plugins/mapdoom3/compiler/OptIsland.cpp @@ -677,7 +677,7 @@ void OptIsland::removeIfColinear(OptVertex* ov) // see if they are colinear Vector3 dir1 = v3->v.vertex - v1->v.vertex; - float len = dir1.normalise(); + dir1.normalise(); Vector3 dir2 = v2->v.vertex - v1->v.vertex; diff --git a/plugins/mapdoom3/compiler/ProcCompiler.cpp b/plugins/mapdoom3/compiler/ProcCompiler.cpp index 08c9a7ac52..2b1dc720a1 100644 --- a/plugins/mapdoom3/compiler/ProcCompiler.cpp +++ b/plugins/mapdoom3/compiler/ProcCompiler.cpp @@ -326,8 +326,6 @@ class ToolPrimitiveGenerator : _buildBrush.contentShader = firstSide.material; - bool mixed = false; - // a brush is only opaque if all sides are opaque _buildBrush.opaque = true; @@ -344,7 +342,6 @@ class ToolPrimitiveGenerator : if (flags != contents) { - mixed = true; contents |= flags; } @@ -4503,7 +4500,7 @@ Surface ProcCompiler::createShadowVolume(const Matrix4& transform, const Surface bool overflowed = false; _indexFrustumNumber = 0; int capPlaneBits = 0; - bool callOptimizer = (optimize == SG_OFFLINE); + //bool callOptimizer = (optimize == SG_OFFLINE); // the facing information will be the same for all six projections // from a point light, as well as for any directed lights diff --git a/plugins/mapdoom3/compiler/ProcPatch.cpp b/plugins/mapdoom3/compiler/ProcPatch.cpp index 26cd33eb0a..bb017e0aae 100644 --- a/plugins/mapdoom3/compiler/ProcPatch.cpp +++ b/plugins/mapdoom3/compiler/ProcPatch.cpp @@ -656,7 +656,6 @@ void ProcPatch::generateNormals() { for (int j = 0; j < _height; ++j) { - std::size_t count = 0; const Vector3& base = _vertices[j * _width + i].vertex; for (std::size_t k = 0; k < 8; ++k) @@ -730,13 +729,6 @@ void ProcPatch::generateNormals() } sum += norm; - count++; - } - - if (count == 0) - { - //idLib::common->Printf("bad normal\n"); - count = 1; } _vertices[j * _width + i].normal = sum; diff --git a/plugins/sound/WavFileLoader.h b/plugins/sound/WavFileLoader.h index a44b8cedcd..06a666ed6d 100644 --- a/plugins/sound/WavFileLoader.h +++ b/plugins/sound/WavFileLoader.h @@ -87,36 +87,36 @@ class WavFileLoader unsigned short bps = 0; stream.read(reinterpret_cast(&bps), 2); - int bufferSize = 0; + //int bufferSize = 0; if (channels == 1) { if (bps == 8) { format = AL_FORMAT_MONO8; // Set BufferSize to 250ms (Frequency divided by 4 (quarter of a second)) - bufferSize = freq / 4; + //bufferSize = freq / 4; } else { format = AL_FORMAT_MONO16; // Set BufferSize to 250ms (Frequency * 2 (16bit) divided by 4 (quarter of a second)) - bufferSize = freq >> 1; + //bufferSize = freq >> 1; // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ... - bufferSize -= (bufferSize % 2); + //bufferSize -= (bufferSize % 2); } } else { if (bps == 8) { format = AL_FORMAT_STEREO16; // Set BufferSize to 250ms (Frequency * 2 (8bit stereo) divided by 4 (quarter of a second)) - bufferSize = freq >> 1; + //bufferSize = freq >> 1; // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ... - bufferSize -= (bufferSize % 2); + //bufferSize -= (bufferSize % 2); } else { format = AL_FORMAT_STEREO16; // Set BufferSize to 250ms (Frequency * 4 (16bit stereo) divided by 4 (quarter of a second)) - bufferSize = freq; + //bufferSize = freq; // IMPORTANT : The Buffer Size must be an exact multiple of the BlockAlignment ... - bufferSize -= (bufferSize % 4); + //bufferSize -= (bufferSize % 4); } } diff --git a/plugins/uimanager/MenuManager.cpp b/plugins/uimanager/MenuManager.cpp index 7bb34f024f..524cd57abe 100644 --- a/plugins/uimanager/MenuManager.cpp +++ b/plugins/uimanager/MenuManager.cpp @@ -378,7 +378,7 @@ void MenuManager::remove(const std::string& path) else if (parent->getType() == menuBar) { wxMenuBar* parentBar = static_cast(parent->getWidget()); - wxMenu* menu = static_cast(item->getWidget()); + static_cast(item->getWidget()); int oldPosition = parent->getMenuPosition(item); @@ -388,7 +388,7 @@ void MenuManager::remove(const std::string& path) item->removeAllChildren(); item->setWidget(NULL); - menu = parentBar->Remove(oldPosition); + wxMenu* menu = parentBar->Remove(oldPosition); delete menu; } else diff --git a/radiant/patch/PatchTesselation.cpp b/radiant/patch/PatchTesselation.cpp index dbaed8e4b4..8c06998335 100644 --- a/radiant/patch/PatchTesselation.cpp +++ b/radiant/patch/PatchTesselation.cpp @@ -112,7 +112,6 @@ void PatchTesselation::generateNormals() { for (std::size_t j = 0; j < height; j++) { - int count = 0; Vector3 base = vertices[j * width + i].vertex; for (std::size_t k = 0; k < 8; k++) @@ -185,12 +184,6 @@ void PatchTesselation::generateNormals() } sum += tempNormal; - count++; - } - - if (count == 0) - { - count = 1; } vertices[j * width + i].normal = sum;