Files
commandergenius/project/jni/application/quake/quake-r2tec-androidsdl.diff

90 lines
2.5 KiB
Diff

diff -ru orig/source/cpu.c source/cpu.c
--- orig/source/cpu.c 2010-08-15 11:52:04.000000000 -0400
+++ source/cpu.c 2011-02-08 13:20:14.000000000 -0500
@@ -123,7 +123,7 @@
munmap((void *)jz_cpmregl, 0x80);
munmap((void *)jz_emcregl, 0x90);
close(jz_dev);
- fcloseall();
+// fcloseall();
sync();
}
diff -ru orig/source/menu.c source/menu.c
--- orig/source/menu.c 2010-09-07 06:17:42.000000000 -0400
+++ source/menu.c 2011-02-08 08:47:59.000000000 -0500
@@ -464,7 +464,7 @@
// char name[MAX_OSPATH];
FILE *f;
int version;
- ulong dummy,fsize;
+ unsigned long dummy,fsize;
char name[45];
char *line;
Only in orig/source: snd_linux.c
Only in orig/source: sound.c
diff -ru orig/source/sys_sdl.c source/sys_sdl.c
--- orig/source/sys_sdl.c 2010-09-03 07:05:16.000000000 -0400
+++ source/sys_sdl.c 2011-02-08 13:36:34.000000000 -0500
@@ -11,10 +11,11 @@
#include <string.h>
#include <ctype.h>
#include <errno.h>
+#include <SDL.h>
#ifndef __WIN32__
#include <sys/ipc.h>
-#include <sys/shm.h>
+//#include <sys/shm.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/mman.h>
diff -ru orig/source/vid_sdl.c source/vid_sdl.c
--- orig/source/vid_sdl.c 2010-09-06 15:26:04.000000000 -0400
+++ source/vid_sdl.c 2011-02-09 07:21:04.000000000 -0500
@@ -1,10 +1,10 @@
// vid_sdl.h -- sdl video driver
-
-#include <sys/stat.h>
-#include <sys/dir.h>
-#include <unistd.h>
-#include <SDL.h>
-#include <SDL_ttf.h>
+
+#include <sys/stat.h>
+//#include <sys/dir.h>
+#include <unistd.h>
+#include <SDL.h>
+#include <SDL_ttf.h>
#include <SDL_image.h>
#include "quakedef.h"
#include "d_local.h"
@@ -81,13 +81,13 @@
int handle = -1;
TTF_Init();
- gTTFFont = TTF_OpenFont("q_sys/gfx/dpquake.ttf", 12);
+ gTTFFont = TTF_OpenFont("q_sys/gfx/dpquake.ttf", 16);
// Load the SDL library
if (SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO) != 0)
Sys_Error("VID: Couldn't load SDL: %s", SDL_GetError());
- if (!(hwscreen = SDL_SetVideoMode(320, 240, 32, SDL_SWSURFACE|SDL_ASYNCBLIT|SDL_ANYFORMAT|SDL_HWPALETTE)))
+ if (!(hwscreen = SDL_SetVideoMode(480, 320, 32, SDL_SWSURFACE|SDL_ASYNCBLIT|SDL_ANYFORMAT|SDL_HWPALETTE)))
Sys_Error("VID: Couldn't set video mode: %s\n", SDL_GetError());
// Background
@@ -208,8 +208,8 @@
case SDLK_LCTRL:
if(option == 2) {
// Set up display mode (width and height)
- vid.width = 320;
- vid.height = 240;
+ vid.width = 480;
+ vid.height = 320;
if ((pnum=COM_CheckParm("-winsize"))) {
if (pnum >= com_argc-2)