wok-current annotate celestia/stuff/celestia-1.6.0-gcc45.patch @ rev 10162
Up: libdvdread to 4.1.3.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Fri May 20 20:11:13 2011 +0000 (2011-05-20) |
| parents | |
| children |
| rev | line source |
|---|---|
| slaxemulator@7697 | 1 --- src/celengine/overlay.h 2010-04-16 17:43:35.000000000 +0200 |
| slaxemulator@7697 | 2 +++ src/celengine/overlay.h 2010-04-16 17:43:55.000000000 +0200 |
| slaxemulator@7697 | 3 @@ -12,6 +12,7 @@ |
| slaxemulator@7697 | 4 |
| slaxemulator@7697 | 5 #include <string> |
| slaxemulator@7697 | 6 #include <iostream> |
| slaxemulator@7697 | 7 +#include <cstdio> |
| slaxemulator@7697 | 8 #include <celtxf/texturefont.h> |
| slaxemulator@7697 | 9 |
| slaxemulator@7697 | 10 |
| slaxemulator@7697 | 11 --- src/celmath/mathlib.h 2010-04-16 18:16:09.000000000 +0200 |
| slaxemulator@7697 | 12 +++ src/celmath/mathlib.h 2010-04-16 18:16:18.000000000 +0200 |
| slaxemulator@7697 | 13 @@ -44,11 +44,6 @@ template<class T> T radToDeg(T r) |
| slaxemulator@7697 | 14 return r * 180 / static_cast<T>(PI); |
| slaxemulator@7697 | 15 } |
| slaxemulator@7697 | 16 |
| slaxemulator@7697 | 17 -template<class T> T abs(T x) |
| slaxemulator@7697 | 18 -{ |
| slaxemulator@7697 | 19 - return (x < 0) ? -x : x; |
| slaxemulator@7697 | 20 -} |
| slaxemulator@7697 | 21 - |
| slaxemulator@7697 | 22 template<class T> T square(T x) |
| slaxemulator@7697 | 23 { |
| slaxemulator@7697 | 24 return x * x; |
| slaxemulator@7697 | 25 --- src/celengine/star.cpp 2010-04-16 18:17:42.000000000 +0200 |
| slaxemulator@7697 | 26 +++ src/celengine/star.cpp 2010-04-16 18:17:57.000000000 +0200 |
| slaxemulator@7697 | 27 @@ -10,6 +10,7 @@ |
| slaxemulator@7697 | 28 #include <celmath/mathlib.h> |
| slaxemulator@7697 | 29 #include <cstring> |
| slaxemulator@7697 | 30 #include <cassert> |
| slaxemulator@7697 | 31 +#include <cstdio> |
| slaxemulator@7697 | 32 #include "celestia.h" |
| slaxemulator@7697 | 33 #include "astro.h" |
| slaxemulator@7697 | 34 #include "orbit.h" |
| slaxemulator@7697 | 35 --- src/celestia/celx_object.cpp 2010-04-16 18:19:52.000000000 +0200 |
| slaxemulator@7697 | 36 +++ src/celestia/celx_object.cpp 2010-04-16 18:22:37.000000000 +0200 |
| slaxemulator@7697 | 37 @@ -773,7 +773,7 @@ static int object_mark(lua_State* l) |
| slaxemulator@7697 | 38 markAlpha = 1.0f; |
| slaxemulator@7697 | 39 |
| slaxemulator@7697 | 40 Color markColorAlpha(0.0f, 1.0f, 0.0f, 0.9f); |
| slaxemulator@7697 | 41 - markColorAlpha = Color::Color(markColor, markAlpha); |
| slaxemulator@7697 | 42 + markColorAlpha = Color(markColor, markAlpha); |
| slaxemulator@7697 | 43 |
| slaxemulator@7697 | 44 const char* markLabel = celx.safeGetString(6, WrongType, "Fifth argument to object:mark must be a string"); |
| slaxemulator@7697 | 45 if (markLabel == NULL) |