nzp-team
/
dquakeplus
mirror of https://github.com/nzp-team/dquakeplus.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert broken scale to fix map loading

This commit is contained in:
Steam Deck User 2022-12-27 16:39:40 -05:00
parent a7461c4dcf
commit db6f33d495
7 changed files with 8 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/cl_parse.c
View File

@ -617,12 +617,6 @@ void CL_ParseUpdate (int bits)
ent->msg_angles[0][2] = MSG_ReadAngle();
else
ent->msg_angles[0][2] = ent->baseline.angles[2];
if (bits & U_SCALE)
ent->scale = MSG_ReadFloat();
else
ent->scale = 1.0f;
// Tomaz - QC Alpha Scale Glow Begin
if (bits & U_RENDERAMT)
ent->renderamt = MSG_ReadFloat();
@ -675,7 +669,6 @@ void CL_ParseBaseline (entity_t *ent)
ent->baseline.frame = MSG_ReadByte ();
ent->baseline.colormap = MSG_ReadByte();
ent->baseline.skin = MSG_ReadByte();
ent->baseline.scale = (float)MSG_ReadByte();
for (i=0 ; i<3 ; i++)
{
ent->baseline.origin[i] = MSG_ReadCoord ();
@ -1043,7 +1036,6 @@ void CL_ParseStatic (void)
ent->colormap = vid.colormap;
ent->skinnum = ent->baseline.skin;
ent->effects = ent->baseline.effects;
ent->scale = ent->baseline.scale;
VectorCopy (ent->baseline.origin, ent->origin);
VectorCopy (ent->baseline.angles, ent->angles);

1
source/progdefs.h
View File

@ -164,7 +164,6 @@ typedef struct
float currentmag2;
float maxspeed;
float facingenemy;
float scale;
} entvars_t;
#define PROGHEADER_CRC 14116

1
source/protocol.h
View File

@ -51,7 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define U_EXTEND2 (1<<21) // another byte to follow
#define U_FRAMETIME (1<<22) // another byte to follow
// Tomaz - QC Alpha Scale Glow Control End
#define U_SCALE (1<<23)
#define SU_VIEWHEIGHT (1<<0)

17
source/psp/video_hardware_main.cpp
View File

@ -373,6 +373,14 @@ void R_RotateForEntity (entity_t *e, int shadow)
e->origin[0], e->origin[1], e->origin[2]
};
sceGumTranslate(&translation);
/*
// Scale.
const ScePspFVector3 scale =
{
e->scale, e->scale, e->scale
};
sceGumScale(&scale);
*/
// Rotate.
sceGumRotateZ(e->angles[YAW] * (GU_PI / 180.0f));
@ -382,15 +390,6 @@ void R_RotateForEntity (entity_t *e, int shadow)
sceGumRotateX (e->angles[ROLL] * (GU_PI / 180.0f));
}
// Scale.
if (e != &cl.viewent && e != &cl.viewent2) {
const ScePspFVector3 scale =
{
e->scale, e->scale, e->scale
};
sceGumScale(&scale);
}
sceGumUpdateMatrix();
}

1
source/quakedef.h
View File

@ -211,7 +211,6 @@ typedef struct
int colormap;
int skin;
int effects;
float scale;
// dr_mabuse1981: HalfLife rendermodes fixed START
unsigned short renderamt;
unsigned short rendermode;

4
source/render.h
View File

@ -61,10 +61,6 @@ typedef struct entity_s
float rendercolor[3];
//Crow_bar
// motolegacy -- scale shit from FTE
float scale; /* Multiplier that resizes the entity. 1 is normal sized, 2 is double sized. scale 0 is remapped to 1. In SSQC, this is limited to 1/16th precision, with a maximum just shy of 16.*/
// motolegacy -- end scale
struct model_s *model; // NULL = no model
char old_model[128]; // NULL = no model
struct efrag_s *efrag; // linked list of efrags

15
source/sv_main.c
View File

@ -514,17 +514,6 @@ void SV_WriteEntitiesToClient (edict_t *clent, sizebuf_t *msg, qboolean nomap)
if (ent->baseline.modelindex != ent->v.modelindex)
bits |= U_MODEL;
if (ent->baseline.scale != ent->v.scale) {
if (ent->v.scale == 0)
ent->v.scale = 1.0f;
if (ent->v.scale > 16.0f)
ent->v.scale = 16.0f;
bits |= U_SCALE;
}
// Tomaz - QC Alpha Scale Glow Begin
{
@ -622,8 +611,6 @@ void SV_WriteEntitiesToClient (edict_t *clent, sizebuf_t *msg, qboolean nomap)
MSG_WriteCoord (msg, ent->v.origin[2]);
if (bits & U_ANGLE3)
MSG_WriteAngle(msg, ent->v.angles[2]);
if (bits & U_SCALE)
MSG_WriteFloat(msg, ent->v.scale);
// Tomaz - QC Alpha Scale Glow Begin
if (bits & U_RENDERAMT)
MSG_WriteFloat(msg, renderamt);
@ -1044,7 +1031,6 @@ void SV_CreateBaseline (void)
VectorCopy (svent->v.angles, svent->baseline.angles);
svent->baseline.frame = svent->v.frame;
svent->baseline.skin = svent->v.skin;
svent->baseline.scale = 1.0f;
if (entnum > 0 && entnum <= svs.maxclients)
{
svent->baseline.colormap = entnum;
@ -1067,7 +1053,6 @@ void SV_CreateBaseline (void)
MSG_WriteByte (&sv.signon, svent->baseline.frame);
MSG_WriteByte (&sv.signon, svent->baseline.colormap);
MSG_WriteByte (&sv.signon, svent->baseline.skin);
MSG_WriteByte (&sv.signon, (int)svent->baseline.scale);
for (i=0 ; i<3 ; i++)
{
MSG_WriteCoord(&sv.signon, svent->baseline.origin[i]);