[Planeshift-cvs] CVS: planeshift/src/server/bulkobjects pscharacterloader.cpp,1.12,1.13 psspell.cpp,1.9,1.10

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

Update of /cvsroot/planeshift/planeshift/src/server/bulkobjects
In directory sc8-pr-cvs1:/tmp/cvs-serv11080/src/server/bulkobjects

Modified Files:
	pscharacterloader.cpp psspell.cpp 
Log Message:
- Added saving of faction_standings on saving of character
- Added server command: progress <player>,<event> to test
  progress scripts.
- Displaying way name instead of way id in the spell window.


Index: pscharacterloader.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/pscharacterloader.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** pscharacterloader.cpp	13 Aug 2003 23:21:47 -0000	1.12
--- pscharacterloader.cpp	16 Aug 2003 22:54:32 -0000	1.13
***************
*** 30,33 ****
--- 30,34 ----
  #include "../globals.h"
  #include "psglyph.h"
+ #include "rpgrules/factions.h"
  
  
***************
*** 505,509 ****
          "loc_z",
          "loc_yrot",
!         "loc_sector_id"
      };
      psStringArray fields;
--- 506,511 ----
          "loc_z",
          "loc_yrot",
!         "loc_sector_id",
!         "faction_standings"
      };
      psStringArray fields;
***************
*** 542,545 ****
--- 544,550 ----
      fields.FormatPush("%1.2f",yrot);
      fields.FormatPush("%u",sectorinfo->uid);
+     csString csv;
+     actor->GetFactions()->GetFactionListCSV(csv);
+     fields.FormatPush("%s",csv.GetData());
  
      char characteridstring[25];

Index: psspell.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psspell.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** psspell.cpp	16 Aug 2003 17:12:33 -0000	1.9
--- psspell.cpp	16 Aug 2003 22:54:32 -0000	1.10
***************
*** 202,207 ****
      }
      csString xml;
!     xml.Format("<SPELL NAME=\"%s\" WAY=\"%d\" REALM=\"%d\" GLYPHS=\"%s\"/>",
!                name.GetData(),way->id,realm,glyphs.GetData());
      return xml;
  }
--- 202,207 ----
      }
      csString xml;
!     xml.Format("<SPELL NAME=\"%s\" WAY=\"%s\" REALM=\"%d\" GLYPHS=\"%s\"/>",
!                name.GetData(),way->name.GetData(),realm,glyphs.GetData());
      return xml;
  }