From 2a452571c8bd058ec614ea479f84fcc0490ed0ae Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Mon, 29 Aug 2022 23:56:14 -0500 Subject: [PATCH] Added preprocessor directives to make it easy to switch between testing modes Co-authored-by: sigonasr2 --- SeasonsOfLoneliness.cpp | 24 ++++++++++++++++++++++-- Seasons_of_Loneliness | Bin 857664 -> 857664 bytes 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/SeasonsOfLoneliness.cpp b/SeasonsOfLoneliness.cpp index 32a1151..1d1ab4d 100644 --- a/SeasonsOfLoneliness.cpp +++ b/SeasonsOfLoneliness.cpp @@ -7,9 +7,29 @@ using namespace olc; +#define TEST_MAP1 //Toggle to just play around on map 1. +//#define TEST_MAP2 //Toggle on to just play around on map 2. + #define STARTING_MAP "assets/maps/map1" #define STARTING_STATE CUTSCENE_1 -#define MOVE_SPD 0.1 +#define MOVE_SPD 0.075 +#define PLAYER_X 14 +#define PLAYER_Y 4 + +#ifdef TEST_MAP1 + #define STARTING_MAP "assets/maps/map1" + #define STARTING_STATE GAMEWORLD + #define MOVE_SPD 0.1 + #define PLAYER_X 40 + #define PLAYER_Y 31 +#endif +#ifdef TEST_MAP2 + #define STARTING_MAP "assets/maps/map2" + #define STARTING_STATE GAMEWORLD + #define MOVE_SPD 0.1 + #define PLAYER_X 16 + #define PLAYER_Y 5 +#endif enum GAMESTATE{ CUTSCENE_1, @@ -281,7 +301,7 @@ public: int MAP_WIDTH=-1; int MAP_HEIGHT=-1; Decal*TILES; - float PLAYER_COORDS[2] = {14,4}; + float PLAYER_COORDS[2] = {PLAYER_X,PLAYER_Y}; std::vector OBJECTS; bool CUTSCENE_ACTIVE=false; cutscene::CUTSCENE CURRENT_CUTSCENE=cutscene::NONE; diff --git a/Seasons_of_Loneliness b/Seasons_of_Loneliness index 62f60e520ff5b275bc37481c08fe2afaa8c1299c..1ac16c49c91e283ebf57f71430e8f2741983e2bb 100755 GIT binary patch delta 1317 zcmZXRZBUd|7>4(`-`zccEDOpG5`%(?ppB3XD2N4uE5u-6MWJIr`Bi*P4j(bhggQk? zy8|NBW5W-saiAac;ZPkle@KlZ8QCD1Zc75pQOpADXJ#;k4W=vx(=~$ zSTi_m;XE@#b}@KShXKxXQ$6L#Gj7TzaoeSfQye*~5+8V=o6BZZB34e!>WOpb^~4~r zC)k4`t5J@3C7g$c$WGWPio^yJi!~DDk zyV&W0?fkKZ-NHSjJC}L25zzsI3hwsK+sG|ugz`QkrbWx3o@(aTO=`d01L^Wx6V8$- z9nh^}{!l0@!UGF^bhyP4e(0j@vd<6EB%;37#ryf@ z95tq^Ux)K*y?d0ZNAHYT?2l(?lkD@?yT*K_#};u|03w489=LtlyQeaPF9`&T3rcg? z&T>hBI?+1*L#0KmN1HE0t+-~VM_A-x6^+W2Jj{gHETx)Z!Wy(E!q;HPbl9gRtbrys z=a%7DTWHCDtP8s3%h~0~wH+`1zf~y@mt(OR4cmBkwYte0mGDQ=Hjb-Bw2Z1kKG6u* zRbvqym+w?#4pj+cWjMi|HG; z7MvbebG0fSw{B7#XlnL+7xb!cn}gAU7~0GawBSBV&ONDg`FIP$LCg8YR zGi_mNMUQ;dC;4DIGU!WrsU7<@TEn|KkQ1Dpq#0hq?**BT`kKFIXZ3qcl0zN1 zU>4mE>F?JmdphwpS=O%bo+?2Wy@zNk4e&mR4q72&j$j#C(jvT(m0Wlf>#0X}9>uLd zQ5B%~s*s(h@q(EWWZ(eYgjHq^8o)A{G>9s*Wpoz*&i$SI%!N}V4!EKA?U#)g0TPWf zIyJ}x!`SR2N+)&N!4p5@UHU@4`3tg)bV&Yq6%NoCmyIC=Lt`9v6%Wc!$57#GDY@+Z zLm{uciDJv-PhRN?zpqO#-y`jki~qtCMoah)-dK=)bs7taKH)<%s6^^8Z@dMYjB~>p zPX%2mD>OkHI5kmwn5?ocQQPT96+D`zZB>|+u0;x3%B5M_5}>)EElX2nlx=7N&tI>c^v6uax33U?|1cR<6N?m;D>XOgS; z;U=>12}R?ugp$VtHa2oq!bP$#K|MUrhnFA|*t}bcx5?@ij!%7Xib}k~5zFVi(&4%+ z9V4_2&}OdpL7i9+8cV;mpSbXQ)NblmFr2;yjAMzubUfVxw8Cmyg}4Exc^V30XU1in zZaS=>jTQJHpL!ImWea06bB$887#%z!V7YeoE^1aWlp3|T$le;2E(g7-6X!SkAeH~1 z!%M&pyJYGhona#Nh!4VOkzqab@Ye%SG_iF=IyTdoUO4U!OSnT3f!GE4d>{~`fmts~ zaUIRC5N(bRNf;ID@>MFHd(dW45WWoAd>}|xjr?BP)>3#dTFst83G-rIK2x4fQw+^) z%$FIaqru`vY4n$Hvsj;I=AlOX(*`NTvM~{^^VDqggjn>&ie}EZ@_2+^qp>?|_vVZy z-2&|_!QU+7MgK`%ktv|eQrv0j`JdD={zWN9s#se{wUuI$x5_aHa|$W08l!ns1?B); zrkYB8R7~olN<0quWWID-Xvm2{VB)qa><8R_;DNZN8ch(*H&$be5mdhS1pWvCo3<;O zSz}H=xhior?QmdD!1))X^pal+q#*~s%M_oUL)VgHqZ zctvF$Pso@3fPdMEAA%t{-hZnNJns}n8{s=@J z1rsX^mbG5tor8Epg?Mgq;gT4-N-JF$%acd3LN!c!@!!5L@pEpx0IX>V#W^QGaTO6* zy+=|Ve`f;s2e881l5%P827V0Z_f3lcXF9groH97NtO7##Y73z)Hm#%42xHsi8GP5uxR+8M>M# p$fFRqE|vDXb$M#U7LE8Cdfhq^st6_`K!jdIpokT`*B#XO%s-=0%7_2}