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/clisp.cpp

    r674 r676  
    615615    { if (player_list->next)
    616616        return LPointer::Create(current_level->attacker(current_object));
    617       else return LPointer::Create(player_list->focus); } break;
     617      else return LPointer::Create(player_list->m_focus); } break;
    618618    case 5 : return LPointer::Create(current_level->find_closest(current_object->x,
    619619                                 current_object->y,
     
    664664    } break;
    665665
    666     case 9 : return LPointer::Create(the_game->first_view->focus); break;
     666    case 9 : return LPointer::Create(the_game->first_view->m_focus); break;
    667667    case 10 :
    668668    {
    669669      view *v=((game_object *)lpointer_value(CAR(args)->Eval()))->controller()->next;
    670670      if (v)
    671         return LPointer::Create(v->focus);
     671        return LPointer::Create(v->m_focus);
    672672      else return NULL;
    673673    } break;
     
    12561256    {
    12571257      game_object *o=(game_object *)lpointer_value(CAR(args));
    1258       if (!o->controller())
    1259     printf("set shift : object is not a focus\n");
    1260       else o->controller()->shift_down=lnumber_value(CAR(CDR(args))); return 1;
     1258      if (!o->controller()) printf("set shift: object is not a focus\n");
     1259      else o->controller()->m_shift.y=lnumber_value(CAR(CDR(args))); return 1;
    12611260    } break;
    12621261    case 78 :
    12631262    {
    12641263      game_object *o=(game_object *)lpointer_value(CAR(args));
    1265       if (!o->controller())
    1266     printf("set shift : object is not a focus\n");
    1267       else o->controller()->shift_right=lnumber_value(CAR(CDR(args))); return 1;
     1264      if (!o->controller()) printf("set shift: object is not a focus\n");
     1265      else o->controller()->m_shift.x=lnumber_value(CAR(CDR(args))); return 1;
    12681266    } break;
    12691267    case 79 : current_object->set_gravity(lnumber_value(CAR(args))); return 1; break;
     
    18191817    } break;
    18201818    case 211:
    1821     { return lget_view(CAR(args),"shift_down")->shift_right; } break;
     1819    { return lget_view(CAR(args),"shift_down")->m_shift.y; } break;
    18221820    case 212:
    1823     { return lget_view(CAR(args),"shift_right")->shift_down; } break;
     1821    { return lget_view(CAR(args),"shift_right")->m_shift.x; } break;
    18241822    case 213 :
    18251823    { view *v=lget_view(CAR(args),"set_no_scroll_range"); args=CDR(args);
     
    18701868      view *v=current_object->controller();
    18711869      if (!v) lbreak("object has no view : view_push_down");
    1872       else v->last_y-=lnumber_value(CAR(args));
     1870      else v->m_lastpos.y-=lnumber_value(CAR(args));
    18731871    } break;
    18741872    case 222 :
     
    22732271        v->kills=0;
    22742272    game_object *o=current_object;
    2275     current_object=v->focus;
     2273    current_object=v->m_focus;
    22762274
    22772275    ((LSymbol *)l_restart_player)->EvalFunction(NULL);
    22782276    v->reset_player();
    2279     v->focus->set_aistate(0);
     2277    v->m_focus->set_aistate(0);
    22802278    current_object=o;
    22812279      }
Note: See TracChangeset for help on using the changeset viewer.