diff options
author | Matt Turner <mattst88@gmail.com> | 2008-06-05 20:02:57 +0000 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2008-06-05 20:02:57 +0000 |
commit | 1f714742e2dc53445f9979980e4b2e74c5bdcf8f (patch) | |
tree | 7b4a30484bb0e963e6caea1f44c7d1eb3b80ca8b /glpong.c | |
parent | 33c1f18d3871fc756f381d1a3aee1fdac2ff077e (diff) |
Fix a few warnings from icc. Remove an unneeded function
git-svn-id: svn://mattst88.com/svn/glpong/trunk@17 449aeecc-241a-0410-943f-e2f883e2d7a2
Diffstat (limited to 'glpong.c')
-rw-r--r-- | glpong.c | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -59,6 +59,9 @@ int main(int argc, char * argv[]) { case GLPONG_ADDBALL: /* add another ball */ GLPong_BallAdd(&GLPong.balls); break; + case GLPONG_DELETEBALL: +/* GLPong_BallDelete(GLPong.balls, GLPong.balls);*/ + break; } GLPong_BallMoveAll(&GLPong.balls); @@ -137,10 +140,10 @@ GLPong_Init(GLPong_t * GLPong) { glClearColor(0.0f, 0.0f, 0.0f, 0.0f); - printf("OpenGL Vendor: %s\n", glGetString(GL_VENDOR)); - printf("OpenGL Renderer: %s\n", glGetString(GL_RENDERER)); - printf("OpenGL Version: %s\n", glGetString(GL_VERSION)); - printf("OpenGL Extensions: %s\n", glGetString(GL_EXTENSIONS)); + printf("OpenGL Vendor: %s\n", (const char *)glGetString(GL_VENDOR)); + printf("OpenGL Renderer: %s\n", (const char *)glGetString(GL_RENDERER)); + printf("OpenGL Version: %s\n", (const char *)glGetString(GL_VERSION)); + printf("OpenGL Extensions: %s\n", (const char *)glGetString(GL_EXTENSIONS)); ball_texture = SDL_GL_NPOTSurfaceToTexture(temp, NULL, NULL); SDL_FreeSurface(temp); @@ -168,7 +171,9 @@ GLPong_HandleEvents(void) { return GLPONG_EXIT; } if (Event.type == SDL_KEYDOWN) { - if (Event.key.keysym.sym == SDLK_ESCAPE) { + if (Event.key.keysym.sym == SDLK_d) { + return GLPONG_DELETEBALL; + } else if (Event.key.keysym.sym == SDLK_ESCAPE) { return GLPONG_EXIT; } else if (Event.key.keysym.sym == SDLK_SPACE) { return GLPONG_ADDBALL; |