diff -r -u b7-original/Source/amx.c b7/Source/amx.c --- b7-original/Source/amx.c 2004-02-04 09:12:50.000000000 +0000 +++ b7/Source/amx.c 2004-04-14 17:43:33.000000000 +0100 @@ -27,7 +27,7 @@ #include #include "osdefs.h" #if defined LINUX - #include + #include "sclinux.h" #if !defined AMX_NODYNALOAD #include #endif diff -r -u b7-original/Source/amx.h b7/Source/amx.h --- b7-original/Source/amx.h 2003-12-31 12:48:18.000000000 +0000 +++ b7/Source/amx.h 2004-04-14 17:43:18.000000000 +0100 @@ -22,7 +22,7 @@ */ #if defined LINUX - #include + #include "sclinux.h" #endif #ifndef __AMX_H diff -r -u b7-original/Source/Confuse/lexer.c b7/Source/Confuse/lexer.c --- b7-original/Source/Confuse/lexer.c 2004-02-24 21:14:02.000000000 +0000 +++ b7/Source/Confuse/lexer.c 2004-04-14 17:47:52.000000000 +0100 @@ -23,7 +23,7 @@ // All of this code, with the exception of the include stuff, is // brand spankin' new. -#ifdef DJGPP +#if defined(DJGPP) || defined(LINUX) #include #endif diff -r -u b7-original/Source/d_main.c b7/Source/d_main.c --- b7-original/Source/d_main.c 2004-04-08 11:33:16.000000000 +0100 +++ b7/Source/d_main.c 2004-04-14 17:45:38.000000000 +0100 @@ -29,7 +29,7 @@ static const char rcsid[] = "$Id: d_main.c,v 1.47 1998/05/16 09:16:51 killough Exp $"; -#include +//#include #include #include #include "z_zone.h" @@ -1932,12 +1932,17 @@ v_ticker = true; // turn on the fps ticker } +#ifndef LINUX + // ok then, this is broken under linux. does anyone + // really care too much? does anyone use this option? + if(M_CheckParm("-cdrom")) { printf(D_CDROM); #ifndef DJGPP mkdir("c:/doomdata"); #else + mkdir("c:/doomdata",0); #endif // killough 10/98: @@ -1945,6 +1950,8 @@ "c:/doomdata/%s.cfg", D_DoomExeName()); } +#endif + // turbo option if((p=M_CheckParm("-turbo"))) { diff -r -u b7-original/Source/Makefile.unix b7/Source/Makefile.unix --- b7-original/Source/Makefile.unix 2002-09-08 21:38:54.000000000 +0100 +++ b7/Source/Makefile.unix 2004-04-14 17:47:31.000000000 +0100 @@ -1,27 +1,13 @@ -include ./rules.make - -OBJS = am_color.o am_map.o c_cmd.o c_io.o c_net.o c_runcmd.o d_deh.o \ - d_dialog.o d_items.o d_main.o d_net.o doomdef.o doomstat.o \ - dstrings.o f_finale.o f_wipe.o g_bind.o g_cmd.o g_game.o \ - hu_frags.o hu_fspic.o hu_over.o hu_stuff.o info.o m_argv.o \ - m_bbox.o m_cheat.o m_misc.o m_random.o mn_engin.o mn_menus.o \ - mn_misc.o p_anim.o p_ceilng.o p_chase.o p_cmd.o p_doors.o \ - p_enemy.o p_floor.o p_genlin.o p_hubs.o p_info.o p_inter.o \ - p_lights.o p_map.o p_maputl.o p_mobj.o p_partcl.o p_plats.o \ - p_pspr.o p_saveg.o p_setup.o p_sight.o p_skin.o p_spec.o \ - p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o \ - r_draw.o r_main.o r_plane.o r_ripple.o r_segs.o r_sky.o \ - r_things.o s_sound.o sounds.o st_lib.o st_stuff.o t_array.o \ - t_func.o t_oper.o t_parse.o t_prepro.o t_script.o t_spec.o \ - t_vari.o tables.o v_misc.o v_video.o version.o w_wad.o \ - wi_stuff.o z_zone.o - -eternity: $(OBJS) sdl - $(CC) $(CFLAGS) $(LDFLAGS) sdl/libplatform.o $(OBJS) -o eternity - -sdl: - make -C sdl - -%.o: %.c - $(CC) -c $< -o $@ - +include ./rules.make + +OBJS = Confuse/lexer.o Confuse/confuse.o a_fixed.o am_color.o am_map.o amx.o amxcore.o a_small.o c_cmd.o c_io.o c_net.o c_runcmd.o d_deh.o d_dehtbl.o d_dialog.o d_gi.o d_io.o d_items.o d_main.o d_net.o doomdef.o doomstat.o dstrings.o e_cmd.o e_edf.o e_exdata.o e_sound.o f_finale.o f_wipe.o g_bind.o g_cmd.o g_dmflag.o g_game.o g_gfs.o hi_stuff.o hu_frags.o hu_fspic.o hu_over.o hu_stuff.o info.o in_lude.o m_argv.o m_bbox.o m_cheat.o m_fcvt.o m_misc.o mn_engin.o mn_htic.o mn_menus.o mn_misc.o mn_skinv.o m_qstr.o m_queue.o m_random.o p_anim.o p_ceilng.o p_chase.o p_cmd.o p_doors.o p_enemy.o p_floor.o p_genlin.o p_henemy.o p_hubs.o p_info.o p_inter.o p_lights.o p_map.o p_maputl.o p_mobj.o p_partcl.o p_plats.o p_pspr.o p_saveg.o p_setup.o p_sight.o p_skin.o psnprntf.o p_spec.o p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o r_draw.o r_main.o r_plane.o r_portal.o r_ripple.o r_segs.o r_sky.o r_things.o sounds.o s_sound.o st_hbar.o st_lib.o st_stuff.o tables.o v_block.o version.o v_misc.o v_patch.o v_video.o wi_stuff.o w_wad.o z_zone.o + +eternity: $(OBJS) sdl + $(CC) $(CFLAGS) $(LDFLAGS) sdl/libplatform.o $(OBJS) -o eternity + +sdl: + make -C sdl + +%.o: %.c + $(CC) $(CFLAGS) -c $< -o $@ + diff -r -u b7-original/Source/rules.make b7/Source/rules.make --- b7-original/Source/rules.make 2002-07-09 17:06:48.000000000 +0100 +++ b7/Source/rules.make 2004-04-14 17:48:07.000000000 +0100 @@ -1,3 +1,3 @@ -CFLAGS=-O3 `sdl-config --cflags` -D_SDL_VER -LDFLAGS=`sdl-config --libs` +CFLAGS=-O3 `sdl-config --cflags` -D_SDL_VER -DLINUX +LDFLAGS=`sdl-config --libs` -lSDL_mixer diff -r -u b7-original/Source/sdl/i_video.c b7/Source/sdl/i_video.c --- b7-original/Source/sdl/i_video.c 2004-04-07 21:04:14.000000000 +0100 +++ b7/Source/sdl/i_video.c 2004-04-14 18:01:33.000000000 +0100 @@ -56,6 +56,8 @@ #include "../i_system.h" #include "../d_gi.h" +static int grab_mouse = 1; + SDL_Surface *sdlscreen; /////////////////////////////////////////////////////////////////////////// @@ -636,10 +638,12 @@ V_Init(); - SDL_ShowCursor(SDL_DISABLE); - // SoM 1-20-04: grab mouse input - SDL_WM_GrabInput(SDL_GRAB_ON); - + if (grab_mouse) { + SDL_ShowCursor(SDL_DISABLE); + // SoM 1-20-04: grab mouse input + SDL_WM_GrabInput(SDL_GRAB_ON); + } + { char *title; char *icon; @@ -765,6 +769,18 @@ CONSOLE COMMANDS ************************/ +VARIABLE_BOOLEAN(grab_mouse, NULL, yesno); + +CONSOLE_VARIABLE(grab_mouse, grab_mouse, 0) { + if (grab_mouse) { + SDL_WM_GrabInput(SDL_GRAB_ON); + SDL_ShowCursor(0); + } else { + SDL_WM_GrabInput(SDL_GRAB_OFF); + SDL_ShowCursor(1); + } +} + VARIABLE_BOOLEAN(use_vsync, NULL, yesno); VARIABLE_BOOLEAN(disk_icon, NULL, onoff); @@ -797,6 +813,8 @@ C_AddCommand(joySens_x); C_AddCommand(joySens_y); + + C_AddCommand(grab_mouse); } //----------------------------------------------------------------------------