cpp/openttd-patchpack/source Changeset - r12259:1d19e876f7f9

Changeset - r12259:1d19e876f7f9

Parent rev.

Child rev.

[Not reviewed]

master

0 4 2

alberth - 15 years ago 2009-06-28 15:16:57
alberth@openttd.org

(svn r16684) -Codechange: Add maxdim function for Dimension struct.

6 files changed with 52 insertions and 1 deletions:

projects/openttd_vs80.vcproj

projects/openttd_vs90.vcproj

source.list

src/core/geometry_func.cpp

src/core/geometry_func.hpp

src/window_gui.h

0 comments (0 inline, 0 general)

projects/openttd_vs80.vcproj

➞

Show inline comments

@@ @@ -1696,6 +1696,14 @@ @@
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\core\geometry_func.cpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\core\geometry_func.hpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\core\geometry_type.hpp"
+				>
 			</File>

projects/openttd_vs90.vcproj

➞

Show inline comments

@@ @@ -1693,6 +1693,14 @@ @@
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\core\geometry_func.cpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\core\geometry_func.hpp"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\core\geometry_type.hpp"
+				>
 			</File>

source.list

➞

Show inline comments

@@ @@ -367,6 +367,8 @@ core/bitmath_func.hpp @@
 core/endian_func.hpp
 core/endian_type.hpp
 core/enum_type.hpp
 core/geometry_func.cpp
 core/geometry_func.hpp
 core/geometry_type.hpp
 core/math_func.cpp
 core/math_func.hpp

src/core/geometry_func.cpp

➞

Show inline comments

@@ new file 100644 @@
 /* $Id$ */
 /** @file geometry_func.cpp Geometry functions. */
 #include "../stdafx.h"
 #include "geometry_func.hpp"
 #include "math_func.hpp"
 /**
  * Compute bounding box of both dimensions.
  * @param d1 First dimension.
  * @param d2 Second dimension.
  * @return The bounding box of both dimensions, the smallest dimension that surrounds both arguments.
  */
 Dimension maxdim(const Dimension &d1, const Dimension &d2)
+{
 	Dimension d;
 	d.width  = max(d1.width,  d2.width);
 	d.height = max(d1.height, d2.height);
 	return d;
+}

src/core/geometry_func.hpp

➞

Show inline comments

@@ new file 100644 @@
 /* $Id$ */
 /** @file geometry_func.hpp Geometry functions. */
 #ifndef GEOMETRY_FUNC_HPP
 #define GEOMETRY_FUNC_HPP
 #include "geometry_type.hpp"
 Dimension maxdim(const Dimension &d1, const Dimension &d2);
 #endif /* GEOMETRY_FUNC_HPP */

src/window_gui.h

➞

Show inline comments

@@ @@ -5,7 +5,7 @@ @@
 #ifndef WINDOW_GUI_H
 #define WINDOW_GUI_H
-#include "core/geometry_type.hpp"
+#include "core/geometry_func.hpp"
 #include "vehicle_type.h"
 #include "viewport_type.h"
 #include "company_type.h"

0 comments (0 inline, 0 general)