# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1379783908 -10800
# Node ID ad6b185723cd03962911d2b437d194c5b926502c
# Parent  4ad71b558ab27a5147fa6803eba1f494b03d9096
foo

diff -r 4ad71b558ab2 -r ad6b185723cd dosemu/dosemu.c
--- a/dosemu/dosemu.c	Sat Sep 21 19:09:03 2013 +0300
+++ b/dosemu/dosemu.c	Sat Sep 21 20:18:28 2013 +0300
@@ -1,21 +1,3 @@
-/*
-256-color 3D graphics hack for real-mode DOS.
-Copyright (C) 2011  John Tsiombikas <nuclear@member.fsf.org>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 /* This file implements all calls made to dos-specific code using SDL
  * Don't ask why ...
  */
@@ -23,19 +5,19 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <SDL.h>
-#include "vga.h"
+#include "wvga.h"
 #include "conio.h"
 #include "mouse.h"
 #include "timer.h"
 
 static void proc_events(void);
 
-/* ----- graphics (vga.c implementation) ----- */
+/* ----- graphics (wvga.c implementation) ----- */
 static SDL_Surface *fbsurf;
 
 #define DOUBLESZ	(fbsurf->w != 320)
 
-void set_video_mode(int mode)
+int set_video_mode(int mode)
 {
 	int resx = 320, resy = 200;
 	unsigned int sdl_flags = SDL_HWPALETTE;
@@ -69,22 +51,36 @@
 	default:
 		break;
 	}
+
+	return 0;
 }
 
-void set_palette(unsigned char c, unsigned char r, unsigned char g, unsigned char b)
+void set_palette(int idx, int *col, int count)
+{
+	int i;
+
+	for(i=0; i<count; i++) {
+		set_pal_entry(idx + i, col[0], col[1], col[2]);
+		col += 3;
+	}
+}
+
+void set_pal_entry(int idx, int r, int g, int b)
 {
 	SDL_Color col;
 	col.r = r;
 	col.g = g;
 	col.b = b;
 
-	if(SDL_SetPalette(fbsurf, SDL_LOGPAL | SDL_PHYSPAL, &col, c, 1) != 1) {
+	if(SDL_SetPalette(fbsurf, SDL_LOGPAL | SDL_PHYSPAL, &col, idx, 1) != 1) {
 		fprintf(stderr, "set_palette failed to set the required color\n");
 	}
 }
 
-void copy_frame(unsigned char *frame)
+void copy_frame(void *pixels)
 {
+	unsigned char *frame = (unsigned char*)pixels;
+
 	if(SDL_MUSTLOCK(fbsurf)) {
 		SDL_LockSurface(fbsurf);
 	}
diff -r 4ad71b558ab2 -r ad6b185723cd src/inttypes.h
--- a/src/inttypes.h	Sat Sep 21 19:09:03 2013 +0300
+++ b/src/inttypes.h	Sat Sep 21 20:18:28 2013 +0300
@@ -1,6 +1,7 @@
 #ifndef INT_TYPES_H_
 #define INT_TYPES_H_
 
+#ifdef __DOS__
 typedef char int8_t;
 typedef short int16_t;
 typedef long int32_t;
@@ -8,5 +9,8 @@
 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned long uint32_t;
+#else
+#include <stdint.h>
+#endif
 
 #endif	/* INT_TYPES_H_ */