diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-07-02 10:11:45 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-07-02 10:11:45 -0400 |
| commit | d96c869152527ae0c570de1d1c8552ec64d7fddb (patch) | |
| tree | 89ef30120517c769be5c6fbf3920f6952b723950 /src/entities.cpp | |
| parent | 6f13e748c526576198d197ad194f4c1d8fdadec0 (diff) | |
fixed quest menu, only entity vector in worlds
Diffstat (limited to 'src/entities.cpp')
| -rw-r--r-- | src/entities.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 53d3aca..b93d1f0 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -697,7 +697,7 @@ COMMONAIFUNC: do { // assign quest if (!(qname = oxml->StrAttribute("assign")).empty()) - player->qh.assign(qname, "None", std::string(oxml->GetText())); // TODO add descriptions + player->qh.assign(qname, oxml->StrAttribute("desc"), (oxml->GetText() == nullptr) ? "" : oxml->GetText()); // check / finish quest else if (!(qname = oxml->StrAttribute("check")).empty()) { @@ -1038,11 +1038,7 @@ void Particles::draw(GLfloat*& p) const { vec2 tc = vec2(0.25f * index.x, 0.125f * (8.0f - index.y)); - float z = 0.9; - if (behind) - z = 2.0; - - z += zOffset; + float z = (behind ? 2.0f : 0.9f) + zOffset; // lower left *(p++) = loc.x; |