aboutsummaryrefslogtreecommitdiff
path: root/pd/src/g_array.c
diff options
context:
space:
mode:
authorGuenter Geiger <ggeiger@users.sourceforge.net>2002-12-09 18:30:29 +0000
committerGuenter Geiger <ggeiger@users.sourceforge.net>2002-12-09 18:30:29 +0000
commit011312406096edae98aeb079a12932f2b720e10b (patch)
tree862b717c3b0a7a8fd575301f223df2dc0e68291f /pd/src/g_array.c
parentb28e8e9e7aea1451a7bd5946dc3e4331e44ba514 (diff)
This commit was generated by cvs2svn to compensate for changes in r284,
which included commits to RCS files with non-trunk default branches. svn path=/trunk/; revision=285
Diffstat (limited to 'pd/src/g_array.c')
-rw-r--r--pd/src/g_array.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/pd/src/g_array.c b/pd/src/g_array.c
index 2cdb3d8e..7a9fb3f7 100644
--- a/pd/src/g_array.c
+++ b/pd/src/g_array.c
@@ -336,7 +336,7 @@ static void array_motion(void *z, t_floatarg dx, t_floatarg dy)
{
if (i == 0)
{
- float newy = ywas + dy;
+ float newy = ywas + dy * array_motion_yperpix;
if (newy < 0)
newy = 0;
template_setfloat(array_motion_template,
@@ -346,7 +346,8 @@ static void array_motion(void *z, t_floatarg dx, t_floatarg dy)
else
{
template_setfloat(array_motion_template,
- array_motion_yfield, thisword, ywas + dy, 1);
+ array_motion_yfield, thisword,
+ ywas + dy * array_motion_yperpix, 1);
}
}
}
@@ -488,9 +489,8 @@ int array_doclick(t_array *array, t_glist *glist, t_gobj *gobj,
elem = (char *)array->a_vec;
memmove(elem + elemsize * (i+1),
elem + elemsize * i,
- (array->a_n - i) * elemsize);
+ (array->a_n - i - 1) * elemsize);
i++;
- (array->a_n)++;
}
if (xonset >= 0)
{
@@ -516,7 +516,7 @@ int array_doclick(t_array *array, t_glist *glist, t_gobj *gobj,
array_motion_yfield = gensym("w");
array_motion_ycumulative =
*(float *)((elem + elemsize * i) + wonset);
- array_motion_xperpix *= array_motion_fatten;
+ array_motion_yperpix *= array_motion_fatten;
}
else if (yonset >= 0)
{