Changeset 676 for abuse/trunk/src/dev.cppTweet

Timestamp:

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

Author:

Sam Hocevar

Message:

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

File:

• abuse/trunk/src/dev.cpp (modified) (3 diffs)

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();