From 653bf3a0b5c78c7106ea8c9d48c3bb300c0481aa Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Mon, 1 Dec 2008 21:08:23 +0000 Subject: Don't try to read SDL events until initialised. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1394 --- src/i_video.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/i_video.c b/src/i_video.c index 0fe25736..a4129aba 100644 --- a/src/i_video.c +++ b/src/i_video.c @@ -20,7 +20,7 @@ // 02111-1307, USA. // // DESCRIPTION: -// DOOM graphics stuff for X11, UNIX. +// DOOM graphics stuff for SDL. // //----------------------------------------------------------------------------- @@ -588,6 +588,11 @@ static void I_ReadMouse(void) // void I_StartTic (void) { + if (!initialised) + { + return; + } + I_GetEvent(); if (usemouse && !nomouse) -- cgit v1.2.3 From 3fd9acf6e0d664858162ac369ae8670f40edea11 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 3 Dec 2008 22:09:22 +0000 Subject: Use FILE_MAP_COPY instead of FILE_MAP_ALL_ACCESS for mapping files (thanks to Christian Chech). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1407 --- src/w_file_win32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/w_file_win32.c b/src/w_file_win32.c index 0ec6b56c..05d3c445 100644 --- a/src/w_file_win32.c +++ b/src/w_file_win32.c @@ -61,7 +61,7 @@ static void MapFile(win32_wad_file_t *wad, char *filename) } wad->wad.mapped = MapViewOfFile(wad->handle_map, - FILE_MAP_ALL_ACCESS, + FILE_MAP_COPY, 0, 0, 0); if (wad->wad.mapped == NULL) -- cgit v1.2.3 From a0062502d183d5d526c1f801b1206234b664898b Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 9 Dec 2008 19:56:43 +0000 Subject: Add SDL_CFLAGS, SDL_LDFLAGS to default compile flags, and check for SDL in configure before checking for libraries and headers, to fix Windows. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1412 --- configure.in | 22 +++++++++++++++++----- pcsound/Makefile.am | 2 +- setup/Makefile.am | 5 +++-- src/Makefile.am | 11 ++++++++--- textscreen/Makefile.am | 2 +- textscreen/examples/Makefile.am | 2 +- 6 files changed, 31 insertions(+), 13 deletions(-) diff --git a/configure.in b/configure.in index bf2a2c75..43e3438f 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,6 @@ orig_CFLAGS="$CFLAGS" AC_PROG_CC AC_PROG_RANLIB AC_CHECK_PROG(HAVE_PYTHON, python, true, false) -AC_CHECK_FUNCS(mmap) OPT_LEVEL=2 @@ -25,24 +24,37 @@ then CFLAGS="-O$OPT_LEVEL -g -Wall $orig_CFLAGS" fi -AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h]) +dnl Search for SDL ... AM_PATH_SDL(1.1.3) +# Add the SDL compiler flags to the default compiler flag variables. +# It is important to do this now, before checking for headers and +# library functions. The reason being that on Windows, sdl-config +# sets the -mno-cygwin compiler option in order to generate MinGW +# executables. If we don't do this now, we might end up discovering +# header files that are not actually available to us when we come +# to compile. + +CFLAGS="$CFLAGS $SDL_CFLAGS" +LDFLAGS="$LDFLAGS $SDL_LIBS" + AC_CHECK_LIB(SDL_mixer,Mix_LoadMUS,[ -dnl AC_DEFINE(HAVE_LIBSDL_MIXER) SDLMIXER_LIBS="$SDLMIXER_LIBS -lSDL_mixer" ],[ echo "*** Could not find SDL_mixer. Please install it." exit -1 -],$SDL_LIBS $SDLMIXER_LIBS) +]) AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,[ SDLNET_LIBS="$SDLNET_LIBS -lSDL_net" ],[ echo "*** Could not find SDL_net. Please install it." exit -1 -] ,$SDL_LIBS $SDLNET_LIBS) +]) + +AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h]) +AC_CHECK_FUNCS(mmap) # DWF 2008-02-10: FIXME AC_CHECK_LIB(samplerate, src_new) diff --git a/pcsound/Makefile.am b/pcsound/Makefile.am index 63c76f77..b956a886 100644 --- a/pcsound/Makefile.am +++ b/pcsound/Makefile.am @@ -1,5 +1,5 @@ -AM_CFLAGS= @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ +AM_CFLAGS=@SDLMIXER_CFLAGS@ noinst_LIBRARIES=libpcsound.a diff --git a/setup/Makefile.am b/setup/Makefile.am index f845f853..b7b05520 100644 --- a/setup/Makefile.am +++ b/setup/Makefile.am @@ -1,11 +1,10 @@ gamesdir = $(prefix)/games -AM_CFLAGS = @SDL_CFLAGS@ -I../textscreen -I../src -DINSTALL_DIR="\"$(gamesdir)\"" +AM_CFLAGS = -I../textscreen -I../src -DINSTALL_DIR="\"$(gamesdir)\"" games_PROGRAMS = chocolate-setup -chocolate_setup_LDADD = ../textscreen/libtextscreen.a @LDFLAGS@ @SDL_LIBS@ SOURCE_FILES = \ compatibility.c compatibility.h \ configfile.c configfile.h \ @@ -32,6 +31,8 @@ else chocolate_setup_SOURCES=$(SOURCE_FILES) endif +chocolate_setup_LDADD = ../textscreen/libtextscreen.a @LDFLAGS@ + .rc.o: $(WINDRES) $^ -o $@ %.o : %.rc diff --git a/src/Makefile.am b/src/Makefile.am index e43cb7f0..63ddc98f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ gamesdir = $(prefix)/games games_PROGRAMS = chocolate-doom chocolate-server -AM_CFLAGS = -I../textscreen -I../pcsound @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ +AM_CFLAGS = -I../textscreen -I../pcsound @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ DEDSERV_FILES=\ d_dedicated.c \ @@ -21,7 +21,7 @@ net_structrw.c net_structrw.h \ z_native.c z_zone.h chocolate_server_SOURCES=$(DEDSERV_FILES) -chocolate_server_LDADD = @LDFLAGS@ @SDL_LIBS@ @SDLNET_LIBS@ +chocolate_server_LDADD = @LDFLAGS@ @SDLNET_LIBS@ MAIN_SOURCE_FILES=\ am_map.c am_map.h \ @@ -169,7 +169,12 @@ else chocolate_doom_SOURCES=$(SOURCE_FILES) endif -chocolate_doom_LDADD = ../textscreen/libtextscreen.a ../pcsound/libpcsound.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@ +chocolate_doom_LDADD = \ + ../textscreen/libtextscreen.a \ + ../pcsound/libpcsound.a \ + @LDFLAGS@ \ + @SDLMIXER_LIBS@ \ + @SDLNET_LIBS@ EXTRA_DIST = \ icon.c \ diff --git a/textscreen/Makefile.am b/textscreen/Makefile.am index 752e6361..76fe8f0f 100644 --- a/textscreen/Makefile.am +++ b/textscreen/Makefile.am @@ -1,5 +1,5 @@ -AM_CFLAGS = @SDL_CFLAGS@ -I../src +AM_CFLAGS = -I../src # build this directory before the examples directory. diff --git a/textscreen/examples/Makefile.am b/textscreen/examples/Makefile.am index f6d247ea..e314e7e8 100644 --- a/textscreen/examples/Makefile.am +++ b/textscreen/examples/Makefile.am @@ -1,5 +1,5 @@ -AM_CFLAGS = @SDL_CFLAGS@ -I.. -I../../src +AM_CFLAGS = -I.. -I../../src noinst_PROGRAMS=guitest calculator -- cgit v1.2.3 From ca3844dc5b138b19259e8dc9daaa397867834a5f Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 9 Dec 2008 20:35:17 +0000 Subject: Add check for sched_setaffinity to configure and only use it if it is found. Display a message if we don't have any way to set processor affinity. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1413 --- configure.in | 2 +- src/i_main.c | 39 +++++++++++++++++++++++++++------------ 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/configure.in b/configure.in index 43e3438f..83c4739a 100644 --- a/configure.in +++ b/configure.in @@ -54,7 +54,7 @@ AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,[ ]) AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h]) -AC_CHECK_FUNCS(mmap) +AC_CHECK_FUNCS(mmap sched_setaffinity) # DWF 2008-02-10: FIXME AC_CHECK_LIB(samplerate, src_new) diff --git a/src/i_main.c b/src/i_main.c index 74b164b1..c103296b 100644 --- a/src/i_main.c +++ b/src/i_main.c @@ -25,6 +25,8 @@ //----------------------------------------------------------------------------- +#include "config.h" + #include "SDL.h" #include @@ -32,7 +34,9 @@ #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN #include -#else +#endif + +#ifdef HAVE_SCHED_SETAFFINITY #include #include #endif @@ -42,25 +46,35 @@ #include "m_argv.h" #include "d_main.h" -int main(int argc, char **argv) -{ +#if !defined(_WIN32) && !defined(HAVE_SCHED_SETAFFINITY) +#warning No known way to set processor affinity on this platform. +#warning You may experience crashes due to SDL_mixer. +#endif + +int main(int argc, char **argv) +{ // save arguments - myargc = argc; - myargv = argv; + myargc = argc; + myargv = argv; + +#ifdef _WIN32 // Set the process affinity mask so that all threads - // run on the same processor. This is a workaround for a bug in + // run on the same processor. This is a workaround for a bug in // SDL_mixer that causes occasional crashes. -#ifdef _WIN32 if (!SetProcessAffinityMask(GetCurrentProcess(), 1)) { fprintf(stderr, "Failed to set process affinity mask (%d)\n", (int) GetLastError()); } -#else - // POSIX version: + +#endif + +#ifdef HAVE_SCHED_SETAFFINITY + + // Linux version: { cpu_set_t set; @@ -70,12 +84,13 @@ int main(int argc, char **argv) sched_setaffinity(getpid(), sizeof(set), &set); } + #endif // start doom - - D_DoomMain (); + + D_DoomMain (); return 0; -} +} -- cgit v1.2.3 From b00b65538a1f7a04fdd46d7c193a7c59733fde9b Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 9 Dec 2008 23:32:19 +0000 Subject: Make intermission screen work on MAP33, to be consistent with Vanilla Doom. Also, make levels after MAP33 trigger a V_DrawPatch error. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1414 --- src/wi_stuff.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/src/wi_stuff.c b/src/wi_stuff.c index 938d6915..238462de 100644 --- a/src/wi_stuff.c +++ b/src/wi_stuff.c @@ -427,13 +427,32 @@ void WI_drawLF(void) { int y = WI_TITLEY; - // draw - V_DrawPatch((SCREENWIDTH - SHORT(lnames[wbs->last]->width))/2, - y, FB, lnames[wbs->last]); + if (wbs->last < NUMCMAPS) + { + // draw + V_DrawPatch((SCREENWIDTH - SHORT(lnames[wbs->last]->width))/2, + y, FB, lnames[wbs->last]); + + // draw "Finished!" + y += (5*SHORT(lnames[wbs->last]->height))/4; + } + else if (wbs->last == NUMCMAPS) + { + // MAP33 - nothing is displayed! + } + else if (wbs->last > NUMCMAPS) + { + // > MAP33. Doom bombs out here with a Bad V_DrawPatch error. + // I'm pretty sure that doom2.exe is just reading into random + // bits of memory at this point, but let's try to be accurate + // anyway. This deliberately triggers a V_DrawPatch error. + + patch_t tmp = { SCREENWIDTH, SCREENHEIGHT, 1, 1, + { 0, 0, 0, 0, 0, 0, 0, 0 } }; + + V_DrawPatch(0, y, FB, &tmp); + } - // draw "Finished!" - y += (5*SHORT(lnames[wbs->last]->height))/4; - V_DrawPatch((SCREENWIDTH - SHORT(finished->width))/2, y, FB, finished); } -- cgit v1.2.3 From b22df6a13aedecce1818c41eb38b265b066f3eda Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 10 Dec 2008 00:00:55 +0000 Subject: Fix window icon/title under Windows XP Luna theme. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1415 --- src/i_video.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/i_video.c b/src/i_video.c index a4129aba..0ed4d716 100644 --- a/src/i_video.c +++ b/src/i_video.c @@ -1481,6 +1481,12 @@ void I_InitGraphics(void) } } + // Set up title and icon. Windows cares about the ordering; this + // has to be done before the call to SDL_SetVideoMode. + + I_SetWindowCaption(); + I_SetWindowIcon(); + // Set the video mode. flags |= SDL_SWSURFACE | SDL_HWPALETTE | SDL_DOUBLEBUF; @@ -1518,11 +1524,6 @@ void I_InitGraphics(void) I_SetPalette(doompal); SDL_SetColors(screen, palette, 0, 256); - // Setup title and icon - - I_SetWindowCaption(); - I_SetWindowIcon(); - CreateCursors(); UpdateFocus(); -- cgit v1.2.3 From aed280e13947099544f584077e9cd893ddeaf9e5 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 10 Dec 2008 00:42:49 +0000 Subject: Set icon before calling TXT_Init, for setup and ENDOOM screens. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1416 --- setup/mainmenu.c | 6 +++--- src/i_system.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/setup/mainmenu.c b/setup/mainmenu.c index d4dfe0db..55341c81 100644 --- a/setup/mainmenu.c +++ b/setup/mainmenu.c @@ -193,15 +193,15 @@ static void RunGUI(void) { SetDisplayDriver(); + TXT_SetDesktopTitle(PACKAGE_NAME " Setup ver " PACKAGE_VERSION); + SetIcon(); + if (!TXT_Init()) { fprintf(stderr, "Failed to initialise GUI\n"); exit(-1); } - TXT_SetDesktopTitle(PACKAGE_NAME " Setup ver " PACKAGE_VERSION); - SetIcon(); - MainMenu(); TXT_GUIMainLoop(); diff --git a/src/i_system.c b/src/i_system.c index fe596a60..282000ed 100644 --- a/src/i_system.c +++ b/src/i_system.c @@ -139,15 +139,15 @@ void I_Endoom(void) endoom_data = W_CacheLumpName(DEH_String("ENDOOM"), PU_STATIC); - // Set up text mode screen - - TXT_Init(); - // Make sure the new window has the right title and icon I_SetWindowCaption(); I_SetWindowIcon(); + // Set up text mode screen + + TXT_Init(); + // Write the data to the screen memory screendata = TXT_GetScreenData(); -- cgit v1.2.3 From 08522e4bcff0f552fa0392102e73591e58822524 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 10 Dec 2008 01:01:19 +0000 Subject: Undo previous change. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1417 --- setup/mainmenu.c | 6 +++--- src/i_system.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/setup/mainmenu.c b/setup/mainmenu.c index 55341c81..d4dfe0db 100644 --- a/setup/mainmenu.c +++ b/setup/mainmenu.c @@ -193,15 +193,15 @@ static void RunGUI(void) { SetDisplayDriver(); - TXT_SetDesktopTitle(PACKAGE_NAME " Setup ver " PACKAGE_VERSION); - SetIcon(); - if (!TXT_Init()) { fprintf(stderr, "Failed to initialise GUI\n"); exit(-1); } + TXT_SetDesktopTitle(PACKAGE_NAME " Setup ver " PACKAGE_VERSION); + SetIcon(); + MainMenu(); TXT_GUIMainLoop(); diff --git a/src/i_system.c b/src/i_system.c index 282000ed..fe596a60 100644 --- a/src/i_system.c +++ b/src/i_system.c @@ -139,15 +139,15 @@ void I_Endoom(void) endoom_data = W_CacheLumpName(DEH_String("ENDOOM"), PU_STATIC); + // Set up text mode screen + + TXT_Init(); + // Make sure the new window has the right title and icon I_SetWindowCaption(); I_SetWindowIcon(); - // Set up text mode screen - - TXT_Init(); - // Write the data to the screen memory screendata = TXT_GetScreenData(); -- cgit v1.2.3 From c04e96584870a9bf95a508937cde224e1d640b7a Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 10 Dec 2008 01:06:08 +0000 Subject: Bump version to 1.2.0, update NEWS and ChangeLog. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1418 --- ChangeLog | 248 +++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 37 +++++++ codeblocks/config.h | 6 +- codeblocks/game-res.rc | 10 +- codeblocks/setup-res.rc | 8 +- configure.in | 2 +- msvc/config.h | 6 +- msvc/win32.rc | 10 +- setup/setup-manifest.xml | 2 +- 9 files changed, 307 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37836295..925231a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,251 @@ +2008-12-09 20:35:17 fraggle + + Add check for sched_setaffinity to configure and only use it if it is + found. Display a message if we don't have any way to set processor + affinity. + +2008-12-09 19:56:43 fraggle + + Add SDL_CFLAGS, SDL_LDFLAGS to default compile flags, and check for + SDL in configure before checking for libraries and headers, to fix + Windows. + +2008-12-03 22:09:22 fraggle + + Use FILE_MAP_COPY instead of FILE_MAP_ALL_ACCESS for mapping files + (thanks to Christian Chech). + +2008-12-01 21:08:23 fraggle + + Don't try to read SDL events until initialised. + +2008-10-01 21:22:09 fraggle + + Add .lvimrc local vim project settings. + +2008-09-21 19:20:32 fraggle + + Don't play DEMO4 if gameversion is emulating chex.exe - it only plays + demos 1-3. + +2008-09-20 19:18:06 fraggle + + Set processor affinity under non-Windows platforms using the POSIX + API. + +2008-09-16 01:17:20 rtc_marine + + - Force use of dwarf-2 debugging information - Fix an age-old problem + of not being able to find -lpcsound, the debug target was looking for + it rather than -lpcsound-dbg + +2008-09-14 19:14:46 fraggle + + Add -nocheat command line parameter to disable applying cheats from + dehacked files. + +2008-09-07 18:47:08 fraggle + + Strip out NUL characters from dehacked files; this makes the dehacked + patch with portal.wad load properly. + +2008-08-29 00:31:53 fraggle + + Update TODO. + +2008-08-24 03:06:26 fraggle + + Update INSTALL to include some notes about Chex Quest. + +2008-08-24 02:58:57 fraggle + + Update missing chex.deh to reference its location in the idgames + repository. + +2008-08-20 19:27:56 fraggle + + Use / as a path separator, to allow cross-compiling of resource files + (thanks Anonymous bug reporter) + +2008-08-19 20:51:41 fraggle + + Fix crash related to A_BFGSpray with NULL target when using dehacked + patches - discovered with insaned2.deh (thanks CSonicGo) + +2008-08-09 18:09:23 fraggle + + Don't modify level lumps when loading levels. + +2008-08-08 23:38:25 fraggle + + Use FILE_MAP_ALL_ACCESS rather than FILE_MAP_READ when mmapping files + under Windows (thanks entryway) + +2008-08-02 14:29:37 fraggle + + Search for chex.deh in WAD path. + +2008-07-31 23:01:38 fraggle + + Update netcode to allow chex quest gameversion. + +2008-07-31 22:29:20 fraggle + + Update Chocolate Setup to support chex.wad. + +2008-07-31 21:21:58 fraggle + + Fix crash on Chex Quest intermission screen (thanks entryway) + +2008-07-31 21:06:42 fraggle + + Automatically load chex.deh on startup if playing in chex mode. + +2008-07-31 20:43:45 fraggle + + Fix mistake in exit confirmation string that was breaking dehacked + patches that replace it. + +2008-07-31 12:55:35 rtc_marine + + Update codeblocks project to locate setup manifest + +2008-07-29 19:06:04 fraggle + + Don't do the Final Doom teleport quirk with Chex Quest, as chex.exe + doesn't do it. + +2008-07-29 19:05:16 fraggle + + Monsters don't drop ammo in Chex Quest. + +2008-07-29 01:50:56 fraggle + + Add magic dehacked comment to enable long cheat sequences (also for + Chex Quest support) + +2008-07-27 00:51:25 fraggle + + In chex mode, always warp to an episode 1 level, and display the level + title in the automap for the equivalent episode 1 level. + +2008-07-26 16:45:52 fraggle + + Allow magic comments in dehacked files that disable the DOS dehacked + text replacement limit, so that we can use a dehacked patch to emulate + chex.exe. + +2008-07-26 16:29:08 fraggle + + Chex Quest's chex.exe is based on the Final Doom exe, not the Ultimate + Doom exe. + +2008-07-26 16:23:06 fraggle + + Fix "dimensional shambler waiting at the dos prompt" quit message to + match the one in doom2.exe precisely. + +2008-07-25 20:56:39 fraggle + + Initial chex.exe emulation. + +2008-07-10 00:22:34 fraggle + + Fix dehacked replacements for the "press y to quit to dos" string. + +2008-07-07 10:10:26 fraggle + + Fix quit screen confirm message to say "quit to dos" rather than just + "quit" (thanks MikeRS) + +2008-06-14 18:42:06 fraggle + + Add a helpful message for people trying to play with the wrong IWAD. + +2008-06-11 01:14:07 fraggle + + Only apply dehacked green armor class to the green armor shirt, not + the armor helmets as well. + +2008-06-09 19:11:24 fraggle + + Always set armor class to 2 when picking up a megasphere (thanks + entryway). + +2008-05-05 04:52:08 GhostlyDeath + + Updated Code::Blocks project for new files + +2008-05-05 04:48:45 fraggle + + Add setup-manifest.xml to dist. + +2008-05-05 04:44:28 GhostlyDeath + + Updated VC++ Project for added files; Manifest should have version + 1.1.1.0 not 1.0.0.0; the rc files in the codeblocks folder have been + updated + +2008-05-05 04:11:29 fraggle + + (Hopefully) fix for Windows Vista asking for security elevation when + running chocolate-setup. + +2008-05-04 22:43:38 fraggle + + Remove Vanilla Doom reload hack. + +2008-05-04 18:09:51 fraggle + + Add command line option to disable mmapped WAD I/O. + +2008-05-04 17:45:10 fraggle + + Fix win32 mmap driver and add to build. + +2008-05-02 23:52:00 fraggle + + Add Windows memory mapping backend. + +2008-05-02 20:19:38 fraggle + + Memory-mapped WAD access. + +2008-05-02 20:18:52 fraggle + + Fix up some more code calling Z_Free instead of W_ReleaseLumpNum. + +2008-05-02 19:48:43 fraggle + + Add W_CacheLumpNum,Name API to WAD code for releasing a lump back to + cache when it is no longer needed. Switch existing code to use the + new API instead of Z_ChangeTag. + +2008-05-02 18:32:09 fraggle + + Add WAD I/O abstraction layer - first step for mmapped WAD access. + +2008-04-26 17:31:47 fraggle + + "Python Image Library" -> "Python Imaging Library" (thanks exp(x)). + +2008-04-26 15:33:14 fraggle + + Add new Chocolate Doom icon. + +2008-04-26 00:33:00 fraggle + + Generate transparency mask for the application icon from black parts + of the image. + +2008-04-23 08:44:17 GhostlyDeath + + VC++ Project now builds + +2008-04-20 02:00:11 fraggle + + Bump version to 1.1.1, update ChangeLog and NEWS. + 2008-04-19 17:41:58 fraggle Fix build problem when libsamplerate support is enabled. diff --git a/NEWS b/NEWS index ff1d9b59..8088fe2c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,40 @@ +1.2.0 (2008-12-10): + + Happy 15th Birthday, Doom! + + * Chocolate Doom now has an icon that is not based on the proprietary + Doom artwork. + * There is now memory-mapped WAD I/O support, which should be useful + on some embedded systems. + * Chex quest emulation support is now included, although an + auxiliary dehacked patch is needed (chexdeh.zip in the idgames + archive). + + Compatibility: + * The armor class is always set to 2 when picking up a megasphere + (thanks entryway). + * The quit screen prompts to quit "to dos" instead of just to quit + (thanks MikeRS) + * The "dimensional shambler" quit message was fixed. + * Fix crash related to A_BFGSpray with NULL target when using + dehacked patches - discovered with insaned2.deh + (thanks CSonicGo) + * NUL characters are stripped from dehacked files, to ensure correct + behavior with some dehacked patches (eg. the one with portal.wad). + + Bugs fixed: + * "Python Image Library" should have been "Python Imaging Library" + (thanks exp(x)). + * The setup tool should no longer ask for elevated permissions + on Windows Vista (this fix possibly may not work). + * The application icon is set properly when running under Windows + XP with the "Luna" theme. + * Fix compilation under Cygwin to detect libraries and headers from + the correct environment. + * The video code does not try to read SDL events before SDL has + been properly initialised - this was causing problems with some + older versions of SDL. + 1.1.1 (2008-04-20): The previous release (v1.1.0) included a bug that broke compilation diff --git a/codeblocks/config.h b/codeblocks/config.h index c006d256..a0560009 100644 --- a/codeblocks/config.h +++ b/codeblocks/config.h @@ -9,19 +9,19 @@ #define PACKAGE_NAME "Chocolate Doom" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Chocolate Doom 1.1.1" +#define PACKAGE_STRING "Chocolate Doom 1.2.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "chocolate-doom" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.1.1" +#define PACKAGE_VERSION "1.2.0" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.1.1" +#define VERSION "1.2.0" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ diff --git a/codeblocks/game-res.rc b/codeblocks/game-res.rc index 9219b149..de0afd76 100644 --- a/codeblocks/game-res.rc +++ b/codeblocks/game-res.rc @@ -1,21 +1,21 @@ 1 ICON "../data/doom.ico" 1 VERSIONINFO -PRODUCTVERSION 1,1,1,0 -FILEVERSION 1,1,1,0 +PRODUCTVERSION 1,2,0,0 +FILEVERSION 1,2,0,0 FILETYPE 1 { BLOCK "StringFileInfo" { BLOCK "040904E4" { - VALUE "FileVersion", "1.1.1" - VALUE "FileDescription", "1.1.1" + VALUE "FileVersion", "1.2.0" + VALUE "FileDescription", "1.2.0" VALUE "InternalName", "Chocolate-Doom" VALUE "CompanyName", "Chocolate-Doom" VALUE "LegalCopyright", "GNU General Public License" VALUE "ProductName", "Chocolate-Doom" - VALUE "ProductVersion", "1.1.1" + VALUE "ProductVersion", "1.2.0" } } } diff --git a/codeblocks/setup-res.rc b/codeblocks/setup-res.rc index 41a7f1dc..50758e10 100644 --- a/codeblocks/setup-res.rc +++ b/codeblocks/setup-res.rc @@ -3,21 +3,21 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup-manifest.xml" 1 VERSIONINFO -PRODUCTVERSION 1,1,1,0 -FILEVERSION 1,1,1,0 +PRODUCTVERSION 1,2,0,0 +FILEVERSION 1,2,0,0 FILETYPE 1 { BLOCK "StringFileInfo" { BLOCK "040904E4" { - VALUE "FileVersion", "1.1.1" + VALUE "FileVersion", "1.2.0" VALUE "FileDescription", "Chocolate-Doom Setup" VALUE "InternalName", "chocolate-setup" VALUE "CompanyName", "fraggle@gmail.com" VALUE "LegalCopyright", "GNU General Public License" VALUE "ProductName", "Chocolate-Doom Setup" - VALUE "ProductVersion", "1.1.1" + VALUE "ProductVersion", "1.2.0" } } } diff --git a/configure.in b/configure.in index 83c4739a..525a164c 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(Chocolate Doom, 1.1.1, fraggle@gmail.com, chocolate-doom) +AC_INIT(Chocolate Doom, 1.2.0, fraggle@gmail.com, chocolate-doom) AC_CONFIG_AUX_DIR(autotools) diff --git a/msvc/config.h b/msvc/config.h index 7a28c0c1..c370479d 100644 --- a/msvc/config.h +++ b/msvc/config.h @@ -11,16 +11,16 @@ #define PACKAGE_NAME "Chocolate Doom" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Chocolate Doom 1.1.1" +#define PACKAGE_STRING "Chocolate Doom 1.2.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "chocolate-doom" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.1.1" +#define PACKAGE_VERSION "1.2.0" /* Version number of package */ -#define VERSION "1.1.1" +#define VERSION "1.2.0" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ diff --git a/msvc/win32.rc b/msvc/win32.rc index 668bdb0a..5e2d27a9 100644 --- a/msvc/win32.rc +++ b/msvc/win32.rc @@ -32,21 +32,21 @@ #endif 1 VERSIONINFO -PRODUCTVERSION 1,1,1,0 -FILEVERSION 1,1,1,0 +PRODUCTVERSION 1,2,0,0 +FILEVERSION 1,2,0,0 FILETYPE 1 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN - VALUE "FileVersion", "1.1.1" - VALUE "FileDescription", "Chocolate Doom 1.1.1" + VALUE "FileVersion", "1.2.0" + VALUE "FileDescription", "Chocolate Doom 1.2.0" VALUE "InternalName", "chocolate-doom" VALUE "CompanyName", "fraggle@gmail.com" VALUE "LegalCopyright", "GNU General Public License" VALUE "ProductName", "Chocolate Doom" - VALUE "ProductVersion", "1.1.1" + VALUE "ProductVersion", "1.2.0" END END END diff --git a/setup/setup-manifest.xml b/setup/setup-manifest.xml index 74dd5493..56ac9557 100644 --- a/setup/setup-manifest.xml +++ b/setup/setup-manifest.xml @@ -2,7 +2,7 @@ - -- cgit v1.2.3 From baf0aa3a5356ea07956608ff43833d6cee6f85ae Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 10 Dec 2008 20:20:10 +0000 Subject: Fix crash when playing Doom 1 levels. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1420 --- src/wi_stuff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wi_stuff.c b/src/wi_stuff.c index 238462de..5e87069e 100644 --- a/src/wi_stuff.c +++ b/src/wi_stuff.c @@ -427,7 +427,7 @@ void WI_drawLF(void) { int y = WI_TITLEY; - if (wbs->last < NUMCMAPS) + if (gamemode != commercial || wbs->last < NUMCMAPS) { // draw V_DrawPatch((SCREENWIDTH - SHORT(lnames[wbs->last]->width))/2, -- cgit v1.2.3 From acd1a13a4f70973d7616df3f6de43f8f79b8e392 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 10 Dec 2008 20:25:05 +0000 Subject: Bump version to 1.2.1, update NEWS and ChangeLog. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1421 --- ChangeLog | 25 +++++++++++++++++++++++++ NEWS | 5 +++++ codeblocks/config.h | 6 +++--- codeblocks/game-res.rc | 10 +++++----- codeblocks/setup-res.rc | 8 ++++---- configure.in | 2 +- msvc/config.h | 6 +++--- msvc/win32.rc | 10 +++++----- setup/setup-manifest.xml | 2 +- 9 files changed, 52 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 925231a6..a370d4bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2008-12-10 20:20:10 fraggle + + Fix crash when playing Doom 1 levels. + +2008-12-10 01:06:08 fraggle + + Bump version to 1.2.0, update NEWS and ChangeLog. + +2008-12-10 01:01:19 fraggle + + Undo previous change. + +2008-12-10 00:42:49 fraggle + + Set icon before calling TXT_Init, for setup and ENDOOM screens. + +2008-12-10 00:00:55 fraggle + + Fix window icon/title under Windows XP Luna theme. + +2008-12-09 23:32:19 fraggle + + Make intermission screen work on MAP33, to be consistent with Vanilla + Doom. Also, make levels after MAP33 trigger a V_DrawPatch error. + 2008-12-09 20:35:17 fraggle Add check for sched_setaffinity to configure and only use it if it is diff --git a/NEWS b/NEWS index 8088fe2c..abb31290 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +1.2.1 (2008-12-10): + + This version just fixes a crash at the intermission screen when + playing Doom 1 levels. + 1.2.0 (2008-12-10): Happy 15th Birthday, Doom! diff --git a/codeblocks/config.h b/codeblocks/config.h index a0560009..fe1bde8f 100644 --- a/codeblocks/config.h +++ b/codeblocks/config.h @@ -9,19 +9,19 @@ #define PACKAGE_NAME "Chocolate Doom" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Chocolate Doom 1.2.0" +#define PACKAGE_STRING "Chocolate Doom 1.2.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "chocolate-doom" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.2.0" +#define PACKAGE_VERSION "1.2.1" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.2.0" +#define VERSION "1.2.1" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ diff --git a/codeblocks/game-res.rc b/codeblocks/game-res.rc index de0afd76..4a9e289b 100644 --- a/codeblocks/game-res.rc +++ b/codeblocks/game-res.rc @@ -1,21 +1,21 @@ 1 ICON "../data/doom.ico" 1 VERSIONINFO -PRODUCTVERSION 1,2,0,0 -FILEVERSION 1,2,0,0 +PRODUCTVERSION 1,2,1,0 +FILEVERSION 1,2,1,0 FILETYPE 1 { BLOCK "StringFileInfo" { BLOCK "040904E4" { - VALUE "FileVersion", "1.2.0" - VALUE "FileDescription", "1.2.0" + VALUE "FileVersion", "1.2.1" + VALUE "FileDescription", "1.2.1" VALUE "InternalName", "Chocolate-Doom" VALUE "CompanyName", "Chocolate-Doom" VALUE "LegalCopyright", "GNU General Public License" VALUE "ProductName", "Chocolate-Doom" - VALUE "ProductVersion", "1.2.0" + VALUE "ProductVersion", "1.2.1" } } } diff --git a/codeblocks/setup-res.rc b/codeblocks/setup-res.rc index 50758e10..fe791088 100644 --- a/codeblocks/setup-res.rc +++ b/codeblocks/setup-res.rc @@ -3,21 +3,21 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup-manifest.xml" 1 VERSIONINFO -PRODUCTVERSION 1,2,0,0 -FILEVERSION 1,2,0,0 +PRODUCTVERSION 1,2,1,0 +FILEVERSION 1,2,1,0 FILETYPE 1 { BLOCK "StringFileInfo" { BLOCK "040904E4" { - VALUE "FileVersion", "1.2.0" + VALUE "FileVersion", "1.2.1" VALUE "FileDescription", "Chocolate-Doom Setup" VALUE "InternalName", "chocolate-setup" VALUE "CompanyName", "fraggle@gmail.com" VALUE "LegalCopyright", "GNU General Public License" VALUE "ProductName", "Chocolate-Doom Setup" - VALUE "ProductVersion", "1.2.0" + VALUE "ProductVersion", "1.2.1" } } } diff --git a/configure.in b/configure.in index 525a164c..15ef200a 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(Chocolate Doom, 1.2.0, fraggle@gmail.com, chocolate-doom) +AC_INIT(Chocolate Doom, 1.2.1, fraggle@gmail.com, chocolate-doom) AC_CONFIG_AUX_DIR(autotools) diff --git a/msvc/config.h b/msvc/config.h index c370479d..7880c3c1 100644 --- a/msvc/config.h +++ b/msvc/config.h @@ -11,16 +11,16 @@ #define PACKAGE_NAME "Chocolate Doom" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Chocolate Doom 1.2.0" +#define PACKAGE_STRING "Chocolate Doom 1.2.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "chocolate-doom" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.2.0" +#define PACKAGE_VERSION "1.2.1" /* Version number of package */ -#define VERSION "1.2.0" +#define VERSION "1.2.1" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ diff --git a/msvc/win32.rc b/msvc/win32.rc index 5e2d27a9..b9bc06a2 100644 --- a/msvc/win32.rc +++ b/msvc/win32.rc @@ -32,21 +32,21 @@ #endif 1 VERSIONINFO -PRODUCTVERSION 1,2,0,0 -FILEVERSION 1,2,0,0 +PRODUCTVERSION 1,2,1,0 +FILEVERSION 1,2,1,0 FILETYPE 1 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN - VALUE "FileVersion", "1.2.0" - VALUE "FileDescription", "Chocolate Doom 1.2.0" + VALUE "FileVersion", "1.2.1" + VALUE "FileDescription", "Chocolate Doom 1.2.1" VALUE "InternalName", "chocolate-doom" VALUE "CompanyName", "fraggle@gmail.com" VALUE "LegalCopyright", "GNU General Public License" VALUE "ProductName", "Chocolate Doom" - VALUE "ProductVersion", "1.2.0" + VALUE "ProductVersion", "1.2.1" END END END diff --git a/setup/setup-manifest.xml b/setup/setup-manifest.xml index 56ac9557..409a142b 100644 --- a/setup/setup-manifest.xml +++ b/setup/setup-manifest.xml @@ -2,7 +2,7 @@ - -- cgit v1.2.3