Skip to content

Revert #2494, #2667 for reducing mouse precision #2754

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

Closed
oznogon wants to merge 1 commit into from
Closed

Revert #2494, #2667 for reducing mouse precision #2754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 0 additions & 23 deletions src/screens/crew6/relayScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,12 +204,6 @@ RelayScreen::RelayScreen(GuiContainer* owner, bool allow_comms)
}
}

RelayScreen::~RelayScreen()
{
if (P<MouseRenderer> mouse_renderer = engine->getObject("mouseRenderer"))
mouse_renderer->setSpriteImage("mouse.png");
}

void RelayScreen::onDraw(sp::RenderTarget& renderer)
{
///Handle mouse wheel
Expand Down Expand Up @@ -333,21 +327,4 @@ void RelayScreen::onDraw(sp::RenderTarget& renderer)
}

delete_waypoint_button->setEnable(targets.getWaypointIndex() >= 0);

if (P<MouseRenderer> mouse_renderer = engine->getObject("mouseRenderer"))
{
switch(mode)
{
case TargetSelection:
case MoveWaypoint:
mouse_renderer->setSpriteImage("mouse.png");
break;
case WaypointPlacement:
mouse_renderer->setSpriteImage("waypoint.png");
break;
case LaunchProbe:
mouse_renderer->setSpriteImage("radar/probe.png");
break;
}
}
}
1 change: 0 additions & 1 deletion src/screens/crew6/relayScreen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ class RelayScreen : public GuiOverlay
glm::vec2 mouse_down_position{};
public:
RelayScreen(GuiContainer* owner, bool allow_comms);
virtual ~RelayScreen();

virtual void onDraw(sp::RenderTarget& target) override;
};
20 changes: 1 addition & 19 deletions src/screens/gm/gameMasterScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#include "i18n.h"
#include "main.h"
#include "vectorUtils.h"
#include "gui/mouseRenderer.h"
#include "gameGlobalInfo.h"
#include "objectCreationView.h"
#include "globalMessageEntryView.h"
Expand Down Expand Up @@ -259,10 +258,9 @@ GameMasterScreen::GameMasterScreen(RenderLayer* render_layer)
gameGlobalInfo->on_gm_click = nullptr;
}

//due to a suspected compiler bug this deconstructor needs to be explicitly defined
// Due to a suspected compiler bug this deconstructor needs to be explicitly defined
GameMasterScreen::~GameMasterScreen()
{
if (P<MouseRenderer> mouse_renderer = engine->getObject("mouseRenderer")) mouse_renderer->setSpriteImage("mouse.png");
}

void GameMasterScreen::update(float delta)
Expand Down Expand Up @@ -443,32 +441,16 @@ void GameMasterScreen::update(float delta)
message_frame->hide();
}

P<MouseRenderer> mouse_renderer = engine->getObject("mouseRenderer");

if (gameGlobalInfo->on_gm_click)
{
create_button->hide();
object_creation_view->hide();
cancel_action_button->show();
if (mouse_renderer)
{
if (gameGlobalInfo->on_gm_click_cursor == "")
mouse_renderer->setSpriteImage(gameGlobalInfo->DEFAULT_ON_GM_CLICK_CURSOR);
else
mouse_renderer->setSpriteImage(gameGlobalInfo->on_gm_click_cursor);
}
}
else
{
create_button->show();
cancel_action_button->hide();
if (mouse_renderer)
{
if (SDL_GetModState() & KMOD_CTRL) mouse_renderer->setSpriteImage("mouse_ship.png");
else if (SDL_GetModState() & KMOD_ALT) mouse_renderer->setSpriteImage("mouse_faction.png");
else if (SDL_GetModState() & KMOD_SHIFT) mouse_renderer->setSpriteImage("mouse_add.png");
else mouse_renderer->setSpriteImage("mouse.png");
}
}
}

Expand Down