Commit graph

3040 commits

Author SHA1 Message Date
zicodxx 690a99c15d Compile out memory checker if not enabled - patch by Kp 2012-09-02 19:17:17 +02:00
zicodxx 0df40b1e77 Use enum for object types, powerup types, weapon types 2012-09-02 00:23:38 +02:00
zicodxx fcc578c1a8 Removed Assert in create_smart_children() which has been taken from D2X code but does not apply for D1X and only will let the Assert fail 2012-09-01 23:47:05 +02:00
zicodxx b0df198dc9 Fixed incorrect patch merge introduced in the last commit 2012-09-01 23:24:00 +02:00
zicodxx 495333522d Some Sconstruct lovin': Respect LDFLAGS; Made D1XMAJORi/MINORi/MICROi compile time constants; Do not pass CFLAGS to CXX; Mark some more warnings as errors - patches by Kp 2012-07-28 01:41:30 +02:00
Chris Taylor 4b44e08b6c Don't draw objects with a modelnum of -1, improving stability when a third party mission is played with shareware data 2012-07-24 17:42:51 +08:00
Chris Taylor b9e16185a3 Fix warnings (add d_splitpath prototype, no checking ubyte 'id' is < 0, fix say_totals prototype, include d_strdup prototype for radio.c and make sure that 'text' gets freed) 2012-07-24 17:29:43 +08:00
Chris Taylor a65bb22202 Increment version number for Mac files (should have committed this ages ago) 2012-07-24 16:28:20 +08:00
Chris Taylor 50070ba165 No calling piggy_dump_all() when EDITOR is defined, it causes a failed Assert and causes it to exit when the PC Shareware descent.pig is used 2012-07-24 16:23:43 +08:00
zicodxx 33bf139002 Redefined lotsa variables, functions and parameters as const and/or static - patch by Kp 2012-07-23 01:17:52 +02:00
Kp a81afea7fe Rename include/error.h to include/dxxerror.h
Avoid conflict with generic system header.
2012-07-07 18:35:06 +00:00
Kp 5b82e04194 Add const markers to missed vecmat functions
This aligns the code with D1X-Rebirth.
2013-03-03 01:16:22 +00:00
Kp e87d5dba08 Remove unnecessary program-specific references in pstypes.h 2013-03-03 01:01:28 +00:00
Kp 22d38bcace Prepare for files to be in a subdirectory 2013-03-03 02:20:54 +00:00
Kp 66cf62e359 Normalize whitespace in copyright header to match D1X-Rebirth 2013-02-24 02:40:43 +00:00
Kp 67f433b3f1 Move register_program into subclass 2013-03-02 23:58:29 +00:00
Kp b77e563e50 Move net_udp.c reference to subclass 2013-03-02 23:17:38 +00:00
Kp 1c52e588df Move names of platform-specific sources into subclasses 2013-03-02 23:00:10 +00:00
Kp c03c9f128c Combine platform-specific settings construction 2013-03-03 01:54:44 +00:00
Kp c282e0b852 Use pkg-config to get libSDL settings 2013-03-03 01:52:59 +00:00
Kp 39bbc74872 Copy source lists into individual program objects
This is required once unification begins.
2013-03-02 22:41:05 +00:00
Kp 5d1e19423b Remove DPMI support and BITMAP_SELECTOR 2013-02-23 22:54:28 +00:00
Kp f9397bdfc5 Generate resource file at build time 2013-03-02 21:25:47 +00:00
Kp ed33108ae7 Move SCons rules into wrapper classes 2013-02-25 01:59:08 +00:00
Kp 96bf0f5bee Remove ineffective LINKFLAGS assignment 2013-02-25 01:59:08 +00:00
Kp dbf90c43db Move platform-specific settings into specialized settings classes 2013-02-25 01:59:08 +00:00
Kp e14d2ad601 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 01:59:08 +00:00
Kp 857c8d30ac Simplify copying in compiler environment variables 2013-02-25 01:59:08 +00:00
Kp 87ac6ea221 Move command line settable values into class Settings 2013-02-25 01:59:08 +00:00
Kp f702d92c5a Overload argument lookup to allow version-specific names 2013-02-25 01:59:08 +00:00
Kp 93a23298ff Rename D2XMAJORi/D2XMINORi/D2XMICROi to DXX_VERSION_MAJORi/DXX_VERSION_MINORi/DXX_VERSION_MICROi 2013-02-25 01:59:08 +00:00
Kp 5e7db3626a Rename D2XMAJOR/D2XMINOR/D2XMICRO to VERSION_MAJOR/VERSION_MINOR/VERSION_MICRO 2013-02-25 01:59:08 +00:00
Kp 4fa7ccbb3d Use correct array index when loading circle distance
When reading a custom robot's circle distance from a file, store into
the circle_distance[] array, rather than out beyond it.
2013-02-25 01:59:08 +00:00
Kp 5c2d180d0f Normalize comments and whitespace to match D1X 2013-02-25 01:59:08 +00:00
Kp 2c5ecf0829 Revert "Move main/bmread.c to be sorted in SConstruct"
This reverts commit e3dd328e66.

Folding hid that this move migrated bmread.c from common_sources to
editor_sources.
2013-02-25 01:59:05 +00:00
Kp f12f4e6737 Remove RCS embedded string to synchronize code with D1X 2013-02-22 04:32:23 +00:00
Kp 7f5d61c3ed Remove RCS comment to synchronize code with D1X 2013-02-22 04:32:14 +00:00
Kp 01cb338618 Normalize comments and whitespace to match D1X 2013-02-22 04:32:03 +00:00
Kp 839c8d3c43 Normalize comments and whitespace to match D1X 2013-02-21 00:25:12 +00:00
Kp e3dd328e66 Move main/bmread.c to be sorted in SConstruct 2013-02-21 00:25:12 +00:00
zicodxx 0a56099ad1 Increased ship wiggle from 20FPS- to 30FPS-base as I think this more representy the 486 play style - feels way more natural to me, too 2013-01-22 00:55:56 +01:00
zicodxx 125fbb0ab8 Support for Raspberry Pi - patch by derhass 2013-01-22 00:34:06 +01:00
zicodxx b6a906bc53 Decrease personal score when killing multi buddy and don't increment towards kill goal; Killing off some old externs on which I don't wanna waste an extra commit 2013-01-19 16:37:42 +01:00
Chris Taylor 06b1efad8f Fix click-selection in the editor for OpenGL implementations that insist on point blending 2013-01-17 13:14:44 +08:00
Chris Taylor efe9992ee3 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:09:23 +08:00
Chris Taylor f6702eee8e 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 18:53:43 +08:00
Chris Taylor e4c0b69031 Use new D1XMAJORi / D1XMINORi / D1XMICROi version constants for Mac 2013-01-12 12:35:23 +08:00
zicodxx bf9cdcb04f Changed additive color blending func to GL_ONE, GL_ONE - patch by derhass 2013-01-08 19:12:36 +01:00
zicodxx fb9518dd97 Corrected ai_fire_laser_at_player() syntax where boss should not fire when Boss_dying_start_time != 0 and boss flag is set - patch by derhass 2013-01-08 18:00:15 +01:00
zicodxx fa3a0c60fc Patch by A Future Pilot to hopefully fix bug which prevented building source within MinGW if Visual Studio installed 2013-01-08 17:53:12 +01:00