[Pingus-CVS] CVS: Games/Pingus/src blitter.cxx,1.11,1.12 button_panel.cxx,1.10,1.11 credits.cxx,1.6,1.7 fade_out.cxx,1.2,1.3 force_vector.cxx,1.3,1.4 layer_manager.cxx,1.1,1.2 liquid.cxx,1.1,1.2 multiline_text.cxx,1.3,1.4 music_provider.cxx,1.1,1.2 pingus_main.cxx,1.11,1.12 screenshot.cxx,1.4,1.5 smallmap.cxx,1.10,1.11 sound_real.cxx,1.3,1.4 spot_map.cxx,1.6,1.7 system.cxx,1.4,1.5 theme.cxx,1.3,1.4 theme_selector.cxx,1.3,1.4 world.cxx,1.13,1.14

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv28473

Modified Files:
        blitter.cxx button_panel.cxx credits.cxx fade_out.cxx 
        force_vector.cxx layer_manager.cxx liquid.cxx 
        multiline_text.cxx music_provider.cxx pingus_main.cxx 
        screenshot.cxx smallmap.cxx sound_real.cxx spot_map.cxx 
        system.cxx theme.cxx theme_selector.cxx world.cxx 
Log Message:
changed some postfix increments to prefix increments


Index: blitter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/blitter.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- blitter.cxx 16 Aug 2002 15:13:59 -0000      1.11
+++ blitter.cxx 17 Aug 2002 17:56:23 -0000      1.12
@@ -201,8 +201,8 @@
   provider->lock();
   if (1) // slow
     {
-      for(int y = Math::max(0, -y_pos); y < sheight && (y + y_pos) < theight ; 
y++) 
-       for(int x = Math::max(0,-x_pos); x < swidth && (x + x_pos) < twidth; 
x++) 
+      for(int y = Math::max(0, -y_pos); y < sheight && (y + y_pos) < theight; 
++y) 
+       for(int x = Math::max(0,-x_pos); x < swidth && (x + x_pos) < twidth; 
++x) 
          {
            provider->get_pixel(x, y, &red, &green, &blue, &alpha);
            canvas->get_pixel(x + x_pos, y + y_pos, &tred, &tgreen, &tblue, 
&talpha);
@@ -393,9 +393,9 @@
     {
       // Slow but generic, using get_data () would be better, but would
       // require quite a bit of work
-      for (int y = 0; y < height; y++)
+      for (int y = 0; y < height; ++y)
        {
-         for (int x = 0; x < width; x++)
+         for (int x = 0; x < width; ++x)
            {
              unsigned char pixel = *(static_cast<unsigned 
char*>(provider->get_data ()) 
                                      + (y * pheight/height) * 
provider->get_pitch() + (x * pwidth/width));
@@ -422,8 +422,8 @@
          {
            // We assume that we have the data in RGB888, which might not be
            // the case
-           for (int y = 0; y < height; y++)
-             for (int x = 0; x < width; x++)
+           for (int y = 0; y < height; ++y)
+             for (int x = 0; x < width; ++x)
                {
                  int ti = (y * width + x) * 4;
                  int si = ((y * pheight / height) * pwidth
@@ -440,8 +440,8 @@
          {
            // We assume that we have the data in RGBA8888, which might not be
            // the case
-           for (int y = 0; y < height; y++)
-             for (int x = 0; x < width; x++)
+           for (int y = 0; y < height; ++y)
+             for (int x = 0; x < width; ++x)
                {
                  int ti = (y * width + x) * 4;
                  int si = ((y * pheight / height) * pwidth
@@ -457,8 +457,8 @@
        default:
          // Slow but generic, using get_data () would be better, but would
          // require quite a bit of work
-         for (int y = 0; y < height; y++)
-           for (int x = 0; x < width; x++)
+         for (int y = 0; y < height; ++y)
+           for (int x = 0; x < width; ++x)
              {
                // std::cout << "X: " << x << " Y: " << y << std::endl;
                provider->get_pixel (x * provider->get_width () / width,

Index: button_panel.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/button_panel.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- button_panel.cxx    14 Aug 2002 12:45:01 -0000      1.10
+++ button_panel.cxx    17 Aug 2002 17:56:23 -0000      1.11
@@ -52,7 +52,7 @@
       buttons_data.push_back(ActionData(Miner, 20));
     }
 
-  for(std::vector<ActionData>::size_type i = 0; i < buttons_data.size(); i++)
+  for(std::vector<ActionData>::size_type i = 0; i < buttons_data.size(); ++i)
     {
       a_buttons.push_back(new VerticalActionButton (x_pos, i * 38 + y_pos,
                                                    buttons_data[i].name,

Index: credits.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/credits.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- credits.cxx 17 Aug 2002 00:25:06 -0000      1.6
+++ credits.cxx 17 Aug 2002 17:56:23 -0000      1.7
@@ -139,7 +139,7 @@
                        0.0, 0.0, 0.0, 1.0);
 
   yof = 0;
-  for (std::vector<std::string>::iterator i = credits.begin(); i != 
credits.end(); i++)
+  for (std::vector<std::string>::iterator i = credits.begin(); i != 
credits.end(); ++i)
     {
       switch ((*i)[0])
        {

Index: fade_out.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/fade_out.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fade_out.cxx        20 Jun 2002 16:48:11 -0000      1.2
+++ fade_out.cxx        17 Aug 2002 17:56:23 -0000      1.3
@@ -125,7 +125,7 @@
 {
   CL_Display::sync_buffers();
 
-  for(int i = 0; i < steps; i++)
+  for(int i = 0; i < steps; ++i)
     {
       CL_Display::fill_rect(0,0,
                            CL_Display::get_width(),

Index: force_vector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/force_vector.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- force_vector.cxx    21 Jun 2002 07:45:35 -0000      1.3
+++ force_vector.cxx    17 Aug 2002 17:56:23 -0000      1.4
@@ -92,11 +92,11 @@
   CL_Vector tv = v;
 
   // Go through all of the forces and apply them all
-  for (GForceIter i = grav_array.begin(); i != grav_array.end(); i++)
+  for (GForceIter i = grav_array.begin(); i != grav_array.end(); ++i)
     tv = i->apply_forces(p,v);
   
   // Explosion array...
-  for (EForceIter j = explo_array.begin(); j != explo_array.end(); j++)
+  for (EForceIter j = explo_array.begin(); j != explo_array.end(); ++j)
     tv = j->apply_forces(p,v);
   
   return tv;

Index: layer_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/layer_manager.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- layer_manager.cxx   12 Jun 2002 19:09:37 -0000      1.1
+++ layer_manager.cxx   17 Aug 2002 17:56:23 -0000      1.2
@@ -52,7 +52,7 @@
 LayerManager::update (float delta)
 {
   for (std::vector<Layer>::iterator i = layers.begin (); 
-       i != layers.end (); i++)
+       i != layers.end (); ++i)
     i->update (delta);
 }
 

Index: liquid.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/liquid.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- liquid.cxx  12 Jun 2002 19:09:37 -0000      1.1
+++ liquid.cxx  17 Aug 2002 17:56:23 -0000      1.2
@@ -47,7 +47,7 @@
 {
   CL_Surface sur = PingusResource::load_surface("Liquid/water_cmap", "global");
 
-  for(int i=0; i < width; i++)
+  for(int i=0; i < width; ++i)
     world->get_colmap()->put(sur, (int)pos.x + i, (int)pos.y, 
GroundpieceData::GP_WATER);
 }
 

Index: multiline_text.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/multiline_text.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- multiline_text.cxx  20 Jun 2002 16:48:11 -0000      1.3
+++ multiline_text.cxx  17 Aug 2002 17:56:23 -0000      1.4
@@ -51,7 +51,7 @@
 
       for(unsigned int i=j; /* i < (text_width + j) */ 
          font->get_text_width(str.substr(j, i-j).c_str()) < text_width;
-         i++)
+         ++i)
        {
          if (i >= str.length()) 
            {
@@ -75,11 +75,11 @@
   //cout << "MultiLineText: " << str << endl;
   /*
   cout << "MultiLineText: " << endl;
-  for(vector<string>::iterator i = text.begin(); i != text.end(); i++)
+  for(vector<string>::iterator i = text.begin(); i != text.end(); ++i)
     cout << "  " << *i << endl;
   */
   width = 0;
-  for(vector<string>::iterator i = text.begin(); i != text.end(); i++)
+  for(vector<string>::iterator i = text.begin(); i != text.end(); ++i)
          width = Math::max(width, font->get_text_width(i->c_str()));
 
   height = text.size() * font->get_height();
@@ -92,7 +92,7 @@
 
   for(vector<string>::iterator i = text.begin(); 
       i != text.end();
-      i++)
+      ++i)
     {
       font->print_left(x_pos, y_pos + y_inc, i->c_str());
       y_inc += font->get_height();
@@ -106,7 +106,7 @@
 
   for(vector<string>::iterator i = text.begin(); 
       i != text.end();
-      i++)
+      ++i)
     {
       font->print_right(x_pos, y_pos + y_inc, i->c_str());
       y_inc += font->get_height();
@@ -120,7 +120,7 @@
 
   for(vector<string>::iterator i = text.begin(); 
       i != text.end();
-      i++)
+      ++i)
     {
       font->print_center(x_pos, y_pos + y_inc, i->c_str());
       y_inc += font->get_height();

Index: music_provider.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/music_provider.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- music_provider.cxx  12 Jun 2002 19:09:37 -0000      1.1
+++ music_provider.cxx  17 Aug 2002 17:56:23 -0000      1.2
@@ -59,7 +59,7 @@
 Mix_Music*
 PingusMusicProvider::get(std::string str)
 {
-  for(std::list<music_pair>::iterator i = music.begin(); i != music.end(); i++)
+  for(std::list<music_pair>::iterator i = music.begin(); i != music.end(); ++i)
     {
       if (i->filename == str)
        return i->data;

Index: pingus_main.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pingus_main.cxx     17 Aug 2002 00:27:21 -0000      1.11
+++ pingus_main.cxx     17 Aug 2002 17:56:23 -0000      1.12
@@ -158,7 +158,7 @@
 PingusMain::quick_check_args(int argc, char** argv)
 {
   no_config_file = false;
-  for(int i=1; i < argc; i++)
+  for(int i=1; i < argc; ++i)
     {
       if (strcmp(argv[i], "--no-cfg-file") == 0)
        {

Index: screenshot.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/screenshot.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- screenshot.cxx      21 Jun 2002 07:45:35 -0000      1.4
+++ screenshot.cxx      17 Aug 2002 17:56:23 -0000      1.5
@@ -145,8 +145,8 @@
       << "255" << std::endl;
 
   target->lock();
-  for (unsigned int y=0; y < target->get_height(); y++) {
-    for (unsigned int x=0; x < target->get_width(); x++)
+  for (unsigned int y=0; y < target->get_height(); ++y) {
+    for (unsigned int x=0; x < target->get_width(); ++x)
       {
        target->get_pixel(x, y, &red, &green, &blue, &alpha);
        out << (int)(red * 255) << " " 
@@ -168,7 +168,7 @@
     sprintf(str, "%d.pnm", i);
     tmp_filename = System::get_statdir() + "screenshots/" 
       + "pingus-" + get_date() + "-" + std::string(str);
-    i++;
+    ++i;
   } while (System::exist(tmp_filename));
   
   return tmp_filename;

Index: smallmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- smallmap.cxx        14 Aug 2002 12:45:02 -0000      1.10
+++ smallmap.cxx        17 Aug 2002 17:56:23 -0000      1.11
@@ -68,9 +68,9 @@
   
   cbuffer = static_cast<unsigned char*>(canvas->get_data());
 
-  for(int y = 0; y < height; y++)
+  for(int y = 0; y < height; ++y)
     {
-      for (int x = 0; x < width; x++)
+      for (int x = 0; x < width; ++x)
        {
          tx = x * colmap->get_width() / width;
          ty = y * colmap->get_height() / height;
@@ -116,7 +116,7 @@
     }
   /* FIXME: due to API change in PLF disabled
   std::vector<ExitData>     exit_d     = plf->get_exit();
-  for(std::vector<ExitData>::iterator i = exit_d.begin(); i != exit_d.end(); 
i++)
+  for(std::vector<ExitData>::iterator i = exit_d.begin(); i != exit_d.end(); 
++i)
     {
       // FIXME: Replace this with put_target() when it is bug free
       Blitter::put_surface(canvas, exit_sur, 
@@ -125,7 +125,7 @@
     }
 
   std::vector<EntranceData>     entrance_d     = plf->get_entrance();
-  for(std::vector<EntranceData>::iterator i = entrance_d.begin(); i != 
entrance_d.end(); i++)
+  for(std::vector<EntranceData>::iterator i = entrance_d.begin(); i != 
entrance_d.end(); ++i)
     {
       Blitter::put_surface(canvas, entrance_sur,
                           i->pos.x * width / colmap->get_width() - 
(entrance_sur.get_width()/2),
@@ -178,14 +178,14 @@
   // FIXME: This should use put_target(), but put_target(), does not
   // seem to work?!
   /*  vector<exit_data>     exit_d     = plf->get_exit();
-  for(std::vector<exit_data>::iterator i = exit_d.begin(); i != exit_d.end(); 
i++)
+  for(std::vector<exit_data>::iterator i = exit_d.begin(); i != exit_d.end(); 
++i)
     {
       exit_sur->put_screen(i->x_pos * width / colmap->get_width() +  x_pos - 
3, 
                           i->y_pos * height / colmap->get_height() + y_pos - 
3);
     }
 
   vector<entrance_data>     entrance_d     = plf->get_entrance();
-  for(std::vector<entrance_data>::iterator i = entrance_d.begin(); i != 
entrance_d.end(); i++)
+  for(std::vector<entrance_data>::iterator i = entrance_d.begin(); i != 
entrance_d.end(); ++i)
     {
       entrance_sur->put_screen(i->x_pos * width / colmap->get_width() + x_pos 
- 3,
                               i->y_pos * height / colmap->get_height() + 
y_pos);
@@ -201,7 +201,7 @@
   int y;
   PinguHolder* pingus = client->get_server()->get_world()->get_pingu_p();
 
-  for(PinguIter i = pingus->begin(); i != pingus->end(); i++)
+  for(PinguIter i = pingus->begin(); i != pingus->end(); ++i)
     {
       //FIXME: Replace this with put pixel
       x = x_pos + ((*i)->get_x() * width / 
client->get_server()->get_world()->get_colmap()->get_width());

Index: sound_real.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/sound_real.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sound_real.cxx      23 Jun 2002 19:16:41 -0000      1.3
+++ sound_real.cxx      17 Aug 2002 17:56:23 -0000      1.4
@@ -50,8 +50,8 @@
     delete music;
   }
   
-  // Alle allozierten Sound Buffer wieder löschen
-  for (unsigned int i = 0; i < sound_holder.size(); i++)
+  // delete all sound buffers
+  for (unsigned int i = 0; i < sound_holder.size(); ++i)
     delete sound_holder[i];
   
   if (is_init) {

Index: spot_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/spot_map.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- spot_map.cxx        16 Aug 2002 15:13:59 -0000      1.6
+++ spot_map.cxx        17 Aug 2002 17:56:23 -0000      1.7
@@ -170,7 +170,7 @@
 
   for (vector<GroundpieceData>::iterator i = surfaces.begin();
        i != surfaces.end();
-       i++) // WIN32BUG
+       ++i) // WIN32BUG
     {
       i->surface = PingusResource::load_surface(i->desc);
     }
@@ -190,7 +190,7 @@
   // Drawing all surfaces to the provider
   for(std::vector<GroundpieceData>::iterator i = surfaces.begin(); 
       i != surfaces.end(); 
-      i++)
+      ++i)
     {
       mark_tiles_not_empty((int) i->pos.x, (int) i->pos.y,
                           i->surface.get_width(), i->surface.get_height());
@@ -265,11 +265,11 @@
          // drawing the stuff
          for (TileIter x = start_x; 
               x <= (start_x + tilemap_width) && x < tile.size();
-              x++)
+              ++x)
            {
              for (TileIter y = start_y;
                   y <= start_y + tilemap_height && y < tile[x].size();
-                  y++)
+                  ++y)
                {
                  if (!tile[x][y].is_empty()) 
                    {
@@ -581,8 +581,8 @@
   //cout << "X: " << start_x << " Y: " << start_y << endl;
   //cout << "stop_X: " << stop_x << " stop_Y: " << stop_y << endl;
 
-  for(int y = start_y; y < stop_y; y++) {
-    for(int x = start_x; x < stop_x; x++) {
+  for(int y = start_y; y < stop_y; ++y) {
+    for(int x = start_x; x < stop_x; ++x) {
       tile[x][y].set_empty(false);
     }
   }

Index: system.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/system.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- system.cxx  22 Jun 2002 17:40:55 -0000      1.4
+++ system.cxx  17 Aug 2002 17:56:23 -0000      1.5
@@ -421,7 +421,7 @@
          throw Error (_("System:checksum: file read error"));
        }
 
-      for (int i=0; i < bytes_read; i++)
+      for (int i=0; i < bytes_read; ++i)
        checksum = checksum * 17 + buffer[i];
     } 
   while (bytes_read != 0);

Index: theme.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/theme.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- theme.cxx   2 Aug 2002 11:25:47 -0000       1.3
+++ theme.cxx   17 Aug 2002 17:56:23 -0000      1.4
@@ -108,7 +108,7 @@
 
   for(std::vector<std::string>::iterator i = levelnames.begin();
       i < levelnames.end(); 
-      i++, j++)
+      ++i, ++j)
     {
       int width = font->get_text_width(i->c_str());
       
@@ -215,7 +215,7 @@
        {
          font->print_center(x_center, y_pos, (*i).c_str());
        }
-      j++;
+      ++j;
       y_pos += font->get_height() + 4;     
     }
 }
@@ -294,7 +294,7 @@
 {
   preload ();
 
-  current_level++;
+  ++current_level;
 
   if ((unsigned int)(current_level) >= level_filenames.size()) 
     current_level = level_filenames.size() - 1;
@@ -326,7 +326,7 @@
   if (verbose) std::cout << "Theme opening levels... " << std::flush;
 
   for(std::vector<std::string>::iterator i = level_filenames.begin(); 
-      i != level_filenames.end(); i++)
+      i != level_filenames.end(); ++i)
     {
       filename = path_manager.complete("levels/" + *i);
 

Index: theme_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/theme_selector.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- theme_selector.cxx  16 Aug 2002 15:13:59 -0000      1.3
+++ theme_selector.cxx  17 Aug 2002 17:56:23 -0000      1.4
@@ -49,7 +49,7 @@
   CL_Display::fill_rect(x, y, x + 200, CL_Display::get_height() - 20,
                        0.0, 0.0, 0.0, 0.5);
   for(ListIter item = items.begin(); item != items.end(); ++item) {
-    item->draw_offset(x, y + (i++ * 20));
+    item->draw_offset(x, y + (i++ * 20)); // FIXME i++ is a bit ambigious here
   }
 }
 
@@ -215,7 +215,7 @@
 {
   // FIXME: Deleting the stuff which was allocated in readdir()
   // FIXME: Should be rewritten
-  for(std::vector<Theme*>::iterator i = themes.begin(); i != themes.end(); i++)
+  for(std::vector<Theme*>::iterator i = themes.begin(); i != themes.end(); ++i)
     delete (*i);
 
   // CL_Input::chain_mouse_move.remove(event);
@@ -326,7 +326,7 @@
       std::cout << "ThemeSelector: " << pathname << std::endl;
       dir = System::opendir(pathname, "*.xml");
       
-      for(System::Directory::iterator entry = dir.begin(); entry != dir.end(); 
entry++)
+      for(System::Directory::iterator entry = dir.begin(); entry != dir.end(); 
++entry)
        {
          if (verbose) std::cout << "ThemeSelelector: Name of entry: " << 
pathname + entry->name << std::endl;
          try {

Index: world.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- world.cxx   28 Jun 2002 15:12:22 -0000      1.13
+++ world.cxx   17 Aug 2002 17:56:23 -0000      1.14
@@ -138,7 +138,7 @@
     {
       // The iterator here might be invalid
       (*armageddon_count)->request_set_action(Bomber);
-      armageddon_count++;
+      ++armageddon_count;
     }
     
   // Let all pingus move and
@@ -160,7 +160,7 @@
       (*pingu)->update(delta);
       
       if ((*pingu)->need_catch()) {
-       for(PinguIter i = pingus->begin(); i != pingus->end(); i++) {
+       for(PinguIter i = pingus->begin(); i != pingus->end(); ++i) {
          (*pingu)->catch_pingu(*i);
        }
       }
@@ -189,14 +189,14 @@
 
   for(vector<WeatherData>::iterator i = weather_d.begin();
       i != weather_d.end();
-      i++)
+      ++i)
     {
       world_obj->push_back(WeatherGenerator::create(*i));
     }
 
   for (vector<WorldObjData*>::iterator i = worldobj_d.begin ();
        i != worldobj_d.end ();
-       i++)
+       ++i)
     {
       WorldObj* obj = (*i)->create_WorldObj ();
       if (obj)