CVS: bzflag/src/bzfs CustomBase.cxx,2.2,2.3 CustomBase.h,2.2,2.3 CustomWeapon.cxx,2.5,2.6 CustomWeapon.h,2.3,2.4

[Jeff M. <jef...@us...>]

Update of /cvsroot/bzflag/bzflag/src/bzfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4750/src/bzfs

Modified Files:
	CustomBase.cxx CustomBase.h CustomWeapon.cxx CustomWeapon.h 
Log Message:
stupid english language, add another G to spell trigger right.

Index: CustomBase.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzfs/CustomBase.cxx,v
retrieving revision 2.2
retrieving revision 2.3
diff -w -u -r2.2 -r2.3
--- CustomBase.cxx	18 May 2005 05:56:34 -0000	2.2
+++ CustomBase.cxx	18 May 2005 17:07:35 -0000	2.3
@@ -26,7 +26,7 @@
   size[0] = size[1] = BZDB.eval(StateDatabase::BZDB_BASESIZE);
   color = 0;
 
-	trigerWorldWep = false;
+	triggerWorldWep = false;
 	worldWepType = "SW";
 }
 
@@ -39,7 +39,7 @@
   }
 	else if (strcmp(cmd, "oncap") == 0)
 	{
-		trigerWorldWep= true;
+		triggerWorldWep= true;
 		input >> worldWepType;
 	}
 	else
@@ -57,7 +57,7 @@
   BaseBuilding* base = new BaseBuilding(pos, rotation, absSize, color);
   groupdef->addObstacle(base);
 
-	if (trigerWorldWep)
+	if (triggerWorldWep)
 		worldEventManager.addCapEvent(color,new WorldWeaponGlobalEventHandaler(Flag::getDescFromAbbreviation(worldWepType.c_str()), pos, rotation, 0));
 }
 

Index: CustomBase.h
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzfs/CustomBase.h,v
retrieving revision 2.2
retrieving revision 2.3
diff -w -u -r2.2 -r2.3
--- CustomBase.h	18 May 2005 05:56:34 -0000	2.2
+++ CustomBase.h	18 May 2005 17:07:35 -0000	2.3
@@ -33,7 +33,7 @@
 
   protected:
     int color;
-		bool trigerWorldWep;
+		bool triggerWorldWep;
 		std::string worldWepType;
 };
 

Index: CustomWeapon.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzfs/CustomWeapon.cxx,v
retrieving revision 2.5
retrieving revision 2.6
diff -w -u -r2.5 -r2.6
--- CustomWeapon.cxx	18 May 2005 16:20:04 -0000	2.5
+++ CustomWeapon.cxx	18 May 2005 17:07:35 -0000	2.6
@@ -38,8 +38,8 @@
   delay.push_back(10.0f);
   type = Flags::Null;
 
-	eventTrigerd = false;
-	teamCapTriger = false;
+	eventTriggerd = false;
+	teamCapTrigger = false;
 	capTeam = -1;
 }
 
@@ -83,20 +83,20 @@
     // convert to radians
     tilt = (float)(tilt * (M_PI / 180.0));
   }
-  else if (strcmp(cmd, "triger") == 0) 
+  else if (strcmp(cmd, "trigger") == 0) 
   {
-	  std::string trigerType;
-	  input >> trigerType;
+	  std::string triggerType;
+	  input >> triggerType;
 
-	  eventTrigerd = true;
+	  eventTriggerd = true;
 
-	  TextUtils::tolower(trigerType);
-	  if ( trigerType == "flagcap")
-		  teamCapTriger = true;
+	  TextUtils::tolower(triggerType);
+	  if ( triggerType == "flagcap")
+		  teamCapTrigger = true;
 	  else
 	  {
-		  eventTrigerd = false;
-		  std::cout << "weapon triger type:" << trigerType << " unknown" << std::endl;
+		  eventTriggerd = false;
+		  std::cout << "weapon trigger type:" << triggerType << " unknown" << std::endl;
 	  }
   }
   else if (strcmp(cmd, "capteam") == 0) 
@@ -114,9 +114,9 @@
 
 void CustomWeapon::writeToWorld(WorldInfo* world) const
 {
-	if (!eventTrigerd)
+	if (!eventTriggerd)
 		world->addWeapon(type, pos, rotation, tilt, initdelay, delay, sync);
-	else if ( teamCapTriger )
+	else if ( teamCapTrigger )
 		worldEventManager.addCapEvent(capTeam,new WorldWeaponGlobalEventHandaler(type, pos, rotation, tilt));
 }
 

Index: CustomWeapon.h
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzfs/CustomWeapon.h,v
retrieving revision 2.3
retrieving revision 2.4
diff -w -u -r2.3 -r2.4
--- CustomWeapon.h	18 May 2005 05:42:13 -0000	2.3
+++ CustomWeapon.h	18 May 2005 17:07:35 -0000	2.4
@@ -44,8 +44,8 @@
     float tilt;
     static TimeKeeper sync;
 
-		bool eventTrigerd;
-		bool teamCapTriger;
+		bool eventTriggerd;
+		bool teamCapTrigger;
 		int	 capTeam;
 };