some improves in hall view

2 files changed, 26 insertions, 7 deletions

diff --git a/src/api/Button.py b/src/api/Button.py
index f78cda2..c16855f 100755
--- a/src/api/Button.py
+++ b/src/api/Button.py
@@ -33,12 +33,12 @@ class CButton(CLabel):
     def update(self):

         CLabel.update(self)

         

-        self.mclicked = False

-

         #TODO: Make a CMouse class and check for isPressed() and click().

 

         #check for mouse input

         

+        self.mclicked = False

+        

         if CMouse().firstPress():

             if self.rect.collidepoint(CMouse().getPos()):

                 print("first press in button")

diff --git a/src/api/Sprite.py b/src/api/Sprite.py
index 6cfa895..6cd48be 100755
--- a/src/api/Sprite.py
+++ b/src/api/Sprite.py
@@ -91,7 +91,10 @@ class CSprite(pygame.sprite.Sprite):
         # Angle of rotation in degrees of the sprite image (usually the same as mAngle).

         self.mRotation = 0

         

-        self.pressed = False

+        #self.pressed = False

+        self.mactive = False

+        self.mclicked = False

+        

         self.states = {}

         self.currentState = "default"

         

@@ -150,6 +153,22 @@ class CSprite(pygame.sprite.Sprite):
         self.mPos.add(self.mVel)

         

         self.calculatePositionWithOffset()

+        

+        self.mclicked = False

+        

+        if CMouse().firstPress():

+            if self.rect.collidepoint(CMouse().getPos()):

+                #print("first press in button")

+                self.mactive = True

+

+        #check for mouse release

+        if self.mactive == True:

+            if CMouse().release():

+                self.mactive = False

+                if self.rect.collidepoint(CMouse().getPos()):

+                    #print("release in button")

+                    self.mclicked = True

+                    

 

     #---------------------------------------------------------------------------

     # updateLogic().

@@ -417,12 +436,13 @@ class CSprite(pygame.sprite.Sprite):
         """ Boolean function. Returns True only if mouse

             is pressed and released over sprite           

         """

-        released = False

+        """released = False

         if self.pressed:

             if (not CMouse().pressed()):

                 if self.rect.collidepoint(CMouse().getPos()):

                     released = True

-            return released

+            return released"""

+        return self.mclicked

         

     def collidesWith(self, target):

         """ boolean function. Returns True if the sprite

@@ -440,8 +460,7 @@ class CSprite(pygame.sprite.Sprite):
             returns result of collision check (sprite from group 

             that was hit or None)

         """

-        collision = pygame.sprite.spritecollideany(self, target)

-        return collision

+        return pygame.sprite.spritecollideany(self, target)

         

     def distanceTo(self, point):

         """ returns distance to any point in pixels