vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Comment out calls to CV_SetValue for cv_analog

This commit is contained in:
Sryder 2018-03-12 03:18:45 +00:00
parent 419b83ee27
commit be0e5fe627
6 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/b_bot.c
View File

@ -121,7 +121,7 @@ void B_BuildTiccmd(player_t *player, ticcmd_t *cmd)
}
// Bot AI isn't programmed in analog.
CV_SetValue(&cv_analog2, false);
//CV_SetValue(&cv_analog2, false);
#ifdef HAVE_BLUA
// Let Lua scripts build ticcmds

34
src/g_game.c
View File

@ -1520,7 +1520,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
if (!player->powers[pw_tailsfly] && (cmd->forwardmove || cmd->sidemove || cmd->buttons))
{
player->bot = 2; // A player-controlled bot. Returns to AI when it respawns.
CV_SetValue(&cv_analog2, true);
//CV_SetValue(&cv_analog2, true);
}
else
{
@ -1616,40 +1616,40 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
// fudging with it.
static void UserAnalog_OnChange(void)
{
if (cv_useranalog.value)
/*if (cv_useranalog.value)
CV_SetValue(&cv_analog, 1);
else
CV_SetValue(&cv_analog, 0);
CV_SetValue(&cv_analog, 0);*/
}
static void UserAnalog2_OnChange(void)
{
if (botingame)
return;
if (cv_useranalog2.value)
/*if (cv_useranalog2.value)
CV_SetValue(&cv_analog2, 1);
else
CV_SetValue(&cv_analog2, 0);
CV_SetValue(&cv_analog2, 0);*/
}
static void UserAnalog3_OnChange(void)
{
if (botingame)
return;
if (cv_useranalog3.value)
/*if (cv_useranalog3.value)
CV_SetValue(&cv_analog3, 1);
else
CV_SetValue(&cv_analog3, 0);
CV_SetValue(&cv_analog3, 0);*/
}
static void UserAnalog4_OnChange(void)
{
if (botingame)
return;
if (cv_useranalog4.value)
/*if (cv_useranalog4.value)
CV_SetValue(&cv_analog4, 1);
else
CV_SetValue(&cv_analog4, 0);
CV_SetValue(&cv_analog4, 0);*/
}
static void Analog_OnChange(void)
@ -1659,10 +1659,10 @@ static void Analog_OnChange(void)
// cameras are not initialized at this point
if (!cv_chasecam.value && cv_analog.value) {
/*if (!cv_chasecam.value && cv_analog.value) {
CV_SetValue(&cv_analog, 0);
return;
}
}*/
if (cv_analog.value)
players[consoleplayer].pflags |= PF_ANALOGMODE;
@ -1679,10 +1679,10 @@ static void Analog2_OnChange(void)
// cameras are not initialized at this point
if (!cv_chasecam2.value && cv_analog2.value) {
/*if (!cv_chasecam2.value && cv_analog2.value) {
CV_SetValue(&cv_analog2, 0);
return;
}
}*/
if (cv_analog2.value)
players[secondarydisplayplayer].pflags |= PF_ANALOGMODE;
@ -1699,10 +1699,10 @@ static void Analog3_OnChange(void)
// cameras are not initialized at this point
if (!cv_chasecam3.value && cv_analog3.value) {
/*if (!cv_chasecam3.value && cv_analog3.value) {
CV_SetValue(&cv_analog3, 0);
return;
}
}*/
if (cv_analog3.value)
players[thirddisplayplayer].pflags |= PF_ANALOGMODE;
@ -1719,10 +1719,10 @@ static void Analog4_OnChange(void)
// cameras are not initialized at this point
if (!cv_chasecam4.value && cv_analog4.value) {
/*if (!cv_chasecam4.value && cv_analog4.value) {
CV_SetValue(&cv_analog4, 0);
return;
}
}*/
if (cv_analog4.value)
players[fourthdisplayplayer].pflags |= PF_ANALOGMODE;

6
src/p_map.c
View File

@ -388,7 +388,7 @@ static void P_DoTailsCarry(player_t *sonic, player_t *tails)
else
{
if (sonic-players == consoleplayer && botingame)
CV_SetValue(&cv_analog2, false);
//CV_SetValue(&cv_analog2, false);
P_ResetPlayer(sonic);
P_SetTarget(&sonic->mo->tracer, tails->mo);
sonic->pflags |= PF_CARRIED;
@ -401,7 +401,7 @@ static void P_DoTailsCarry(player_t *sonic, player_t *tails)
}
else {
if (sonic-players == consoleplayer && botingame)
CV_SetValue(&cv_analog2, true);
//CV_SetValue(&cv_analog2, true);
sonic->pflags &= ~PF_CARRIED;
}
}
@ -1593,7 +1593,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
}
else if (thing->player) {
if (thing->player-players == consoleplayer && botingame)
CV_SetValue(&cv_analog2, true);
//CV_SetValue(&cv_analog2, true);
thing->player->pflags &= ~PF_CARRIED;
}*/

12
src/p_setup.c
View File

@ -2477,7 +2477,7 @@ static void P_LoadRecordGhosts(void)
// Guest ghost
if (cv_ghost_guest.value && FIL_FileExists(va("%s-guest.lmp", gpath)))
G_AddGhost(va("%s-guest.lmp", gpath));
// Staff Attack ghosts
if (cv_ghost_staff.value)
{
@ -2918,7 +2918,7 @@ boolean P_SetupLevel(boolean skipprecip)
if (!cv_cam2_height.changed)
CV_Set(&cv_cam2_height, cv_cam2_height.defaultvalue);
if (!cv_cam_dist.changed)
CV_Set(&cv_cam_dist, cv_cam_dist.defaultvalue);
@ -2938,14 +2938,14 @@ boolean P_SetupLevel(boolean skipprecip)
if (!cv_cam4_rotate.changed)
CV_Set(&cv_cam4_rotate, cv_cam4_rotate.defaultvalue);
if (!cv_analog.changed)
/*if (!cv_analog.changed)
CV_SetValue(&cv_analog, 0);
if (!cv_analog2.changed)
CV_SetValue(&cv_analog2, 0);
if (!cv_analog3.changed)
CV_SetValue(&cv_analog3, 0);
if (!cv_analog4.changed)
CV_SetValue(&cv_analog4, 0);
CV_SetValue(&cv_analog4, 0);*/
#ifdef HWRENDER
if (rendermode != render_soft && rendermode != render_none)
@ -2955,7 +2955,7 @@ boolean P_SetupLevel(boolean skipprecip)
displayplayer = consoleplayer; // Start with your OWN view, please!
}
if (cv_useranalog.value)
/*if (cv_useranalog.value)
CV_SetValue(&cv_analog, true);
if ((splitscreen && cv_useranalog2.value) || botingame)
@ -2973,7 +2973,7 @@ boolean P_SetupLevel(boolean skipprecip)
CV_SetValue(&cv_analog3, false);
CV_SetValue(&cv_analog2, false);
CV_SetValue(&cv_analog, false);
}
}*/
// SRB2Kart: map load variables
if (modeattacking)

16
src/p_user.c
View File

@ -889,8 +889,8 @@ void P_ResetPlayer(player_t *player)
player->powers[pw_tailsfly] = 0;
player->onconveyor = 0;
player->skidtime = 0;
if (player-players == consoleplayer && botingame)
CV_SetValue(&cv_analog2, true);
/*if (player-players == consoleplayer && botingame)
CV_SetValue(&cv_analog2, true);*/
}
//
@ -3738,8 +3738,8 @@ void P_DoJump(player_t *player, boolean soundandstate)
{
player->mo->momz = 9*FRACUNIT;
player->pflags &= ~PF_CARRIED;
if (player-players == consoleplayer && botingame)
CV_SetValue(&cv_analog2, true);
/*if (player-players == consoleplayer && botingame)
CV_SetValue(&cv_analog2, true);*/
}
else if (player->pflags & PF_ITEMHANG)
{
@ -8110,7 +8110,7 @@ static void P_DeathThink(player_t *player)
curlap = 0;
}
}
if ((G_RaceGametype() || (gametype == GT_COOP && (multiplayer || netgame))) && (player->lives <= 0))
{
// Return to level music
@ -9137,7 +9137,7 @@ static void P_CalcPostImg(player_t *player)
*param = 5;
}
#endif
if (mirrormode) // srb2kart
*type = postimg_mirror;
}
@ -9971,8 +9971,8 @@ void P_PlayerAfterThink(player_t *player)
P_SetPlayerMobjState(player->mo, S_PLAY_CARRY);
if (player-players == consoleplayer && botingame)
CV_SetValue(&cv_analog2, !(player->pflags & PF_CARRIED));
//if (player-players == consoleplayer && botingame)
//CV_SetValue(&cv_analog2, !(player->pflags & PF_CARRIED));
}
else if (player->pflags & PF_ITEMHANG && player->mo->tracer)
{

16
src/r_main.c
View File

@ -234,36 +234,36 @@ void SplitScreen_OnChange(void)
static void ChaseCam_OnChange(void)
{
if (!cv_chasecam.value || !cv_useranalog.value)
/*if (!cv_chasecam.value || !cv_useranalog.value)
CV_SetValue(&cv_analog, 0);
else
CV_SetValue(&cv_analog, 1);
CV_SetValue(&cv_analog, 1);*/
}
static void ChaseCam2_OnChange(void)
{
if (botingame)
return;
if (!cv_chasecam2.value || !cv_useranalog2.value)
/*if (!cv_chasecam2.value || !cv_useranalog2.value)
CV_SetValue(&cv_analog2, 0);
else
CV_SetValue(&cv_analog2, 1);
CV_SetValue(&cv_analog2, 1);*/
}
static void ChaseCam3_OnChange(void)
{
if (!cv_chasecam3.value || !cv_useranalog3.value)
/*if (!cv_chasecam3.value || !cv_useranalog3.value)
CV_SetValue(&cv_analog3, 0);
else
CV_SetValue(&cv_analog3, 1);
CV_SetValue(&cv_analog3, 1);*/
}
static void ChaseCam4_OnChange(void)
{
if (!cv_chasecam4.value || !cv_useranalog4.value)
/*if (!cv_chasecam4.value || !cv_useranalog4.value)
CV_SetValue(&cv_analog4, 0);
else
CV_SetValue(&cv_analog4, 1);
CV_SetValue(&cv_analog4, 1);*/
}
static void FlipCam_OnChange(void)