diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-04 07:32:55 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-04 07:32:55 -0400 |
| commit | c74d256646cf0c438feee2ac703cc1f34b47b8ec (patch) | |
| tree | af9ec2469bce263c53ce6adc8d9385750eab3ead /src/entities.cpp | |
| parent | 260c617673ab332bf2a3531db45bd264668d1b98 (diff) | |
| parent | a45daeda3633bdf25267a0186b39618269dca970 (diff) | |
Merge branch 'master' of https://github.com/tcsullivan/gamedev
Diffstat (limited to 'src/entities.cpp')
| -rw-r--r-- | src/entities.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 6476755..f4e2dd7 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -102,7 +102,7 @@ void Entity::spawn(float x, float y){ //spawns the entity you pass to it based o Player::Player(){ //sets all of the player specific traits on object creation width = HLINE * 10; - height = HLINE * 15; + height = HLINE * 16; type = PLAYERT; //set type to player subtype = 0; @@ -697,7 +697,7 @@ void Player::save(void){ void Player::sspawn(float x,float y){ unsigned int i; uint count; - std::ifstream in ("xml/main.dat",std::ios::in | std::ios::binary); + std::ifstream in ("storyXML/main.dat",std::ios::in | std::ios::binary); spawn(x,y); if(in.good()){ |