summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormario <mario@notk.org>2011-11-30 01:43:05 +0100
committermario <mario@notk.org>2011-11-30 01:43:05 +0100
commitf5c32b3b880deb0ff2eee7243e3f112469841e95 (patch)
tree5a92f9c236e1d7ba6b1ecdac9b0b5e83d00aa253
parent09bca1fdee6ead5d0a4d34bca3ec979ad82d0496 (diff)
parente76f03e0437bd865b20095c4ec4a4d1c03b8a6c6 (diff)
Merge branch 'master' of notk.org:trolltron
-rw-r--r--MainWindow.cpp4
-rw-r--r--Makefile13
-rw-r--r--Notes.txt5
3 files changed, 11 insertions, 11 deletions
diff --git a/MainWindow.cpp b/MainWindow.cpp
index e40cc84..19f02c9 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -3,7 +3,7 @@
#include <iostream>
-#include <string>
+//#include <string>
#include <iostream>
#define WINDOW_TIMER 15
@@ -170,7 +170,7 @@ void MainWindow::onRenderScene() {
}
}
if (! m_pGame->isRunning())
- drawString(0, -0.02, "PAUSED", 0xffffff, center);
+ drawString(0, -0.02, (char*)"PAUSED", 0xffffff, center);
}
glutSwapBuffers();
diff --git a/Makefile b/Makefile
index abf1d9d..290971d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,19 +17,14 @@ else
LDFLAGS=-lGLU -lglut
endif
-SOURCES=Cell.cpp Field.cpp Controller.cpp Game.cpp MainWindow.cpp KeyboardController.cpp Player.cpp AIController.cpp
+SOURCES=Cell.cpp Field.cpp Controller.cpp Game.cpp MainWindow.cpp KeyboardController.cpp Player.cpp AIController.cpp TrollTron.cpp
OBJECTS=$(SOURCES:.cpp=.o)
-MAIN_SOURCE=TrollTron.cpp
MAIN=trolltron
+all: $(MAIN)
-all: $(OBJECTS) lab
-
-opt: $(OBJECTS)
- $(CC) -o $(MAIN) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(MAIN_SOURCE)
-
-lab:
- $(CC) -o $(MAIN) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(MAIN_SOURCE)
+$(MAIN): $(OBJECTS)
+ $(CC) -o $(MAIN) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS)
.o:
$(CC) $(CXXFLAGS) $< -o $@
diff --git a/Notes.txt b/Notes.txt
new file mode 100644
index 0000000..b5ab709
--- /dev/null
+++ b/Notes.txt
@@ -0,0 +1,5 @@
+Possible additions (sorted by difficulty, but fairly easy stuff i.e. "planned for"):
+ - Count scores and print them out (just number of wins for each player)
+ - play with bike speed - zoooomm! :D (everything should "just work", but gotta find a proper ruleset)
+ - add a repetitive and entertaining background music :)
+ - Network controller/client