Merge pull request #172 from Xottab-DUTY/pvs-fixes

CrossVR · web-flow · commit 8589126e6047 · 2017-03-13T17:44:57.000+01:00
Stretched skyboxes and PVS-Studio bugfixes
diff --git a/src/Layers/xrRender/dxEnvironmentRender.cpp b/src/Layers/xrRender/dxEnvironmentRender.cpp
@@ -8,15 +8,18 @@
 //////////////////////////////////////////////////////////////////////////
 // half box def
 static Fvector3 hbox_verts[24] = {
-    {-1.f, -1.f, -1.f}, {-1.f, -1.01f, -1.f}, // down
-    {1.f, -1.f, -1.f}, {1.f, -1.01f, -1.f}, // down
-    {-1.f, -1.f, 1.f}, {-1.f, -1.01f, 1.f}, // down
-    {1.f, -1.f, 1.f}, {1.f, -1.01f, 1.f}, // down
-    {-1.f, 2.f, -1.f}, {-1.f, 1.f, -1.f}, {1.f, 2.f, -1.f}, {1.f, 1.f, -1.f}, {-1.f, 2.f, 1.f}, {-1.f, 1.f, 1.f},
-    {1.f, 2.f, 1.f}, {1.f, 1.f, 1.f}, {-1.f, 0.f, -1.f}, {-1.f, -1.f, -1.f}, // half
-    {1.f, 0.f, -1.f}, {1.f, -1.f, -1.f}, // half
-    {1.f, 0.f, 1.f}, {1.f, -1.f, 1.f}, // half
-    {-1.f, 0.f, 1.f}, {-1.f, -1.f, 1.f} // half
+    {-1.f, -1.f, -1.f }, {-1.f, -1.01f, -1.f},  // down
+    {1.f, -1.f, -1.f }, {1.f, -1.01f, -1.f},    // down
+    {-1.f, -1.f, 1.f},{-1.f, -1.01f, 1.f},      // down
+    {1.f, -1.f, 1.f},{1.f, -1.01f, 1.f},        // down
+    {-1.f, 1.f, -1.f}, {-1.f, 1.f, -1.f},
+    {1.f, 1.f, -1.f}, {1.f, 1.f, -1.f},
+    {-1.f, 1.f, 1.f}, {-1.f, 1.f, 1.f},
+    {1.f, 1.f, 1.f }, { 1.f, 1.f, 1.f},
+    {-1.f, 0.f, -1.f}, {-1.f, -1.f, -1.f},  // half
+    {1.f, 0.f, -1.f}, {1.f, -1.f, -1.f},    // half
+    {1.f, 0.f, 1.f}, {1.f, -1.f, 1.f},      // half
+    {-1.f, 0.f, 1.f}, {-1.f, -1.f, 1.f}     // half
 };
 static u16 hbox_faces[20 * 3] = {0, 2, 3, 3, 1, 0, 4, 5, 7, 7, 6, 4, 0, 1, 9, 9, 8, 0, 8, 9, 5, 5, 4, 8, 1, 3, 10, 10,
     9, 1, 9, 10, 7, 7, 5, 9, 3, 2, 11, 11, 10, 3, 10, 11, 6, 6, 7, 10, 2, 0, 8, 8, 11, 2, 11, 8, 4, 4, 6, 11};
diff --git a/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp b/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp
@@ -26,7 +26,7 @@ CRenderTarget::CRenderTarget()
     param_color_map_influence = 0.0f;
     param_color_map_interpolate = 0.0f;
 
-    im_noise_time = 1 / 100;
+    im_noise_time = 1 / 100.0f;
     im_noise_shift_w = 0;
     im_noise_shift_h = 0;
 
diff --git a/src/Layers/xrRenderPC_R2/r2_rendertarget.cpp b/src/Layers/xrRenderPC_R2/r2_rendertarget.cpp
@@ -195,7 +195,7 @@ CRenderTarget::CRenderTarget()
     param_noise_fps = 25.f;
     param_noise_scale = 1.f;
 
-    im_noise_time = 1 / 100;
+    im_noise_time = 1 / 100.0f;
     im_noise_shift_w = 0;
     im_noise_shift_h = 0;
 
diff --git a/src/Layers/xrRenderPC_R3/r3_rendertarget.cpp b/src/Layers/xrRenderPC_R3/r3_rendertarget.cpp
@@ -291,7 +291,7 @@ CRenderTarget::CRenderTarget()
     param_noise_fps = 25.f;
     param_noise_scale = 1.f;
 
-    im_noise_time = 1 / 100;
+    im_noise_time = 1 / 100.0f;
     im_noise_shift_w = 0;
     im_noise_shift_h = 0;
 
diff --git a/src/Layers/xrRenderPC_R4/r4_rendertarget.cpp b/src/Layers/xrRenderPC_R4/r4_rendertarget.cpp
@@ -293,7 +293,7 @@ CRenderTarget::CRenderTarget()
     param_noise_fps = 25.f;
     param_noise_scale = 1.f;
 
-    im_noise_time = 1 / 100;
+    im_noise_time = 1 / 100.0f;
     im_noise_shift_w = 0;
     im_noise_shift_h = 0;
 
diff --git a/src/utils/LWO/lwio.c b/src/utils/LWO/lwio.c
@@ -335,7 +335,7 @@ int sgetI1(unsigned char** bp)
     if (i > 127)
         i -= 256;
     flen += 1;
-    *bp++;
+    (*bp)++;
     return i;
 }
 
@@ -373,7 +373,7 @@ unsigned char sgetU1(unsigned char** bp)
         return 0;
     c = **bp;
     flen += 1;
-    *bp++;
+    (*bp)++;
     return c;
 }
 
diff --git a/src/utils/LWO/lwob.c b/src/utils/LWO/lwob.c
@@ -79,7 +79,7 @@ static int add_clip(char* s, lwClip** clist, int* nclips)
         clip->source.still.name = s;
     }
 
-    *nclips++;
+    (*nclips)++;
     clip->index = *nclips;
 
     lwListAdd(clist, clip);
diff --git a/src/utils/xrDXT/NVI_Image.cpp b/src/utils/xrDXT/NVI_Image.cpp
@@ -151,10 +151,10 @@ void NVI_Image::ABGR8_To_ARGB8()
     {
         DWORD col;
         GetPixel_ARGB8(&col, i);
-        DWORD a = (col >> 24) && 0x000000FF;
-        DWORD b = (col >> 16) && 0x000000FF;
-        DWORD g = (col >> 8) && 0x000000FF;
-        DWORD r = (col >> 0) && 0x000000FF;
+        DWORD a = (col >> 24) & 0x000000FF;
+        DWORD b = (col >> 16) & 0x000000FF;
+        DWORD g = (col >> 8) & 0x000000FF;
+        DWORD r = (col >> 0) & 0x000000FF;
         col = (a << 24) | (r << 16) | (g << 8) | b;
         SetPixel_ARGB8(i, col);
     }
diff --git a/src/utils/xrDXT/dds/tPixel.h b/src/utils/xrDXT/dds/tPixel.h
@@ -952,7 +952,7 @@ class RGBAMipMappedCubeMap
     const RGBAMipMappedImage& operator[](size_t i) const { return cubeFaces[i]; }
     size_t numMIPMaps() const { return cubeFaces[0].numMIPMaps(); }
     size_t height() const { return cubeFaces[0].height(); }
-    size_t width() const { return cubeFaces[0].height(); }
+    size_t width() const { return cubeFaces[0].width(); }
     void clear()
     {
         for (size_t f = 0; f < 6; f++)
@@ -1140,7 +1140,7 @@ class fpMipMappedCubeMap
     const fpMipMappedImage& operator[](size_t i) const { return cubeFaces[i]; }
     size_t numMIPMaps() const { return cubeFaces[0].numMIPMaps(); }
     size_t height() const { return cubeFaces[0].height(); }
-    size_t width() const { return cubeFaces[0].height(); }
+    size_t width() const { return cubeFaces[0].width(); }
     void clear()
     {
         for (size_t f = 0; f < 6; f++)
diff --git a/src/utils/xrQSlim/src/MxQMetric.cpp b/src/utils/xrQSlim/src/MxQMetric.cpp
@@ -81,7 +81,7 @@ MxMatrix& MxQuadric::homogeneous(MxMatrix& H) const
     unsigned int i, j;
 
     for (i = 0; i < A.dim(); i++)
-        for (j = 0; j < A.dim(); i++)
+        for (j = 0; j < A.dim(); j++)
             H(i, j) = A(i, j);
 
     for (i = 0; i < b.dim(); i++)
diff --git a/src/xrCore/_matrix33.h b/src/xrCore/_matrix33.h
@@ -377,6 +377,7 @@ struct _matrix33
         R.x = s1 * (m[0][0] * V1.x + m[1][0] * V1.y + m[2][0] * V1.z);
         R.y = s1 * (m[0][1] * V1.x + m[1][1] * V1.y + m[2][1] * V1.z);
         R.z = s1 * (m[0][2] * V1.x + m[1][2] * V1.y + m[2][2] * V1.z);
+        return *this;
     }
     IC SelfRef MxV(Tvector& R, const Tvector& V1) const
     {
diff --git a/src/xrCore/xrDebug.cpp b/src/xrCore/xrDebug.cpp
@@ -97,7 +97,7 @@ size_t xrDebug::BuildStackTrace(char* buffer, size_t capacity, size_t lineCapaci
 
 size_t xrDebug::BuildStackTrace(EXCEPTION_POINTERS* exPtrs, char* buffer, size_t capacity, size_t lineCapacity)
 {
-    memset(buffer, capacity * lineCapacity, 0);
+    memset(buffer, 0, capacity*lineCapacity);
     auto flags = GSTSO_MODULE | GSTSO_SYMBOL | GSTSO_SRCLINE;
     auto traceDump = GetFirstStackTraceString(flags, exPtrs);
     int frameCount = 0;
diff --git a/src/xrGame/Actor_Network.cpp b/src/xrGame/Actor_Network.cpp
@@ -685,7 +685,7 @@ BOOL CActor::net_Spawn(CSE_Abstract* DC)
     inventory().SetPrevActiveSlot(NO_ACTIVE_SLOT);
 
     //-------------------------------------
-    m_States.empty();
+    m_States.clear(); // Xottab_DUTY: check if replace is correct
     //-------------------------------------
     if (!g_Alive())
     {
diff --git a/src/xrGame/BoneProtections.cpp b/src/xrGame/BoneProtections.cpp
@@ -51,7 +51,7 @@ void SBoneProtections::reload(const shared_str& bone_sect, IKinematics* kinemati
 
         BP.koeff = (float)atof(_GetItem(i->second.c_str(), 0, buffer));
         BP.armor = (float)atof(_GetItem(i->second.c_str(), 1, buffer));
-        BP.BonePassBullet = (BOOL)(atoi(_GetItem(i->second.c_str(), 2, buffer)) > 0.5f);
+        BP.BonePassBullet = (BOOL)(atof(_GetItem(i->second.c_str(), 2, buffer)) > 0.5f);
 
         if (!xr_strcmp(i->first.c_str(), "default"))
         {
diff --git a/src/xrGame/HudItem.cpp b/src/xrGame/HudItem.cpp
@@ -299,7 +299,7 @@ BOOL CHudItem::GetHUDmode()
     if (object().H_Parent())
     {
         CActor* A = smart_cast<CActor*>(object().H_Parent());
-        return (A && A->HUDview() && HudItemData() && HudItemData());
+        return (A && A->HUDview() && HudItemData());
     }
     else
         return FALSE;
diff --git a/src/xrGame/ai/monsters/basemonster/base_monster_startup.cpp b/src/xrGame/ai/monsters/basemonster/base_monster_startup.cpp
@@ -449,10 +449,10 @@ void CBaseMonster::settings_read(CInifile const* ini, LPCSTR section, SMonsterSe
         if (ini->line_exist(ppi_section, "color_base"))
             sscanf(ini->r_string(ppi_section, "color_base"), "%f,%f,%f", &data.m_attack_effector.ppi.color_base.r,
                 &data.m_attack_effector.ppi.color_base.g, &data.m_attack_effector.ppi.color_base.b);
-        if (ini->line_exist(ppi_section, "color_base"))
+        if (ini->line_exist(ppi_section, "color_gray"))
             sscanf(ini->r_string(ppi_section, "color_gray"), "%f,%f,%f", &data.m_attack_effector.ppi.color_gray.r,
                 &data.m_attack_effector.ppi.color_gray.g, &data.m_attack_effector.ppi.color_gray.b);
-        if (ini->line_exist(ppi_section, "color_base"))
+        if (ini->line_exist(ppi_section, "color_add"))
             sscanf(ini->r_string(ppi_section, "color_add"), "%f,%f,%f", &data.m_attack_effector.ppi.color_add.r,
                 &data.m_attack_effector.ppi.color_add.g, &data.m_attack_effector.ppi.color_add.b);
 
diff --git a/src/xrGame/ai/monsters/rats/ai_rat.cpp b/src/xrGame/ai/monsters/rats/ai_rat.cpp
@@ -487,7 +487,7 @@ void CAI_Rat::UpdateCL()
         CMonsterSquad* squad = monster_squad().get_squad(this);
 
         if (squad &&
-            ((squad->GetLeader() != this && !squad->GetLeader()->g_Alive()) || squad->get_index(this) == u32(-1)))
+            ((squad->GetLeader() != this && !squad->GetLeader()->g_Alive()) || squad->get_index(this) == u8(-1)))
             squad->SetLeader(this);
 
         if (squad && squad->SquadActive() && squad->GetLeader() == this && m_squad_count != squad->squad_alife_count())
diff --git a/src/xrGame/relation_registry.cpp b/src/xrGame/relation_registry.cpp
@@ -47,7 +47,6 @@ RELATION_REGISTRY::RELATION_MAP_SPOTS::RELATION_MAP_SPOTS()
     spot_names[ALife::eRelationTypeNeutral] = "neutral_location";
     spot_names[ALife::eRelationTypeEnemy] = "enemy_location";
     spot_names[ALife::eRelationTypeWorstEnemy] = "enemy_location";
-    spot_names[ALife::eRelationTypeWorstEnemy] = "enemy_location";
     spot_names[ALife::eRelationTypeLast] = "neutral_location";
 }
 //////////////////////////////////////////////////////////////////////////
diff --git a/src/xrGame/space_restriction.cpp b/src/xrGame/space_restriction.cpp
@@ -152,7 +152,7 @@ CSpaceRestriction::CBaseRestrictionPtr CSpaceRestriction::merge(
     RESTRICTIONS::const_iterator I = temp_restrictions.begin();
     RESTRICTIONS::const_iterator E = temp_restrictions.end();
     for (; I != E; ++I)
-        temp = strconcat(sizeof(S), S, *temp, ",", *(*I)->name());
+        temp = strconcat(acc_length, S, *temp, ",", *(*I)->name());
 
     xr_free(S);
 
diff --git a/src/xrGame/ui/UIMpTradeWnd_misc.cpp b/src/xrGame/ui/UIMpTradeWnd_misc.cpp
@@ -373,7 +373,7 @@ CUIDragDropListEx* CUIMpTradeWnd::GetMatchedListForItem(const shared_str& sect_n
             return m_list[e_player_bag];
     }
 
-    if (list_idx == e_pistol || list_idx == e_rifle || list_idx == e_outfit || list_idx == e_outfit)
+    if (list_idx == e_pistol || list_idx == e_rifle || list_idx == e_outfit)
     {
         if (m_list[list_idx]->ItemsCount())
             return m_list[e_player_bag];

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ static int add_clip(char* s, lwClip** clist, int* nclips)`
`79`	`79`	`clip->source.still.name = s;`
`80`	`80`	`}`
`81`	`81`
`82`		`- *nclips++;`
	`82`	`+ (*nclips)++;`
`83`	`83`	`clip->index = *nclips;`
`84`	`84`
`85`	`85`	`lwListAdd(clist, clip);`