diff options
| author | Simon Howard | 2005-08-10 08:45:35 +0000 |
|---|---|---|
| committer | Simon Howard | 2005-08-10 08:45:35 +0000 |
| commit | 24c1bf494f6dad82a55ea41d75fa99b48ff04f4e (patch) | |
| tree | ee7025f820c0c0983365539b876451d113099411 /src/i_video.c | |
| parent | e4ee3ece6a3297a1a6c6d4b74ec8538ad473f05a (diff) | |
| download | chocolate-doom-24c1bf494f6dad82a55ea41d75fa99b48ff04f4e.tar.gz chocolate-doom-24c1bf494f6dad82a55ea41d75fa99b48ff04f4e.tar.bz2 chocolate-doom-24c1bf494f6dad82a55ea41d75fa99b48ff04f4e.zip | |
Remove "if (french)" stuff, FRENCH define, detect french wad automatically
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 51
Diffstat (limited to 'src/i_video.c')
| -rw-r--r-- | src/i_video.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/i_video.c b/src/i_video.c index c21283b8..8197e674 100644 --- a/src/i_video.c +++ b/src/i_video.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: i_video.c 49 2005-08-07 20:01:00Z fraggle $ +// $Id: i_video.c 51 2005-08-10 08:45:35Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -22,6 +22,9 @@ // 02111-1307, USA. // // $Log$ +// Revision 1.18 2005/08/10 08:45:35 fraggle +// Remove "if (french)" stuff, FRENCH define, detect french wad automatically +// // Revision 1.17 2005/08/07 20:01:00 fraggle // Clear the screen on startup // @@ -84,7 +87,7 @@ //----------------------------------------------------------------------------- static const char -rcsid[] = "$Id: i_video.c 49 2005-08-07 20:01:00Z fraggle $"; +rcsid[] = "$Id: i_video.c 51 2005-08-10 08:45:35Z fraggle $"; #include <ctype.h> #include <SDL.h> @@ -330,6 +333,7 @@ void I_GetEvent(void) case SDL_KEYDOWN: event.type = ev_keydown; event.data1 = xlatekey(&sdlevent.key.keysym); + event.data2 = sdlevent.key.keysym.unicode; D_PostEvent(&event); break; case SDL_KEYUP: @@ -681,16 +685,18 @@ void I_InitGraphics(void) I_Error("Error setting video mode: %s\n", SDL_GetError()); } + SDL_ShowCursor(0); + SDL_WM_GrabInput(SDL_GRAB_ON); + if (multiply == 1) screens[0] = (unsigned char *) (screen->pixels); else screens[0] = (unsigned char *) Z_Malloc (SCREENWIDTH * SCREENHEIGHT, PU_STATIC, NULL); - SDL_ShowCursor(0); - SDL_WM_GrabInput(SDL_GRAB_ON); - LoadDiskImage(); + SDL_EnableUNICODE(1); + // start with a clear black screen memset(screens[0], 0, SCREENWIDTH * SCREENHEIGHT); |