Skip to content

Fix Some Warnings and Problems #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
edgarbarney wants to merge 3 commits into
base: the-last-goodbye
Choose a base branch
from
Open

Fix Some Warnings and Problems #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60edf48
Fix Some Warnings
edgarbarney Mar 5, 2025
337ac7b
Fix a Problematic Vector Initialisation
edgarbarney Mar 5, 2025
5cbc7b6
Check for Model Name when Hiding Muzzle Flash
edgarbarney Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions cl_dll/StudioModelRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::vector<cl_stored_light>StoredLightBuffer;
Expand Down Expand Up @@ -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;
}
}

Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions cl_dll/entity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion cl_dll/svdformat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions dlls/male_assassin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,6 @@ void CMOFAssassin::MonsterThink()

if (m_hEnemy)
{

float ang;
Vector forward, enemy;
Vector dist = m_hEnemy->pev->origin - pev->origin;

Expand Down
2 changes: 1 addition & 1 deletion dlls/spider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
6 changes: 4 additions & 2 deletions dlls/weapons.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) );

Expand Down Expand Up @@ -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));

Expand Down
1 change: 0 additions & 1 deletion external/imgui/misc/fonts/binary_to_compressed_c.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <stdio.h>
#include <string.h>
#include <stdlib.h>
Expand Down
1 change: 0 additions & 1 deletion external/sptlib/sptlib-stdafx.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#ifdef _WIN32
#define _CRT_SECURE_NO_WARNINGS
#define WIN32_LEAN_AND_MEAN
#define NOMINMAX
#include <Windows.h>
Expand Down