From ba3e8a512fb15f91628892f4aa3ba0ef09edd888 Mon Sep 17 00:00:00 2001
From: "YiJie (Jackie) Zhu" <64090163+jckpokimain@users.noreply.github.com>
Date: Sun, 17 Jan 2021 04:51:24 -0500
Subject: [PATCH] final fiuna;l fianl commit

---
 .vs/slnx.sqlite                               | Bin 778240 -> 778240 bytes
 .../Game/Components/PetMovementComponent.cpp  |   1 +
 UbiGame_Blank/Source/Game/GameBoard.cpp       |  10 +++++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index 337b5635f5e549fb390c701e0db02a5e5a965dd5..406c42b1b38a096ce39027889ec58c81ab1a1d64 100644
GIT binary patch
delta 596
zcmZoTpx<yne}Xh);zSu|#>9;YiTZ5sC0Lk^nWig>GYU_>r7yv#xcRewY5^0^-pL6I
z9!}0*z_!_OVGXyaP<uWb0}~@78>^xSGslfxXLTOeOHIDC#!BjJ_B6gPLhV@)X_g6K
z=`*aW5B}S%wpN>&^DVn5J1g5)wzr!THb^r~&fmbcxq4F;iw)af1`g(b%&*y*nV4WS
z%LL|E?7RqZmLlf2?6L?x^MB?y?4b-An-#a0?O;8tbN}kn?Q`-OGXyy}+gV-$;i1Wj
z0_xk18yV-Ysj0HKGcg$%C0badCMKtuSXvsG7#XFdBwLy$nx&Z}r&y%0%CjnL|Ju$d
zE6Kqj%CZIsCj<58Zf{@6=+3IF#OzK$yTbO5%NQqEG0JamddSGF3#9w_m~@006}RtJ
zWICY8tiY-`J<yj)WV-KHM)vJ9otc^hfofzznNs!(FfcH1umTl;X^=aB0jH_M`hs}}
z^Nj8L9GGu0)w7;rP+(AJ;$(AA%uRL5Pb^B&OD-s2RR9M+(Ca{X0|s{{4mJXwL{hKF
zpv}m^mYSCwUy_<z5TBNxlagA*4pX4iCC$cQ2(-{CF*!TEUEGBkh*^M`6^Pk@m>q~Y
QfS41AxwebDaKD@l087-gj{pDw

delta 554
zcmZoTpx<yne}Xh)z(g5m#(<3piTZ4BC0Lk^nWig>GYU_>r7yuKz4^0#YQf}$1rI0Z
zFW}hhxUhy>l!1XElYxnmk&QV`fSKdQuASFex>iiSw8l#6SW{JDhfsSK8(5lUf(S@@
z|5jOP_RVT*wVB!fvWv2_vdeBx*dWa`Ie!Dk=ITvZEH>=C3=+)$nKtwDFmN#cW7@>d
z%*4dX!*m@)Gyh|L4We0!nBTIig5)85=KsuZK;oMfx0mf;J)#)*lYRS~e8vnx4wjc-
zcxbYsfckdhM#ed8YAkXfCo?%G=B5@U`X=Tjrl%I^B^MO1sIz!8F&UdDrCC~-r*8k+
z&L}I%!LkMnCj<58Zf{@6=*~Lba5<x}0MG~(W^cIal<gmvF;1{zl-S<%kda##NcZtE
z=?F7QZQrfPbU=|=l2vMYpf8iibl<Ox?AvELGc^eU)yRZ0rR)~~d&rL^323AMD^THf
zU_fc=u<mBw&HH!zJ_qJoOw%KrnE8?!wHVBqIN1Uci%K$+b5fo2a|`nGSWhtoF{lHD
z-GSb5%1<mx0eOX05*X5ZkILA;2Fe>Tcr$UZ!TgnyXqswiVwhr{mTa1qXliL<l9pm=
mX3Q!9($UW8!VJVLK+FonY(UHo#2i4(3B+96IbFEF&jtWS8=t2D

diff --git a/UbiGame_Blank/Source/Game/Components/PetMovementComponent.cpp b/UbiGame_Blank/Source/Game/Components/PetMovementComponent.cpp
index cdf1987..d54feea 100644
--- a/UbiGame_Blank/Source/Game/Components/PetMovementComponent.cpp
+++ b/UbiGame_Blank/Source/Game/Components/PetMovementComponent.cpp
@@ -13,6 +13,7 @@ float getDistance(sf::Vector2f vector) {
 }
 
 void PetMovementComponent::GetHappiness(float haps) {
+
     happiness = haps;
 }
 
diff --git a/UbiGame_Blank/Source/Game/GameBoard.cpp b/UbiGame_Blank/Source/Game/GameBoard.cpp
index 0728dcc..dbebf43 100644
--- a/UbiGame_Blank/Source/Game/GameBoard.cpp
+++ b/UbiGame_Blank/Source/Game/GameBoard.cpp
@@ -21,7 +21,7 @@ using namespace Game;
 GameBoard::GameBoard() : boardx(1800.f), boardy(900.f), pastscreen(1), screen(1), agendaHover(false),
 init(false), px(500), py(500), hapwidth(416.0), haplength(32.0), pastHappiness(1.f),
 m_player(nullptr), pet(nullptr), check{ false }, checklist{ nullptr }, happinessTime(15.0),
-ispressed(false), score(100), happiness(0.6), taskLength(3), enteredwith(false)
+ispressed(false), score(100), happiness(1.f), taskLength(3), enteredwith(false)
 
 {
 	sf::Time time1 = clock.restart();
@@ -118,8 +118,9 @@ void GameBoard::CreateBackground() {
 		if (happiness > 0.3f) {
 			CreatePet(0.f, py - 75.f);
 			enteredwith = true;
+			CreateHappinessBar();
 		}
-		CreateHappinessBar();
+		
 	}
 	render->SetFillColor(sf::Color::Transparent);
 	render->SetZLevel(-1);
@@ -709,7 +710,10 @@ void GameBoard::UpdateHappiness() {
 void GameBoard::UpdatePetHappiness() {
 	if (screen == 1 || screen == 4) {
 		Game::PetMovementComponent* temp = pet->GetComponent<Game::PetMovementComponent>();
-		temp->GetHappiness(happiness);
+		if (temp != nullptr) {
+			temp->GetHappiness(happiness);
+		}
+		
 	}
 	else if (screen == 3) {
 		Game::BigDogComponent* temp2 = bigDog->GetComponent<Game::BigDogComponent>();