Enable 1024x768 (#66)

cxong · Jul 3, 2013 · d137d06 · d137d06
1 parent 8769796
commit d137d06
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 23 deletions.
diff --git a/src/cdogs.c b/src/cdogs.c
@@ -830,7 +830,7 @@ void *MakeBkg(void)
 	SetupMission(0, 1, &gCampaign);
 	SetupMap();
 	SetDstScreen(bkg);
-	SetBuffer(512, 384, buffer, X_TILES);
+	SetBuffer(1024, 768, buffer, X_TILES);
 	FixBuffer(buffer, 255);
 	DrawBuffer(buffer, 0);
 	CFREE(buffer);

diff --git a/src/cdogs/draw.c b/src/cdogs/draw.c
@@ -54,9 +54,6 @@ SetBuffer(int x_origin, int y_origin, struct Buffer *buffer, int width)
 	int x, y;
 	TTile *bufTile;
 
-	//memset(buffer, 0, sizeof(struct Buffer));
-	ClearBuffer(buffer);
-
 	buffer->width = width;
 
 	buffer->xTop = x_origin - TILE_WIDTH * width / 2;

diff --git a/src/cdogs/grafx.c b/src/cdogs/grafx.c
@@ -68,9 +68,10 @@ GFX_Mode gfx_modelist[] = {
 	{ 400, 300 },
 	{ 640, 480 },
 	{ 800, 600 }, /* things go strange above this... */
+	{ 1024, 768 },
 	{ 0, 0 },
 };
-#define MODE_MAX 3
+#define MODE_MAX 4
 
 
 static int mode_idx = 1;

diff --git a/src/cdogs/map.c b/src/cdogs/map.c
@@ -79,21 +79,6 @@ struct Buffer * NewBuffer(void)
 	return b;
 }
 
-void ClearBuffer(struct Buffer *b)
-{
-	if (!b) {
-		printf("!!! Buffer nonexistent?\n"); 
-		return;
-	}
-
-//	TTile *tmp = b->tiles;
-
-//	memset(b, 0, sizeof(struct Buffer));
-//	memset(tmp, 0, sizeof(TTile) * X_TILES * Y_TILES);
-
-//	b->tiles = tmp;
-}
-
 static void AddItemToTile(TTileItem * t, TTile * tile)
 {
 	t->next = tile->things;

diff --git a/src/cdogs/map.h b/src/cdogs/map.h
@@ -22,8 +22,8 @@
 #ifndef __MAP
 #define __MAP
 
-#define YMAX    64
-#define XMAX    64
+#define YMAX    128
+#define XMAX    128
 
 #define TILE_WIDTH      16
 #define TILE_HEIGHT     12
@@ -92,7 +92,6 @@ struct Buffer {
 };
 
 struct Buffer * NewBuffer(void);
-void ClearBuffer(struct Buffer *b);
 
 extern TTile gMap[YMAX][XMAX];
 #define Map( x, y)  gMap[y][x]