From f71c8f59f2c16747ae91dac142a679fec9690893 Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Fri, 9 Dec 2011 15:53:56 +0000 Subject: A few things that MSVC's analyzer found --- nGenEx/MachineInfo.cpp | 2 +- nGenEx/Slider.cpp | 2 +- nGenEx/Solid.cpp | 36 +++++++++++++++++------------------- nGenEx/Sound.cpp | 2 +- nGenEx/SoundD3D.cpp | 4 ++-- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/nGenEx/MachineInfo.cpp b/nGenEx/MachineInfo.cpp index b281c36..c57bd56 100644 --- a/nGenEx/MachineInfo.cpp +++ b/nGenEx/MachineInfo.cpp @@ -625,7 +625,7 @@ static void DescribeDriversNT(const char* sType) HKEY hkWin; char sVideo[256] = ""; char sDriver[256] = ""; - DWORD dwSize; + DWORD dwSize = NULL; // find the pointer to the video driver: if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, diff --git a/nGenEx/Slider.cpp b/nGenEx/Slider.cpp index fc5d454..cc8f95c 100644 --- a/nGenEx/Slider.cpp +++ b/nGenEx/Slider.cpp @@ -223,7 +223,7 @@ Slider::Draw() } else { if (nvalues < 2) { - int led_width = w - 4; + led_width = w - 4; int led_height = (int) ((double)(h-4) * FractionalValue()); Color fc = ShadeColor(fill_color, 1); diff --git a/nGenEx/Solid.cpp b/nGenEx/Solid.cpp index d059957..a0306c7 100644 --- a/nGenEx/Solid.cpp +++ b/nGenEx/Solid.cpp @@ -1046,7 +1046,7 @@ Model::LoadMag5(BYTE* block, int len, double scale) // read texture list: for (int i = 0; i < ntex; i++) { - Material* mtl = new(__FILE__,__LINE__) Material; + mtl = new(__FILE__,__LINE__) Material; char tname[32]; if (mtl) { @@ -1177,7 +1177,7 @@ Model::LoadMag5(BYTE* block, int len, double scale) // luminous if (dummy_flags & 2) { - Material* mtl = materials[mtl_num]; + mtl = materials[mtl_num]; mtl->Ka = ColorValue(0,0,0,0); mtl->Kd = ColorValue(0,0,0,0); @@ -1218,7 +1218,7 @@ Model::LoadMag5(BYTE* block, int len, double scale) poly.nverts = poly_nverts; for (int vi = 0; vi < poly_nverts; vi++) { - int v = vert_index_buffer[vi]; + v = vert_index_buffer[vi]; if (vset->rw[v] > 0) { vset->CopyVertex(next_vert, v); @@ -1231,13 +1231,13 @@ Model::LoadMag5(BYTE* block, int len, double scale) loader->fread(texture_index_buffer, sizeof(float), poly_nverts, fp); // tu's for (int vi = 0; vi < poly_nverts; vi++) { - int v = poly.verts[vi]; + v = poly.verts[vi]; vset->tu[v] = texture_index_buffer[vi]; } loader->fread(texture_index_buffer, sizeof(float), poly_nverts, fp); // tv's for (int vi = 0; vi < poly_nverts; vi++) { - int v = poly.verts[vi]; + v = poly.verts[vi]; vset->tv[v] = texture_index_buffer[vi]; } @@ -1253,10 +1253,10 @@ Model::LoadMag5(BYTE* block, int len, double scale) // hack: retrieve flat shaded flag from unused visible byte if (poly.visible) { - int poly_nverts = poly.nverts; + poly_nverts = poly.nverts; for (int vi = 0; vi < poly_nverts; vi++) { - int v = poly.verts[vi]; + v = poly.verts[vi]; vset->nrm[v] = poly.plane.normal; } } @@ -1333,7 +1333,6 @@ Model::LoadMag6(BYTE* block, int len, double scale) DataLoader* loader = DataLoader::GetLoader(); BYTE* fp = block + 4; - int i = 0; int ntex = 0; int nmtls = 0; int nsurfs = 0; @@ -1361,7 +1360,7 @@ Model::LoadMag6(BYTE* block, int len, double scale) delete [] buffer; } - for (i = 0; i < nmtls; i++) { + for (int i = 0; i < nmtls; i++) { MaterialMag6 m6; Material* mtl = new(__FILE__,__LINE__) Material; @@ -1408,7 +1407,7 @@ Model::LoadMag6(BYTE* block, int len, double scale) } } - for (i = 0; i < nsurfs; i++) { + for (int i = 0; i < nsurfs; i++) { int nverts = 0; int npolys = 0; BYTE namelen = 0; @@ -1769,10 +1768,10 @@ Model::DeletePrivateData() ListIter seg_iter = s->GetSegments(); while (++seg_iter) { Segment* segment = seg_iter.value(); - VideoPrivateData* vpd = segment->video_data; + VideoPrivateData* vpdp = segment->video_data; - if (vpd) { - delete vpd; + if (vpdp) { + delete vpdp; segment->video_data = 0; } } @@ -2078,7 +2077,6 @@ Surface::OptimizeMesh() if (!vertex_set || vertex_set->nverts < 3) return; - int i, j, n, v; int nverts = vertex_set->nverts; int used = 0; int final = 0; @@ -2091,10 +2089,10 @@ Surface::OptimizeMesh() ZeroMemory(vert_dst, nverts * sizeof(WORD)); // count used verts: - for (i = 0; i < npolys; i++) { + for (int i = 0; i < npolys; i++) { Poly* p = polys + i; - for (j = 0; j < p->nverts; j++) { + for (int j = 0; j < p->nverts; j++) { WORD vert = p->verts[j]; if (vert < nverts) { @@ -2109,7 +2107,7 @@ Surface::OptimizeMesh() v = 0; // compress verts: - for (i = 0; i < nverts; i++) { + for (int i = 0; i < nverts; i++) { if (vert_map[i] == 0) continue; vert_dst[i] = v; @@ -2137,10 +2135,10 @@ Surface::OptimizeMesh() final = v; // remap polys: - for (n = 0; n < npolys; n++) { + for (int n = 0; n < npolys; n++) { Poly* p = polys + n; p->vertex_set = vset; - for (v = 0; v < p->nverts; v++) { + for (int v = 0; v < p->nverts; v++) { p->verts[v] = vert_dst[ p->verts[v] ]; } } diff --git a/nGenEx/Sound.cpp b/nGenEx/Sound.cpp index b8e502a..ee19a50 100644 --- a/nGenEx/Sound.cpp +++ b/nGenEx/Sound.cpp @@ -136,7 +136,7 @@ Sound::CreateStream(const char* filename) } } - delete buf; + delete[] buf; return sound; } diff --git a/nGenEx/SoundD3D.cpp b/nGenEx/SoundD3D.cpp index 45c5c0d..162295d 100644 --- a/nGenEx/SoundD3D.cpp +++ b/nGenEx/SoundD3D.cpp @@ -727,14 +727,14 @@ SoundD3D::Localize() HRESULT hr = buffer->SetPan((LONG) pan); if (!SUCCEEDED(hr)) { char warn[512]; - sprintf_s(warn, "Warning could not set pan on buffer to %d", pan); + sprintf_s(warn, "Warning could not set pan on buffer to %f", pan); SoundD3DError(warn, hr); } hr = buffer->SetVolume((LONG) vol); if (!SUCCEEDED(hr)) { char warn[512]; - sprintf_s(warn, "Warning: could not set volume on buffer to %d", vol); + sprintf_s(warn, "Warning: could not set volume on buffer to %f", vol); SoundD3DError(warn, hr); } -- cgit v1.1