Updated Textures

diff --git a/assets/NPC.png b/assets/NPC.png
index 6f2fbca8168367f0a49ce1fe0bc80e52f470d2b6..2317adeeff5d0bc3fca70a678642595fc529004f 100644 (file)
Binary files a/assets/NPC.png and b/assets/NPC.png differ

diff --git a/assets/house1.png b/assets/house1.png
index 460c6754edd3c7e21aa4ac5cfd43e9c67586810c..2f5034bd5c1f65c7c1c71824d64cded081bf04e9 100644 (file)
Binary files a/assets/house1.png and b/assets/house1.png differ

diff --git a/assets/player.png b/assets/player.png
index 4dbe7727b6452aa2dc393679841bbf9203e2dec2..708954bbacfcaf356cb85597196bfd4215100be2 100644 (file)
Binary files a/assets/player.png and b/assets/player.png differ

diff --git a/main.cpp b/main.cpp
index fdb7d32d601f7cb97368b1e315fc04b63ffd6dce..e45ed9698b2662f0c393696c1798a097fb1e9355 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -64,7 +64,7 @@ int main(int argc, char *argv[]){
        if( music == NULL ){
                printf( "Failed to load beat music! SDL_mixer Error: %s\n", Mix_GetError() );
        }
-       Mix_PlayMusic( music, -1 );
+       //Mix_PlayMusic( music, -1 );
 
 
 
@@ -188,7 +188,7 @@ void render(){
        **************************/
 
        currentWorld->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 42f93c8b6969195bb0db7dad6c5aa6c638700e61..0f555b255bbf16d3d12703cb37026fb593b6afa9 100644 (file)
--- 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<tempN;i++){