summaryrefslogtreecommitdiff
path: root/yapf/unittest
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2006-09-04 20:40:33 +0000
committerrubidium <rubidium@openttd.org>2006-09-04 20:40:33 +0000
commit63687763e9680663e68754b47ee9f1511641faf8 (patch)
treeb1e52d993ce60e919358d998b36ea08adfe26cba /yapf/unittest
parenta7cfb80c40d9a4c544ece10872fd3808f9f59f8d (diff)
downloadopenttd-63687763e9680663e68754b47ee9f1511641faf8.tar.xz
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
-Cleanup: whitespace alignment of a few tables.
Diffstat (limited to 'yapf/unittest')
-rw-r--r--yapf/unittest/test_yapf.h10
-rw-r--r--yapf/unittest/unittest.cpp34
2 files changed, 22 insertions, 22 deletions
diff --git a/yapf/unittest/test_yapf.h b/yapf/unittest/test_yapf.h
index 4e2f2c0e5..952040faa 100644
--- a/yapf/unittest/test_yapf.h
+++ b/yapf/unittest/test_yapf.h
@@ -160,8 +160,8 @@ struct CYapfTestBaseT
FORCEINLINE char TransportTypeChar() const {return 'T';}
/** Called by YAPF to move from the given node to the next tile. For each
- * reachable trackdir on the new tile creates new node, initializes it
- * and adds it to the open list by calling Yapf().AddNewNode(n) */
+ * reachable trackdir on the new tile creates new node, initializes it
+ * and adds it to the open list by calling Yapf().AddNewNode(n) */
FORCEINLINE void PfFollowNode(Node& org)
{
int x_org = org.m_key.m_x;
@@ -207,8 +207,8 @@ struct CYapfTestBaseT
}
/** Called by YAPF to calculate the cost from the origin to the given node.
- * Calculates only the cost of given node, adds it to the parent node cost
- * and stores the result into Node::m_cost member */
+ * Calculates only the cost of given node, adds it to the parent node cost
+ * and stores the result into Node::m_cost member */
FORCEINLINE bool PfCalcCost(Node& n)
{
// base tile cost depending on distance
@@ -225,7 +225,7 @@ struct CYapfTestBaseT
}
/** Called by YAPF to calculate cost estimate. Calculates distance to the destination
- * adds it to the actual cost from origin and stores the sum to the Node::m_estimate */
+ * adds it to the actual cost from origin and stores the sum to the Node::m_estimate */
FORCEINLINE bool PfCalcEstimate(Node& n)
{
int dx = abs(n.m_key.m_x - m_x2);
diff --git a/yapf/unittest/unittest.cpp b/yapf/unittest/unittest.cpp
index 099862bee..33d3f3065 100644
--- a/yapf/unittest/unittest.cpp
+++ b/yapf/unittest/unittest.cpp
@@ -109,23 +109,23 @@ const TileIndexDiffC _tileoffs_by_dir[] = {
extern "C"
const byte _ffb_64[128] = {
- 0,0,1,0,2,0,1,0,
- 3,0,1,0,2,0,1,0,
- 4,0,1,0,2,0,1,0,
- 3,0,1,0,2,0,1,0,
- 5,0,1,0,2,0,1,0,
- 3,0,1,0,2,0,1,0,
- 4,0,1,0,2,0,1,0,
- 3,0,1,0,2,0,1,0,
-
- 0,0,0,2,0,4,4,6,
- 0,8,8,10,8,12,12,14,
- 0,16,16,18,16,20,20,22,
- 16,24,24,26,24,28,28,30,
- 0,32,32,34,32,36,36,38,
- 32,40,40,42,40,44,44,46,
- 32,48,48,50,48,52,52,54,
- 48,56,56,58,56,60,60,62,
+ 0, 0, 1, 0, 2, 0, 1, 0,
+ 3, 0, 1, 0, 2, 0, 1, 0,
+ 4, 0, 1, 0, 2, 0, 1, 0,
+ 3, 0, 1, 0, 2, 0, 1, 0,
+ 5, 0, 1, 0, 2, 0, 1, 0,
+ 3, 0, 1, 0, 2, 0, 1, 0,
+ 4, 0, 1, 0, 2, 0, 1, 0,
+ 3, 0, 1, 0, 2, 0, 1, 0,
+
+ 0, 0, 0, 2, 0, 4, 4, 6,
+ 0, 8, 8, 10, 8, 12, 12, 14,
+ 0, 16, 16, 18, 16, 20, 20, 22,
+ 16, 24, 24, 26, 24, 28, 28, 30,
+ 0, 32, 32, 34, 32, 36, 36, 38,
+ 32, 40, 40, 42, 40, 44, 44, 46,
+ 32, 48, 48, 50, 48, 52, 52, 54,
+ 48, 56, 56, 58, 56, 60, 60, 62,
};
/* Maps a trackdir to the (4-way) direction the tile is exited when following