Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Fixed assertion when facing away from target.

Browse Source
This commit is contained in:
Rtch90 2017-11-17 20:59:13 +00:00
parent aff5111f36
commit 7757997e56
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/player.cpp
View File

@ -249,7 +249,7 @@ void Player::DrawHUD(const Frame* cam_frame) {
} }
void Player::DrawTargetSquare(void) { void Player::DrawTargetSquare(void) {
if(GetTarget()) { if(GetTarget() && GetTarget()->IsOnscreen()) {
glPushAttrib(GL_CURRENT_BIT | GL_LINE_BIT); glPushAttrib(GL_CURRENT_BIT | GL_LINE_BIT);
glColor3f(0.0f, 1.0f, 0.0f); glColor3f(0.0f, 1.0f, 0.0f);
glLineWidth(2.0f); glLineWidth(2.0f);

2
src/sbre/Makefile.am
View File

@ -1,6 +1,6 @@
# Process this file with automake to produce Makefile.in # Process this file with automake to produce Makefile.in
noinst_LIBRARIES = libsbre.a noinst_LIBRARIES = libsbre.a
libsbre_a_SOURCES = brender.cpp models.cpp collfunc.cpp primfunc.cpp simtriang.cpp transp.cpp jjvector.cpp libsbre_a_SOURCES = brender.cpp models.cpp primfunc.cpp simtriang.cpp transp.cpp jjvector.cpp collfunc.cpp
include_HEADERS = fastmath.h sbre.h sbre_int.h sbre_models.h sbre_anim.h jjtypes.h jjvector.h include_HEADERS = fastmath.h sbre.h sbre_int.h sbre_models.h sbre_anim.h jjtypes.h jjvector.h

4
src/sector_view.cpp
View File

@ -147,14 +147,14 @@ void SectorView::DrawSector(int sx, int sy) {
glEnd(); glEnd();
glPushMatrix(); glPushMatrix();
glDepthRange(0.2, 1.2); glDepthRange(0.2, 1.0);
glColor3f(3, 3, 3); glColor3f(3, 3, 3);
glCallList(m_gluDiskDlist); glCallList(m_gluDiskDlist);
glPopMatrix(); glPopMatrix();
} }
/* Selected indicator. */ /* Selected indicator. */
if((sx == m_secx) && (sy == m_secy) && (num == m_selected)) { if((sx == m_secx) && (sy == m_secy) && (num == m_selected)) {
glDepthRange(0.1, 1.1); glDepthRange(0.1, 1.0);
glColor3f(0, 0.8, 0); glColor3f(0, 0.8, 0);
glScalef(2, 2, 2); glScalef(2, 2, 2);
glCallList(m_gluDiskDlist); glCallList(m_gluDiskDlist);