SF.net SVN: bzflag:[22764] trunk/bzflag

[<bul...@us...>]

Revision: 22764
          http://sourceforge.net/p/bzflag/code/22764
Author:   bullet_catcher
Date:     2013-05-18 20:19:54 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Preserve const quality in collision manager.
Add "Local Variables: ***" comment for Emacs.

Modified Paths:
--------------
    trunk/bzflag/include/CollisionManager.h
    trunk/bzflag/src/game/CollisionManager.cxx

Modified: trunk/bzflag/include/CollisionManager.h
===================================================================
--- trunk/bzflag/include/CollisionManager.h	2013-05-18 19:54:06 UTC (rev 22763)
+++ trunk/bzflag/include/CollisionManager.h	2013-05-18 20:19:54 UTC (rev 22764)
@@ -49,7 +49,7 @@
 
 typedef struct {
   int count;
-  class ColDetNode** list;
+  const class ColDetNode** list;
 } ColDetNodeList;
 
 

Modified: trunk/bzflag/src/game/CollisionManager.cxx
===================================================================
--- trunk/bzflag/src/game/CollisionManager.cxx	2013-05-18 19:54:06 UTC (rev 22763)
+++ trunk/bzflag/src/game/CollisionManager.cxx	2013-05-18 20:19:54 UTC (rev 22764)
@@ -74,7 +74,7 @@
   return;
 }
 
-inline static void addToRayList (ColDetNode* node)
+inline static void addToRayList (const ColDetNode* node)
 {
   RayList.list[RayList.count] = node;
   RayList.count++;
@@ -481,7 +481,7 @@
   root->tallyStats();
 
   // setup the ray list
-  RayList.list = new ColDetNode*[leafNodes];
+  RayList.list = new const ColDetNode*[leafNodes];
   RayList.count = 0;
 
   // print some statistics
@@ -868,7 +868,7 @@
   }
 
   if (childCount == 0) {
-    addToRayList((ColDetNode*)this);
+    addToRayList(this);
   }
   else {
     for (int i = 0; i < childCount; i++) {
@@ -960,6 +960,7 @@
 }
 
 
+// Local Variables: ***
 // mode: C++ ***
 // tab-width: 8 ***
 // c-basic-offset: 2 ***

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.