From 61730209be0fc35168ce7668fed9d430f44f386d Mon Sep 17 00:00:00 2001 From: posweg Date: Sat, 6 May 2017 18:01:20 +0200 Subject: [PATCH] Powerup update --- main | Bin 24036 -> 23964 bytes main.cpp | 8 -------- player.cpp | 26 ++++++++++++++++++-------- player.h | 4 ++-- textures/player.png | Bin 38659 -> 412 bytes 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/main b/main index ab338ce4667785dfcabe97acb9cd225cb59bba8f..df0335d59baed32258d8d2e9ba0ad4943f63f2ce 100755 GIT binary patch delta 6780 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 G9QZGF^DiR+ delta 7039 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 BOD6yT diff --git a/main.cpp b/main.cpp index fb824a5..9bee2c0 100644 --- a/main.cpp +++ b/main.cpp @@ -18,15 +18,8 @@ SDL_Renderer* gRenderer = NULL; const int sz = SCREEN_WIDTH/16; void init(); -bool loadMedia(); void close(); -bool loadMedia(){ - bool success = true; - - return success; -} - void init(){ SDL_Init(SDL_INIT_VIDEO); gWindow = SDL_CreateWindow("Platform Test!",SDL_WINDOWPOS_CENTERED,SDL_WINDOWPOS_CENTERED,SCREEN_WIDTH,SCREEN_HEIGHT,SDL_WINDOW_SHOWN); @@ -45,7 +38,6 @@ void close(){ int main(int argc, char* args[]){ init(); - loadMedia(); bool quit = false; SDL_Event e; diff --git a/player.cpp b/player.cpp index 08cfe17..bbea440 100644 --- a/player.cpp +++ b/player.cpp @@ -7,15 +7,19 @@ void Player::print(int cameraX){ SDL_Rect cameraFix = rect; cameraFix.x -= cameraX; - if(power > 0){ + if(false){ std::cout << power << "ye" << std::endl; power--; } SDL_SetRenderDrawColor(*renderer,0xFF,0,0,0xFF); - ply.render(&cameraFix,&plyFrame[0]); + if(power == 0)ply.render(&cameraFix,&plyFrame[0]); + else{ + ply.render(&cameraFix,&plyRun); + power--; + } //ply.render(currentFrame); - if(ifRunning)ply.render(&cameraFix,&plyFrame[1]); + if(ifRunning or power > 0)ply.render(&cameraFix,&plyFrame[1]); oldPosX = posX; @@ -37,8 +41,6 @@ Player::Player(int x,int y, int w, int h, SDL_Renderer** render){ ply.setRenderer(renderer); loadMedia(); - - currentFrame = &plyFrame[0]; }; void Player::loadMedia(){ @@ -51,9 +53,13 @@ void Player::loadMedia(){ plyFrame[1].w = szW; plyFrame[1].h = szH; - plyFrame[1].x = 2*szW; - plyFrame[1].y = szH; + plyFrame[1].x = szW; + plyFrame[1].y = 0; + plyRun.w = szW; + plyRun.h = szH; + plyRun.x = szW*2; + plyRun.y = 0; }; int Player::intVelX(){ @@ -76,6 +82,10 @@ void Player::move(){ int gravity = 800; //Gravity force int jump = 500; //Jump force + if(power > 0){ + jump = 700; + speed = 250; + } //Check keyboard current state if(currentKeyStates[SDL_SCANCODE_LEFT]) direction += -1; @@ -231,7 +241,7 @@ int Player::check(SDL_Rect rectA, int type){ } } } - else if(type == 2){ + else if(type == 2 and power == 0){ if(((movX >= bX and movX < b2X) or (movX + szW > bX and movX + szW <= b2X) or (movX < bX and movX + szW > b2X)) diff --git a/player.h b/player.h index 0a21cde..ea58cb2 100644 --- a/player.h +++ b/player.h @@ -34,8 +34,8 @@ class Player: public Entity{ int power = 0; PosuTexture ply; - SDL_Rect* currentFrame; - SDL_Rect plyFrame[2]; + SDL_Rect plyFrame[3]; + SDL_Rect plyRun; }; #endif diff --git a/textures/player.png b/textures/player.png index 349913ef98b5aae45ed60d8cd307e434d256c37a..21898ceec22007f37549655214fb397efaa7688e 100644 GIT binary patch delta 353 zcmV-n0iOPYt^%9`kQWLl2nGNE05$49C6OUAe+CE>BQf05a{vGVDM>^@RCwC$n%fG) zAP@z2#sB~1)2BkOp{ciBGXsG%I;_j|2L^m>W1sc!|PN40=s61473Lhv<2BN!08d1^xlcH~ZJj|69su7n9jSl(fj-c!I8x~3BK-9 z>Nv<2nGZLf&syRV0hvNFl{+l+;OO>00000NkvXXu0mjf&^ewA literal 38659 zcmeI4v1=4T6vk&ICYlfs#X~H_%1Rrp#46!Ja!5i5Y3zcnC_*e!sn`Xqv{MVgLMuTK z5yVda0c#se8|`h*9c0MMWH0w-zS)_#=R0$`+1YvTeee72ZPsIx-SxHQ`Ps9x#+doR zN`Iq%-Kn4J$ENG=-=4qQtzV{ZUSIB;q5b#r^XsSe%<;P`H@1zLJ7u4hdG_K=Jvno4 zu(~w!<7hQ^`NGD>_d{dOn?ZkJbEh(29$b4^)f4rXJ|@Y5JEWN-WURvpbU*=5AXM6t z0;X3Yd_UQ$8FSaJ3rMN1vsZbDwaEzu8-SCigi(dQxw)5c^pu{d3-Kb zMFAJHK2KoSdwu0UOfIiP?s|FT3kolUr(W@Q14 z2+ZN2bbW{i4)Ef}m8XmKw`Q2=sL7sNIV;GDS@;ucN}6sQ%*F#DW{!lEAOa!c0LGj34w=+ z_xDNHXZ6Nvv~lj~_kGwl>(^Ll0z@Fq)7DtJzP9=vl{e@eJSvIK%XMG`;P0PK^z>c; zx!B^Ajes4OOrzvEpn&BuNvbILf-7ltMl$+`Mi|SpFL{!^Vpu_a2Z#C9xz!4|bI8I3 zSGVK;A0AdI!D^AG!{M;$cIyP)rb!|GXKYQhf}W!H7$hC}KrL|k zOjXQ3ko>$;B2RlnrSz+4BK5$~L2iQJ=G>YC!DA*|{Fr4%PtoHXO0eIDNa5JAzkgIo z8aHZ&L!k1MJMRMeSG`24%C;LNU0=K1@6R3u zcz+7rlI(y2mP{vsHXh(}UoXAUdjS&IT{Z;|c3F*D9dMu+VCfe{()Dqf7X!={sOvBX z6fowW_~^jm07e9AEard$#{3f>t$@WN!UQT{%s=tb3RpZMOrQeB z{1YFofW;%i1S(+6Kk?BDSUe(3paRDH6Cce2Ea_v#CP$^~Yto!+u6o?t{>h?D6n!}T zYSozD)}X(zNv3t!1qax$k+%&J%QX?Hfy8q4m0HIJOa-Ebpz%~o(-_T<#y4pyH5UX} zdgIddm4F<4SA49Av2mfM#MX(83)PoYhbJD`AZ4@GBCz@qWs;uJ9Mq38?> oSTr77oC3x@6rDi