diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2015-12-16 07:27:06 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-12-16 07:27:06 -0500 |
| commit | a83d037394f37403918b62fdc0083d4b84ea02db (patch) | |
| tree | 4fd40f383a600d94552e2e7122fe243363831016 /src/entities.cpp | |
| parent | 7b1908e2bc2531de0b7e5ec81ab09b50ae14263f (diff) | |
music/merge
Diffstat (limited to 'src/entities.cpp')
| -rw-r--r-- | src/entities.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 24c0d01..7ebe744 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -83,7 +83,8 @@ Player::Player(){ //sets all of the player specific traits on object creation subtype = 0; health = maxHealth = 100; speed = 1; - tex = new Texturec(3, "assets/player1.png", "assets/player.png", "assets/player2.png"); + //tex = new Texturec(3, "assets/player1.png", "assets/player.png", "assets/player2.png"); + tex = new Texturec(3, "assets/maybeplayer.png", "assets/maybeplayer.png", "assets/maybeplayer.png"); inv = new Inventory(PLAYER_INV_SIZE); } Player::~Player(){ @@ -155,8 +156,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 * 19; tex = new Texturec(1,"assets/door.png"); break; } |