From 1bc1c3baf833a62720d4df67d7d37ebc74d1395d Mon Sep 17 00:00:00 2001 From: drumsetmonkey Date: Tue, 6 Oct 2015 11:55:04 -0400 Subject: 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 6f2fbca..2317ade 100644 Binary files a/assets/NPC.png and b/assets/NPC.png differ diff --git a/assets/house1.png b/assets/house1.png index 460c675..2f5034b 100644 Binary files a/assets/house1.png and b/assets/house1.png differ diff --git a/assets/player.png b/assets/player.png index 4dbe772..708954b 100644 Binary files a/assets/player.png and b/assets/player.png differ 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