diff options
author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-01-21 09:09:57 -0500 |
---|---|---|
committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-01-21 09:09:57 -0500 |
commit | 2de24080f2954fda1d8b4142907fb8743ea66a22 (patch) | |
tree | 5988b9ea3642b276fd14047648d4673ded8ba511 /main.cpp | |
parent | 9b6173fb47e5d7bbcded9e3ef1cb735690be4c84 (diff) | |
parent | 77f6086bedaa0cbd945fb727a9e82a4c93e6255c (diff) |
Merge branch 'master' of http://github.com/tcsullivan/gamedev
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -110,7 +110,7 @@ extern bool worldInside; * referenced somewhere. */ -unsigned int tickCount = 0; +unsigned int tickCount = DAY_CYCLE; unsigned int deltaTime = 0; /* @@ -340,7 +340,7 @@ int main(/*int argc, char *argv[]*/){ const GLchar *shaderSource = readFile("test.frag"); - GLint bufferln = 0; + GLint bufferln = GL_FALSE; int logLength; |