Updated Textures

5 files changed, 8 insertions, 8 deletions

diff --git a/assets/NPC.png b/assets/NPC.png
index 6f2fbca..2317ade 100644
--- a/assets/NPC.png
+++ b/assets/NPC.png
diff --git a/assets/house1.png b/assets/house1.png
index 460c675..2f5034b 100644
--- a/assets/house1.png
+++ b/assets/house1.png
diff --git a/assets/player.png b/assets/player.png
index 4dbe772..708954b 100644
--- a/assets/player.png
+++ b/assets/player.png
diff --git a/main.cpp b/main.cpp
index fdb7d32..e45ed96 100644
--- 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 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<tempN;i++){