Merge branch 'move_dice'

Author: Databean

Makefile

@@ -7,8 +7,8 @@ export EXECUTABLE := warsofcatan
 ALLFILES := $(wildcard $(SRC_HOME)/*) $(wildcard $(INCL_HOME)/*)
 export CXX := g++
 export LD := g++
-export CXXFLAGS := -g -I$(INCL_HOME) -std=c++0x -Wall
-export LDFLAGS := -L/usr/local/lib -lSDL2 -lSDL2_ttf -lGL -lGLU
+export CXXFLAGS := -g -I$(INCL_HOME) -std=c++0x -I/usr/include/SDL -Wall
+export LDFLAGS := -L/usr/local/lib -lSDL2 -lSDL2_ttf -lGL -lGLU -Wl,-R/usr/local/lib
 
 .PHONY: all
 all: $(EXECUTABLE)
@@ -25,4 +25,4 @@ tests: $(EXECUTABLE)
 .PHONY: clean
 clean:
 	rm -f $(EXECUTABLE)
-	rm -f obj/*.o
+	rm -f obj/*.o

src/GameView.cpp

@@ -511,11 +511,11 @@ void DrawingGameVisitor::visit(GameDice& dice) {
 	};
 
 	drawTexturedRectangle(topLeftOffset.find(dice.getFirst())->second, 95.f, 
-		make_pair(.7f, .9f), 0.06);
+		make_pair(.7f, .8f), 0.06);
 
 
 	drawTexturedRectangle(topLeftOffset.find(dice.getSecond())->second, 95.f, 
-		make_pair(.78f, .9f), 0.06);
+		make_pair(.78f, .8f), 0.06);