Page MenuHomePhabricator (Chris)

No OneTemporary

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
diff --git a/.drone.yml b/.drone.yml
index e45129b..4ae695a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,7 +1,5 @@
build:
- image: ubuntu:14.04
+ image: bluszcz/libsfml-dev
commands:
- - sudo apt-get update
- - sudo apt-get install libc6-dev gcc g++ qt5-qmake build-essential -y
- qmake
- make
diff --git a/assets/img/background_land.png b/assets/img/background_land.png
index 409ea91..b01a7ac 100644
Binary files a/assets/img/background_land.png and b/assets/img/background_land.png differ
diff --git a/boarddiamond.cpp b/boarddiamond.cpp
index 2b16dac..38d145b 100644
--- a/boarddiamond.cpp
+++ b/boarddiamond.cpp
@@ -1,35 +1,36 @@
#include "boarddiamond.h"
BoardDiamond::BoardDiamond()
{
}
BoardDiamond::BoardDiamond(TextureHolder *textures, int idNumber,
int element, int boardPosition)
{
this->textures = textures;
this->element = element;
this->boardPosition = boardPosition;
this->idNumber = idNumber;
spriteHolder.setTexture(this->textures->textureBoardDiamond);
sf::IntRect textureRect(idNumber*44, 0, 44,44);
spriteHolder.setTextureRect(textureRect);
+ spriteHolder.scale(0.5, 0.5);
setBoardPosition(boardPosition);
}
void BoardDiamond::draw(sf::RenderTarget& target, sf::RenderStates states) const
{
if (boardPosition>-1)
{
states.transform *= getTransform();
sf::Vector2f where(getPosition());
target.draw(spriteHolder, states);
}
}
void BoardDiamond::update(sf::Time deltaTime, std::set<int> &busyTiles)
{
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jun 20, 7:44 PM (1 w, 1 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
71667
Default Alt Text
(1 KB)

Event Timeline