X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2Fmulti-touch%2Fmulti-touch.c;h=37f5d79e33ab31cb761359d15afc43d7e14cfa95;hb=580b9f6bd513a4dab7527538c8e7aeca2daeaed6;hp=f294a1b6ab2bb66f373fb5947f631361a1c1319e;hpb=d225ac34a598c827ff73e35cbbfd0660c90c8a06;p=freeglut

diff --git a/progs/demos/multi-touch/multi-touch.c b/progs/demos/multi-touch/multi-touch.c
index f294a1b..37f5d79 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);
@@ -109,8 +109,8 @@ void onMotion(int x, int y) {
 /* Using FG2.8 (reversed) prototype for now */
 /* 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);
+    if (cursor_id >= NUM_CURSORS) {
+        fprintf(stderr, "cursor_id (%d) >= NUM_CURSORS (%d), out of slots\n", cursor_id, NUM_CURSORS);
         return;
     }
     if (button == 0) {
@@ -122,8 +122,8 @@ 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);
+    if (cursor_id >= NUM_CURSORS) {
+        fprintf(stderr, "cursor_id (%d) >= NUM_CURSORS (%d), out of slots\n", cursor_id, NUM_CURSORS);
         return;
     }
     cursors[0][cursor_id].x = (float)x;