AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-08-03 12:47:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename feature to Mouse Shift, change variable names

Browse Source
This commit is contained in:
Fabian Greffrath 2024-07-31 21:17:37 +02:00
parent ca8d817b5a
commit 217e03fe13
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/am_map.c
View File

@ -129,7 +129,7 @@ static int m_zoomin_mouse = M2_ZOOMIN;
static int m_zoomout_mouse = M2_ZOOMOUT;
static boolean mousewheelzoom;
static boolean scrollmode;
static boolean mousepan;
// translates between frame-buffer and map distances
// [FG] fix int overflow that causes map and grid lines to disappear
@ -488,7 +488,7 @@ static void AM_changeWindowLoc(void)
incy = m_paninc.y;
}
if (scrollmode)
if (mousepan)
{
m_paninc.x = 0;
m_paninc.y = 0;
@ -925,9 +925,9 @@ boolean AM_Responder
automaprotate = !automaprotate;
togglemsg("%s", automaprotate ? s_AMSTR_ROTATEON : s_AMSTR_ROTATEOFF);
}
else if (M_InputActivated(input_strafe))
else if (M_InputActivated(input_map_mousepan))
{
scrollmode = true;
mousepan = true;
}
else
{
@ -968,16 +968,16 @@ boolean AM_Responder
{
buttons_state[ZOOM_IN] = 0;
}
else if (M_InputDeactivated(input_strafe))
else if (M_InputDeactivated(input_map_mousepan))
{
scrollmode = false;
mousepan = false;
}
}
m_paninc.x = 0;
m_paninc.y = 0;
if (scrollmode && ev->type == ev_mouse)
if (mousepan && ev->type == ev_mouse)
{
m_paninc.x -= (int)G_CalcMouseSide(ev->data1) * MAPUNIT;
m_paninc.y += (int)G_CalcMouseVert(ev->data2) * MAPUNIT;

1
src/m_input.c
View File

@ -636,6 +636,7 @@ void M_BindInputVariables(void)
BIND_INPUT(input_map_grid, "Toggle grid display over automap");
BIND_INPUT(input_map_overlay, "Toggle automap overlay mode");
BIND_INPUT(input_map_rotate, "Toggle automap rotation");
BIND_INPUT(input_map_mousepan, "Shift automap with the mouse");
BIND_INPUT(input_chat, "Enter a chat message");
BIND_INPUT(input_chat_dest0, "Chat with player 1");

1
src/m_input.h
View File

@ -108,6 +108,7 @@ enum
input_map_grid,
input_map_overlay,
input_map_rotate,
input_map_mousepan,
input_chat,
input_chat_dest0,

1
src/mn_setup.c
View File

@ -1153,6 +1153,7 @@ static setup_menu_t keys_settings5[] = {
{"Shift Down", S_INPUT, KB_X, M_SPC, {0}, m_map, input_map_down},
{"Shift Left", S_INPUT, KB_X, M_SPC, {0}, m_map, input_map_left},
{"Shift Right", S_INPUT, KB_X, M_SPC, {0}, m_map, input_map_right},
{"Mouse Shift", S_INPUT, KB_X, M_SPC, {0}, m_map, input_map_mousepan},
{"Mark Place", S_INPUT, KB_X, M_SPC, {0}, m_map, input_map_mark},
{"Clear Last Mark", S_INPUT, KB_X, M_SPC, {0}, m_map, input_map_clear},
{"Full/Zoom", S_INPUT, KB_X, M_SPC, {0}, m_map, input_map_gobig},