From 90301322ea8a32f37939633e2c6f290010225afc Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Mon, 25 Jan 2016 17:39:56 -0800 Subject: [PATCH] migrate some mouse-wide var definitions and macros into header file --- mouse_movement.cpp | 17 ----------------- mouse_movement.h | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/mouse_movement.cpp b/mouse_movement.cpp index 5d9551d5..3675fa48 100644 --- a/mouse_movement.cpp +++ b/mouse_movement.cpp @@ -17,23 +17,6 @@ void _warp_jump(long left, long top, long height, long width) { -// apparently, the mac discards 15% of the value space for mouse movement. -// need to test this on other platforms -// - -#define HALF_WIDTH 16384 -#define HALF_HEIGHT 16384 - - - -int abs_left = 0; -int abs_top = 0; - -int next_width; -int next_height; -int section_top; -int section_left; -boolean is_warping = false; void begin_warping() { section_left = abs_left; diff --git a/mouse_movement.h b/mouse_movement.h index 668cfa22..20657a88 100644 --- a/mouse_movement.h +++ b/mouse_movement.h @@ -1,6 +1,26 @@ #pragma once + +// Warping double mouseActiveForCycles = 0; float carriedOverX = 0; float carriedOverY = 0; + + +// apparently, the mac discards 15% of the value space for mouse movement. +// need to test this on other platforms + +#define HALF_WIDTH 16384 +#define HALF_HEIGHT 16384 + + + +int abs_left = 0; +int abs_top = 0; + +int next_width; +int next_height; +int section_top; +int section_left; +boolean is_warping = false;