From 8e686370437ed512beb1dc884eeaa8aa3cb2051d Mon Sep 17 00:00:00 2001
From: Miteruzo <matuda.miteruzo@gmail.com>
Date: Thu, 15 Jun 2023 22:49:00 +0900
Subject: [PATCH] =?UTF-8?q?=E3=81=84=E3=82=8D=E3=81=84=E3=82=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.hsp | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/main.hsp b/main.hsp
index f56fd64..2f1c87d 100644
--- a/main.hsp
+++ b/main.hsp
@@ -60,10 +60,12 @@
 
 			If IsWindowVisible (hWindow) {
 				If StrLen (buf) != 0 {
-					hWindows.windowCnt = hWindow
-					GetWindowRect hWindow, VarPtr (windowRects.0.windowCnt)
+					If hWindow != hWnd {
+						hWindows.windowCnt = hWindow
+						GetWindowRect hWindow, VarPtr (windowRects.0.windowCnt)
 
-					windowCnt++
+						windowCnt++
+					}
 				}
 			}
 
@@ -101,15 +103,23 @@
 			base = gInfo_dispY
 
 			Repeat windowCnt
-				If windowRects.LEFT.cnt <= nizikaX + (NIZIKA_WIDTH - NIZIKA_LEFT) {
-					If nizikaX + NIZIKA_LEFT < windowRects.RIGHT.cnt {
-						If nizikaY + NIZIKA_BASE <= windowRects.TOP.cnt {
-							If windowRects.TOP.cnt < base {
-								base = windowRects.TOP.cnt
-							}
-						}
-					}
+				If windowRects.LEFT.cnt > nizikaX + (NIZIKA_WIDTH - NIZIKA_LEFT) {
+					Continue
 				}
+
+				If nizikaX + NIZIKA_LEFT >= windowRects.RIGHT.cnt {
+					Continue
+				}
+
+				If nizikaY + NIZIKA_BASE > windowRects.TOP.cnt {
+					Continue
+				}
+
+				If windowRects.TOP.cnt >= base {
+					Continue
+				}
+
+				base = windowRects.TOP.cnt
 			Loop
 		}
 
@@ -118,7 +128,7 @@
 			BoxF
 
 			Pos nizikaX, nizikaY
-			GCopy SCREEN_NIZIKA, IIf (direction < 0, NIZIKA_WIDTH, 0), NIZIKA_HEIGHT * (frame \ 24), NIZIKA_WIDTH, NIZIKA_HEIGHT
+			GCopy SCREEN_NIZIKA, IIf (direction < 0, NIZIKA_WIDTH, 0), NIZIKA_HEIGHT * (frame * IIf (moving, 3, 1) \ 24), NIZIKA_WIDTH, NIZIKA_HEIGHT
 		ReDraw True
 
 		nizikaX += direction * 4