Changeset 54 for trunk/orca/gl/joystick.c

Timestamp:

02/17/06 15:30:01 (3 years ago)

Author:

krobillard

Message:

Now using orDecimal() & orInt() where appropriate.

Files:

• trunk/orca/gl/joystick.c (modified) (6 diffs)

trunk/orca/gl/joystick.c

@@ -70 +70 @@
         val = cblk->values + JV_FD;
         orSetTF( val, OT_INTEGER );
-        val->integer = fd;
+        orInt(val) = fd;
 
         i = orMakeCString( name, -1 );
@@ -79 +79 @@
         val = cblk->values + JV_AXIS_COUNT;
         orSetTF( val, OT_INTEGER );
-        val->integer = axes;
+        orInt(val) = axes;
 
         val = cblk->values + JV_BTN_COUNT;
         orSetTF( val, OT_INTEGER );
-        val->integer = buttons;
+        orInt(val) = buttons;
 
         blk = orMakeBlock( axes + buttons );
@@ -92 +92 @@
         {
             orSetTF( val, OT_INTEGER );
-            val->integer = 0;
+            orInt(val) = 0;
             ++val;
         }
@@ -119 +119 @@
     if( orIs( val, OT_INTEGER ) )
     {
-        fd = val->integer;
+        fd = orInt(val);
         if( fd > -1 )
         {
@@ -141 +141 @@
     val = vblk->values + JV_FD;
 
-    if( orIs( val, OT_INTEGER ) && (val->integer > -1) )
+    if( orIs( val, OT_INTEGER ) && (orInt(val) > -1) )
     {
         int axes;
@@ -148 +148 @@
         OBlock* blk;
 
-        fd = val->integer;
+        fd = orInt(val);
 
         val = vblk->values + JV_AXIS_COUNT;
-        axes = val->integer;
+        axes = orInt(val);
 
         val = vblk->values + JV_INPUT;