mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-03-23 15:50:37 +01:00
Code Issues Projects Releases Wiki Activity

fix brush when CELL is changed to 1

Browse Source
This commit is contained in:
jacob1 2017-07-28 19:40:50 -04:00
parent 8064d3b467
commit cbad202ac2
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/game/GameView.cpp
View File

@ -720,11 +720,7 @@ void GameView::NotifyLastToolChanged(GameModel * sender)
{
if (sender->GetLastTool())
{
if (sender->GetLastTool()->GetResolution() == CELL)
wallBrush = true;
else
wallBrush = false;
wallBrush = sender->GetLastTool()->GetBlocky();
if (sender->GetLastTool()->GetIdentifier().find("DEFAULT_TOOL_") != sender->GetLastTool()->GetIdentifier().npos)
toolBrush = true;
else

4
src/gui/game/Tool.cpp
View File

@ -12,7 +12,7 @@ Tool::Tool(int id, string name, string description, int r, int g, int b, std::st
toolName(name),
toolDescription(description),
strength(1.0f),
resolution(1),
blocky(false),
identifier(identifier),
colRed(r),
colGreen(g),
@ -72,7 +72,7 @@ void ElementTool::DrawFill(Simulation * sim, Brush * brush, ui::Point position)
WallTool::WallTool(int id, string name, string description, int r, int g, int b, std::string identifier, VideoBuffer * (*textureGen)(int, int, int)):
Tool(id, name, description, r, g, b, identifier, textureGen)
{
resolution = CELL;
blocky = true;
}
WallTool::~WallTool() {}
void WallTool::Draw(Simulation * sim, Brush * brush, ui::Point position) {

4
src/gui/game/Tool.h
View File

@ -20,7 +20,7 @@ protected:
string toolName;
string toolDescription;
float strength;
int resolution;
bool blocky;
std::string identifier;
public:
int colRed, colGreen, colBlue;
@ -30,7 +30,7 @@ public:
string GetName();
string GetDescription();
std::string GetIdentifier();
int GetResolution() { return resolution; }
int GetBlocky() { return blocky; }
void SetStrength(float value) { strength = value; }
float GetStrength() { return strength; }
VideoBuffer * GetTexture(int width, int height);