Changeset 676Tweet

Timestamp:

May 16, 2011, 2:37:51 AM (9 years ago)

Author:

Sam Hocevar

Message:

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

Location:

abuse/trunk/src

Files:

• ant.cpp (modified) (7 diffs)
• clisp.cpp (modified) (6 diffs)
• cop.cpp (modified) (3 diffs)
• demo.cpp (modified) (2 diffs)
• dev.cpp (modified) (3 diffs)
• extend.cpp (modified) (1 diff)
• game.cpp (modified) (11 diffs)
• level.cpp (modified) (14 diffs)
• menu.cpp (modified) (1 diff)
• sensor.cpp (modified) (2 diffs)
• statbar.cpp (modified) (1 diff)
• view.cpp (modified) (31 diffs)
• view.h (modified) (6 diffs)

abuse/trunk/src/ant.cpp

@@ -173 +173 @@
     if (player_list->next)
       b=current_level->attacker(current_object);
-    else b=player_list->focus;
+    else b=player_list->m_focus;
     if (abs(b->x-o->x)<130 && (o->y<b->y))
       fall=1;
@@ -205 +205 @@
       if (player_list->next)
         b=current_level->attacker(current_object);
-      else b=player_list->focus;
+      else b=player_list->m_focus;
       if (abs(b->x-o->x)<130 && (o->y<b->y))
       fall=1;
@@ -224 +224 @@
       if (player_list->next)
       b=current_level->attacker(current_object);
-      else b=player_list->focus;
+      else b=player_list->m_focus;
 
       scream_check(o,b);
@@ -258 +258 @@
       if (player_list->next)
       b=current_level->attacker(current_object);
-      else b=player_list->focus;
+      else b=player_list->m_focus;
       scream_check(o,b);
 
@@ -350 +350 @@
         if (player_list->next)
         b=current_level->attacker(current_object);
-        else b=player_list->focus;
+        else b=player_list->m_focus;
         fire_at_player(o,b);
         o->set_state(stopped);
@@ -386 +386 @@
       if (player_list->next)
       b=current_level->attacker(current_object);
-      else b=player_list->focus;
+      else b=player_list->m_focus;
       scream_check(o,b);
       if (((jrand()%8)==0 && abs(o->x-b->x)<10 && o->y<b->y) ||
@@ -425 +425 @@
     if (player_list->next)
       b=current_level->attacker(current_object);
-    else b=player_list->focus;
+    else b=player_list->m_focus;
     fire_at_player(o,b);
     o->set_state((character_state)S_top_walk);

abuse/trunk/src/clisp.cpp

@@ -615 +615 @@
     { if (player_list->next)
         return LPointer::Create(current_level->attacker(current_object));
-      else return LPointer::Create(player_list->focus); } break;
+      else return LPointer::Create(player_list->m_focus); } break;
     case 5 : return LPointer::Create(current_level->find_closest(current_object->x,
                                  current_object->y,
@@ -664 +664 @@
     } break;
 
-    case 9 : return LPointer::Create(the_game->first_view->focus); break;
+    case 9 : return LPointer::Create(the_game->first_view->m_focus); break;
     case 10 :
     {
       view *v=((game_object *)lpointer_value(CAR(args)->Eval()))->controller()->next;
       if (v)
-        return LPointer::Create(v->focus);
+        return LPointer::Create(v->m_focus);
       else return NULL;
     } break;
@@ -1256 +1256 @@
     {
       game_object *o=(game_object *)lpointer_value(CAR(args));
-      if (!o->controller())
-    printf("set shift : object is not a focus\n");
-      else o->controller()->shift_down=lnumber_value(CAR(CDR(args))); return 1;
+      if (!o->controller()) printf("set shift: object is not a focus\n");
+      else o->controller()->m_shift.y=lnumber_value(CAR(CDR(args))); return 1;
     } break;
     case 78 :
     {
       game_object *o=(game_object *)lpointer_value(CAR(args));
-      if (!o->controller())
-    printf("set shift : object is not a focus\n");
-      else o->controller()->shift_right=lnumber_value(CAR(CDR(args))); return 1;
+      if (!o->controller()) printf("set shift: object is not a focus\n");
+      else o->controller()->m_shift.x=lnumber_value(CAR(CDR(args))); return 1;
     } break;
     case 79 : current_object->set_gravity(lnumber_value(CAR(args))); return 1; break;
@@ -1819 +1817 @@
     } break;
     case 211:
-    { return lget_view(CAR(args),"shift_down")->shift_right; } break;
+    { return lget_view(CAR(args),"shift_down")->m_shift.y; } break;
     case 212:
-    { return lget_view(CAR(args),"shift_right")->shift_down; } break;
+    { return lget_view(CAR(args),"shift_right")->m_shift.x; } break;
     case 213 :
     { view *v=lget_view(CAR(args),"set_no_scroll_range"); args=CDR(args);
@@ -1870 +1868 @@
       view *v=current_object->controller();
       if (!v) lbreak("object has no view : view_push_down");
-      else v->last_y-=lnumber_value(CAR(args));
+      else v->m_lastpos.y-=lnumber_value(CAR(args));
     } break;
     case 222 :
@@ -2273 +2271 @@
         v->kills=0;
     game_object *o=current_object;
-    current_object=v->focus;
+    current_object=v->m_focus;
 
     ((LSymbol *)l_restart_player)->EvalFunction(NULL);
     v->reset_player();
-    v->focus->set_aistate(0);
+    v->m_focus->set_aistate(0);
     current_object=o;
       }

abuse/trunk/src/cop.cpp

@@ -502 +502 @@
   {
     o->y-=28;
-    o->controller()->pan_y+=28;
-    o->controller()->last_y-=28;
+    o->controller()->pan_y += 28;
+    o->controller()->m_lastpos.y -= 28;
     o->set_state(stopped);
   }
@@ -581 +581 @@
       o->y+=28;
       o->controller()->pan_y-=28;
-      o->controller()->last_y+=28;
+      o->controller()->m_lastpos.y += 28;
       o->set_state((character_state)S_climb_on);
     }
@@ -700 +700 @@
     for (; f; f=f->next)
     {
-      int mex=f->focus->x;
-      int mey=f->focus->y;
+      int mex=f->m_focus->x;
+      int mey=f->m_focus->y;
 
       if (o->x<=mex && o->y<=mey && other->x>=mex && other->y>=mey)
       {
-    if (f->focus->state==S_climbing)
-      f->focus->x=(o->x+other->x)/2;
-        f->focus->lvars[in_climbing_area]=mey-o->y;
+    if (f->m_focus->state==S_climbing)
+      f->m_focus->x=(o->x+other->x)/2;
+        f->m_focus->lvars[in_climbing_area]=mey-o->y;
       }
     }

abuse/trunk/src/demo.cpp

@@ -144 +144 @@
 
   view *v=player_list;
-  for (; v; v=v->next) { if (v->focus) v->reset_player(); }
+  for (; v; v=v->next) { if (v->m_focus) v->reset_player(); }
 
   last_demo_mpos = vec2i(0, 0);
@@ -215 +215 @@
       view *v=player_list;
       for (; v; v=v->next)  // reset all the players
-      { if (v->focus) { v->reset_player(); v->focus->set_aistate(0); } }
+      { if (v->m_focus) { v->reset_player(); v->m_focus->set_aistate(0); } }
       delete current_level;
       current_level=NULL;

abuse/trunk/src/dev.cpp

@@ -1016 +1016 @@
   if (!strcmp(fword,"reload"))
   {
-    if (current_level && player_list && player_list->focus)
+    if (current_level && player_list && player_list->m_focus)
     {
       edit_object=selected_object=NULL;
-      int32_t cx=player_list->focus->x,cy=player_list->focus->y;
+      int32_t cx=player_list->m_focus->x,cy=player_list->m_focus->y;
 
       // save the old weapon array
@@ -1033 +1033 @@
         the_game->draw();
       player_list->reset_player();
-      player_list->focus->x=cx;
-      player_list->focus->y=cy;
+      player_list->m_focus->x=cx;
+      player_list->m_focus->y=cy;
 
       memcpy(player_list->weapons,w,total_weapons*sizeof(int32_t));
@@ -2828 +2828 @@
       case 'j' :
       {
-        if (current_level && player_list && player_list->focus)
+        if (current_level && player_list && player_list->m_focus)
         {
           vec2i pos = the_game->MouseToGame(dlast);
-          player_list->focus->x = pos.x;
-          player_list->focus->y = pos.y;
+          player_list->m_focus->x = pos.x;
+          player_list->m_focus->y = pos.y;
           do_command("center",ev);
           the_game->need_refresh();

abuse/trunk/src/extend.cpp

@@ -153 +153 @@
   if (tobjs)   free(objs);
   if (Controller)
-    Controller->focus=NULL;
+    Controller->m_focus=NULL;
 }
 

abuse/trunk/src/game.cpp

@@ -209 +209 @@
         f->suggest.cy1 = (yres - 31) / 2 + 5 - h / 2;
         f->suggest.cy2 = (yres - 51) / 2 + 5 + h / 2;
-        f->suggest.shift_down = f->shift_down;
-        f->suggest.shift_right = f->shift_right;
+        f->suggest.shift = f->m_shift;
         f->suggest.pan_x = f->pan_x;
         f->suggest.pan_y = f->pan_y;
@@ -230 +229 @@
         f->suggest.cx2=(f->m_bb.x + amount);
         f->suggest.cy2 = f->m_bb.y + amount / 2;
-        f->suggest.shift_down = f->shift_down;
-        f->suggest.shift_right = f->shift_right;
+        f->suggest.shift = f->m_shift;
         f->suggest.pan_x = f->pan_x;
         f->suggest.pan_y = f->pan_y;
@@ -315 +313 @@
     if (dev & EDIT_MODE)
         tmp = vec2i(map_xoff, map_yoff);
-    else if(v->focus)
-        tmp = vec2i(v->focus->x / ftile_width()
+    else if(v->m_focus)
+        tmp = vec2i(v->m_focus->x / ftile_width()
                        - (v->m_bb.x - v->m_aa.x) / AUTOTILE_WIDTH / 2,
-                    v->focus->y / ftile_height()
+                    v->m_focus->y / ftile_height()
                        - (v->m_bb.y - v->m_aa.y) / AUTOTILE_HEIGHT / 2);
     else
@@ -331 +329 @@
                  - tmp.y * AUTOTILE_HEIGHT + v->m_aa.y);
     if (tmp.x > 0)
-        ret.x -= (v->focus->x * AUTOTILE_WIDTH / ftile_width())
+        ret.x -= (v->m_focus->x * AUTOTILE_WIDTH / ftile_width())
                      % AUTOTILE_WIDTH;
     if(tmp.y > 0)
-        ret.y -= (v->focus->y * AUTOTILE_HEIGHT / ftile_height())
+        ret.y -= (v->m_focus->y * AUTOTILE_HEIGHT / ftile_height())
                      % AUTOTILE_HEIGHT;
 
@@ -385 +383 @@
         if(player_list)
         {
-            first_view = new view(player_list->focus, NULL, -1);
+            first_view = new view(player_list->m_focus, NULL, -1);
             first_view->pan_x = player_list->xoff();
             first_view->pan_y = player_list->yoff();
@@ -777 +775 @@
       } else
       {
-    if(v->focus)
-    {
-      x1 = v->focus->x / ftile_width() - (v->m_bb.x - v->m_aa.x) / fw / 2;
-      y1 = v->focus->y / ftile_height() - (v->m_bb.y - v->m_aa.y) / fh / 2;
+    if(v->m_focus)
+    {
+      x1 = v->m_focus->x / ftile_width() - (v->m_bb.x - v->m_aa.x) / fw / 2;
+      y1 = v->m_focus->y / ftile_height() - (v->m_bb.y - v->m_aa.y) / fh / 2;
     } else x1 = y1 = 0;
       }
       if(x1 > 0)
-        xo = v->m_aa.x - ((v->focus->x * fw / ftile_width()) % fw);
+        xo = v->m_aa.x - ((v->m_focus->x * fw / ftile_width()) % fw);
       else xo = v->m_aa.x;
       if(y1 > 0)
-        yo = v->m_aa.y - ((v->focus->y * fh / ftile_height()) % fh);
+        yo = v->m_aa.y - ((v->m_focus->y * fh / ftile_height()) % fh);
       else yo = v->m_aa.y;
     } else
@@ -1450 +1448 @@
       for(; f; f = f->next)
       {
-    if(f->focus)
+    if(f->m_focus)
     {
       int w, h;
@@ -1762 +1760 @@
                                         v->suggest.pan_x = v->pan_x;
                                         v->suggest.pan_y = v->pan_y;
-                                        v->suggest.shift_down = v->shift_down;
-                                        v->suggest.shift_right = v->shift_right;
+                                        v->suggest.shift = v->m_shift;
                                     }
                                 }
@@ -1827 +1824 @@
 
 
-      if(!player_list->focus)
+      if(!player_list->m_focus)
       {
     dprintf("Players have not been created\ncall create_players");
@@ -1886 +1883 @@
     for(view *f = first_view; f; f = f->next)
     {
-      if(f->focus)
+      if(f->m_focus)
       {
     f->update_scroll();
@@ -1949 +1946 @@
   {
     view *p = player_list;
-    game_object *o = p->focus;
+    game_object *o = p->m_focus;
     player_list = player_list->next;
     delete p;

abuse/trunk/src/level.cpp

@@ -53 +53 @@
   for (; f; f=f->next)
   {
-    if (f->focus)
-    {
-      int32_t tmp_d=abs(f->focus->x-who->x)+abs(f->focus->y-who->y);
+    if (f->m_focus)
+    {
+      int32_t tmp_d=abs(f->m_focus->x-who->x)+abs(f->m_focus->y-who->y);
       if (tmp_d<d)
       {
     d=tmp_d;
-    c=f->focus;
+    c=f->m_focus;
       }
     }
@@ -77 +77 @@
 game_object *level::main_character()
 {
-  return the_game->first_view->focus;
+  return the_game->first_view->m_focus;
 }
 
@@ -89 +89 @@
   view *f=player_list;
   for (; f; f=f->next)
-    if (f->focus)
-      current_level->remove_object(f->focus);
+    if (f->m_focus)
+      current_level->remove_object(f->m_focus);
 
   while (first)
@@ -131 +131 @@
   for (o=first; f && o; o=o->next)
   {
-    while (f && !f->focus) f=f->next;
+    while (f && !f->m_focus) f=f->next;
     if (f)
     {
@@ -137 +137 @@
       {
     if (!found) found=o;
-    f->focus->x=o->x;
-    f->focus->y=o->y;
-    f->focus->set_hp(get_ability(f->focus->otype,start_hp));
-    f->focus->set_state(stopped);
+    f->m_focus->x=o->x;
+    f->m_focus->y=o->y;
+    f->m_focus->set_hp(get_ability(f->m_focus->otype,start_hp));
+    f->m_focus->set_state(stopped);
     f=f->next;
       }
@@ -147 +147 @@
   while (f)
   {
-    if (f->focus)
-    {
-      f->focus->x=found->x;
-      f->focus->y=found->y;
-      f->focus->set_hp(get_ability(f->focus->otype,start_hp));
-      f->focus->set_state(stopped);
+    if (f->m_focus)
+    {
+      f->m_focus->x=found->x;
+      f->m_focus->y=found->y;
+      f->m_focus->set_hp(get_ability(f->m_focus->otype,start_hp));
+      f->m_focus->set_state(stopped);
     }
     f=f->next;
@@ -163 +163 @@
 /*  int i;
   for (i=0; i<total_objs; i++)
-    if (obj[i]==the_game->first_view->focus)
+    if (obj[i]==the_game->first_view->m_focus)
     {
       int tries=total_objs;
@@ -171 +171 @@
     if (i==total_objs)
       i=0;
-    the_game->first_view->focus=obj[i];
-      }  while ((!the_game->first_view->focus->is_playable() ||
-         the_game->first_view->focus->hp<=0) && tries--);
+    the_game->first_view->m_focus=obj[i];
+      }  while ((!the_game->first_view->m_focus->is_playable() ||
+         the_game->first_view->m_focus->hp<=0) && tries--);
       return ;
     }            */
@@ -310 +310 @@
     {
       f=new view(create(use_type,o->x,o->y),f,num); num++;
-      f->focus->set_controller(f);
-      add_object_after(f->focus,o);
+      f->m_focus->set_controller(f);
+      add_object_after(f->m_focus,o);
       j++;
       last_start=o;
@@ -324 +324 @@
     if (startable)
     {
-      game_object *o=create(use_type,f->focus->x,f->focus->y);
+      game_object *o=create(use_type,f->m_focus->x,f->m_focus->y);
       f=new view(o,f,num); num++;
-      f->focus->set_controller(f);
+      f->m_focus->set_controller(f);
       add_object_after(o,last_start);
     }
@@ -1667 +1667 @@
 
   for (v=player_list; v; v=v->next)
-    fp->write_uint32(object_to_number_in_list(v->focus,save_list));
+    fp->write_uint32(object_to_number_in_list(v->m_focus,save_list));
 
   int tv=total_view_vars();
@@ -1721 +1721 @@
     {
       v=player_list;
-      if (v->focus)
-      {
-        if (v->focus->controller())
-         v->focus->set_controller(NULL);
-    delete v->focus;
+      if (v->m_focus)
+      {
+        if (v->m_focus->controller())
+         v->m_focus->set_controller(NULL);
+    delete v->m_focus;
       }
 
@@ -1829 +1829 @@
       for (f=player_list; f; f=f->next)
       {
-    if (f->focus)
-    {
-      current_object = f->focus;
+    if (f->m_focus)
+    {
+      current_object = f->m_focus;
       void *m = LSpace::Tmp.Mark();
       fun->EvalFunction(NULL);
@@ -3094 +3094 @@
     if (st)
     {
-      f->focus->x=st->x;
-      f->focus->y=st->y;
-    }
-    add_object_after(f->focus,st);
+      f->m_focus->x=st->x;
+      f->m_focus->y=st->y;
+    }
+    add_object_after(f->m_focus,st);
   }
 

abuse/trunk/src/menu.cpp

@@ -446 +446 @@
       view *v;
       for (v=player_list; v; v=v->next)
-        if (v->focus)
+        if (v->m_focus)
           v->reset_player();
 

abuse/trunk/src/sensor.cpp

@@ -33 +33 @@
     if (player_list->next)                 // find closest player
       b=current_level->attacker(current_object);
-    else b=player_list->focus;
+    else b=player_list->m_focus;
     if (abs(b->x-o->x)<o->xvel() && abs(b->y-o->y)<o->yvel())  // inside area?
     {
@@ -49 +49 @@
       if (player_list->next)
         b=current_level->attacker(current_object);
-      else b=player_list->focus;
+      else b=player_list->m_focus;
       if (abs(o->x-b->x)>o->xacel() || abs(o->y-b->y)>o->yacel())
         o->set_aistate(0);

abuse/trunk/src/statbar.cpp

@@ -135 +135 @@
     scale_put(sb,screen,sx,sy,sb_w,sb_h);
 
-    if (v->focus)
-      draw_num(screen,sx+(small_render ? 17*2 : 17),sy+(small_render ? 11*2 : 11),v->focus->hp(),bnum);
+    if (v->m_focus)
+      draw_num(screen,sx+(small_render ? 17*2 : 17),sy+(small_render ? 11*2 : 11),v->m_focus->hp(),bnum);
 
     int ammo_x,ammo_y;

abuse/trunk/src/view.cpp

@@ -44 +44 @@
 view::~view()
 {
-  if (local_player())
-    sbar.associate(NULL);
-
-  if (total_weapons)
-  {
-    free(weapons);
-    free(last_weapons);
-  }
+    if (local_player())
+        sbar.associate(NULL);
+
+    if (total_weapons)
+    {
+        free(weapons);
+        free(last_weapons);
+    }
 }
 
@@ -116 +116 @@
 int32_t view::xoff()
 {
-    if (!focus)
+    if (!m_focus)
         return pan_x;
 
-    return Max(0, last_x - (m_bb.x - m_aa.x + 1) / 2 + shift_right + pan_x);
+    return Max(0, m_lastpos.x - (m_bb.x - m_aa.x + 1) / 2 + m_shift.x + pan_x);
 }
 
 int32_t view::interpolated_xoff()
 {
-    if (!focus)
+    if (!m_focus)
         return pan_x;
 
-    return Max(0, (last_last_x + last_x) / 2
-                    - (m_bb.x - m_aa.x + 1) / 2 + shift_right + pan_x);
-}
-
+    return Max(0, (m_lastlastpos.x + m_lastpos.x) / 2
+                    - (m_bb.x - m_aa.x + 1) / 2 + m_shift.x + pan_x);
+}
 
 int32_t view::yoff()
 {
-    if (!focus)
+    if (!m_focus)
         return pan_y;
 
-    return Max(0, last_y - (m_bb.y - m_aa.y + 1) / 2 - shift_down + pan_y);
-}
-
+    return Max(0, m_lastpos.y - (m_bb.y - m_aa.y + 1) / 2 - m_shift.y + pan_y);
+}
 
 int32_t view::interpolated_yoff()
 {
-    if (!focus)
+    if (!m_focus)
         return pan_y;
 
-    return Max(0, (last_last_y + last_y) / 2
-                    - (m_bb.y - m_aa.y + 1) / 2 - shift_down + pan_y);
+    return Max(0, (m_lastlastpos.y + m_lastpos.y) / 2
+                    - (m_bb.y - m_aa.y + 1) / 2 - m_shift.y + pan_y);
 }
 
@@ -153 +151 @@
 void view::update_scroll()
 {
-  if (focus)
-  {
-    last_last_x=last_x;
-    last_last_y=last_y;
-    if (focus->x>last_x)
-    {
-      if (focus->x-last_x>=no_xright)
-        last_x=focus->x-no_xright;
-    } else if (focus->x<last_x)
-    {
-      if (last_x-focus->x>=no_xleft)
-        last_x=focus->x+no_xleft;
-    }
-    if (focus->y>last_y)
-    {
-      if (focus->y-last_y>=no_ybottom)
-        last_y=focus->y-no_ybottom;
-    } else if (focus->y<last_y)
-    {
-      if (last_y-focus->y>=no_ytop)
-        last_y=focus->y+no_ytop;
-    }
-  }
+    if (!m_focus)
+        return;
+
+    m_lastlastpos = m_lastpos;
+
+    if (m_focus->x > m_lastpos.x)
+        m_lastpos.x = Max(m_lastpos.x, m_focus->x - no_xright);
+    else if (m_focus->x < m_lastpos.x)
+        m_lastpos.x = Min(m_lastpos.x, m_focus->x + no_xleft);
+
+    if (m_focus->y > m_lastpos.y)
+        m_lastpos.y = Max(m_lastpos.y, m_focus->y - no_ybottom);
+    else if (m_focus->y < m_lastpos.y)
+        m_lastpos.y = Min(m_lastpos.y, m_focus->y + no_ytop);
 }
 
@@ -199 +188 @@
 }
 
-view::view(game_object *Focus, view *Next, int number)
-{
-  chat_buf[0]=0;
+view::view(game_object *focus, view *Next, int number)
+{
+    m_chat_buf[0] = 0;
 
   draw_solid=-1;
@@ -208 +197 @@
   no_ytop=0;
   no_ybottom=0;
-  if (Focus)
-  {
-    last_x=Focus->x;
-    last_y=Focus->y;
-  } else
-  {
-    last_x=last_y=0;
-  }
-
-  last_last_x=last_x;
-  last_last_y=last_y;
+    m_lastlastpos = m_lastpos = focus ? vec2i(focus->x, focus->y) : vec2i(0);
   last_hp=last_ammo=-1;
   last_type=-1;
@@ -239 +218 @@
     m_aa = vec2i(0);
     m_bb = vec2i(100);
-  focus=Focus;
+    m_focus = focus;
   next=Next;
-  shift_down=SHIFT_DOWN_DEFAULT;
-  shift_right=SHIFT_RIGHT_DEFAULT;
+    m_shift = vec2i(SHIFT_RIGHT_DEFAULT, SHIFT_DOWN_DEFAULT);
   x_suggestion=0;
   y_suggestion=0;
@@ -276 +254 @@
 int32_t view::x_center()
 {
-    return focus ? focus->x : (m_aa.x + m_bb.x) / 2;
+    return m_focus ? m_focus->x : (m_aa.x + m_bb.x) / 2;
 }
 
 int32_t view::y_center()
 {
-    return focus ? focus->y : (m_aa.y + m_bb.y) / 2;
+    return m_focus ? m_focus->y : (m_aa.y + m_bb.y) / 2;
 }
 
 void view::draw_character_damage()
 {
-  if (focus && drawable())
-  {
-    if (last_hp!=focus->hp()) draw_hp();
+  if (m_focus && drawable())
+  {
+    if (last_hp!=m_focus->hp()) draw_hp();
     int i;
     for (i=0; i<total_weapons; i++)
@@ -310 +288 @@
     for (; f; f=f->next)
     {
-      if (f->focus)
-      {
-    x^=(f->focus->x&0xffff);
-    x^=(f->focus->y&0xffff);
+      if (f->m_focus)
+      {
+    x^=(f->m_focus->x&0xffff);
+    x^=(f->m_focus->y&0xffff);
       }
     }
@@ -368 +346 @@
     {
         get_movement( 0, sug_x, sug_y, sug_b1, sug_b2, sug_b3, sug_b4 );
-        if( focus )
+        if( m_focus )
         {
             sug_p = the_game->MouseToGame(last_demo_mpos);
@@ -389 +367 @@
         base->packet.write_uint32( suggest.pan_x );
         base->packet.write_uint32( suggest.pan_y );
-        base->packet.write_uint32( suggest.shift_down );
-        base->packet.write_uint32( suggest.shift_right );
+        base->packet.write_uint32( suggest.shift.y );
+        base->packet.write_uint32( suggest.shift.x );
     }
 
@@ -431 +409 @@
 void view::add_chat_key(int key)  // return string if buf is complete
 {
-  int len=strlen(chat_buf);
+    int len = strlen(m_chat_buf);
   if (key==JK_BACKSPACE)
   {
     if (len)
     {
-      chat_buf[len-1]=0;
+      m_chat_buf[len-1]=0;
       if (local_player() && chat)
-        chat->draw_user(chat_buf);
+        chat->draw_user(m_chat_buf);
     }
   } else if (key!=JK_ENTER)
   {
-    chat_buf[len]=key;
-    chat_buf[len+1]=0;
+    m_chat_buf[len]=key;
+    m_chat_buf[len+1]=0;
     if (local_player() && chat)
-      chat->draw_user(chat_buf);
+      chat->draw_user(m_chat_buf);
   }
 
@@ -453 +431 @@
     {
       game_object *o=current_object;
-      current_object=focus;
+      current_object=m_focus;
 
       void *m = LSpace::Tmp.Mark();
       void *list=NULL;
-      push_onto_list(LString::Create(chat_buf),list);
+      push_onto_list(LString::Create(m_chat_buf),list);
       ((LSymbol *)l_chat_input)->EvalFunction(list);
       LSpace::Tmp.Restore(m);
@@ -466 +444 @@
     {
       if (chat)
-        chat->put_all(chat_buf);
-    }
-    chat_buf[0]=0;
+        chat->put_all(m_chat_buf);
+    }
+    m_chat_buf[0]=0;
     if (local_player() && chat)
-      chat->draw_user(chat_buf);
+      chat->draw_user(m_chat_buf);
   }
 }
@@ -491 +469 @@
       pan_x=lltl(x[4]);
       pan_y=lltl(x[5]);
-      shift_down=lltl(x[6]);
-      shift_right=lltl(x[7]);
+      m_shift = vec2i(lltl(x[7]), lltl(x[6]));
       if (small_render)
           small_render->Scale(m_bb - m_aa + vec2i(1));
@@ -689 +666 @@
 void view::draw_hp()
 {
-    if (focus)
-    {
-        int h = focus->hp();
+    if (m_focus)
+    {
+        int h = m_focus->hp();
         last_hp=h;
-        sbar.draw_health( main_screen, focus->hp() );
+        sbar.draw_health( main_screen, m_focus->hp() );
     }
     else
@@ -734 +711 @@
     f->suggest.cy2=h-(total_weapons ? 33 : 0);
 
-    f->suggest.shift_down=f->shift_down;
-    f->suggest.shift_right=f->shift_right;
+    f->suggest.shift = f->m_shift;
     f->suggest.pan_x=f->pan_x;
     f->suggest.pan_y=f->pan_y;
@@ -799 +775 @@
     v->m_aa = vec2i(320 / 2 - 155, 200 / 2 - 95);
     v->m_bb = vec2i(320 / 2 + 155, 200 / 2 + total_weapons ? 60 : 95);
-    v->focus->set_controller(v);
+    v->m_focus->set_controller(v);
     total--;
     rdw=1;
@@ -832 +808 @@
 void view::reset_player()
 {
-  if (focus)
-  {
-
-    game_object *start=current_level ? current_level->get_random_start(320,focus->controller()) : 0;
-    focus->defaults();
+  if (m_focus)
+  {
+
+    game_object *start=current_level ? current_level->get_random_start(320,m_focus->controller()) : 0;
+    m_focus->defaults();
     if (start)
     {
-      focus->x=start->x;
-      focus->y=start->y;
+      m_focus->x=start->x;
+      m_focus->y=start->y;
       dprintf("reset player position to %d %d\n",start->x,start->y);
     }
-    focus->set_state(stopped);
-    focus->set_tint(_tint);
-    focus->set_team(_team);
+    m_focus->set_state(stopped);
+    m_focus->set_tint(_tint);
+    m_focus->set_team(_team);
     memset(weapons,0xff,total_weapons*sizeof(int32_t));
     memset(last_weapons,0xff,total_weapons*sizeof(int32_t));
 
-    shift_down=SHIFT_DOWN_DEFAULT;
-    shift_right=SHIFT_RIGHT_DEFAULT;
+    m_shift = vec2i(SHIFT_RIGHT_DEFAULT, SHIFT_DOWN_DEFAULT);
 
     if (total_weapons)
@@ -856 +831 @@
     current_weapon=0;
 
-    memset(focus->lvars,0,figures[focus->otype]->tv*4);
-    focus->set_aistate(0);
-    if (figures[focus->otype]->get_fun(OFUN_CONSTRUCTOR))
+    memset(m_focus->lvars,0,figures[m_focus->otype]->tv*4);
+    m_focus->set_aistate(0);
+    if (figures[m_focus->otype]->get_fun(OFUN_CONSTRUCTOR))
     {
       game_object *o=current_object;
-      current_object=focus;
-      ((LSymbol *)figures[focus->otype]->get_fun(OFUN_CONSTRUCTOR))->EvalUserFunction(NULL);
+      current_object=m_focus;
+      ((LSymbol *)figures[m_focus->otype]->get_fun(OFUN_CONSTRUCTOR))->EvalUserFunction(NULL);
       current_object=o;
     }
@@ -868 +843 @@
 
     int i;
-    for (i=0; i<focus->total_objects(); i++)   // reset the vars for the attached objects
-    {
-      game_object *o=focus->get_object(i);
+    for (i=0; i<m_focus->total_objects(); i++)   // reset the vars for the attached objects
+    {
+      game_object *o=m_focus->get_object(i);
       memset(o->lvars,0,figures[o->otype]->tv*4);
     }
@@ -886 +861 @@
   for (view *o=player_list; o; o=o->next)
   {
-    if (o->focus && (player_num==-1 || o->player_number==player_num))
-    {
-      if (!object_to_number_in_list(o->focus,first))
-      {
-    object_node *q=new object_node(o->focus,NULL);
+    if (o->m_focus && (player_num==-1 || o->player_number==player_num))
+    {
+      if (!object_to_number_in_list(o->m_focus,first))
+      {
+    object_node *q=new object_node(o->m_focus,NULL);
     if (first)
       last->next=q;
@@ -896 +871 @@
     last=q;
       }
-      for (int i=0; i<o->focus->total_objects(); i++)
-      {
-    game_object *p=o->focus->get_object(i);
+      for (int i=0; i<o->m_focus->total_objects(); i++)
+      {
+    game_object *p=o->m_focus->get_object(i);
 
     if (!object_to_number_in_list(p,first))
@@ -977 +952 @@
     case V_CX2 : return m_bb.x; break;
     case V_CY2 : return m_bb.y; break;
-    case V_SHIFT_DOWN : return shift_down; break;
-    case V_SHIFT_RIGHT : return shift_right; break;
+    case V_SHIFT_DOWN : return m_shift.y; break;
+    case V_SHIFT_RIGHT : return m_shift.x; break;
     case V_GOD : return god; break;
     case V_PLAYER_NUMBER : return player_number; break;
@@ -997 +972 @@
     case V_NO_YTOP : return no_ytop; break;
     case V_NO_YBOTTOM : return no_ybottom; break;
-    case V_LAST_X : return last_x; break;
-    case V_LAST_Y : return last_y; break;
+    case V_LAST_X : return m_lastpos.x; break;
+    case V_LAST_Y : return m_lastpos.y; break;
     case V_LAST_LEFT : return last_left; break;
     case V_LAST_RIGHT : return last_right; break;
@@ -1015 +990 @@
     case V_POINTER_X : return pointer_x; break;
     case V_POINTER_Y : return pointer_y; break;
-    case V_LAST_LAST_X : return last_last_x; break;
-    case V_LAST_LAST_Y : return last_last_y; break;
+    case V_LAST_LAST_X : return m_lastlastpos.x; break;
+    case V_LAST_LAST_Y : return m_lastlastpos.y; break;
     case V_FREEZE_TIME : return freeze_time; break;
   }
@@ -1032 +1007 @@
     case V_CX2 : m_bb.x = x; break;
     case V_CY2 : m_bb.y = x; break;
-    case V_SHIFT_DOWN : shift_down=x; break;
-    case V_SHIFT_RIGHT : shift_right=x; break;
+    case V_SHIFT_DOWN : m_shift.y = x; break;
+    case V_SHIFT_RIGHT : m_shift.x = x; break;
     case V_GOD : god=x; break;
     case V_PLAYER_NUMBER : { player_number=x; if (local_player()) sbar.associate(this); }  break;
@@ -1052 +1027 @@
     case V_NO_YTOP : no_ytop=x; break;
     case V_NO_YBOTTOM : no_ybottom=x; break;
-    case V_LAST_X : last_x=x; break;
-    case V_LAST_Y : last_y=x; break;
+    case V_LAST_X : m_lastpos.x=x; break;
+    case V_LAST_Y : m_lastpos.y=x; break;
     case V_LAST_LEFT : last_left=x; break;
     case V_LAST_RIGHT : last_right=x; break;
@@ -1071 +1046 @@
     case V_POINTER_X : pointer_x=x; break;
     case V_POINTER_Y : pointer_y=x; break;
-    case V_LAST_LAST_X : last_last_x=x; break;
-    case V_LAST_LAST_Y : last_last_y=x; break;
+    case V_LAST_LAST_X : m_lastlastpos.x = x; break;
+    case V_LAST_LAST_Y : m_lastlastpos.y = x; break;
     case V_FREEZE_TIME : freeze_time=x; break;
   }
@@ -1222 +1197 @@
       }
 
-      v->focus=NULL;
+      v->m_focus=NULL;
       if (last)
       last->next=v->next;
@@ -1242 +1217 @@
         tint = 0;
     _tint = tint;
-    focus->set_tint(tint);
+    m_focus->set_tint(tint);
 }
 
@@ -1255 +1230 @@
         team = 0;
     _team = team;
-    focus->set_team(team);
+    m_focus->set_team(team);
 }
 

abuse/trunk/src/view.h

@@ -22 +22 @@
 struct suggest_struct
 {
-  int32_t cx1,cy1,cx2,cy2,shift_down,shift_right,pan_x,pan_y;
-  int32_t new_weapon;
-  uint8_t send_view,send_weapon_change;
-} ;
+    int32_t cx1,cy1,cx2,cy2,pan_x,pan_y;
+    vec2i shift;
+    int32_t new_weapon;
+    uint8_t send_view,send_weapon_change;
+};
 
 
@@ -37 +38 @@
     ~view();
 
-  int key_down(int key) { return keymap[key/8]&(1<<(key%8)); }
-  void set_key_down(int key, int x) { if (x) keymap[key/8]|=(1<<(key%8)); else keymap[key/8]&=~(1<<(key%8)); }
-  void reset_keymap() { memset(keymap,0,sizeof(keymap)); }
+  int key_down(int key) { return m_keymap[key/8]&(1<<(key%8)); }
+  void set_key_down(int key, int x) { if (x) m_keymap[key/8]|=(1<<(key%8)); else m_keymap[key/8]&=~(1<<(key%8)); }
+  void reset_keymap() { memset(m_keymap,0,sizeof(m_keymap)); }
   void add_chat_key(int key);
 
   char name[100];
   struct suggest_struct suggest;
-  int32_t shift_down,shift_right;             // shift of view
 
   int god;                                // :) if you believe in such things
@@ -57 +57 @@
 
 
-  game_object *focus;                     // object we are focusing on (player)
   int x_suggestion,                      // input from the player at the current time
       y_suggestion,
@@ -71 +70 @@
   short ambient;                        // ambient lighting setting, used by draw
 
-  int32_t pan_x,pan_y,no_xleft,no_xright,no_ytop,no_ybottom,
-       last_x,last_y,last_last_x,last_last_y,view_percent;
+  int32_t pan_x,pan_y,no_xleft,no_xright,no_ytop,no_ybottom, view_percent;
 
   int32_t last_left,last_right,last_up,last_down,   // how many frames ago were these pressed (<=0)
@@ -113 +111 @@
 
   void reset_player();
-  int receive_failed() { return focus==NULL; }
+  int receive_failed() { return m_focus==NULL; }
   int32_t get_view_var_value(int num);
   int32_t set_view_var_value(int num, int32_t x);
@@ -124 +122 @@
 
     vec2i m_aa, m_bb; // view area to show
+    vec2i m_shift; // shift of view
+    vec2i m_lastpos, m_lastlastpos;
+
+    game_object *m_focus; // object we are focusing on (player)
 
 private:
-    uint8_t keymap[512 / 8];
-    char chat_buf[60];
+    uint8_t m_keymap[512 / 8];
+    char m_chat_buf[60];
 };