diff --git a/cl_dll/StudioModelRenderer.cpp b/cl_dll/StudioModelRenderer.cpp index 9986a164..91efc0ca 100644 --- a/cl_dll/StudioModelRenderer.cpp +++ b/cl_dll/StudioModelRenderer.cpp @@ -60,7 +60,7 @@ cvar_t* te_render_distance = NULL; struct cl_stored_light { int index = 0; - Vector color = 0; + Vector color = Vector(0, 0, 0); }; std::vectorStoredLightBuffer; @@ -4232,17 +4232,17 @@ int CStudioModelRenderer::StudioRecursiveLightPoint( entextrainfo_t *ext, mnode_ // bacontsu - smoothed lightmap while moving // scan for existing index bool bFoundStoredLight = false; - int iFoundIndex = 0; + size_t iFoundIndex = 0; // make sure we're not lerping particles if(!isParticle) { - for (int jaja = 0; jaja < StoredLightBuffer.size(); jaja++) + for (size_t k = 0; k < StoredLightBuffer.size(); k++) { - if (StoredLightBuffer[jaja].index == m_pCurrentEntity->index) + if (StoredLightBuffer[k].index == m_pCurrentEntity->index) { bFoundStoredLight = true; - iFoundIndex = jaja; + iFoundIndex = k; } } @@ -7092,8 +7092,7 @@ StudioDrawPointsShadow */ void CStudioModelRenderer::StudioDrawPointsShadow() { - float* av, height; - float vec_x, vec_y; + float* av; mstudiomesh_t* pmesh; Vector point; int i, k; diff --git a/cl_dll/entity.cpp b/cl_dll/entity.cpp index 0c74fe30..a155263f 100644 --- a/cl_dll/entity.cpp +++ b/cl_dll/entity.cpp @@ -366,7 +366,7 @@ void ProjectMuzzleflash(const struct cl_entity_s* entity) { if (entity != gEngfuncs.GetViewModel()) return; - if( entity && entity->curstate.body == 1 ) + if(entity && entity->curstate.body == 1 && strcmp(entity->model->name, "models/v_pistol.mdl") == 0) return; // Aynekko: silenced pistol has no light Vector forward; @@ -388,7 +388,7 @@ void ProjectMuzzleflash(const struct cl_entity_s* entity) { Vector dist = tr.endpos - VecSrc; dist.z = 0; - dist.Normalize(); + dist = dist.Normalize(); VectorAngles(dist, angles); } diff --git a/cl_dll/svdformat.cpp b/cl_dll/svdformat.cpp index 88735cfa..1f46b1f5 100644 --- a/cl_dll/svdformat.cpp +++ b/cl_dll/svdformat.cpp @@ -297,7 +297,7 @@ svdheader_t* SVD_Create( char* filename, model_t* pmodel ) if (pstudiohdr->numbodyparts == 0) { gEngfuncs.Con_Printf("Error: model %s has 0 submodels\n", pmodel->name); - return false; + return nullptr; } // Allocate the buffer diff --git a/dlls/male_assassin.cpp b/dlls/male_assassin.cpp index 1cd59668..5597e46e 100644 --- a/dlls/male_assassin.cpp +++ b/dlls/male_assassin.cpp @@ -310,8 +310,6 @@ void CMOFAssassin::MonsterThink() if (m_hEnemy) { - - float ang; Vector forward, enemy; Vector dist = m_hEnemy->pev->origin - pev->origin; diff --git a/dlls/spider.cpp b/dlls/spider.cpp index 6c61f01d..c87c9b5d 100644 --- a/dlls/spider.cpp +++ b/dlls/spider.cpp @@ -795,7 +795,7 @@ void CBullsquid :: HandleAnimEvent( MonsterEvent_t *pEvent ) case BSQUID_AE_THROW: { - int iPitch; + //int iPitch; // squid throws its prey IF the prey is a client. CBaseEntity *pHurt = CheckTraceHullAttack( 70, gSkillData.spiderDmgJump, DMG_CLUB | DMG_ALWAYSGIB ); diff --git a/dlls/weapons.cpp b/dlls/weapons.cpp index 52be00b7..259b2329 100644 --- a/dlls/weapons.cpp +++ b/dlls/weapons.cpp @@ -745,7 +745,8 @@ void CBasePlayerItem::DefaultUse(CBaseEntity *pActivator, CBaseEntity *pCaller, if( !gEvilImpulse101 ) { int i; - char sample[32]; + // Aynekko: remove + //char sample[32]; char weapon_name[32]; strcpy( weapon_name, STRING( pev->classname ) ); @@ -802,7 +803,8 @@ void CBasePlayerItem::DefaultTouch( CBaseEntity *pOther ) if(!gEvilImpulse101) { int i; - char sample[32]; + // Aynekko: remove + //char sample[32]; char weapon_name[32]; strcpy(weapon_name, STRING(pev->classname)); diff --git a/external/imgui/misc/fonts/binary_to_compressed_c.cpp b/external/imgui/misc/fonts/binary_to_compressed_c.cpp index 441c8f67..a793d09b 100644 --- a/external/imgui/misc/fonts/binary_to_compressed_c.cpp +++ b/external/imgui/misc/fonts/binary_to_compressed_c.cpp @@ -20,7 +20,6 @@ // # binary_to_compressed_c.exe myfont.ttf MyFont > myfont.cpp // # binary_to_compressed_c.exe -base85 myfont.ttf MyFont > myfont.cpp -#define _CRT_SECURE_NO_WARNINGS #include #include #include diff --git a/external/sptlib/sptlib-stdafx.hpp b/external/sptlib/sptlib-stdafx.hpp index e8531dfd..48ffce87 100644 --- a/external/sptlib/sptlib-stdafx.hpp +++ b/external/sptlib/sptlib-stdafx.hpp @@ -1,7 +1,6 @@ #pragma once #ifdef _WIN32 -#define _CRT_SECURE_NO_WARNINGS #define WIN32_LEAN_AND_MEAN #define NOMINMAX #include