[Enigma-cvs] enigma/src floors.cc, 1.5, 1.6 items.cc, 1.91, 1.92 stones_complex.cc, 1.50, 1.51 stones_simple.cc, 1.58, 1.59

[Ralf Westram <address@hidden>]

Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv12229/src

Modified Files:
        floors.cc items.cc stones_complex.cc stones_simple.cc 
Log Message:
- sprintf -> px::strf



Index: stones_simple.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/stones_simple.cc,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** stones_simple.cc    21 Oct 2003 19:47:55 -0000      1.58
--- stones_simple.cc    27 Oct 2003 11:48:30 -0000      1.59
***************
*** 23,26 ****
--- 23,27 ----
  #include "game.hh"
  #include "laser.hh"
+ #include "px/tools.hh"
  
  #include "stones_internal.hh"
***************
*** 2272,2278 ****
          }
          void init_model() {
!             char mname[20];
!             sprintf(mname, "st-knight%d", subtype);
!             set_model(mname);
          }
      };
--- 2273,2277 ----
          }
          void init_model() {
!             set_model(px::strf("st-knight%d", subtype));
          }
      };

Index: items.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/items.cc,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** items.cc    23 Oct 2003 17:40:44 -0000      1.91
--- items.cc    27 Oct 2003 11:48:30 -0000      1.92
***************
*** 25,28 ****
--- 25,29 ----
  #include "sound.hh"
  #include "player.hh"
+ #include "px/tools.hh"
  #include <string>
  #include <vector>
***************
*** 1640,1646 ****
                  //SetItem(get_pos(), MakeItem("it-debris"));
                  }else {
!                     char modelname[20];
!                     sprintf(modelname, "it-crack%d", t);
!                     set_model(modelname);
                  }
              }
--- 1641,1645 ----
                  //SetItem(get_pos(), MakeItem("it-debris"));
                  }else {
!                     set_model(px::strf("it-crack%d", t));
                  }
              }

Index: floors.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/floors.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** floors.cc   22 Oct 2003 09:55:37 -0000      1.5
--- floors.cc   27 Oct 2003 11:48:30 -0000      1.6
***************
*** 22,25 ****
--- 22,26 ----
  #include "objects.hh"
  #include "object_mixins.hh"
+ #include "px/tools.hh"
  
  #include <iostream>
***************
*** 193,199 ****
  void Gradient::init_model()
  {
!     char mname[20];
!     sprintf(mname, "fl-gradient%d", get_type());
!     set_model(mname);
  }
  
--- 194,198 ----
  void Gradient::init_model()
  {
!     set_model(px::strf("fl-gradient%d", get_type()));
  }
  
***************
*** 344,351 ****
  void Bridge::init_model()
  {
!     char mname[25];
!     sprintf(mname, "fl-bridge%c-%s", get_type(),
!             (state==OPEN) ? "open" : "closed");
!     set_model(mname);
  }
  
--- 343,348 ----
  void Bridge::init_model()
  {
!     set_model(px::strf("fl-bridge%c-%s", get_type(),
!                        (state==OPEN) ? "open" : "closed"));
  }
  

Index: stones_complex.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/stones_complex.cc,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** stones_complex.cc   22 Oct 2003 10:30:10 -0000      1.50
--- stones_complex.cc   27 Oct 2003 11:48:30 -0000      1.51
***************
*** 26,29 ****
--- 26,30 ----
  #include "laser.hh"
  #include "sound.hh"
+ #include "px/tools.hh"
  
  #include "stones_internal.hh"
***************
*** 908,917 ****
  void
  ConnectiveStone::init_model() {
!     string modelname = get_kind();
!     char   x[10];
! 
!     sprintf(x, "%d", get_modelno());
!     modelname += x;
!     set_model(modelname);
  }
  
--- 909,913 ----
  void
  ConnectiveStone::init_model() {
!     set_model(get_kind()+px::strf("%d", get_modelno()));
  }
  
***************
*** 1857,1863 ****
  
          void init_model() {
!             char x[20];
!             sprintf(x, "st-shogun%d", int(get_holes()));
!             set_model(x);
          }
  
--- 1853,1857 ----
  
          void init_model() {
!             set_model(px::strf("st-shogun%d", int(get_holes())));
          }