From c1b5e72d7d4fefdc41fd38946bed825dd63c6987 Mon Sep 17 00:00:00 2001
From: Cyberarm <matthewlikesrobots@gmail.com>
Date: Tue, 28 Jan 2020 23:17:25 -0600
Subject: [PATCH] Added a proper cursor, game pause menu now has a transparent
 background (Game is drawn behind menu)

---
 lib/ui/menu.rb                  |   5 +++--
 lib/ui/menus/game_pause_menu.rb |   7 ++++++-
 lib/window.rb                   |  11 ++++-------
 static/cursors/pointer.png      | Bin 0 -> 1034 bytes
 4 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 static/cursors/pointer.png

diff --git a/lib/ui/menu.rb b/lib/ui/menu.rb
index bb205c1..11d32a0 100644
--- a/lib/ui/menu.rb
+++ b/lib/ui/menu.rb
@@ -6,6 +6,7 @@ class IMICFPS
       @slope = 250
       @color_step = 10
       @base_color = Gosu::Color.rgb(255, 127, 0)
+      @background_alpha = 200
       window.needs_cursor = true
       super(*args)
     end
@@ -40,14 +41,14 @@ class IMICFPS
             0, @slope+(i*@size),
             window.width/2, (-@slope)+(i*@size),
             window.width/2, i*@size,
-            Gosu::Color.rgba(@base_color.red-i*@color_step, @base_color.green-i*@color_step, @base_color.blue-i*@color_step, 200)
+            Gosu::Color.rgba(@base_color.red-i*@color_step, @base_color.green-i*@color_step, @base_color.blue-i*@color_step, @background_alpha)
           )
           fill_quad(
             window.width, i*@size,
             window.width, @slope+(i*@size),
             window.width/2, (-@slope)+(i*@size),
             window.width/2, i*@size,
-            Gosu::Color.rgba(@base_color.red-i*@color_step, @base_color.green-i*@color_step, @base_color.blue-i*@color_step, 200)
+            Gosu::Color.rgba(@base_color.red-i*@color_step, @base_color.green-i*@color_step, @base_color.blue-i*@color_step, @background_alpha)
           )
         end
 
diff --git a/lib/ui/menus/game_pause_menu.rb b/lib/ui/menus/game_pause_menu.rb
index 72237d4..1e4a37e 100644
--- a/lib/ui/menus/game_pause_menu.rb
+++ b/lib/ui/menus/game_pause_menu.rb
@@ -1,6 +1,7 @@
 class IMICFPS
   class GamePauseMenu < Menu
     def setup
+      @background_alpha = 50
       title "I-MIC FPS"
       subtitle "Paused"
 
@@ -8,6 +9,10 @@ class IMICFPS
         pop_state
       end
 
+      link "Settings" do
+        push_state(SettingsMenu)
+      end
+
       link "Disconnect" do
         push_state(MainMenu)
       end
@@ -20,4 +25,4 @@ class IMICFPS
       super
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/window.rb b/lib/window.rb
index 8eef29f..2aa298d 100644
--- a/lib/window.rb
+++ b/lib/window.rb
@@ -13,6 +13,7 @@ class IMICFPS
       end
       $window = self
       @needs_cursor = false
+      @cursor = Gosu::Image.new(IMICFPS::GAME_ROOT_PATH + "/static/cursors/pointer.png")
       @number_of_vertices = 0
 
       self.caption = "#{IMICFPS::NAME} v#{IMICFPS::VERSION} (#{IMICFPS::RELEASE_NAME})"
@@ -37,14 +38,10 @@ class IMICFPS
     end
 
     def draw_cursor
+      size = 16
+      
       if needs_cursor
-        draw_quad(
-          mouse_x, mouse_y, Gosu::Color::WHITE,
-          mouse_x+16, mouse_y, Gosu::Color::WHITE,
-          mouse_x, mouse_y+16, Gosu::Color::WHITE,
-          mouse_x, mouse_y+16, Gosu::Color::WHITE,
-          Float::INFINITY
-        )
+        @cursor.draw(mouse_x, mouse_y, Float::INFINITY)
       end
     end
 
diff --git a/static/cursors/pointer.png b/static/cursors/pointer.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b74e0c4e36891506357449606d0188c84214223
GIT binary patch
literal 1034
zcmV+l1oiugP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000ie000ie0hKEb8vp<R8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11BXdOK~zYIwUb+HlVupk|L=G1VO`g*%Mw?%hT#I`FdSS^m{>I-
z5=a<uK?)KLEE7UZ%z|7PiC&ONjEW}4cuM5bD?@ZB0n}a8!SKRXh#R=lbr9Q*G1`^(
zJHDScZu#uirr`YFy-%L!_se?%A%sejRB$?-p8yDAsl)U9?3*Xw_^r3^u;zBVi*C2;
z2FtRC063R|&+<I)H(_o&)cf);ufBGyJ-9mPd+;C^PXCpDU6Q0uP19xoBpzE}7{+)e
zlR4bcv0{b8;TQ_8Ue&gJ#|z@_y*<3g<5`(ZPV6;J^C+cMq?C>VC_a(^z&(!VBF)Xs
zP1G>jY&P3aeZ8yAZntCYx;5m$!H5tFZE`8HylEmi(QmWaL#nD~0o<-t0A16SQn3_X
z|5T@#$z<jwb4|V`AD(?a%t!X`<GfAY_Ea*}qbO=W03W4v3_z}`0Km;$E`MUf#x7nI
zMJy%(06`QG46Y)P1N+3yTS9h1&~-bJJSIuf4pmk20B!=HiwQJA;8qHP6buB~7yuO|
z)?GclwVONm(u-Um(AtvCX1C?@`Qr@3HW`L74q(PAfUX;Nr?OL#E!~?1LI`S+0076a
zSl+%IyZ7u8!_Pe<QEGN25{V;@I>#=#B<ER6?_EMj@3K~ZgU8b_U#vwk7mvq-MqeX)
zJ$^%-zBkRNs`ial07@woMeSa@ZjE5A*CNSgvKTmZy7=xp@5$+@^hrfl_X8MX$^>V}
zMn~CVv9tgXkHxo6rtS=t*Gr`mKL7MfZRhqL`O?KppDBvsryBhLfDTyh;Gf7m&u?%#
z9Z&j~`AIp<x)Vw%zCHJy+1GnikHxS5S(u#-X`22u0L41900JQF^?J@7Kha-T={Q)H
zjh%V_qYhcsNS(|5RdW2+E0ubgMQT463J)JnPTpB`fKrNqQ>Qx^UXq?@4GdI+R}z?p
zVSIdbcx2&402sM?jT+P>4ULU&#eW@nyBfTb0J^S!5sSr%qWtSPp{gn_T)1e|dwpkX
zfmaj&NOK$;jmLgBt;HWN|D*|`^hav^R$ndfY66r>@`usr@a)_=pUWc}9X4_^GdpXA
zR}}y_e}DSEmdRuR0E2_y7YWE20I5e2l>Y;3OhQNlfQ_#DI_~`74@FJW_Mq&Y|JMXW
zQ7E?fTM7)r99c^6d~7z`6;Tu?0C4|{06-^z^^ZIJHx^}n{F;FOK>z>%07*qoM6N<$
Ef(?(-dH?_b

literal 0
HcmV?d00001