diff --git a/src/log.c b/src/log.c index 5ab55179354b32afa622fe525b88504d597b431e..90d1e0c4bf50362fd7b8496cf74892c8eb2f421e 100644 --- a/src/log.c +++ b/src/log.c @@ -89,20 +89,6 @@ enum cursors oldcursortype; log_action_t gg; ///< External global variables -short cursx; ///< Current X position of cursor -short cursy; ///< Current Y position of cursor -short cursx1; ///< X position of wire starting point -short cursy1; ///< Y position of wire starting point -short cursx2; ///< X position of wire end point -short cursy2; ///< Y position of wire end point -short chairx; ///< X position of crosshair -short chairy; ///< Y position of crosshair - -int cursorflag; ///< If cursor is displayed -int prevcursorflag; ///< If cursor was displayed before operation began -int chairflag; ///< If crosshair is on screen -int chairflag2; ///< If crosshair will be on screen -int rbandflag; ///< If Rubber-band wire is on screen int rabbits; ///< A plushy animal int rabflag; ///< If Rabbit mode int avoidrabbits; ///< Should repel rabbits @@ -11386,7 +11372,6 @@ static void initialize() helpptr = 0; cursortype = normal; oldcursortype = normal; - cursorflag = false; setscale(0); curlistgroup = 0; messagepos = topmessagepos; diff --git a/src/screen.c b/src/screen.c index 1dbd8d185cadd8537ce2a31fe4a785d5ba143ea4..3e093d23b5f3b93f44038d35363da9f2dfb427cd 100644 --- a/src/screen.c +++ b/src/screen.c @@ -43,6 +43,22 @@ #include "log.h" #include "box.h" +short cursx; ///< Current X position of cursor +short cursy; ///< Current Y position of cursor +short cursx1; ///< X position of wire starting point +short cursy1; ///< Y position of wire starting point +short cursx2; ///< X position of wire end point +short cursy2; ///< Y position of wire end point +short chairx; ///< X position of crosshair +short chairy; ///< Y position of crosshair + +int cursorflag; ///< If cursor is displayed +int prevcursorflag; ///< If cursor was displayed before operation began + +int chairflag; ///< If crosshair is on screen +int chairflag2; ///< If crosshair will be on screen +int rbandflag; ///< If Rubber-band wire is on screen + static rablistrec rabtable[rabtabsize]; ///< Positions of rabbits void initcolormap() @@ -82,6 +98,7 @@ void fixcolormap() /// Initialize color graphics, graphics tablet, low-level flags & variables. void initscreen() { + cursorflag = false; m_init_screen(); m_upside_down(); m_setlinestyle(1L, 0xf0f0L);