Commit graph

390 commits

Author SHA1 Message Date
Bradley Bell cdcd871e79 fix compiler warning 2002-12-31 22:26:16 +00:00
Bradley Bell 34e654b6c9 fixed rle_swap leaks, thanks to martin schaffner 2002-12-31 21:51:37 +00:00
Bradley Bell 95489e824b fixes an infinite loop which was caused by d2x thinking d2demo was a descent 1 mission 2002-12-24 06:09:05 +00:00
Bradley Bell 883fbd973e fix compiler warnings, courtesy of maschaffner@gmx.ch 2002-12-24 05:49:33 +00:00
Bradley Bell 7b4a08d13e comments 2002-12-24 05:30:33 +00:00
Bradley Bell 0bf015a146 add help for -hogdir option 2002-10-30 22:04:22 +00:00
Bradley Bell 34b2c612e2 added -hogdir option 2002-10-30 22:02:52 +00:00
Bradley Bell f834662135 enabled Vertigo displays 2002-10-28 21:28:04 +00:00
Bradley Bell b078e8d71c simplify and eliminate redundant swap macros. maschaffner@gmx.ch and btb 2002-10-28 20:57:11 +00:00
Bradley Bell 8b5fd3ed84 make hud_message work correctly 2002-10-11 05:14:59 +00:00
Bradley Bell 95f355e8c6 enable -nofade 2002-10-11 03:37:58 +00:00
Bradley Bell e3b015b572 formatting, small fixes 2002-10-11 00:36:46 +00:00
Bradley Bell 46e94bacdc no swap_object for little-endian 2002-10-10 20:08:51 +00:00
Bradley Bell 53b6b5860d use macros to simplify network endian conversion 2002-10-10 19:40:21 +00:00
Bradley Bell 70e5af41a4 disable autodetect of mac pig (use --enable-macdata for now) 2002-10-10 19:17:37 +00:00
Bradley Bell 1ca035f02f enable loading screen for mac shareware with -nohires 2002-10-10 19:16:52 +00:00
Bradley Bell d3df25bf21 whitespace 2002-10-10 19:12:00 +00:00
Bradley Bell 6d0480e3ff comments 2002-10-10 19:11:23 +00:00
Bradley Bell c68d26ed4f whitespace 2002-10-10 18:55:32 +00:00
Bradley Bell 65b1d2017f comments, formatting, etc. courtesy of Martin Schaffner <maschaffner@gmx.ch> 2002-10-04 07:19:59 +00:00
Bradley Bell 5994795bf0 whitespace 2002-10-03 03:46:35 +00:00
Bradley Bell 0a40cc4bb2 fix a oops, add old logs 2002-09-19 05:43:15 +00:00
Bradley Bell 06a7fb94fc support for >3 mouse buttons 2002-09-19 03:45:14 +00:00
Bradley Bell 3bd6c82056 load hires briefing screen if lores doesn't exist (i.e. vertigo) and MenuHires=0 2002-09-14 00:32:52 +00:00
Bradley Bell faa4fe4222 pack some structures for ipx compatibility - courtesy of Werner Augustin <descent-source@mailinglist.gnuher.de> 2002-09-14 00:23:06 +00:00
Bradley Bell 1bf3f2bdae revert cfgets() and load_endlevel_data() to expect newline-terminated strings, fix load_game_data to read null-terminated string for Current_level_name 2002-09-14 00:20:44 +00:00
Bradley Bell e12fa546b9 added error message 2002-09-07 07:27:19 +00:00
Bradley Bell c3fc9f1a83 enable -nohires with mac shareware 2002-09-07 07:24:29 +00:00
Bradley Bell e9e6a83477 we want the mac ibitblt for everything but dos and windows, I think. 2002-09-04 23:05:01 +00:00
Bradley Bell 05f319b532 these routines are in tmerge.c 2002-09-04 22:47:25 +00:00
Bradley Bell e4bea89105 enable credits for mac and oem data 2002-09-04 22:29:49 +00:00
Bradley Bell 0a9dc80003 use either exit.ham or exit.pofs 2002-09-04 22:28:48 +00:00
Bradley Bell b49393eeba close some memory holes, speed up palette loading 2002-09-04 08:15:20 +00:00
Bradley Bell 3b1e84c254 added fullscreen toggle while playing movies 2002-09-04 08:13:59 +00:00
Bradley Bell d827850699 comment out -superhires help text (always on) 2002-09-04 08:13:26 +00:00
Bradley Bell dca30aecd5 oops 2002-09-01 02:49:59 +00:00
Bradley Bell 09b3b087fd more movie improvements 2002-09-01 02:49:06 +00:00
Bradley Bell 63df9a1163 movie improvements 2002-08-31 12:14:01 +00:00
Bradley Bell a0ca75d917 network endian stuff 2002-08-31 05:27:50 +00:00
Bradley Bell e09bd635a7 formatting, bigendian networking fixes 2002-08-31 03:21:41 +00:00
Bradley Bell d2988bceaf make net menu more accurate, also make superhires always on 2002-08-31 03:18:32 +00:00
Bradley Bell 14e5e0da46 formatting 2002-08-30 08:04:44 +00:00
Bradley Bell c654ad8fd9 networking works, finally 2002-08-30 08:02:25 +00:00
Bradley Bell 03ad09da68 more networking fixes 2002-08-30 01:01:18 +00:00
Bradley Bell 72bfe8dc97 load builtin mission correctly 2002-08-30 00:58:01 +00:00
Bradley Bell 1071667d09 documentation 2002-08-30 00:57:32 +00:00
Bradley Bell 19a9a90c20 move hoard stuff out of network 2002-08-30 00:57:06 +00:00
Bradley Bell fd2abcc57a don't need no more 2002-08-30 00:54:56 +00:00
Bradley Bell 608ace6b3c deleting unused d1x stuff 2002-08-29 22:24:51 +00:00
Bradley Bell 505f83172e fixed networking fuck-up? 2002-08-29 08:54:42 +00:00
Bradley Bell 452a9fa5c3 beginning d1 briefing support 2002-08-27 08:03:25 +00:00
Bradley Bell d864fb9073 Have to get mission_num _after_ promoting... 2002-08-27 08:02:51 +00:00
Bradley Bell 0a301af8f6 d1-style mission briefings 2002-08-27 04:15:38 +00:00
Bradley Bell cc97e64477 whitespace 2002-08-27 04:14:58 +00:00
Bradley Bell a7da408309 beginning robot movie support, fall back on lo/hi res if hi/lo not available 2002-08-27 04:14:18 +00:00
Bradley Bell 4d72ae20a5 added Builtin_mission_num for builtin mission 2002-08-27 04:13:03 +00:00
Bradley Bell a9b9cb3a8a added Builtin_mission_num for builtin mission, D1Hogdir, d1-style mission briefings 2002-08-27 04:12:55 +00:00
Bradley Bell e1311553c4 fix writable string, disable DumbAdjust thing 2002-08-26 06:54:31 +00:00
Bradley Bell f6558b8764 whitespace 2002-08-26 06:52:47 +00:00
Bradley Bell f709f166d0 added pcx_get_dimensions(), other stuff from d2src 2002-08-26 06:52:22 +00:00
Bradley Bell e1a0280720 read movies from AltHogDir, other fixes 2002-08-26 06:50:45 +00:00
Bradley Bell fec0929f59 fix bug w/mission filename 2002-08-26 06:46:37 +00:00
Bradley Bell 1247e68ef6 comments 2002-08-26 06:45:09 +00:00
Bradley Bell 59824c8c82 whitespace n stuff 2002-08-26 06:44:36 +00:00
Bradley Bell 41c90c343f fix briefing stuff 2002-08-23 10:43:11 +00:00
Bradley Bell 636e5ec368 eliminate need for .mn2 files for oem and demo 2002-08-23 01:52:11 +00:00
Bradley Bell b994fb2115 fix for vertigo 2002-08-22 20:49:15 +00:00
Bradley Bell ba93d52c7e make OEM menu pcx available 2002-08-22 19:18:13 +00:00
Bradley Bell d88a79b173 promote builtin missions. patch from Martin Schaffner <maschaffner@gmx.ch> 2002-08-15 18:31:06 +00:00
Bradley Bell 80d7fa86c5 improved mac pig loading/reverted TRANSPARENCY_COLOR changes 2002-08-15 08:53:11 +00:00
Bradley Bell cf1668baac mac data file loading 2002-08-15 07:17:39 +00:00
Bradley Bell 237d059d9b mac data file loading 2002-08-15 05:49:23 +00:00
Bradley Bell 2d7a7d9e58 formatting 2002-08-09 00:48:57 +00:00
Bradley Bell 92383ab77d comments 2002-08-08 23:15:03 +00:00
Bradley Bell dfeb5dfe39 mac demo datafile support 2002-08-08 21:43:20 +00:00
Bradley Bell 1b246b86c6 use lowercase for consistency 2002-08-08 09:10:28 +00:00
Bradley Bell 2cc21d710a enable loading of exit models for other than d2demo 2002-08-08 09:09:43 +00:00
Bradley Bell b580433ee3 formatting, patch for better d1 texture conversion from Martin Schaffner <maschaffner@gmx.ch> 2002-08-07 22:38:58 +00:00
Bradley Bell fba00332f8 recognize .msn mission files. patch from Martin Schaffner <maschaffner@gmx.ch> 2002-08-07 07:34:09 +00:00
Bradley Bell 7a6b836f15 added .cvsignore files 2002-08-07 05:39:22 +00:00
Bradley Bell d9b2eb6397 shareware stuff 2002-08-06 09:30:24 +00:00
Bradley Bell 9921efe082 formatting 2002-08-06 09:28:14 +00:00
Bradley Bell 7ac8b0729f whitespace 2002-08-06 05:21:33 +00:00
Bradley Bell 05952b6a20 shareware stuff, whitespace 2002-08-06 05:16:19 +00:00
Bradley Bell 8634605e42 more fast i/o macros 2002-08-06 05:13:58 +00:00
Bradley Bell 52e9b0883f shareware stuff 2002-08-06 05:12:09 +00:00
Bradley Bell bd2b158966 merged endlevel stuff to non-shareware, allow movies/endlevel for alternate missions 2002-08-06 05:06:38 +00:00
Bradley Bell f4bd33cc2c typo 2002-08-06 04:55:30 +00:00
Bradley Bell 310a5b27ff use global Piggy_hamfile_version 2002-08-06 04:55:06 +00:00
Bradley Bell 57d2b788b9 merged endlevel stuff to non-shareware, more fast i/o macros, use global Piggy_hamfile_version 2002-08-06 04:53:48 +00:00
Bradley Bell bbb5e12a1c terrain and movie stuff always used now 2002-08-06 04:50:19 +00:00
Bradley Bell 08b1d1a7ec load DMB levels 2002-08-06 01:31:55 +00:00
Bradley Bell b0fe71a4e9 fast i/o macros 2002-08-06 01:31:07 +00:00
Bradley Bell 97a3be00ac d1 level stuff from maschaffner@gmx.ch 2002-08-04 23:37:34 +00:00
Bradley Bell e32c48a4ff shareware stuff, formatting 2002-08-04 23:24:34 +00:00
Bradley Bell 0b72dcfff1 more d1 level loading stuff 2002-08-02 23:28:40 +00:00
Bradley Bell 08b76e399c junk 2002-08-02 11:05:26 +00:00
Bradley Bell b1adfc4c4a shareware stuff 2002-08-02 10:57:12 +00:00
Bradley Bell 31d800de19 fast i/o macros 2002-08-02 04:57:19 +00:00
Bradley Bell 31327f50f9 load d1 levels 2002-08-01 23:28:57 +00:00
Bradley Bell ece0b9753d support shareware datafiles\! 2002-07-30 11:29:04 +00:00
Bradley Bell 2f3aa52b9c support shareware datafiles\! 2002-07-30 11:05:53 +00:00
Bradley Bell 18eeeb657e SHAREWARE fixes 2002-07-30 04:52:45 +00:00
Bradley Bell c592b9d5fb SHAREWARE fixes 2002-07-30 04:52:01 +00:00
Bradley Bell ec9d4d0bb5 Portability - OS X support 2002-07-29 02:32:32 +00:00
Bradley Bell 2fd7bc08d2 portability 2002-07-27 22:39:57 +00:00
Bradley Bell 54f533700c portabilization 2002-07-27 04:39:23 +00:00
Bradley Bell 3d213c17b6 portability 2002-07-26 20:59:41 +00:00
Bradley Bell 77f778685e foo 2002-07-26 20:23:30 +00:00
Bradley Bell 4d22710070 s not a writable string anymore... / formatting 2002-07-26 09:25:10 +00:00
Bradley Bell 654b626742 portable-izing file loading routines 2002-07-26 09:22:39 +00:00
Bradley Bell 2625ea4a97 correctly play files with 16bit uncompressed audio, mem checking, etc 2002-07-24 10:31:41 +00:00
Bradley Bell 0a5a73f117 enable standalone mve player 2002-07-24 01:03:44 +00:00
Bradley Bell cbe9fb41fb remove experimental nmovie stuff 2002-07-23 21:24:11 +00:00
Bradley Bell 6c23648cbc add some debugging output 2002-07-23 08:22:12 +00:00
Bradley Bell 1310b8ecb2 make string explicitly writable 2002-07-23 01:05:31 +00:00
Bradley Bell 885ec3adc1 use __unix__ 2002-07-22 22:59:24 +00:00
Bradley Bell 0f4d65d660 -fwritable-strings doesn't work on OS X 2002-07-22 21:43:58 +00:00
Bradley Bell 64d4b483d7 use SDL for timers and threads 2002-07-22 21:27:58 +00:00
Bradley Bell ba1ba5537d simplified header 2002-07-22 18:26:13 +00:00
Bradley Bell 05429875b2 enable mveplay audio 2002-07-22 06:29:00 +00:00
Bradley Bell c5d5d92bb6 moved to main/ 2002-07-22 02:20:52 +00:00
Bradley Bell 44f0c0d870 initial movie support 2002-07-22 02:20:05 +00:00
Bradley Bell 8867476913 OS X stuff 2002-07-22 02:17:10 +00:00
Bradley Bell c56e820c49 use simpler rcs tags 2002-07-18 08:35:58 +00:00
Bradley Bell 103121119d changed cdrom->rbaudio 2002-07-18 08:22:18 +00:00
Bradley Bell 760212ac56 __SDL__ ugly and not needed at all 2002-07-16 22:29:24 +00:00
Bradley Bell c7bb2755d6 don't use althogdir on non-unix 2002-07-16 20:47:27 +00:00
Bradley Bell 0e6e94a501 need limits.h on mingw also 2002-07-16 19:05:13 +00:00
Bradley Bell 663ba6f29b reverting some networking stuff for now 2002-07-16 08:14:35 +00:00
Bradley Bell 3fa8eaeff6 let hoard.ham be a cfile 2002-04-19 21:27:00 +00:00
Bradley Bell a7e242f9e4 better error message when hog not found 2002-04-19 21:26:30 +00:00
Bradley Bell ad06ff619a SDL Joystick works\! 2002-03-23 09:13:00 +00:00
Bradley Bell 3d6e947bf1 moved includes to include 2002-02-23 22:02:12 +00:00
Bradley Bell 772cbf04a6 moved includes to include 2002-02-23 21:36:30 +00:00
Bradley Bell f68c19e4bf disabled cockpit for OGL, formatting 2002-02-23 21:25:01 +00:00
Bradley Bell a0dad416bb allow older sdl versions 2002-02-16 02:08:31 +00:00
Bradley Bell 4033464096 automap resolution now selectable 2002-02-15 12:24:53 +00:00
Bradley Bell 542a96b735 enable udp debug messages 2002-02-15 06:41:42 +00:00
Bradley Bell c5627e5564 need conf.h 2002-02-15 03:18:02 +00:00
Bradley Bell 2c92308ec0 allow gr_init lowres 2002-02-14 11:29:31 +00:00
Bradley Bell 950bc1d9ac Added hotkeys to toggle fullscreen mode 2002-02-14 10:18:24 +00:00
Bradley Bell 7bbe8f1669 d1x->d2x 2002-02-14 09:27:09 +00:00
Bradley Bell fa75b6a63f Lotsa networking stuff from d1x 2002-02-14 09:05:33 +00:00
Bradley Bell e0e9927df4 Lotsa networking stuff from d1x 2002-02-13 10:45:49 +00:00
Bradley Bell 27f887a701 Fullscreen toggle stuff 2002-02-13 10:45:05 +00:00
Bradley Bell 32d1154503 use portable loader if bigendian 2002-02-11 07:44:44 +00:00
Bradley Bell a41b53053e added fixedfont menu functions 2002-02-11 07:39:11 +00:00
Bradley Bell acb0e751a8 added D2X_IVER 2002-02-11 07:37:52 +00:00
Bradley Bell 0f97e2e0e0 Adding d1x network code 2002-02-06 09:22:42 +00:00
Bradley Bell 599e2ae53f Enabled RELEASE option 2002-02-02 23:30:26 +00:00
Bradley Bell c4ecbc3237 RCS header added 2002-01-29 10:14:25 +00:00
Bradley Bell 3e542c20ca update copyright date 2002-01-29 10:11:56 +00:00
Bradley Bell fe8e56ad76 allow missions to be in AltHogDir 2002-01-29 10:11:31 +00:00
Bradley Bell 429fe471d9 Added d_mkdir macro 2002-01-29 00:08:13 +00:00
Bradley Bell 923fe951ed Data files now go in DATADIR/games/d2x, user files now go in ~/.d2x 2002-01-28 00:03:47 +00:00
Bradley Bell ac33dbac5b Movie playing kludgey stuff 2002-01-18 07:26:54 +00:00
Bradley Bell addd555f93 allow -h for help 2002-01-18 07:01:37 +00:00
Bradley Bell 5ec0f0677b document -nomovies option 2001-12-28 09:26:41 +00:00
Bradley Bell a82526a391 formatting, put some code into place for rendering of robots during briefings 2001-12-28 09:23:11 +00:00
Bradley Bell f68a70317e move SDL_LIBS to LIBS, SDL_CFLAGS to CFLAGS 2001-11-27 20:00:51 +00:00
Bradley Bell 4e98f92e17 use mouse wheel to emulate 3rd axis 2001-11-14 11:02:55 +00:00
Bradley Bell 4c71b4e107 change __ENV_WINDOWS__ to __WINDOWS__, __ENV_MSDOS__ to __MSDOS__ 2001-11-14 10:31:40 +00:00
Bradley Bell 0b4d2e38ef use MAKE_SIG 2001-11-14 09:34:32 +00:00
Bradley Bell 0619546b0f Make sure bmread.c and terrain.c get included in dist 2001-11-13 22:44:52 +00:00
Bradley Bell 298fc694bf use D_RAND_MAX instead of RAND_MAX 2001-11-13 21:17:49 +00:00
Bradley Bell 84d2ffc20e load player files regardless of byte order of sig 2001-11-12 00:59:07 +00:00
Bradley Bell 9040140f58 Created header for MAKE_SIG macro 2001-11-11 23:39:22 +00:00
Bradley Bell 9a270994d6 Don't use terrain.c unless SHAREWARE 2001-11-11 23:38:18 +00:00
Bradley Bell 1cbfab65b4 Enabled savegame thumbnails under OpenGL 2001-11-09 11:40:25 +00:00
Bradley Bell ae1a8a88d1 fix 640x400 menu text 2001-11-09 06:56:07 +00:00
Bradley Bell dd0b3207a3 added documentation 2001-11-09 06:55:08 +00:00
Bradley Bell c6990486c4 fix warnings 2001-11-09 06:54:23 +00:00
Bradley Bell 0828ca02eb Enabled shareware build, endlevel flythrough sequence 2001-11-08 10:30:28 +00:00
Bradley Bell 82b109e76a moved file, will be of use for shareware build 2001-11-08 10:21:36 +00:00
Bradley Bell c32c665c5d Change args_init back to InitArgs 2001-11-05 07:39:26 +00:00
Bradley Bell 719586a3c4 SDL applies to more than X11... 2001-11-04 09:01:41 +00:00
Bradley Bell f612d28923 Enable d1x-style hud_message 2001-11-04 09:00:25 +00:00
Bradley Bell 5533d43e89 formatting 2001-11-02 02:22:25 +00:00
Bradley Bell fcf2884da4 automap works in opengl 2001-10-31 11:16:08 +00:00
Bradley Bell 04a345a44a Must call set_screen_mode for menus when using GL 2001-10-31 09:59:34 +00:00
Bradley Bell 46a619a680 Sync with d1x 2001-10-31 07:41:54 +00:00
Bradley Bell 1bc7efe3db added some documentation 2001-10-27 01:39:23 +00:00
Bradley Bell 9098e305d5 Completed tmap selection code. 2001-10-25 09:12:16 +00:00
Bradley Bell a196e6d554 attempt at support for editor, makefile changes, etc 2001-10-25 02:27:57 +00:00
Bradley Bell 6e38434e6e conditionalize including multi.h and network.h, fix backslashes, fix compiler errors with EDITOR 2001-10-25 02:19:32 +00:00
Bradley Bell 413f2a34ab conditionalize including multi.h and network.h, fix backslashes 2001-10-25 02:15:57 +00:00
Bradley Bell 57d095b72a Revert bin_programs to earlier style until i understand automake 1.5 better.
remove input from SUBDIRS
2001-10-24 09:30:02 +00:00
Bradley Bell 2d5c3d2740 Build fixes. EDITOR_SRCS added to libmain_a_SOURCES. 2001-10-23 22:04:38 +00:00
Bradley Bell 8eeb6304b0 No longer #ifdef'ing out the whole file. RCS header added 2001-10-23 22:03:03 +00:00
Bradley Bell 92bcf2eddd No longer #ifdef'ing out the whole file. RCS header added 2001-10-23 21:53:19 +00:00
Bradley Bell 458d1d1d5a Build fixes. Now works with automake 1.5 and autoconf 2.52. --enable-editor option added. SDL_VIDEO and SDL_INPUT defined for mingw (-grabmouse now works on win32). 2001-10-23 21:51:50 +00:00
Bradley Bell 2af4434ad1 make dist more sensible 2001-10-20 03:11:35 +00:00
Bradley Bell 0f34cad9cd RCS headers added 2001-10-19 09:47:34 +00:00
Bradley Bell c611d23c19 Moved final link to top-level directory instead of main/ 2001-10-19 09:37:48 +00:00
Bradley Bell 028be9cb2f Moved arch/sdl_* to arch/sdl 2001-10-19 09:01:56 +00:00
Bradley Bell d88a6539bf conditionalize conf.h 2001-10-19 08:08:50 +00:00
Bradley Bell 546221a7e1 Partial application of linux/alpha patch. Courtesy of Falk Hueffner <falk.hueffner@student.uni-tuebingen.de> 2001-10-19 08:06:20 +00:00
Bradley Bell f9528a8a9c Brought linux networking in line with d1x, moved some arch/linux_* stuff to arch/linux/ 2001-10-19 07:47:38 +00:00
Bradley Bell 316b9cbdd7 RCS info added, conf.h added, etc... 2001-10-19 04:10:27 +00:00