projects
/
ld42_outofspace
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more notes
[ld42_outofspace]
/
src
/
game.cc
diff --git
a/src/game.cc
b/src/game.cc
index
cf3f62a
..
9d69c69
100644
(file)
--- a/
src/game.cc
+++ b/
src/game.cc
@@
-22,8
+22,6
@@
bool game_init()
glEnable(GL_FRAMEBUFFER_SRGB);
glEnable(GL_DEPTH_TEST);
glEnable(GL_CULL_FACE);
glEnable(GL_FRAMEBUFFER_SRGB);
glEnable(GL_DEPTH_TEST);
glEnable(GL_CULL_FACE);
- glEnable(GL_LIGHTING);
- glEnable(GL_LIGHT0);
active_screen->start();
return true;
active_screen->start();
return true;
@@
-43,20
+41,19
@@
void game_draw()
void game_reshape(int x, int y)
{
void game_reshape(int x, int y)
{
- active_screen->draw();
+ active_screen->reshape(x, y);
}
void game_keyboard(int key, bool pressed)
{
if(pressed) {
switch(key) {
}
void game_keyboard(int key, bool pressed)
{
if(pressed) {
switch(key) {
- case 'q':
- case 'Q':
- if(game_modkeys() & MODKEY_CTRL) {
- game_quit();
- return;
- }
- break;
+ case 17:
+ /* for some inexplicable reason freeglut seems to produce key
+ * 17 for ctrl-q on both X and windows.
+ */
+ game_quit();
+ return;
default:
break;
default:
break;