git.ucc.asn.au
/
progcomp2012.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PRELIMINARY ROUND 1]
[progcomp2012.git]
/
judge
/
manager
/
stratego.cpp
diff --git
a/judge/manager/stratego.cpp
b/judge/manager/stratego.cpp
index
c9716cf
..
0e299cb
100644
(file)
--- a/
judge/manager/stratego.cpp
+++ b/
judge/manager/stratego.cpp
@@
-234,7
+234,7
@@
void Board::Draw(const Piece::Colour & reveal, bool showRevealed)
}
Graphics::ClearScreen();
}
Graphics::ClearScreen();
-
+ float scale = (float)(Piece::textures[(int)(Piece::NOTHING)].width()) / (float)(GRID_SIZE);
for (int y=0; y < height; ++y)
{
for (int x=0; x < width; ++x)
for (int y=0; y < height; ++y)
{
for (int x=0; x < width; ++x)
@@
-249,7
+249,8
@@
void Board::Draw(const Piece::Colour & reveal, bool showRevealed)
|| (piece->beenRevealed && showRevealed))
{
//Display the piece
|| (piece->beenRevealed && showRevealed))
{
//Display the piece
- Piece::textures[(int)(piece->type)].DrawColour(x*32,y*32,0,1, Piece::GetGraphicsColour(piece->colour));
+
+ Piece::textures[(int)(piece->type)].DrawColour(x*GRID_SIZE*scale,y*GRID_SIZE*scale,0,scale, Piece::GetGraphicsColour(piece->colour));
}
else
}
else
@@
-257,16
+258,16
@@
void Board::Draw(const Piece::Colour & reveal, bool showRevealed)
switch (piece->colour)
{
case Piece::RED:
switch (piece->colour)
{
case Piece::RED:
- Piece::textures[(int)(Piece::NOTHING)].DrawColour(x*
32,y*32,0,1
, Piece::GetGraphicsColour(piece->colour));
+ Piece::textures[(int)(Piece::NOTHING)].DrawColour(x*
GRID_SIZE*scale,y*GRID_SIZE*scale,0,scale
, Piece::GetGraphicsColour(piece->colour));
break;
case Piece::BLUE:
break;
case Piece::BLUE:
- Piece::textures[(int)(Piece::NOTHING)].DrawColour(x*
32,y*32,0,1
, Piece::GetGraphicsColour(piece->colour));
+ Piece::textures[(int)(Piece::NOTHING)].DrawColour(x*
GRID_SIZE*scale,y*GRID_SIZE*scale,0,scale
, Piece::GetGraphicsColour(piece->colour));
break;
case Piece::NONE:
break;
case Piece::NONE:
- Piece::textures[(int)(Piece::BOULDER)].DrawColour(x*
32,y*32,0,1
, Piece::GetGraphicsColour(piece->colour));
+ Piece::textures[(int)(Piece::BOULDER)].DrawColour(x*
GRID_SIZE*scale,y*GRID_SIZE*scale,0,scale
, Piece::GetGraphicsColour(piece->colour));
break;
case Piece::BOTH:
break;
case Piece::BOTH:
- Piece::textures[(int)(Piece::BOULDER)].DrawColour(x*
32,y*32,0,1
, Piece::GetGraphicsColour(piece->colour));
+ Piece::textures[(int)(Piece::BOULDER)].DrawColour(x*
GRID_SIZE*scale,y*GRID_SIZE*scale,0,scale
, Piece::GetGraphicsColour(piece->colour));
break;
}
}
break;
}
}
UCC
git Repository :: git.ucc.asn.au