From 1d85fd6e70ecba22d927922c8703b444cc6721eb Mon Sep 17 00:00:00 2001
From: posweg <joshu253@gmail.com>
Date: Tue, 2 May 2017 20:56:32 +0200
Subject: [PATCH] Collision improvement

---
 .gitignore |   3 +++
 main       | Bin 23688 -> 23688 bytes
 main.cpp   |   3 +++
 player.cpp |  23 ++++++++++++++---------
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6764b21..fe736d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 *.o
 *.swo
 *.swn
+*.swk
+*.swl
+*.swm
diff --git a/main b/main
index ddd2b71bd83f98a0a7510c5bfcc73a0631049fb1..d97feb2f7dcd2fa8679e21dd508205b8343bfec0 100755
GIT binary patch
delta 4379
zcmZu#4OCQR8oqP6GhTIs0r?sJh7k~mpAoUYQ$~o4AYqMyw6XScHg#t;J=zLOyDPZC
za6}xWUKOiThY}H3Z8Ng9&331x6BN0YoDK+XZVq%YG%YlB(b?zwW(Fr|&f$CB?|t9z
z`QG>ae(t?&eNVOZJyk=sW_pGoOwV{>+xltc$%0VcF3IKXB&v1?uioVfTmQT5gDE@z
zrM&R_OCgzSB1<|BsK&(5&NfMw1VIQCbV3Y-9SxG4s-}0P`^4t9jvu5`Q>Qe+#hTUD
zangUbO6+T+>j5p=EutXQcGYD`wYF+Hpo=JMyy0>QRij$F?OvD5Wl?g}f>70|s~VN8
z%-7n4zTLJ5UKV9_h{q;di@uQLHI_9Nt6l}CEHrjo(oN>nIFm91!zevaBNuSRvrG}4
zwt;t+%w!bCs!<O`l6#gTAXo#6o!lvDCT$HgrXArO;kFUMYl8WFRvF>hZG+rtAc)=y
zjGpxx58k-t1D;iY?bm*ojpZir+y<`Gg}`W4BWZ&oD^L8-<w7K{vrOP)QDV44XSW?e
zvIx+=i&bQqMR|%xpsjoLC=7O6>uu%*9<#?F6<WOY`jA^tOGMzVU|g`bf|c-cSNtdo
zl2v@d>!x>{3@3M0uLa)j)bH!$u5|Atr+0jv+$-=mw^OChd^>!-+)J=+64e@CC->5<
zn&f2mb#gCFmfOj0>+;r(Wwfl)qD&8BIcX7y>u@iOuEQsI+rwMt?k!Q{ROV^4+xnp7
zOT!Yz(sXfhH-(cAJHy*S-ZF15MUj_6ff5vz_Fb$V;IR2{jPY?7c{|Em=I-SP^m1H<
zl83>H1&VAR3JEILVS%^foPv3KDUQpYOe$q~a1K^WaJY20su9db>v*f>E%Wwr)Ok7d
zP;v@ZX;2*Xp@`?hjJ%EFE%WwL<jHe+9JhA=JwJh~Q#Z0_+~rb+uDe|C<8tx67;e(J
z;JDyZOxdZc?Zc{Bly|PeIfiD1q^JsMNl3UD{u9lOO(1(noY*{r-VQNEZ|5=T8oG}y
zuN^|Lb!NHBQNTy<)6tEPCsgxjMW|7HIglzs)5NubbTG6~l}W0w#>(O=JSN;lcJpzI
zbp-dB-8^Vf-n`89b>>dH1yoWY(=Jmk`SaMSE~;vevE9vFY0N``?s431?vd34o8}-E
z>kW28I!;KkGTm)p$`jiq*`iFl?4mIJ=ZV{X<OJV|9!`+l<L30#pc_5qPMRK`Bi=QQ
zmWBt5FOAV}!(&8!d&k!BL_g8kPKTlf#OE(ieRO1G#DICU-#pmg{q@M{zJNvtqOEoW
zR6mcpk|WwEmKtd|+K{y=YryQB>}N~GMTrvDW$A0pjsdfy&pgNof6ivps7N-Xs4A!-
zMo$HXsVXBC8w_`Enm=Gx`psu<ci)1^Icb!a^vr<yqSuSo8={sTxWLPBTAhT4(|@iF
znjQU*4}$9S<Bopw7~6y^<FB5MidXiYpX_+%6LTNp7Dn>11*<mqsRC>pX}}PrDnZKn
z`DOaa8L{g8A<4G}WveH9^><Tz%v#Vi#Dw4PX8BnPUY1))mp%GRiPF)S9T^48V$r#0
zQJuKo?5vo1yK1x|f!lSk2H5FIW2ma0%8adx-GhU<F^UaVJcE5y7d?Z6VGXeV(^GVd
zuSY;VEuPgAWjn`<$R5J2*qzqL@QkuH)nlJNG=c+`92NkFTC-BSeDv#eO4a63;W>FA
zExnzdjg1fM9r<P3!C2$dpDVv;!;*g3|M(bIvTyT6<k0^sc24`V<bL&hthak7lxdmH
zt?=5rk2Tyn*6c<ox<u)5wHaSv9$eUU=H9w2V;!y$*}mL~8|t}ld14K9=CM`t)OZ*Q
zo774XoV&@A7%`;;c`6MGY2)=`@wdn{mh$3rM1O_qq3Ipwnor|D6K4-o<Ln1YiibRP
z!pzr)xm=6gxOq${&0~+1Qmr!2?ZQs4Y|TM3?(;tG9Vr)Dl<y}xp2L4(h)fA#%kT0~
zeuTtp`Nj}zj#9IS`4gvmLe5+?!Q3!G2Ii`Xj)(dAA$mC>L5vupj}p?vSDbVyAybST
zqPdBgV#*M0Ow@~)&LYit!=uH8%6<(0%dx*F@Qb+anRuhU!-*rLy#EdTJ278g$jyZb
zG%M+3W!HaQu1z>)Ot}YG2xPBSCxPtrg&~=8yfQ8P&gB{f+JIWTdNcvA!rlVZLobZF
zT=xQ_fT^%Y;XoGvtAWn|lfMT)a2fCjP>&1J=_gbQf!ACv32&l>z<A(#U=Hv#;7Z_q
zc&JnZD}c>F4c@mpfq6hD@HapSFK}Cd@xV`k>}}KuTnQWpRs%QS3DpezBd`-#19Yk%
z5rlt0kTinuB`_Yy9^-kybd<~rECOx?J_T$At_5}h4+0fn7f_xe2uXN=7tw;`II-Xi
ztxk>=_nxI~$p(?mQaj+sv$Q@fLeqp&HI2|YXlh1iT8cq*j8JmQ-4ASlAs&B?XHh`J
zCpiyEa*kFd<m%L7sgM)kS6Z&o`H7`}77I<fRVJf&-K6`I$+*;{^V>tOrbN=)DG^!}
z9vnNdFpns7AvHqt4#bTL`KLuZ(hE_+p%H+>0)N>iX3tQI;~#4!iH{nCz6-a273N#^
zmE4{Ll^%8-ZjgOI>8C^VWNLIm7M6S)wm_oqn5X#=fsJ_z_7}gSH&PR3Z-<zQ)xU=1
zCg}YxtC=$k`T*=|I-eS;?tzp@Gtwf}Y{$h?8YH&oGH3}Tw!7Y>b&%Np`jYHvks7wc
z?z_Sh-VSla6_&920K{TC4||VW$qF(GvBGWFV*8ZS5)(KfZJ>3K3Ltfo9nv$9-lT(&
zwnKWEK8JLG>&`>!fz(1X=ESHkLTaM9b0XC`WaglykkTP_(nd%YNN;gz1Eg2z5OfWY
zKA<lky#?tAU7C}t9*5LJ52Wj-T$XQ674}T)SdreR4Q<#V$v1XM@@IP`*|ATOvs)y2
zb{l<@xrlwQB|q3MW;f$)gjL^92w)&MCi-}X!jF9yGW5eoAN%$G)!WC5G=9!Q9iiEo
zDzU4LiWeFd^k6tL!Y0uP=YS`C`Zv(;_32C43GXAiZ0JS7U$_(f8+3SKjHtBHR|^e6
zwFuj5EQay3y`;%8iCOJ*ca9;tf+ge`S_>;nFv8P+k3L*DQ(VwaH93YL0a<$;JK>n!
zLht5e2AyrarB;iAfWm0Z2Jy@xN-&#5d<z$w>&3U5X&AkX{S><B;aK1A-%RX;^4*dg
zi78_d{Sx$t_fpLwQv$0YD+2pW?uNSIRY_+1HVAIGwY;CrrxqoPD_TgCYf^nmcjZ19
zG~Ou5?07K0lfYB^s3zAG=v|^9ERh~GJL%)xm{=>q&%z|kc`dYWyd=r&9I^fu^lySW
zZ#|o!EYA?6pa#=C);n?SY-*vFJd@bhN?!qxrDpNNfj8ka&*QWT^Y5fpi(|wq%~Z44
z5ER-h$**{f^|-KpKou815u`^6z{g9Fi=9%wn-cO3qG2~J$~VOJAjs*SLCvtXq95n!
zpF$sQHTj01jQx@v=26Gtdnc=n-px1tjQd%r^Y_!0{D*_szZkGyJk$9|YItu)@k3?)
z;x`d={4s-um8<y<`r)xy4O<Au9TZU#tKt9ONT%$P*r{v__om=BqID%P8g@}S=XShU
Haz*ujxFajU

delta 4182
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

diff --git a/main.cpp b/main.cpp
index 2c9b0e1..4ab3f90 100644
--- a/main.cpp
+++ b/main.cpp
@@ -56,6 +56,7 @@ int main(int argc, char* args[]){
 	Block wallC(6*sz,SCREEN_HEIGHT-sz*3,sz,sz*2,&gRenderer);
 	Block ground(0,SCREEN_HEIGHT-sz,SCREEN_WIDTH,sz,&gRenderer);
 	Block ground2(SCREEN_WIDTH+sz*4,SCREEN_HEIGHT-sz,SCREEN_WIDTH,sz,&gRenderer);
+	Block powerup(13*sz,SCREEN_HEIGHT-sz*4,20,20,&gRenderer);
 
 	posweg.init(100,100,sz,sz,&gRenderer);
 
@@ -77,12 +78,14 @@ int main(int argc, char* args[]){
 		wallC.print(camera.getPosX());
 		ground.print(camera.getPosX());
 		ground2.print(camera.getPosX());
+		powerup.print(camera.getPosX());
 	
 		posweg.check(wallA.getRectangle());	
 		posweg.check(wallB.getRectangle());
 		posweg.check(wallC.getRectangle());
 		posweg.check(ground.getRectangle());	
 		posweg.check(ground2.getRectangle());	
+		posweg.check(powerup.getRectangle());
 
 		SDL_RenderPresent(gRenderer);
 	}
diff --git a/player.cpp b/player.cpp
index 4ad63f6..3eb2a47 100644
--- a/player.cpp
+++ b/player.cpp
@@ -51,8 +51,7 @@ bool Player::loadMedia(){
 				plyFrame[frame].x=szW*column;
 				plyFrame[frame].y=szH*row;
 				frame++;
-			}
-		}
+			} }
 	}
 
 	return success;
@@ -153,9 +152,11 @@ int Player::check(SDL_Rect rectA){
 
 	//Move the player out of the rectangle
 	while(((movX >= bX and movX < b2X)
-	or (movX + szW > bX and movX + szW <= b2X))
+	or (movX + szW > bX and movX + szW <= b2X)
+	or (movX < bX and movX + szW > b2X))
 	and ((movY >= bY and movY < b2Y)
-	or (movY + szH > bY and movY + szH <= b2Y))){
+	or (movY + szH > bY and movY + szH <= b2Y)
+	or (movY < bY and movY + szH > b2Y))){
 		movX += cos(angle) / 2;
 		movY += sin(angle) / 2;
 		collision = 1;
@@ -165,7 +166,8 @@ int Player::check(SDL_Rect rectA){
 	if(collision == 1){
 		//Vertical adjustement
 		if((movX > bX and movX < b2X)
-		or (movX + szW > bX and movX + szW < b2X)){
+		or (movX + szW > bX and movX + szW < b2X)
+		or (movX < bX and movX + szW > b2X)){
 			while(movY + szH < bY){
 				movY++;
 				velocityY = 0;
@@ -176,7 +178,8 @@ int Player::check(SDL_Rect rectA){
 		}
 		//Horizontal adjustement
 		if((movY > bY and movY < b2Y)
-		or (movY + szH > bY and movY + szH < b2Y)){
+		or (movY + szH > bY and movY + szH < b2Y)
+		or (movY < bY and movY + szH > b2Y)){
 			while(movX + szW < bX){
 				movX++;
 			}
@@ -193,7 +196,8 @@ int Player::check(SDL_Rect rectA){
 	//Check collsion type and reset velocities
 	//Vertical collisions
 	if((posX >= bX and posX < b2X)
-	or (posX + szW > bX and posX + szW <= b2X)){
+	or (posX + szW > bX and posX + szW <= b2X)
+	or (posX < bX and posX + szW > b2X)){
 		//Top collision
 		if(posY + szH == bY){
 			ground = true;
@@ -212,8 +216,9 @@ int Player::check(SDL_Rect rectA){
 	}
 	//Horizontal collisions
 	if((posY >= bY and posY < b2Y)
-	or (posY + szH > bY and posY + szH <= b2Y)){
-		//Left collision
+	or (posY + szH > bY and posY + szH <= b2Y)
+	or (posY < bY and posY + szH > b2Y)){
+	//Left collision
 		if(posX + szW == bX){
 			collision = 4;
 			currentFrame = &plyFrame[2];