Kp
65b809b218
Move similar/editor/info.c -> similar/editor/info.cpp
2012-11-17 06:14:09 +00:00
Kp
f95d401926
Move similar/editor/group.c -> similar/editor/group.cpp
2012-11-17 06:14:09 +00:00
Kp
3693743d41
Move similar/main/mission.c -> similar/main/mission.cpp
2013-10-20 22:49:12 +00:00
Kp
e663767201
Move similar/main/menu.c -> similar/main/menu.cpp
2013-10-20 22:49:12 +00:00
Kp
cf2c153c77
Move similar/main/kmatrix.c -> similar/main/kmatrix.cpp
2013-10-20 22:49:11 +00:00
Kp
1d073475e7
Mark various headers for C linkage
2013-10-20 22:49:11 +00:00
Kp
5b0c4b10ac
Use accessor for most get/set object->id accesses
2013-10-20 22:49:09 +00:00
Kp
852a4c7f4d
Use enum weapon_type_t in more places
2013-10-19 17:06:16 +00:00
Kp
14d7c8cef4
Match MAX_SECRET_LEVELS_PER_MISSION type to N_secret_levels
2013-10-19 17:03:11 +00:00
Kp
24ac83d88c
Make PLAYER_DIRECTORY_STRING work in C++
2013-10-19 17:03:11 +00:00
Kp
2bcc7bb371
Only create lasers for known weapon types
2013-10-09 01:54:12 +00:00
Kp
a8050a462f
Only fire valid level lasers
2013-10-09 01:54:12 +00:00
Kp
553dc95b05
Use helper to check for laser type weapons
2013-10-09 01:54:12 +00:00
Kp
798774294f
Use weapon_type_t for Laser_create_new* weapon type
2013-10-08 02:10:18 +00:00
Kp
bd46b7ea73
Make CONTROLCEN_WEAPON_NUM a weapon_type_t member
2013-10-08 02:07:39 +00:00
Kp
00f0fddabc
Centralize handling of SysUsePlayersDir
2013-10-06 21:04:29 +00:00
Kp
7dd7d6704b
Make write_player_file void
2013-10-06 17:56:37 +00:00
Kp
fa1b1a1217
Restructure dumpmine.c for merging
2013-10-06 16:20:00 +00:00
Kp
2dddf084e0
Move similar/editor/eobject.c -> similar/editor/eobject.cpp
2013-10-05 23:10:44 +00:00
Kp
57a0b23ae4
Move similar/editor/elight.c -> similar/editor/elight.cpp
2013-10-05 23:09:01 +00:00
Kp
21c9e11811
Move similar/editor/centers.c -> similar/editor/centers.cpp
2013-10-05 23:07:23 +00:00
Kp
e73205faac
Use enum for player awareness types
2013-10-05 21:35:58 +00:00
Kp
bd467b4140
Move similar/main/inferno.c -> similar/main/inferno.cpp
2013-10-05 21:35:58 +00:00
Kp
9c65aa3cc5
Move similar/main/gauges.c -> similar/main/gauges.cpp
2013-10-05 21:35:58 +00:00
Kp
4db024f953
Move similar/main/gamesave.c -> similar/main/gamesave.cpp
2013-10-05 21:35:58 +00:00
Kp
06c83c9393
Move similar/main/gamecntl.c -> similar/main/gamecntl.cpp
2013-10-05 21:35:58 +00:00
Kp
d656bd4115
Move similar/main/game.c -> similar/main/game.cpp
2013-10-05 21:35:58 +00:00
Kp
782372d6b8
Move similar/main/effects.c -> similar/main/effects.cpp
2013-10-05 21:35:58 +00:00
Kp
c7e34f5330
Move similar/main/digiobj.c -> similar/main/digiobj.cpp
2013-10-05 21:35:58 +00:00
Kp
f4393ca1b6
Move similar/main/credits.c -> similar/main/credits.cpp
2013-10-05 21:35:58 +00:00
Kp
ba4b87d44a
Move similar/main/controls.c -> similar/main/controls.cpp
2013-10-05 21:35:58 +00:00
Kp
b1dbeb6199
Move similar/main/config.c -> similar/main/config.cpp
2013-10-05 21:35:58 +00:00
Kp
64350f83b8
Move similar/main/cntrlcen.c -> similar/main/cntrlcen.cpp
2013-10-05 21:35:58 +00:00
Kp
584fc93f34
Move similar/main/automap.c -> similar/main/automap.cpp
2013-10-05 21:35:58 +00:00
Kp
e5ee9b72f1
Move similar/main/aipath.c -> similar/main/aipath.cpp
2013-10-05 21:35:58 +00:00
Kp
b4107e6526
Remove duplicate declarations
2013-10-03 03:11:52 +00:00
Kp
c58c4e4d06
Move declarations to headers
2013-10-03 03:11:52 +00:00
Kp
f9899a9f20
Mark various functions static
2013-10-03 03:11:51 +00:00
Kp
1b4169b0d0
Move */main/powerup.c -> similar/main/powerup.c
2013-10-02 02:51:25 +00:00
Kp
e2b7b802e3
Move similar/arch/sdl/digi.c -> similar/arch/sdl/digi.cpp
2013-10-01 02:53:23 +00:00
Kp
4863c42c9d
Move similar/3d/interp.c -> similar/3d/interp.cpp
2013-10-01 02:53:09 +00:00
Kp
4d026f8b69
Move similar/2d/pcx.c -> similar/2d/pcx.cpp
2013-10-01 02:53:09 +00:00
Kp
fce2717e83
Move similar/arch/sdl/jukebox.c -> similar/arch/sdl/jukebox.cpp
2013-10-01 02:53:09 +00:00
Kp
ace3238790
Move similar/arch/sdl/digi_mixer.c -> similar/arch/sdl/digi_mixer.cpp
2013-10-01 02:53:09 +00:00
Kp
91f6d5e72d
Move game_init_render_buffers inline
2013-09-28 23:51:52 +00:00
Kp
1ff627f85e
Move multi_send_got_flag declaration to header
2013-09-21 23:34:05 +00:00
Kp
cbe52ce1c7
Move d2x-rebirth/main/escort.h -> common/main/escort.h
2013-09-21 23:31:51 +00:00
Kp
9e3fb796e1
Use helper for comparing to proximity bomb index
2013-09-21 23:19:38 +00:00
Kp
9210a3870e
Remove unused fields in struct player
2013-09-21 18:04:10 +00:00
Kp
83df42af8e
Fix loading of older save files
...
struct player_rw offsets must not change within a savefile version
2013-09-21 17:47:03 +00:00
Kp
f4b21088a0
Track vulcan ammo explicitly
2013-09-20 23:12:54 +00:00
Kp
6e1d9f1f0c
Add helper to test for weapons that use vulcan ammo
2013-09-20 23:12:51 +00:00
Kp
aa9127e3c1
Enable -Wwrite-strings
2013-09-15 21:34:03 +00:00
Kp
ef218b7665
Simplify pilot deletion
2013-09-15 21:34:03 +00:00
Kp
88403fbfd8
Remove defined(SHAREWARE) code
...
Rebirth supports shareware and retail data based on runtime decisions.
2013-09-11 02:39:50 +00:00
Kp
df69df56dc
Remove unused common/ui/popup.cpp
2013-09-07 16:39:25 +00:00
Kp
2d964c414c
Remove unused strcins/strndel
2013-09-07 16:39:25 +00:00
Kp
a3883ab6ac
Move restore_state into #if 0
2013-09-07 16:39:10 +00:00
Kp
4e177dd3fa
Move common/arch/win32/messagebox.c -> common/arch/win32/messagebox.cpp
2013-09-02 23:59:31 +00:00
Kp
cc90678647
Move common/arch/sdl/digi_mixer_music.c -> common/arch/sdl/digi_mixer_music.cpp
2013-09-02 23:59:31 +00:00
Kp
d156a4c1ab
Simplify D1X hostage handling
2013-09-02 23:59:31 +00:00
Kp
c8f0c799b7
Use helper for setting menu items to type number
2013-09-01 23:50:55 +00:00
Kp
4fe618b325
Use helper for setting menu items to type slider
2013-09-01 23:50:55 +00:00
Kp
0645e96e17
Use helper for setting menu items to type radio
2013-09-01 23:50:54 +00:00
Kp
4c5eaded8d
Use helper for setting menu items to type checkbox
2013-09-01 23:23:55 +00:00
Kp
bb8b229dc2
Use helper for setting menu items to type input
2013-09-01 23:23:55 +00:00
Kp
ce2dd25e3f
Use helper for setting menu items to types menu and text
2013-09-01 22:24:13 +00:00
Kp
ccb92fdefa
Use macro to define advanced net UDP options
2013-09-01 21:11:27 +00:00
Kp
9d2d8bb552
Scrub netgame flags on load/save/send/recv
2013-09-01 21:09:01 +00:00
Kp
f131fcd3da
Move */main/menu.c -> similar/main/menu.c
2013-09-01 18:06:24 +00:00
Kp
e23035e61f
Move Last_afterburner_time into laser_info
2013-08-31 17:17:35 +00:00
Kp
31b9ad0bde
Restructure misc options menu for merging
2013-08-31 17:17:34 +00:00
Kp
567b1d13c2
Remove broken COMPACT_SEGS code
...
It has not built since at least 0c36fecb
.
2013-08-31 16:45:43 +00:00
zico
f2cdd906a6
merge HOMING_MAX_TRACKABLE_DOT in builds, giving D2X same tracking as D1X as requested by testers
2013-08-30 23:07:55 +02:00
Kp
16039a3f99
Remove unused extern global hitobj_list
2013-08-27 02:44:09 +00:00
Kp
5bafa16e7f
Fix level load hang on >=mingw32-gcc-4.7
...
Starting in gcc 4.7 "Windows mingw targets are using the -mms-bitfields
option by default." <http://gcc.gnu.org/gcc-4.7/changes.html >. This
causes __attribute__((packed)) not to be effective on structures that
are used to express the layout of on-disk data. In turn, that causes
piggy.c to mishandle texture loads, eventually resulting in an infinite
loop. Add a pragma pack to force the headers to pack tightly on
Windows.
2013-08-25 17:16:41 +00:00
Kp
af52e78a50
Move similar/arch/ogl/ogl.c -> similar/arch/ogl/ogl.cpp
2013-08-24 17:10:35 +00:00
Kp
828ced10a5
Declare newdemo_count_demos for D2 menu system
2013-08-24 16:44:30 +00:00
Kp
afcbfe8e54
Rename d1x/d2x variables to unify names between D1X and D2X
2013-08-24 16:44:30 +00:00
Kp
d909692148
Allow compiler to unroll pow2ize
2013-08-24 16:44:23 +00:00
Kp
20cf3f4cdb
Mark various OGL functions static
2013-08-24 16:44:23 +00:00
Kp
8ef8371563
Use unsigned screen width/height
2013-08-24 16:44:23 +00:00
Kp
8d13642c9f
Hide GM_CAPTURE tests behind static inline
2013-08-11 20:46:52 +00:00
Kp
0c3adc48df
Hide GM_HOARD tests behind static inline
2013-08-11 20:46:52 +00:00
Kp
3226a57848
Remove unused MULTI_ACTIVE_DOOR
2013-08-11 20:43:08 +00:00
Kp
de6422d58f
Remove unused multi_send_audio_taunt
2013-08-11 20:43:08 +00:00
Kp
afd2f5aea1
Remove unused GET/PUT_INTEL_INT64
2013-08-11 20:40:24 +00:00
Kp
4e6142d779
Move similar/arch/ogl/gr.c -> similar/arch/ogl/gr.cpp
2013-08-10 03:56:14 +00:00
Kp
e750c90b00
Mark more math as const correct
2013-08-10 03:55:50 +00:00
Kp
33aa8937d9
Merge branch d1x-rebirth/master into unification/master
...
Conflicts:
SConstruct
common/main/multi.h
similar/main/gamerend.c
2013-08-09 22:49:04 +00:00
zico
27a4a62b19
To compensate the change between D2's to D1's tracking code base, increased HOMING_MAX_TRACKABLE_DOT, making homing projectiles track a bit more agressivly than D1 to pose more of a challenge while not making them useless when having Afterburner
2013-08-09 17:50:11 +02:00
zico
830bcd7845
merge with ccea6b3547
2013-08-09 17:25:42 +02:00
zico
a527348681
Added MULTI_FIRE_BOMB as alteration of MULTI_FIRE to keep bombs mapped in a Multiplayer match for later Host authority and to make their chaff ability work correctly. Additionally added MULTI_FIRE_TRACK to only send Network_laser_track if > -1. On the way I made laser.c a bit more similar between D1X and D2X
2013-08-09 17:21:03 +02:00
Kp
319b3ec5fd
Mark more math as const correct
2013-08-09 03:04:18 +00:00
Kp
9ba729ca3a
Print function and line when calling Error
2013-08-09 02:10:51 +00:00
Kp
2cd7748e93
Convert vsprintf to vsnprintf
2013-08-09 01:58:17 +00:00
Kp
a01dbc59d6
Make ui_messagebox_n static
2013-08-09 01:56:34 +00:00
zico
40c5f10e20
Added definition of DESIGNATED_GAME_FPS as 30 and DESIGNATED_GAME_FRAMETIME based on the former. We use those for d_tick_count intervals and to scale other parts that have never been properly aligned to FrameTime before. In that regard, Release builds will take DESIGNATED_GAME_FPS as MINIMUM_FPS for -maxfps argument
2013-08-08 22:07:29 +02:00
Kp
a881ee455e
Remove fix.h
2013-08-08 03:01:48 +00:00
Kp
5ec78f320b
Always use 64-bit math in vm_vec_dot3
2013-08-08 03:01:48 +00:00