[Planeshift-cvs] CVS: planeshift/src/eedit eeditediteffecttoolbox.cpp,1.11,1.12

[Anders R. <ma...@us...>]

Update of /cvsroot/planeshift/planeshift/src/eedit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15850/src/eedit

Modified Files:
	eeditediteffecttoolbox.cpp 
Log Message:
- Fixed numbers of compiler warnings when compiling in linux.
  - Missing newline at end of file
  - Coverting to int from float without cast
  - Using csString in ... without GetData or cast to (const char*).
  - Using const char * in call with char * to use const char *
- Commited first version of parsing of meshfact and material names
  to be used when items/traits modify the character texture.


Index: eeditediteffecttoolbox.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/eedit/eeditediteffecttoolbox.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** eeditediteffecttoolbox.cpp	31 Mar 2005 09:15:08 -0000	1.11
--- eeditediteffecttoolbox.cpp	31 Mar 2005 21:07:04 -0000	1.12
***************
*** 212,216 ****
      char attr = dataname[1];
  
!     int index = atof(&dataname[3]);
      int index2 = -1;
      int index3 = -1;
--- 212,216 ----
      char attr = dataname[1];
  
!     int index = atoi(&dataname[3]);
      int index2 = -1;
      int index3 = -1;
***************
*** 222,228 ****
          {
              if (index2 == -1)
!                 index2 = atof(&dataname[a+1]);
              else
!                 index3 = atof(&dataname[a+1]);
          }
      }
--- 222,228 ----
          {
              if (index2 == -1)
!                 index2 = atoi(&dataname[a+1]);
              else
!                 index3 = atoi(&dataname[a+1]);
          }
      }