diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-03-08 08:42:20 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-03-08 08:42:20 -0500 |
| commit | 82c75b0a97eba2f78206d3b97d47eaa580a82f0c (patch) | |
| tree | 90116b676fc5b8cef16fbea8b07c4951dd645ea4 /src/entities.cpp | |
| parent | 02419534e3a0753abc74d8d15b1dc8ac0e3b31a7 (diff) | |
world lighting fixed
Diffstat (limited to 'src/entities.cpp')
| -rw-r--r-- | src/entities.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 06269d6..8a10428 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -8,6 +8,7 @@ extern std::istream *names; extern Player *player; // main.cpp extern World *currentWorld; // main.cpp extern unsigned int loops; // main.cpp +extern unsigned int tickCount; // main.cpp GLuint waterTex; @@ -295,6 +296,10 @@ void Object::reloadTexture(void){ void Entity::draw(void){ //draws the entities glPushMatrix(); glColor3ub(255,255,255); + + if ( !alive ) + return; + if(type==NPCT){ if(NPCp(this)->aiFunc.size()){ glColor3ub(255,255,0); @@ -626,6 +631,7 @@ void Player::save(void){ data.append(std::to_string((int)loc.y) + "\n"); data.append(std::to_string((int)health) + "\n"); data.append(std::to_string((int)maxHealth) + "\n"); + data.append(std::to_string((int)tickCount) + "\n"); data.append(std::to_string((int)inv->items.size()) + "\n"); for(auto &i : inv->items) @@ -666,6 +672,8 @@ void Player::sspawn(float x,float y){ health = std::stoi(ddata); std::getline(data,ddata); maxHealth = std::stoi(ddata); + std::getline(data,ddata); + tickCount = std::stoi(ddata); std::getline(data,ddata); for(i = std::stoi(ddata);i;i--){ |