real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Fix build failure on GCC 4.6.

Browse Source 
This was SVN commit r16623.
This commit is contained in:
leper 2015-05-04 19:37:25 +00:00
parent f5107ad189
commit 7f606250f8
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2011 Wildfire Games.
/* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -27,6 +27,8 @@ Brush g_Brush_Elevation; // shared between several elevation-related tools; othe
static Brush* g_Brush_CurrentlyActive = NULL; // only one brush can be active at once
const float Brush::STRENGTH_MULTIPLIER = 1024.f;
Brush::Brush()
: m_Shape(CIRCLE), m_Size(4), m_Strength(1.f), m_IsActive(false)
{

4
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2011 Wildfire Games.
/* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -33,7 +33,7 @@ public:
Brush();
~Brush();
const float STRENGTH_MULTIPLIER = 1024.f;
static const float STRENGTH_MULTIPLIER;
int GetWidth() const;
int GetHeight() const;