Skip to content

Commit c6d5586

Browse files
committed
Merge pull request #52 from Databean/remove_stupid_line
removed some problematic dead code I had been using to spike. which was breaking master on my machine whoops
2 parents 94c0c8b + 22faefa commit c6d5586

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

src/GameView.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ void drawTexturedRectangle(std::pair<float, float> texTopLeft, float sideLength,
562562
void DrawingGameVisitor::visit(GameDice& dice) {
563563

564564
static const GLuint diceTextures = loadImageAsTexture("resources/catan_dice_new.bmp");
565-
static const GLuint gameTextures = loadImageAsTexture("resources/catan_sprite_sheet_thatnewnew.bmp");
565+
566566
glBindTexture(GL_TEXTURE_2D, diceTextures);
567567

568568
glColor3d(1.0, 1.0, 1.0);
@@ -649,10 +649,7 @@ void DrawingGameVisitor::visit(ResourceTile& tile) {
649649

650650
if(tile.getDiceValue() != 0) {
651651
if (tile.getBoard().getRobber() == coord) { //draw the robber on this tile
652-
//static const GLuint robberTextures = loadImageAsTexture("resource/catan_sprite_sheet_thatnewnew.bmp");
653-
654-
//glBindTexture(GL_TEXTURE_2D, robberTextures);
655-
//glColor3d(1.0, 1.0, 1.0);
652+
656653
drawTexturedCircle(make_pair(1240.f, 643.f), 59.5f, coordToScreen(coord), 0.04);
657654
}
658655
else

0 commit comments

Comments
 (0)