[Csp-commits] svn:csp r1338 - trunk/CSP/SimCore/Battlefield

[<sv...@ww...>]

Author: delta
Date: 2004-12-02 11:53:36 -0800 (Thu, 02 Dec 2004)
New Revision: 1338

Modified:
   trunk/CSP/SimCore/Battlefield/Battlefield.cpp
   trunk/CSP/SimCore/Battlefield/GlobalBattlefield.h
   trunk/CSP/SimCore/Battlefield/LocalBattlefield.cpp
   trunk/CSP/SimCore/Battlefield/test-client.cpp
Log:
* Small changes in loops syntax.
* Changed round to floor in LocalBattlefield.cpp & got ride of a few warnings in this file.
* Eliminated a few cast warnings.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1338

Modified: trunk/CSP/SimCore/Battlefield/Battlefield.cpp
===================================================================
--- trunk/CSP/SimCore/Battlefield/Battlefield.cpp	2004-12-02 19:18:43 UTC (rev 1337)
+++ trunk/CSP/SimCore/Battlefield/Battlefield.cpp	2004-12-02 19:53:36 UTC (rev 1338)
@@ -30,7 +30,7 @@
 Battlefield::Unit Battlefield::getNextUnit(Unit const &unit, int human, int local, int /*category*/) {
 	UnitMap::iterator iter = m_UnitMap.find(unit->id());
 	if (iter != m_UnitMap.end()) {
-		for (UnitMap::iterator scan = iter; 1; )  {
+		for (UnitMap::iterator scan = iter; ; )  {
 			if (++scan == m_UnitMap.end()) scan = m_UnitMap.begin();
 			if (scan == iter) break;
 			Unit u = scan->second->unit();

Modified: trunk/CSP/SimCore/Battlefield/GlobalBattlefield.h
===================================================================
--- trunk/CSP/SimCore/Battlefield/GlobalBattlefield.h	2004-12-02 19:18:43 UTC (rev 1337)
+++ trunk/CSP/SimCore/Battlefield/GlobalBattlefield.h	2004-12-02 19:53:36 UTC (rev 1338)
@@ -401,7 +401,7 @@
 				CommandAddUnit::Ref msg = new CommandAddUnit();
 				msg->set_unit_id(from->id());
 				msg->set_unit_class(simdata::Path(from->unit()->getObjectPath()));
-				msg->set_unit_type(from->unit()->type());
+				msg->set_unit_type(static_cast<const simdata::uint8>(from->unit()->type()));
 				msg->set_owner_id(from->owner());
 				msg->set_grid_x(from->point().x());
 				msg->set_grid_y(from->point().y());

Modified: trunk/CSP/SimCore/Battlefield/LocalBattlefield.cpp
===================================================================
--- trunk/CSP/SimCore/Battlefield/LocalBattlefield.cpp	2004-12-02 19:18:43 UTC (rev 1337)
+++ trunk/CSP/SimCore/Battlefield/LocalBattlefield.cpp	2004-12-02 19:53:36 UTC (rev 1338)
@@ -22,7 +22,6 @@
  *
  **/
 
-
 #include <SimCore/Battlefield/LocalBattlefield.h>
 #include <SimCore/Battlefield/Battlefield.h>
 #include <SimCore/Battlefield/SceneManager.h>
@@ -255,7 +254,8 @@
 void LocalBattlefield::continueUnitScan(double dt) {
 	static const double loop_time = 3.0;  // seconds
 	m_ScanElapsedTime += dt;
-	unsigned target_index = static_cast<unsigned>(round(m_ScanElapsedTime * m_ScanRate));
+	//XXX
+	unsigned target_index = static_cast<unsigned>(floor(m_ScanElapsedTime * m_ScanRate + 0.5));
 	if (m_ScanIndex > target_index) return;
 	if (m_ScanIndex == m_ScanUnits.size()) {
 		if (m_ScanElapsedTime < loop_time) return;
@@ -475,7 +475,7 @@
 			Unit unit;
 			try {
 				unit = m_DataManager->getObject(wrapper->path());
-			} catch (simdata::IndexError const &err) {
+			} catch (simdata::IndexError const &) {
 				// pass (error handled below)
 			}
 			if (!unit) {
@@ -531,7 +531,7 @@
 		RegisterUnit::Ref msg = new RegisterUnit();
 		msg->set_unit_id(unit->id());
 		msg->set_unit_class(unit->getObjectPath());
-		msg->set_unit_type(unit->type());
+		msg->set_unit_type(static_cast<const simdata::uint8>(unit->type()));
 		msg->set_grid_x(wrapper->point().x());
 		msg->set_grid_y(wrapper->point().y());
 		sendServerCommand(msg);

Modified: trunk/CSP/SimCore/Battlefield/test-client.cpp
===================================================================
--- trunk/CSP/SimCore/Battlefield/test-client.cpp	2004-12-02 19:18:43 UTC (rev 1337)
+++ trunk/CSP/SimCore/Battlefield/test-client.cpp	2004-12-02 19:53:36 UTC (rev 1338)
@@ -117,7 +117,7 @@
 		simdata::Timer timer;
 		timer.start();
 		bool added = false;
-		while (1) {
+		for (;;) {
 			client->processAndWait(0.01, 0.01, 0.1);
 			bf->update(timer.elapsed());
 			timer.reset();