diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-11 11:15:28 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-11 11:15:28 -0400 |
| commit | ea0a959c2405511255080cae9f9558f2711a887f (patch) | |
| tree | 4ca85bad4d709396c5197374c0cf6a33bbff895b /src/renderer.cpp | |
| parent | 0e0389752a0912614737e5c059b5cd4719ef9cf2 (diff) | |
| download | therapy-ea0a959c2405511255080cae9f9558f2711a887f.tar.gz therapy-ea0a959c2405511255080cae9f9558f2711a887f.tar.bz2 therapy-ea0a959c2405511255080cae9f9558f2711a887f.zip | |
Fixed bug where one could fall through the floor after changing maps
Diffstat (limited to 'src/renderer.cpp')
| -rw-r--r-- | src/renderer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
| diff --git a/src/renderer.cpp b/src/renderer.cpp index cf6b2bd..f01d72a 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp | |||
| @@ -613,7 +613,7 @@ void Texture::fill(Rectangle dstrect, int r, int g, int b) | |||
| 613 | glDeleteBuffers(1, &vertexbuffer); | 613 | glDeleteBuffers(1, &vertexbuffer); |
| 614 | } | 614 | } |
| 615 | 615 | ||
| 616 | void Texture::blit(Texture& srctex, Rectangle srcrect, Rectangle dstrect) | 616 | void Texture::blit(const Texture& srctex, Rectangle srcrect, Rectangle dstrect) |
| 617 | { | 617 | { |
| 618 | if (!rendererInitialized) | 618 | if (!rendererInitialized) |
| 619 | { | 619 | { |
| @@ -710,7 +710,7 @@ void bloomPass1(GLuint srcTex, GLuint dstTex, bool horizontal, glm::vec2 srcRes, | |||
| 710 | glDisableVertexAttribArray(0); | 710 | glDisableVertexAttribArray(0); |
| 711 | } | 711 | } |
| 712 | 712 | ||
| 713 | void Texture::renderScreen() | 713 | void Texture::renderScreen() const |
| 714 | { | 714 | { |
| 715 | if (!rendererInitialized) | 715 | if (!rendererInitialized) |
| 716 | { | 716 | { |
| @@ -851,7 +851,7 @@ void Texture::renderScreen() | |||
| 851 | curBuf = (curBuf + 1) % 2; | 851 | curBuf = (curBuf + 1) % 2; |
| 852 | } | 852 | } |
| 853 | 853 | ||
| 854 | Rectangle Texture::entirety() | 854 | Rectangle Texture::entirety() const |
| 855 | { | 855 | { |
| 856 | return {0, 0, width, height}; | 856 | return {0, 0, width, height}; |
| 857 | } | 857 | } |