From: Diederick Niehorster Date: Wed, 14 Jun 2017 20:51:09 +0000 (+0000) Subject: multi-touch callback had a copy paste error in the draw loop (thanks sorav for reporting) X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=freeglut;a=commitdiff_plain;h=dcdd8f2768e317dfd86561c0abe83c4a83968e52 multi-touch callback had a copy paste error in the draw loop (thanks sorav for reporting) (cherry picked from commit a40f9e9c4efdb519cf623cfb1fde5e5c1156da9b) git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1804 7f0cb862-5218-0410-a997-914c9d46530a --- diff --git a/progs/demos/multi-touch/multi-touch.c b/progs/demos/multi-touch/multi-touch.c index f294a1b..e4fc596 100644 --- a/progs/demos/multi-touch/multi-touch.c +++ b/progs/demos/multi-touch/multi-touch.c @@ -58,7 +58,7 @@ void onDisplay(void) { glVertexPointer(2, GL_FLOAT, 0, square); for (d = 0; d < NUM_DEVICES; d++) { int c; - for (c = 0; d < NUM_DEVICES; d++) { + for (c = 0; c < NUM_CURSORS; c++) { Cursor C = &cursors[d][c]; if (C->on) { glMatrixMode(GL_MODELVIEW); @@ -110,7 +110,7 @@ void onMotion(int x, int y) { /* void onMultiButton(int cursor_id, int button, int state, int x, int y) { */ void onMultiButton(int cursor_id, int x, int y, int button, int state) { if (cursor_id > NUM_CURSORS) { - fprintf(stderr, "cursor_id(%d) > NUM_CURSORS(%d)\n", cursor_id, NUM_CURSORS); + fprintf(stderr, "cursor_id (%d) > NUM_CURSORS (%d)\n", cursor_id, NUM_CURSORS); return; } if (button == 0) { @@ -123,7 +123,7 @@ void onMultiButton(int cursor_id, int x, int y, int button, int state) { void onMultiMotion(int cursor_id, int x, int y) { if (cursor_id > NUM_CURSORS) { - fprintf(stderr, "cursor_id(%d) > NUM_CURSORS(%d)\n", cursor_id, NUM_CURSORS); + fprintf(stderr, "cursor_id (%d) > NUM_CURSORS (%d)\n", cursor_id, NUM_CURSORS); return; } cursors[0][cursor_id].x = (float)x;