wok-6.x view celestia/stuff/celestia-1.6.0-gcc45.patch @ rev 23659

updated sord (0.16.2 -> 0.16.4)
author Hans-G?nter Theisgen
date Wed Apr 22 09:04:19 2020 +0100 (2020-04-22)
parents
children
line source
1 --- src/celengine/overlay.h 2010-04-16 17:43:35.000000000 +0200
2 +++ src/celengine/overlay.h 2010-04-16 17:43:55.000000000 +0200
3 @@ -12,6 +12,7 @@
4
5 #include <string>
6 #include <iostream>
7 +#include <cstdio>
8 #include <celtxf/texturefont.h>
9
10
11 --- src/celmath/mathlib.h 2010-04-16 18:16:09.000000000 +0200
12 +++ src/celmath/mathlib.h 2010-04-16 18:16:18.000000000 +0200
13 @@ -44,11 +44,6 @@ template<class T> T radToDeg(T r)
14 return r * 180 / static_cast<T>(PI);
15 }
16
17 -template<class T> T abs(T x)
18 -{
19 - return (x < 0) ? -x : x;
20 -}
21 -
22 template<class T> T square(T x)
23 {
24 return x * x;
25 --- src/celengine/star.cpp 2010-04-16 18:17:42.000000000 +0200
26 +++ src/celengine/star.cpp 2010-04-16 18:17:57.000000000 +0200
27 @@ -10,6 +10,7 @@
28 #include <celmath/mathlib.h>
29 #include <cstring>
30 #include <cassert>
31 +#include <cstdio>
32 #include "celestia.h"
33 #include "astro.h"
34 #include "orbit.h"
35 --- src/celestia/celx_object.cpp 2010-04-16 18:19:52.000000000 +0200
36 +++ src/celestia/celx_object.cpp 2010-04-16 18:22:37.000000000 +0200
37 @@ -773,7 +773,7 @@ static int object_mark(lua_State* l)
38 markAlpha = 1.0f;
39
40 Color markColorAlpha(0.0f, 1.0f, 0.0f, 0.9f);
41 - markColorAlpha = Color::Color(markColor, markAlpha);
42 + markColorAlpha = Color(markColor, markAlpha);
43
44 const char* markLabel = celx.safeGetString(6, WrongType, "Fifth argument to object:mark must be a string");
45 if (markLabel == NULL)