Attachment #229409 for bug #317507

View | Details | Raw Unified | Return to bug 317507
Collapse All | Expand All

Lines 12-17 Link Here

(-)src/celengine/overlay.h (+1 lines)
12		12
13	#include <string>	13	#include <string>
14	#include <iostream>	14	#include <iostream>
		15	#include <cstdio>
15	#include <celtxf/texturefont.h>	16	#include <celtxf/texturefont.h>
16		17
17		18

Lines 44-54 template<class T> T radToDeg(T r) Link Here

(-)src/celmath/mathlib.h (-5 lines)
44	return r * 180 / static_cast<T>(PI);	44	return r * 180 / static_cast<T>(PI);
45	}	45	}
46		46
47	template<class T> T abs(T x)
48	{
49	return (x < 0) ? -x : x;
50	}
51
52	template<class T> T square(T x)	47	template<class T> T square(T x)
53	{	48	{
54	return x * x;	49	return x * x;

Lines 773-779 static int object_mark(lua_State* l) Link Here

(-)src/celestia/celx_object.cpp (-1 / +1 lines)
773	markAlpha = 1.0f;	773	markAlpha = 1.0f;
774		774
775	Color markColorAlpha(0.0f, 1.0f, 0.0f, 0.9f);	775	Color markColorAlpha(0.0f, 1.0f, 0.0f, 0.9f);
776	markColorAlpha = Color::Color(markColor, markAlpha);	776	markColorAlpha = Color(markColor, markAlpha);
777		777
778	const char* markLabel = celx.safeGetString(6, WrongType, "Fifth argument to object:mark must be a string");	778	const char* markLabel = celx.safeGetString(6, WrongType, "Fifth argument to object:mark must be a string");
779	if (markLabel == NULL)	779	if (markLabel == NULL)

Return to bug 317507