mirror of
https://github.com/nzp-team/quakespasm.git
synced 2024-11-10 06:32:03 +00:00
NX/VITA: Replace old name with new
This commit is contained in:
parent
fa473f0c8e
commit
7e37c9acd1
10 changed files with 16 additions and 16 deletions
|
@ -390,7 +390,7 @@ void CL_BaseMove (usercmd_t *cmd)
|
||||||
|
|
||||||
Q_memset (cmd, 0, sizeof(*cmd));
|
Q_memset (cmd, 0, sizeof(*cmd));
|
||||||
|
|
||||||
// Moto - we handle movespeed in QC now.
|
// cypress - we handle movespeed in QC now.
|
||||||
cl_backspeed = cl_forwardspeed = cl_sidespeed = sv_player->v.maxspeed*0.71;
|
cl_backspeed = cl_forwardspeed = cl_sidespeed = sv_player->v.maxspeed*0.71;
|
||||||
|
|
||||||
// Throttle side and back speeds
|
// Throttle side and back speeds
|
||||||
|
|
|
@ -1537,7 +1537,7 @@ void CL_ParseServerMessage (void)
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
MSG_ReadByte(); // motolegacy -- stop breaking protocol
|
MSG_ReadByte(); // cypress -- stop breaking protocol
|
||||||
|
|
||||||
#endif // VITA
|
#endif // VITA
|
||||||
|
|
||||||
|
|
|
@ -587,7 +587,7 @@ void Draw_CharacterScale (int x, int y, int num, float scale)
|
||||||
Draw_CharacterRGBA
|
Draw_CharacterRGBA
|
||||||
|
|
||||||
This is the same as Draw_Character, but with RGBA color codes.
|
This is the same as Draw_Character, but with RGBA color codes.
|
||||||
- MotoLegacy and ported to Quakespasm by sB :)
|
- cypress and ported to Quakespasm by sB :)
|
||||||
================
|
================
|
||||||
*/
|
*/
|
||||||
void Draw_CharacterRGBA(int x, int y, int num, float r, float g, float b, float a)
|
void Draw_CharacterRGBA(int x, int y, int num, float r, float g, float b, float a)
|
||||||
|
@ -929,7 +929,7 @@ void Draw_SubPic(int x, int y, int width, int height, int start_x, int start_y,
|
||||||
glEnd ();
|
glEnd ();
|
||||||
}
|
}
|
||||||
|
|
||||||
// motolegacy -- ultimate draw function!! probably annihilates gl calls so use wisely lol
|
// cypress -- ultimate draw function!! probably annihilates gl calls so use wisely lol
|
||||||
// TODO: color shifting?
|
// TODO: color shifting?
|
||||||
void Draw_AlphaStretchPic (int x, int y, int width, int height, float alpha, qpic_t *pic)
|
void Draw_AlphaStretchPic (int x, int y, int width, int height, float alpha, qpic_t *pic)
|
||||||
{
|
{
|
||||||
|
|
|
@ -714,7 +714,7 @@ void HUD_Rounds (void)
|
||||||
x_offset = 0;
|
x_offset = 0;
|
||||||
savex = 0;
|
savex = 0;
|
||||||
|
|
||||||
// Round and Title text - moto
|
// Round and Title text - cypress
|
||||||
// extra creds to scatterbox for some x/y vals
|
// extra creds to scatterbox for some x/y vals
|
||||||
// ------------------
|
// ------------------
|
||||||
// First, fade from white to red, ~3s duration
|
// First, fade from white to red, ~3s duration
|
||||||
|
@ -825,7 +825,7 @@ void HUD_Rounds (void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// ------------------
|
// ------------------
|
||||||
// End Round and Title text - moto
|
// End Round and Title text - cypress
|
||||||
|
|
||||||
int x_offset2 = 2; //Extra offset for all round images to keep things uniform (may not be neccesary?) -- SPECIFIC TO WHOLE ROUNDS
|
int x_offset2 = 2; //Extra offset for all round images to keep things uniform (may not be neccesary?) -- SPECIFIC TO WHOLE ROUNDS
|
||||||
int y_offset = 50; //y_offset -- SPECIFIC TO WHOLE ROUNDS
|
int y_offset = 50; //y_offset -- SPECIFIC TO WHOLE ROUNDS
|
||||||
|
|
|
@ -670,7 +670,7 @@ static void SCR_CalcRefdef (void)
|
||||||
r_refdef.vrect.y = (glheight - r_refdef.vrect.height)/2;
|
r_refdef.vrect.y = (glheight - r_refdef.vrect.height)/2;
|
||||||
//johnfitz
|
//johnfitz
|
||||||
|
|
||||||
// motolegacy -- hack to enable more standard fov values in quakespasm
|
// cypress -- hack to enable more standard fov values in quakespasm
|
||||||
r_refdef.fov_x = AdaptFovx(scr_fov.value - 15, vid.width, vid.height);
|
r_refdef.fov_x = AdaptFovx(scr_fov.value - 15, vid.width, vid.height);
|
||||||
r_refdef.fov_y = CalcFovy (r_refdef.fov_x, r_refdef.vrect.width, r_refdef.vrect.height);
|
r_refdef.fov_y = CalcFovy (r_refdef.fov_x, r_refdef.vrect.width, r_refdef.vrect.height);
|
||||||
|
|
||||||
|
@ -1161,7 +1161,7 @@ char *ReturnLoadingtex (void)
|
||||||
#endif // VITA
|
#endif // VITA
|
||||||
break;
|
break;
|
||||||
case 35:
|
case 35:
|
||||||
return "MotoLegacy, or \"Ivy\", is from the USA.";
|
return "CypressImplex, or \"Ivy\", is from the USA.";
|
||||||
break;
|
break;
|
||||||
case 36:
|
case 36:
|
||||||
return "Zombies don't like bullets.";
|
return "Zombies don't like bullets.";
|
||||||
|
|
|
@ -3404,17 +3404,17 @@ void M_Credits_Draw (void)
|
||||||
DRAW_HEADER("CREDITS");
|
DRAW_HEADER("CREDITS");
|
||||||
|
|
||||||
DRAW_CREDITLINE(0, "Programming:");
|
DRAW_CREDITLINE(0, "Programming:");
|
||||||
DRAW_CREDITLINE(1, "Blubswillrule, Jukki, DR_Mabuse1981, Naievil, MotoLegacy");
|
DRAW_CREDITLINE(1, "Blubswillrule, Jukki, DR_Mabuse1981, Naievil, Cypress");
|
||||||
DRAW_CREDITLINE(2, "ScatterBox");
|
DRAW_CREDITLINE(2, "ScatterBox");
|
||||||
DRAW_CREDITLINE(3, "");
|
DRAW_CREDITLINE(3, "");
|
||||||
DRAW_CREDITLINE(4, "Models:");
|
DRAW_CREDITLINE(4, "Models:");
|
||||||
DRAW_CREDITLINE(5, "Blubswillrule, Ju[s]tice, Derped_Crusader");
|
DRAW_CREDITLINE(5, "Blubswillrule, Ju[s]tice, Derped_Crusader");
|
||||||
DRAW_CREDITLINE(6, "");
|
DRAW_CREDITLINE(6, "");
|
||||||
DRAW_CREDITLINE(7, "GFX:");
|
DRAW_CREDITLINE(7, "GFX:");
|
||||||
DRAW_CREDITLINE(8, "Blubswillrule, Ju[s]tice, MotoLegacy, Derped_Crusader");
|
DRAW_CREDITLINE(8, "Blubswillrule, Ju[s]tice, Cypress, Derped_Crusader");
|
||||||
DRAW_CREDITLINE(9, "");
|
DRAW_CREDITLINE(9, "");
|
||||||
DRAW_CREDITLINE(10, "Sounds/Music:");
|
DRAW_CREDITLINE(10, "Sounds/Music:");
|
||||||
DRAW_CREDITLINE(11, "Blubswillrule, Biodude, MotoLegacy, Marty P.");
|
DRAW_CREDITLINE(11, "Blubswillrule, Biodude, Cypress, Marty P.");
|
||||||
DRAW_CREDITLINE(12, "");
|
DRAW_CREDITLINE(12, "");
|
||||||
DRAW_CREDITLINE(13, "Special Thanks:");
|
DRAW_CREDITLINE(13, "Special Thanks:");
|
||||||
DRAW_CREDITLINE(14, "- Spike, Eukara: FTEQW");
|
DRAW_CREDITLINE(14, "- Spike, Eukara: FTEQW");
|
||||||
|
|
|
@ -2533,7 +2533,7 @@ Close_Waypoint
|
||||||
|
|
||||||
void Close_Waypoint (string, string, string, string, string, string, string, string)
|
void Close_Waypoint (string, string, string, string, string, string, string, string)
|
||||||
|
|
||||||
moto - basically a carbon copy of open_waypoint lol
|
cypress - basically a carbon copy of open_waypoint lol
|
||||||
=================
|
=================
|
||||||
*/
|
*/
|
||||||
void Close_Waypoint (void)
|
void Close_Waypoint (void)
|
||||||
|
|
|
@ -706,7 +706,7 @@ void R_SetupAliasLighting (entity_t *e)
|
||||||
lightcolor[2] = 256.0f;
|
lightcolor[2] = 256.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
// motolegacy -- re-te EF_FULLBRIGHT support
|
// cypress -- re-te EF_FULLBRIGHT support
|
||||||
// TODO: potentially just block dlights from colorizing
|
// TODO: potentially just block dlights from colorizing
|
||||||
if (e->effects & EF_FULLBRIGHT) {
|
if (e->effects & EF_FULLBRIGHT) {
|
||||||
lightcolor[0] = 400.0f;
|
lightcolor[0] = 400.0f;
|
||||||
|
|
|
@ -1196,14 +1196,14 @@ void SV_CreateBaseline (void)
|
||||||
svent->baseline.colormap = entnum;
|
svent->baseline.colormap = entnum;
|
||||||
svent->baseline.modelindex = SV_ModelIndex("models/player.mdl");
|
svent->baseline.modelindex = SV_ModelIndex("models/player.mdl");
|
||||||
svent->baseline.alpha = ENTALPHA_DEFAULT; //johnfitz -- alpha support
|
svent->baseline.alpha = ENTALPHA_DEFAULT; //johnfitz -- alpha support
|
||||||
svent->baseline.light_lev = 0; // motolegacy -- light level support
|
svent->baseline.light_lev = 0; // cypress -- light level support
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
svent->baseline.colormap = 0;
|
svent->baseline.colormap = 0;
|
||||||
svent->baseline.modelindex = SV_ModelIndex(PR_GetString(svent->v.model));
|
svent->baseline.modelindex = SV_ModelIndex(PR_GetString(svent->v.model));
|
||||||
svent->baseline.alpha = svent->alpha; //johnfitz -- alpha support
|
svent->baseline.alpha = svent->alpha; //johnfitz -- alpha support
|
||||||
svent->baseline.light_lev = 0; // motolegacy -- light level support
|
svent->baseline.light_lev = 0; // cypress -- light level support
|
||||||
}
|
}
|
||||||
|
|
||||||
//johnfitz -- PROTOCOL_FITZQUAKE
|
//johnfitz -- PROTOCOL_FITZQUAKE
|
||||||
|
|
|
@ -1068,7 +1068,7 @@ void V_CalcRefdef (void)
|
||||||
|
|
||||||
temp_up[0] *= cADSOfs[1];
|
temp_up[0] *= cADSOfs[1];
|
||||||
temp_up[1] *= cADSOfs[1];
|
temp_up[1] *= cADSOfs[1];
|
||||||
temp_up[2] *= cADSOfs[1]; // motolegacy -- another vmodel hack: standard ADS offsets don't go up enough. sB was cADSOfs[1]
|
temp_up[2] *= cADSOfs[1]; // cypress -- another vmodel hack: standard ADS offsets don't go up enough. sB was cADSOfs[1]
|
||||||
|
|
||||||
temp_forward[0] *= cADSOfs[2];
|
temp_forward[0] *= cADSOfs[2];
|
||||||
temp_forward[1] *= cADSOfs[2];
|
temp_forward[1] *= cADSOfs[2];
|
||||||
|
|
Loading…
Reference in a new issue