From bf82dd59140d32f4eb265ae69a44784b5fda116a Mon Sep 17 00:00:00 2001 From: drumsetmonkey Date: Wed, 16 Dec 2015 07:32:28 -0500 Subject: [PATCH] Stuff --- assets/door.png | Bin 255 -> 252 bytes include/entities.h | 3 +-- src/entities.cpp | 7 +++++-- src/gameplay.cpp | 2 +- src/world.cpp | 2 +- xcf/door.xcf | Bin 1404 -> 1930 bytes 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/assets/door.png b/assets/door.png index 2a8b0dd975859b9424580d4c205b3b1707b65f7d..7db551dceb672c51222f0a12d7be2986dffe5dd6 100644 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^DnM+*!3HGxS|##;6lZ})WHAE+w=f7ZGR&GI0Tf*4 z>EalYaqsPo-JA^uBCQXT1!N8=${f0ND{#)yz%|B`nU`F0(`5;)d8+k)ZH|zgKSza+ z3a^og-!Zkh^1DtCboC@}|C-aceI{KoSFCfYoV`+K&Z$GX2AAEZW&D!8ym!u}UngFzxVw+Dq@G-U77#@ delta 241 zcmeyv_@B|ZGr-TCmrII^fq{Y7)59eQNGkxbH3u7zl*;Z{1EkoJyxmN>sZ6H|cf1zGc;w1*#pVyk6$OnP?jOP;JV z2hcaiFunc; diff --git a/src/entities.cpp b/src/entities.cpp index 24c0d01..3b8b52b 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -155,8 +155,8 @@ Mob::Mob(int sub){ height = 2000; tex = new Texturec(0); case MS_DOOR: - width = HLINE * 10; - height = HLINE * 16; + width = HLINE * 12; + height = HLINE * 20; tex = new Texturec(1,"assets/door.png"); break; } @@ -416,7 +416,10 @@ unsigned int Structures::spawn(_TYPE t, BUILD_SUB sub, float x, float y){ * with type NPC. */ + //((World*)(inWorld))->addNPC(loc.x + i * HLINE ,100); + //inWorld->addNPC(loc.x + i * HLINE, 100); currentWorld->addNPC(loc.x + i * HLINE ,100); + } diff --git a/src/gameplay.cpp b/src/gameplay.cpp index 69ae2cc..6b62465 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -133,7 +133,6 @@ void initEverything(void){ //playerSpawnHill->addMob(MS_TRIGGER,player->loc.x,0,story); - //worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill1,worldSpawnHill2); //playerSpawnHill->addStructure(STRUCTURET,FOUNTAIN,(rand()%120*HLINE)+100*HLINE,100,test,iw); //playerSpawnHill->addStructure(STRUCTURET,HOUSE2,(rand()%120*HLINE)+300*HLINE,100,test,iw); @@ -143,6 +142,7 @@ void initEverything(void){ currentWorld = worldSpawnHill1; + worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill1,worldSpawnHill2); player = new Player(); player->spawn(200,100); diff --git a/src/world.cpp b/src/world.cpp index 1b460a2..d26b0fb 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -903,7 +903,7 @@ void World::addStructure(_TYPE t,BUILD_SUB sub, float x,float y,World *outside,W build.push_back(new Structures()); build.back()->spawn(t,sub,x,y); build.back()->inWorld=outside; - build.back()->inside=(void *)inside; + build.back()->inside=inside; entity.push_back(build.back()); } diff --git a/xcf/door.xcf b/xcf/door.xcf index 796501889b1b7676a7b1372dc28304477eda465c..e4edc10c9b7edce3ab4e05c9f0ee61715e94b9f8 100644 GIT binary patch literal 1930 zcmeHHJx|;~5M6tZm^(N@M2G}JVGD{w(M1<(DmtVHrB3Jb*^Y&=k$p&9!&T{VpFXua zet>__6;L3gIB(Xw!4^&t3Mxi=J8$P>KW4o4gR^sS>3G5mLYG1IfI}jXw}4?_*Z`J~ zt~);o;O~GAFaq8yPH~%v--cfIvFtE7vwe5yC&2_JM*iP}bUF)Nk;Y*#+3yWJ--*LG z5d*1)i9fc*=+j6_3;C>E`$!$Pq-wwTH=)$a^xSrW$QK8Cz20EfVpFE!MHEa$5INu7 zl(J*bOWo<;v*iMc26sMS#ntip#`!&7>PV3Sd1Ph=8lIZq-tfn-YCyMKf&^gCV zn<+1|$crK`%CaC3U$87=+09KxAiiLh#jI}EA`oArOYQ-OfV{ww?VS2ad=X7(i|5vY za{s3m6i?Dt3*95Q`8OH$cx2RqM@<{QqWLk~&A9~6yI}>+n%oGNasxiC$*;NAuQrZ4 zzD!-(`?Q@Kg^4q4<@fTt&hcpLT>G27t*@nfsr5_UNAIWg>%P^uRPW6ruioo1n|J!m m$OL z)_cngmWYXoTW)fCPS3q}n4H4JV8|wp$2{S?1d0LfQ9zvnGz}hSfO7k__=W&|4k!Yy z0GCqZ+y%_nfKNCaYl(r)U5iJe4;I1xrx}l?zRTj!7yV|%^tcoHVZ_Xgtcdq)*1BnB zwL{#>RufixJ62Vn{Vs5I5)W-h1f1Qe^D5?ahbJv-9EcGUf%D|XxE*?4?2b0q18e%z zT07gTn1U?rMJZqgz{oM7YTI_6c@&O=EHoV~tP%hNPXT4Aaoms^h%|D#lGD|kKFsN( zoIVDP=c=M0@b|FP$5wX%OMl2Z-&coO{c+pVyZAmM?}_0T0CdBee~@V4t(i*RzyCFl z?L4m&ZP`dx%QRgkHOY1GN}IgZ{66>p{qIzcYwjeo!Uxgj4YHaq7IRXQTnBGf=#Z>S Rp-T;eVmD*x(yU9n=@(j1M{@uG -- 2.39.5