[Vegastrike-cvs] CVS: vegastrike/src/cmd role_bitmask.cpp,1.9,1.10 role_bitmask.h,1.3,1.4 unit_generic.cpp,1.239,1.240 unit_generic.h,1.100,1.101

[Daniel H. <hel...@us...>]

Update of /cvsroot/vegastrike/vegastrike/src/cmd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv439/cmd

Modified Files:
	role_bitmask.cpp role_bitmask.h unit_generic.cpp 
	unit_generic.h 
Log Message:
fixed jump drive and added accessors for role vlaue

Index: role_bitmask.cpp
===================================================================
RCS file: /cvsroot/vegastrike/vegastrike/src/cmd/role_bitmask.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** role_bitmask.cpp	3 Oct 2003 04:38:01 -0000	1.9
--- role_bitmask.cpp	26 Apr 2004 00:18:57 -0000	1.10
***************
*** 57,60 ****
--- 57,68 ----
  		return 0;
  	}
+ 	std::string InternalGetStrRole (unsigned char c) {
+ 	   std::map<string,int>::iterator i = rolemap.begin();
+ 	   for (;i!=rolemap.end();++i) {
+               if ((*i).second==c)
+                  return (*i).first;
+            }
+            return rolemap.size()?(*rolemap.begin()).first:std::string("");
+ 	}
  	vector < vector <string > > buildscripts() {
  	  vector<vector <string> > scripts;
***************
*** 159,166 ****
  		return i;
  	}
! 	unsigned char getRole (const std::string &s) {
! 		//int temp = maxRoleValue();
! 		return InternalGetRole(s);
! 	}
  	unsigned int readBitmask (const std::string &ss){
  		string s= ss;
--- 167,178 ----
  		return i;
  	}
! 	unsigned char getRole (const std::string &s) {

! 		//int temp = maxRoleValue();

! 		return InternalGetRole(s);

! 	}

! 	std::string getRole (unsigned char c) {

! 		//int temp = maxRoleValue();

! 		return InternalGetStrRole(c);

! 	}

  	unsigned int readBitmask (const std::string &ss){
  		string s= ss;

Index: role_bitmask.h
===================================================================
RCS file: /cvsroot/vegastrike/vegastrike/src/cmd/role_bitmask.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** role_bitmask.h	31 Jan 2003 09:56:27 -0000	1.3
--- role_bitmask.h	26 Apr 2004 00:18:57 -0000	1.4
***************
*** 15,18 ****
--- 15,20 ----
  	//getRole returns a number between 0 and 32 that's the discrete log
  	unsigned char getRole (const std::string &role);
+ 	std::string getRole (unsigned char role);
+ 
  	//returns the getRoles or'd together
  	unsigned int readBitmask (const std::string &s);

Index: unit_generic.cpp
===================================================================
RCS file: /cvsroot/vegastrike/vegastrike/src/cmd/unit_generic.cpp,v
retrieving revision 1.239
retrieving revision 1.240
diff -C2 -r1.239 -r1.240
*** unit_generic.cpp	25 Apr 2004 09:51:05 -0000	1.239
--- unit_generic.cpp	26 Apr 2004 00:18:57 -0000	1.240
***************
*** 5921,5924 ****
--- 5921,5930 ----
    return string("destroyed_turret");
  }
+ void Unit::setCombatRole(std::string s) {
+    combatRole(ROLES::getRole(s));
+ }
+ std::string Unit::getCombatRole() const{
+    return ROLES::getRole(combatRole());
+ }
  
  void Unit::SortCargo() {

Index: unit_generic.h
===================================================================
RCS file: /cvsroot/vegastrike/vegastrike/src/cmd/unit_generic.h,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -r1.100 -r1.101
*** unit_generic.h	26 Mar 2004 23:04:13 -0000	1.100
--- unit_generic.h	26 Apr 2004 00:18:57 -0000	1.101
***************
*** 361,364 ****
--- 361,367 ----
    std::vector <Mesh *> meshdata;
    unsigned char combatRole() const {return combat_role;}
+   void combatRole(unsigned char c){combat_role=c;}
+   void setCombatRole(std::string s);
+   std::string getCombatRole()const;
  protected:
    unsigned char combat_role;