Kp
c55aa3be69
Mark titles.c functions static
2013-06-05 23:34:31 +00:00
Kp
251f3abb2d
Fix recvfrom prototype mismatches
...
Win32 uses int* instead of unsigned int*. Fortunately, socklen_t is
defined to the correct type in both cases, so use socklen_t and let the
compiler sort it out.
2013-06-08 17:43:35 +00:00
Kp
b9d08b2bbf
Move PCX filenames onto stack
...
PATH_MAX*2 is cheap, and this improves the quality of the error message
on failure paths.
2013-06-08 16:57:59 +00:00
Kp
7012eda814
Add unused weapon_info_read_n parameter file_version to match D2X
2013-06-08 04:29:20 +00:00
Kp
dc53b2a2a0
Move new_baldguy_pcx inline
2013-06-08 23:21:51 +00:00
Kp
49ef10fe3a
Convert HAS_*_INDEX to use helper macro
2013-06-08 23:19:26 +00:00
Kp
8140b7ff54
Make weapon.c more like D2X
2013-06-08 02:34:30 +00:00
Kp
6914285892
Restore use of Windows icon file
2013-06-02 22:10:32 +00:00
Kp
47d8ca0713
Restore use of Windows icon file
2013-06-02 22:08:50 +00:00
Kp
20d4a9a7cd
Move CPPFLAGS handling into SConstruct environment
2013-06-01 23:46:05 +00:00
Kp
0ef55c0abb
Force CRC to be positive
2013-06-05 01:38:05 +00:00
Kp
3c07a98d18
Move old_gametime into #ifdef D2
2013-06-04 03:30:50 +00:00
Kp
cb4f543ad2
Move segment tmap restore logic out of #ifdef D2
2013-06-04 03:30:50 +00:00
Kp
89be67732b
Fix powerup_basic warnings after merge
2013-06-04 03:12:35 +00:00
Kp
a49aff4897
Restore use of Windows icon file
2013-06-02 21:46:32 +00:00
Kp
738fdf41c4
Fix SDL-only D2X build failure
2013-06-03 01:20:26 +00:00
Kp
285985b071
Move mine_*info fields into #ifdef EDITOR where they belong
2013-06-01 23:11:29 +00:00
Kp
2b0ae93c41
Delete empty function apply_modified_palette
2013-04-20 03:07:49 +00:00
Kp
72eacd118b
Move */main/ai.h -> common/main/ai.h
2013-03-03 01:03:33 +00:00
Kp
e0dbe97264
Move */main/bm.h -> common/main/bm.h
2013-03-03 01:03:33 +00:00
Kp
c1b6f8ef8c
Move */main/playsave.h -> common/main/playsave.h
2013-03-03 01:03:33 +00:00
Kp
5d487f4d4d
Move */main/state.h -> common/main/state.h
2013-03-03 01:03:33 +00:00
Kp
020cdecf31
Remove d*x-rebirth/main/gamemine.h
2013-03-03 01:03:33 +00:00
Kp
7cf3400df7
Handle RC in SConstruct environment
2013-06-01 23:46:05 +00:00
Kp
3e29fdb80e
Move LDFLAGS handling into SConstruct environment
2013-06-01 23:46:05 +00:00
Kp
6cc175d9a3
Move CPPPATH to base class
2013-05-11 18:35:01 +00:00
Kp
a6afaceb00
Add syntax for configuration fan-out
2013-05-18 03:08:05 +00:00
Kp
18d8ee86be
Modify builddir name based on CFLAGS used
2013-05-18 02:37:19 +00:00
Kp
7933888adc
Allow CC=, CFLAGS= arguments
2013-05-18 02:15:01 +00:00
Kp
d4b06ad757
Move argument processing to table form
2013-05-12 03:16:24 +00:00
Kp
336bd53960
Move Raspberry Pi magic setup to class properties
2013-05-12 01:03:37 +00:00
Kp
445bf546ba
Rename UserSettings.platform_name to host_platform
...
Match the name of the command line argument.
2013-05-12 00:53:06 +00:00
Kp
0e81c0594e
Move settings that affect the build to UserBuildSettings
2013-05-11 23:52:32 +00:00
Kp
05a8aaccaf
Move */arch/sdl/digi_audio.c -> similar/arch/sdl/digi_audio.c
2013-03-03 01:03:33 +00:00
Kp
b09f96b31f
Move */arch/sdl/digi.c -> similar/arch/sdl/digi.c
2013-03-03 01:03:33 +00:00
Kp
544a07bffa
Move */2d/palette.c -> similar/2d/palette.c
2013-03-03 01:03:33 +00:00
Kp
61001e1d94
Move */2d/pcx.c -> similar/2d/pcx.c
2013-03-03 01:03:33 +00:00
Kp
606a455c88
Move */2d/font.c -> similar/2d/font.c
2013-03-03 01:03:33 +00:00
Kp
8d6698b4e6
Move */misc/args.c -> similar/misc/args.c
2013-03-03 01:03:33 +00:00
Kp
e18fc92b68
Move */main/gamecntl.c -> similar/main/gamecntl.c
2013-03-03 01:03:33 +00:00
Kp
c49fb2a68d
Move */main/state.c -> similar/main/state.c
2013-03-03 01:03:33 +00:00
Kp
9fe359baae
Move */main/game.c -> similar/main/game.c
2013-03-03 01:03:33 +00:00
Kp
d607792030
Move */main/gameseg.c -> similar/main/gameseg.c
2013-03-03 01:03:33 +00:00
Kp
fd710386b5
Move */main/gamerend.c -> similar/main/gamerend.c
2013-03-03 01:03:33 +00:00
Kp
1e0f0c8f1b
Move */main/cntrlcen.c -> similar/main/cntrlcen.c
2013-03-03 01:03:33 +00:00
Kp
997c35c351
Move */include/loadgl.h -> common/include/loadgl.h
2013-03-03 01:03:33 +00:00
Kp
b87e7c2325
Merge branch 'd2x-rebirth/master' into unification/master
2013-06-02 20:14:42 +00:00
Kp
306ab24486
Merge branch 'd1x-rebirth/master' into unification/master
2013-06-02 20:13:38 +00:00
Kp
e30828a1f6
Fix mismerge that doubled up jointlist reading
...
Commit 616a3a6
improperly brought in both D1X and D2X copies of the same
loop, but it is a bug for the loop to be run twice. This caused the
game to crash during initialization because the file position was not as
expected and the loader error handling is poor.
2013-05-09 23:46:58 +00:00
Kp
e5ab7e85c4
Fix SCons parse errors for Darwin
2013-05-05 23:20:06 +00:00