Commit graph

3057 commits

Author SHA1 Message Date
Kp 2851dac581 Combine platform-specific settings construction 2013-03-03 01:54:44 +00:00
Kp e5b4664555 Use pkg-config to get libSDL settings 2013-03-03 01:52:59 +00:00
Kp b1b9775052 Copy source lists into individual program objects
This is required once unification begins.
2013-03-02 22:41:05 +00:00
Kp ef996d2772 Generate resource file at build time 2013-03-02 21:25:47 +00:00
Kp 6acace06f4 Move SCons rules into wrapper classes 2013-02-25 02:01:28 +00:00
Kp cbbc9740ae Remove ineffective LINKFLAGS assignment 2013-02-25 02:01:28 +00:00
Kp 8d07bf2b38 Move platform-specific settings into specialized settings classes 2013-02-25 02:01:28 +00:00
Kp 6ef163d02c Collapse ogldefines handling
ogldefines is always set to ['OGL'], so remove the definitions of it and
just set that value explicitly when OpenGL is used
2013-02-25 02:01:28 +00:00
Kp 35141d190c Simplify copying in compiler environment variables 2013-02-25 02:01:28 +00:00
Kp e2e89ec8f5 Move command line settable values into class Settings 2013-02-25 02:01:28 +00:00
Kp 38ce033428 Overload argument lookup to allow version-specific names 2013-02-25 02:01:28 +00:00
Kp d14a6860a4 Rename D1XMAJORi/D1XMINORi/D1XMICROi to DXX_VERSION_MAJORi/DXX_VERSION_MINORi/DXX_VERSION_MICROi 2013-02-25 02:01:28 +00:00
Kp f75513e03d Rename D1XMAJOR/D1XMINOR/D1XMICRO to VERSION_MAJOR/VERSION_MINOR/VERSION_MICRO 2013-02-25 02:01:28 +00:00
Kp 38c7b828b5 Remove DPMI support and BITMAP_SELECTOR 2013-02-25 02:01:24 +00:00
Kp 3a8d40ae2d Remove PSX_BUILD_TOOLS code
This is never activated.
2013-02-25 02:00:08 +00:00
Kp 63c77101d3 Remove last bits of HOSTAGE_FACES code
As far as I can tell, this never shipped, so remove it.
2013-02-25 02:00:08 +00:00
Kp 6df4c2d372 config.c: mark global strings as const 2013-02-25 02:00:08 +00:00
Kp 3edbfa2c90 Normalize comments and whitespace to match D2X 2013-02-25 02:00:02 +00:00
Kp 4f85c21f13 Fix incorrect usage of no_asm in SConstruct
zico switched the variable to 'asm' in dac257e, so referring to no_asm
has no effect now.
2013-02-24 05:14:11 +00:00
Kp fa5bde8ad0 Remove RCS embedded string to synchronize code with D2X 2013-02-22 04:31:25 +00:00
Kp c6155f63ce Remove RCS comment to synchronize code with D2X 2013-02-22 04:30:51 +00:00
Kp 7b2cbd5dc3 Normalize comments and whitespace to match D2X 2013-02-22 04:30:38 +00:00
Kp fd22ea5726 Normalize comments and whitespace to match D2X 2013-02-21 00:20:52 +00:00
Kp 7f137ac493 Move arch_sdlmixer to the same relative position as in D2X SConstruct 2013-02-21 00:14:04 +00:00
Kp 4167cf9685 Move main/hash.c -> misc/hash.c to match D2X 2013-02-21 00:13:56 +00:00
Chris Taylor e0b97f5b56 Fix click-selection in the editor for OpenGL implementations that insist on point blending 2013-01-17 12:45:42 +08:00
Chris Taylor 1eb70135fe If there's a messagebox to show on exit, and we *were* in fullscreen, don't try to toggle fullscreen and crash 2013-01-12 19:07:57 +08:00
Chris Taylor fc1108e7b6 Increased the maximum number of levels and secret levels per mission to 127 each, using MALLOC'd arrays; defined 'd_fname' type (mainly for my pointers to arrays of 13 character filenames, but could be convenient elsewhere) 2013-01-12 13:23:28 +08:00
Chris Taylor 245bc93dbf Use new D1XMAJORi / D1XMINORi / D1XMICROi version constants for Mac 2013-01-12 12:31:31 +08:00
zicodxx 39aa112e45 Changed additive color blending func to GL_ONE, GL_ONE - patch by derhass 2013-01-08 19:12:33 +01:00
zicodxx fb9c3b8cce Patch by A Future Pilot to hopefully fix bug which prevented building source within MinGW if Visual Studio installed 2013-01-08 17:53:10 +01:00
zicodxx a43f7df8d0 Added option to hide mouse cursor (without disabling the mouse completely) 2013-01-08 17:47:02 +01:00
zicodxx a55dd5e69b Disable fullscreen toggling via ALT+ENTER if Game_wind is on top so toggling cannot be done accidentially ingame 2013-01-08 17:29:26 +01:00
zicodxx 174b7c92d2 Added default keys for weapon cycling similar to Descent 2 and reverted default reverse key to Z as default as more convinient for the QUERTY keyboard layout 2013-01-08 12:17:16 +01:00
zicodxx 8de1f981cf Defer free of kmatrix data until window is fully gone - patch by Kp 2013-01-08 12:08:12 +01:00
zicodxx cd86e2b8c2 Fixed some minor HUD-text related issues: For team assignment messages, joining player name would appear; team color assignment in netgame info screen could be wrong due to wrong syntax handling; when rewrapping text messages to specific player, game would not add space behind colon 2013-01-08 11:42:07 +01:00
zicodxx 1f2d9bb061 Use proper width in format specifier - patch by Kp 2013-01-03 17:34:06 +01:00
zicodxx 97c86f2b5e Removed obsolete HUD cleaning code - patch by Kp 2013-01-03 17:32:58 +01:00
zicodxx 1ba045abe5 Added dummy %s to prevent formatting untrusted literals - patch by Kp 2013-01-03 17:29:57 +01:00
zicodxx b5b72b3ae3 Converted gr_printf to gr_string where needed - patch by Kp 2013-01-03 17:23:09 +01:00
zicodxx ee7325e114 Moved screenshot message formating to HUD_init_message - patch by Kp (and me for non-OGL code ;)) 2013-01-03 17:10:47 +01:00
zicodxx 947abe1efb Fixed argument specifier mismatches flagged by -Wformat - patch by Kp 2013-01-03 17:04:34 +01:00
zicodxx 6006ee2925 medrobot: avoid needless name copy - patch by Kp 2013-01-03 17:02:14 +01:00
zicodxx 7549ee8c51 Moved large control_info arrays to end - patch by Kp 2013-01-03 16:57:12 +01:00
zicodxx 07f3bac4cd Removed redundant/obsolete declarations - patch by Kp 2013-01-03 16:54:46 +01:00
zicodxx 1e4e463394 Declared wall_close_door_num in wall.h; Declared validate_segment_side in gameseg.h - patches by Kp 2013-01-03 16:44:52 +01:00
zicodxx 88de21684d Moved joy_*_handler declarations to joy.h - patch by Kp 2013-01-03 16:37:49 +01:00
zicodxx f85e5def8d Included maths.h in rand.c to get d_rand prototype - patch by Kp 2013-01-03 16:35:32 +01:00
zicodxx 6f72e2846c Moved multi_* declarations to multi.h - patch by Kp 2013-01-03 16:33:40 +01:00
zicodxx 6b949ddff9 Moved remove_char declaration to piggy.h - patch by Kp 2013-01-03 16:24:46 +01:00