summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorepoch <epoch@hacking.allowed.org>2017-01-15 13:45:02 -0600
committerepoch <epoch@hacking.allowed.org>2017-01-15 13:45:02 -0600
commitace9f98d3d77ce69a3b8501dbecd79cae1b5b215 (patch)
tree4a9d7d7c9cc825b882c7e73030a31d26ee64871b
parenta23de94db5347b9a4fe44b637052c970ca94ac06 (diff)
downloadhackvr-ace9f98d3d77ce69a3b8501dbecd79cae1b5b215.tar.gz
hackvr-ace9f98d3d77ce69a3b8501dbecd79cae1b5b215.zip
makefile now makes hackvr symlink to hackvr_x11, config.h splits by default, _x11.c commented out sky generation
-rw-r--r--src/Makefile1
-rw-r--r--src/config.h6
-rw-r--r--src/graphics_x11.c3
3 files changed, 6 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile
index 19d51b5..fa888cc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,7 @@
CFLAGS=-Wall -pedantic -std=c99 -DGRAPHICAL -ffast-math
all: hackvr_headless hackvr_x11 hackvr_opengl slowcat
+ ln -s hackvr_x11 hackvr
hackvr_headless: LDLIBS=-lm
hackvr_headless: hackvr_headless.o math.o
diff --git a/src/config.h b/src/config.h
index 9e4962e..16e2ec0 100644
--- a/src/config.h
+++ b/src/config.h
@@ -8,13 +8,13 @@
#define DEBUG 1
#define WALK_SPEED 1
-#define SPLIT_SCREEN 1
+#define SPLIT_SCREEN 2
#define CAMERA_SEPARATION 4
#define RED_AND_BLUE 0
#define SHAPES 16386
#define MAX_SIDES 8
-#define WIDTH 1024
-#define HEIGHT 768
+#define WIDTH 4000
+#define HEIGHT 3000
#define DEFAULT_MINIMAP 0
#define FORCE_REDRAW 1
diff --git a/src/graphics_x11.c b/src/graphics_x11.c
index f342089..a1cf145 100644
--- a/src/graphics_x11.c
+++ b/src/graphics_x11.c
@@ -336,6 +336,7 @@ int graphics_init() {
// XSetForeground(x11_global.dpy, gc, whiteColor);
// this was taking a "long" time.
+/*
printf("# generating sky... ");
skypixmap=XCreatePixmap(x11_global.dpy,x11_global.w,SKYW,SKYH,DefaultDepth(x11_global.dpy,DefaultScreen(x11_global.dpy)));
for(i=0;i<SKYH;i++) {
@@ -350,7 +351,7 @@ int graphics_init() {
}
}
printf("done.\n");
-
+*/
gra_global.mapxoff=gra_global.width/2;
gra_global.mapyoff=gra_global.height/2;
gra_global.drawminimap=DEFAULT_MINIMAP;