From 1bc1c3baf833a62720d4df67d7d37ebc74d1395d Mon Sep 17 00:00:00 2001 From: drumsetmonkey Date: Tue, 6 Oct 2015 11:55:04 -0400 Subject: [PATCH] Updated Textures --- assets/NPC.png | Bin 1024 -> 535 bytes assets/house1.png | Bin 694 -> 1483 bytes assets/player.png | Bin 312 -> 566 bytes main.cpp | 4 ++-- src/entities.cpp | 12 ++++++------ 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/NPC.png b/assets/NPC.png index 6f2fbca8168367f0a49ce1fe0bc80e52f470d2b6..2317adeeff5d0bc3fca70a678642595fc529004f 100644 GIT binary patch delta 504 zcmVAVRH6 z?c|V2{T=l;NI(J(f>@!%p?r{wcWJ5tFPeACC3oND$@_hmOQ2M#Qbm{ZjWJOkv8HS$ zRtSCH*LLzeZ=%>%5=Uu-;}m-Wj#b3fNe6!{4DSF~*|-E??!g7%X3)z-Y9+DOTOl3y zBr=vcy)0Ux*ygeU3S~+u}Hi%5$~Vg0&stJ zu&JEyhc&Ds{(lqa=5bQut;iaWGw(oTjh45Lk=zx;FXNPYwvV`T-b^3q7B#Eoz?9vw ztOVfba8DcP_~b&lF74PJ%(AT3>r u+#RjSSDkLM9qFp1IR8NMn&a1qKLHfrQH^OG#!xH(0000uH4}O delta 997 zcmVy{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j2<;4lFV>eZy3d zTPuG9WJyFpR7l62mP>EjMihm=c~B(P#Ih~NL7M>Gv`NtdSttKE=zr*@o36S^fp*oM zfx=B{K(QT>5;?bvJABD9WqLN0hQo92^W1?6%K%SPeNOpi?`G=Z)w2C7y;l|pe||)& z@JNC;&jFYL4p;)0@%Oht06qb$50@OI@b`c0Ti|QpS6~%M7QjU$Is%q&p5s1Tjz{c1 z4?OTY@H!e{<0}D75U{5Ec8tW2>@Q=O41iS#6GUnL__s~Ws0a3*_+J2XfU;8X5Ya@S z?q&VZvU~Psz!o?LOxp9YA^H32;bl4?m^lE_7^1zd*P>oLir|McH55pI8+w_ofHFCh*fa z!Ne{fE7O4oa}UlU&SJkx_|f$8(2s@D7Zn_Cv;o0ipCGZ2Ic_74YYROLvMxaRs4_J@ zlr&KW17yjt{SAcFsR5J9)b!NTf=Pc9C9*v!%@a(Xka|n;?&WwT4U(L=yQB?hmc+PJ zZK$%zAv(+3K4{`B>uN{@(Cjs9%!>iRKQ}FbiJEUrw7NmaJrouE_vI0N&@@uh7Jzt* zDQZXp*l5miHq?>dE*{tiJIgitCIYw73v*Yb!c;YFb1q=30N!ea)j`{Q2ho3y<-m^+ z+c?TB>PaoF z`aUc~?_L5bVqRj63h*RRDHnnH3_h3Y-l_IY3FK2kv=#6YhkFy_lMITwSEgO?zdR^J zaa^`Kv?>({pbQ>hyqUe3@1$T|b$I|-6>wc5bap%e=F1$L?6j^u&LHzTdX0hFw6_Lk9yZn8 zTg7pXEK)wlrUZBooB(!r7};162@ni$+S8V@cen{rFZ@Tq&#@2AfnNaG&B6c1K_8YX TXrkf(0000t+{(dI7AtL&jJcc?JB~^x zo7?8Hk;E!XwsYiCM});=@jQuCJ1&J2&YVBabDr~jp7-*7-uHQ*?_ckISihEOLC7&b z9nIaEAP`8$|EM=fRXM82)PSopB3KJiYHFte*K>s6zg_Vvjl|JmHvZm6fK2&^+mZD^ zm=UA<@GZNgA423h1)i;?`|<2cM_U7lh5OXR6_4|NpF_T6xNO_kuBfTfmqfHp=4^SF4ts7CTK z49oXLA(GKbv=EC4lEWqqS!rYu8#j8Mg0VGC2y)TH=X;GelcoB6^-S#tHgiGrY!q3a zl?I5GY{DX>LyZKrfkLlwE_ofv=S<4KpjPx>fd&0`V>rtK;6@_SrS6-rq|eYXsp%yF zc?x9-`3R4;oUoz2nWOo@I1Ac}3<}jhwb2dsW0BWdXMS-D3gCxJp6C-{X-;XswnWE7 z^~(HU1`7@fm_nB?jg-(oq-*#gaoG(^5sL$Cu77weE4JnUpeF>AnI3W0TdjoLZloZ) zp%x@&F0am;>ke1EA8jFX4fyaz$iC6Lr?S+@H-D>6F7s-z2DyQ17lMdtiabKD2};lz za@vX-@6-I2=HpbF3=yIpM7zs+S(2u#iuYmtOkkN2Q)Wp=HN$i*&TR;O5nYd+E0lO< zztf0h`b>;Vo^mDssojO^=^8!?2_nk3BW!Bbf>m<#9HUSf$R9nSPzf zP+j1Z#N1$J(@*v;2*!f%hAu|M$CO=nlL^B;M{0qWjJ*;kS@*~ySHz&k_(=oUx6d%z zWe-V3G;oT8W`hOv6ZB`JxqziZ#TdG$Nq|oyZ#+v+$rClXTBULj#rsDmBveImoF&F~ zCVtl+wxsaIvNuN5w%q!Hkl7^Hq>u4&7%L@G7^{TH6R!bJQ@9p($nDp7(}3LF>aI}y zAzwTA){cy)UQP)#Ke)l{JnSCm{CN;@CG&!A`H4gtlx%N3ybDQ066rh1Tl5b*?f-=N zUU{^9b)EUNv+G*_kV_kKFNyP@Qe+-u{GQO?z0utC{P3aGo|0Rb7UNU*=<7a(0%Icj zVPR|m&qZeGT-f}uzGl`jyS1Zfc93kwKDa|Qne99C z@#t7PJxvzjx=gl~mmi6mBKo1@PWwg(&flMMSu1~3UZOI$R4RgRzoK3|8^Wm@D6?t~ zj>q@S842*l+{6nVC8FLZ;{4cx9k84o{v!bR$$8$r0Kb8M?3!VeHm<{YRjvhBO;n#1 NN1IF0T25k%WxF3djJ?px<8C#e}3tDhKEGH_5s$RDmA@HD4nw# zs~QQtsWLpNSPJz4Hc3eedZS4iQv?`=jQ>l-E)7#}Hl~UbbOEf%HPA*H7tniJ8>OoR zYl`0J8rZUHqwO>{y?ZND+6J&?=#4Ie)rmNB);O+WkV%OyF_DEdZUd+1!ZxP&~TH$<`pN{bg*e`Y!Sc|0B)ci zHfM_fIJC$RT4wAt5VkiZ>zSKWN947?+YGedKiRg9tfSYk2keG<4L4oG9T}%-{FV4$ zj`}dTdrkU;-NgUk_)t5j<@=|R7_Rxv) znQ{JD5^f@+zEm5fnTkP5!|B~nv_n1~bxAd>6NA^Vucdu0-Mn+S@WtcmtS7zT?aN1^ zw3My1PA>k&y*>3{wccb(OWhbmFCM5kfs)^9y%B!tzM`_SObp5y)-{z3r~5>g2TgP1 zG)>FY`p(>kDcASsus?^rhP{TphFh!QZ4YwW`Y1L03z;n_@wkNYjsO4v07*qoM6N<$ Eg14X>fdBvi diff --git a/assets/player.png b/assets/player.png index 4dbe7727b6452aa2dc393679841bbf9203e2dec2..708954bbacfcaf356cb85597196bfd4215100be2 100644 GIT binary patch delta 535 zcmV+y0_gp?0=5KOiBL{Q4GJ0x0000DNk~Le0000U0000m2nGNE00x%Ivglmf>W_YI*KBqqo8yVN8!GMgM))0;w&P?twX~ZJi8i34kC9pdk0B%2ndX=q=-nOu69;bEsTB8*!yCu2FU-YU1pzZe(x>oCB z99KoJN*K94#Cxe!DEUpH0Ki%M8-TCJi&&(kZr=fT9}cmeSOA>5E&!YPyi!k+n^b@5 z_LUe`6Dy>;bn+S-_th-VadVZ_T9I6be1Wi}^=c>m5*?91H^01i(c z7+<@i^!j`y-xK5W**@Z<5#fJU|D8H>ZN;vC_yCl5vVo(Sv>O4rOX*tOUJ0$Q6H8m} z@AmIbdJpA^q&#JSkaq0PYN2H7(#|vEw>5Vve{zXUMA>o<0KfjD+jjjQ$G*#)b*zOE Z{{j^}%KF6ICL002ovPDHLkV1oL3?%n_Z delta 279 zcmdnSvV$qQGr-TCmrII^fq{Y7)59eQNJ{{*3I`jIoP7S59*|;7@^*J&_z!{$_AZ|c z6yYrJh%9Dc;1&j9Muu5)Kzi6qJbhi+?{hJ6TU%UzkYheETDzWMj;D)bh{y4_VY~Sn z6nJc;X2#0={m&orz4+o0fgYPElZk4v8ZSlPMKSEsl;St{u47#&>hLXdiNJ-Wc_P`5 zo^*4aQo1QB^mfhDuKyGMNHWB)S~P{}Tubr<3(gFSRo!d38+Z@!B(QF{<1xp7(^o!=Z{draw(&player->loc); // Draw the world around the player - glColor3ub(0,0,0); + glColor3ub(255,255,255); player->near=true; player->draw(); // Draw the player player->inv->draw(); diff --git a/src/entities.cpp b/src/entities.cpp index 42f93c8..0f555b2 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -103,8 +103,8 @@ void Entity::getName(){ } Player::Player(){ //sets all of the player specific traits on object creation - width = HLINE * 8; - height = HLINE * 12; + width = HLINE * 10; + height = HLINE * 16; speed = 1; type = PLAYERT; //set type to player subtype = 5; @@ -120,8 +120,8 @@ void Player::interact(){ //the function that will cause the player to search for } NPC::NPC(){ //sets all of the NPC specific traits on object creation - width = HLINE * 8; - height = HLINE * 12; + width = HLINE * 10; + height = HLINE * 16; speed = 1; type = NPCT; //sets type to npc subtype = 0; @@ -165,8 +165,8 @@ unsigned int Structures::spawn(_TYPE t, float x, float y){ //spawns a structure //spawns between 1 and 5 villagers around the village if(type == STRUCTURET){ loc.y=100; - width = 30 * HLINE; - height = 30 * HLINE; + width = 50 * HLINE; + height = 40 * HLINE; int tempN = (getRand() % 5 + 2); //amount of villagers that will spawn for(int i=0;i