mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-13 18:17:39 -04:00
Use wrap-safe TIME_BEFORE/TIME_AFTER macros to compare times with current_time, instead of comparing them directly.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23246 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
1c64a4d3e0
commit
d24d885aa4
14 changed files with 29 additions and 30 deletions
|
@ -450,21 +450,21 @@ int keys(struct pong *p)
|
|||
int start = *rb->current_tick;
|
||||
int end = start + time;
|
||||
|
||||
while(end > *rb->current_tick) {
|
||||
while(TIME_BEFORE(*rb->current_tick, end)) {
|
||||
key = rb->button_get_w_tmo(end - *rb->current_tick);
|
||||
|
||||
#ifdef HAVE_TOUCHSCREEN
|
||||
short touch_x, touch_y;
|
||||
if(key & BUTTON_TOUCHSCREEN)
|
||||
{
|
||||
touch_x = rb->button_get_data() >> 16;
|
||||
touch_y = rb->button_get_data() & 0xFFFF;
|
||||
if(touch_x >= xpos[0] && touch_x <= xpos[0]+(PAD_WIDTH*4))
|
||||
padmove(&p->w_pad[0], touch_y-(p->e_pad[0]*2+PAD_HEIGHT)/2);
|
||||
|
||||
if(touch_x >= xpos[1]-(PAD_WIDTH*4) && touch_x <= xpos[1])
|
||||
padmove(&p->w_pad[1], touch_y-(p->e_pad[1]*2+PAD_HEIGHT)/2);
|
||||
}
|
||||
short touch_x, touch_y;
|
||||
if(key & BUTTON_TOUCHSCREEN)
|
||||
{
|
||||
touch_x = rb->button_get_data() >> 16;
|
||||
touch_y = rb->button_get_data() & 0xFFFF;
|
||||
if(touch_x >= xpos[0] && touch_x <= xpos[0]+(PAD_WIDTH*4))
|
||||
padmove(&p->w_pad[0], touch_y-(p->e_pad[0]*2+PAD_HEIGHT)/2);
|
||||
|
||||
if(touch_x >= xpos[1]-(PAD_WIDTH*4) && touch_x <= xpos[1])
|
||||
padmove(&p->w_pad[1], touch_y-(p->e_pad[1]*2+PAD_HEIGHT)/2);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef HAS_BUTTON_HOLD
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue