Ignore:
Timestamp:
May 16, 2011, 2:37:51 AM (11 years ago)
Author:
Sam Hocevar
Message:

game: prefix a few class members with m_ to avoid confusion.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/cop.cpp

    r674 r676  
    502502  {
    503503    o->y-=28;
    504     o->controller()->pan_y+=28;
    505     o->controller()->last_y-=28;
     504    o->controller()->pan_y += 28;
     505    o->controller()->m_lastpos.y -= 28;
    506506    o->set_state(stopped);
    507507  }
     
    581581      o->y+=28;
    582582      o->controller()->pan_y-=28;
    583       o->controller()->last_y+=28;
     583      o->controller()->m_lastpos.y += 28;
    584584      o->set_state((character_state)S_climb_on);
    585585    }
     
    700700    for (; f; f=f->next)
    701701    {
    702       int mex=f->focus->x;
    703       int mey=f->focus->y;
     702      int mex=f->m_focus->x;
     703      int mey=f->m_focus->y;
    704704
    705705      if (o->x<=mex && o->y<=mey && other->x>=mex && other->y>=mey)
    706706      {
    707     if (f->focus->state==S_climbing)
    708       f->focus->x=(o->x+other->x)/2;
    709         f->focus->lvars[in_climbing_area]=mey-o->y;
     707    if (f->m_focus->state==S_climbing)
     708      f->m_focus->x=(o->x+other->x)/2;
     709        f->m_focus->lvars[in_climbing_area]=mey-o->y;
    710710      }
    711711    }
Note: See TracChangeset for help on using the changeset viewer.