# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1345856871 -10800
# Node ID 21999ef6636bc65879890ddf55a79f4611241bd9
# Parent  527fede3005779424fbe44f7a7bcecf2f7e0b459
lalala

diff -r 527fede30057 -r 21999ef6636b prototype/src/cmdcon.cc
--- a/prototype/src/cmdcon.cc	Sat Aug 25 02:16:08 2012 +0300
+++ b/prototype/src/cmdcon.cc	Sat Aug 25 04:07:51 2012 +0300
@@ -25,6 +25,7 @@
 		return false;
 	}
 
+	printf("loading font: %s\n", path);
 	if(!(font = dtx_open_font(path, 12))) {
 		fprintf(stderr, "failed to open font file: %s\n", path);
 		return false;
@@ -71,19 +72,25 @@
 
 void draw_cmdcon()
 {
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
 	glMatrixMode(GL_PROJECTION);
 	glPushMatrix();
 	glLoadIdentity();
-	glOrtho(0, cfg.width, -cfg.height, 0, -1, 1);
+	//glOrtho(0, cfg.width, cfg.height, 0, -1, 1);
+	glOrtho(-cfg.width / 2.0, cfg.width / 2.0, -cfg.height / 2.0, cfg.height / 2.0, -1, 1);
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
 	glLoadIdentity();
 
+	//glTranslatef(100, 100, 0);
+
 	glPushAttrib(GL_ENABLE_BIT | GL_CURRENT_BIT);
-	glEnable(GL_BLEND);
+	glUseProgram(0);
 	glDisable(GL_DEPTH_TEST);
 	glDisable(GL_LIGHTING);
-	glUseProgram(0);
+	glDisable(GL_CULL_FACE);
+	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
 	glBegin(GL_QUADS);
@@ -94,8 +101,6 @@
 	glVertex2f(-10, 10);
 	glEnd();
 
-	glTranslatef(cfg.width / 2, cfg.height / 2, 0);
-
 	glColor4f(0.2, 0.9, 0.3, 1.0);
 	dtx_string(cmdline.c_str());
 	dtx_flush();
diff -r 527fede30057 -r 21999ef6636b prototype/src/main.cc
--- a/prototype/src/main.cc	Sat Aug 25 02:16:08 2012 +0300
+++ b/prototype/src/main.cc	Sat Aug 25 04:07:51 2012 +0300
@@ -86,6 +86,10 @@
 		return false;
 	}
 
+	if(!init_cmdcon()) {
+		return false;
+	}
+
 	// load a tileset
 	tileset = new TileSet;
 	printf("loading tileset: %s\n", cfg.tileset_file);
@@ -111,6 +115,8 @@
 	delete tileset;
 
 	destroy_renderer();
+
+	cleanup_cmdcon();
 }
 
 void idle()
@@ -163,7 +169,7 @@
 
 void draw()
 {
-	render_deferred(level);
+	//render_deferred(level);
 
 	if(show_con) {
 		draw_cmdcon();