Kp
6ba95cb83b
Use objptridx_t for detect_escort_goal_accomplished
2014-01-25 18:06:54 +00:00
Kp
e7d16f095e
Remove redundant FuelCenter::Center
2014-01-25 17:21:56 +00:00
Kp
b9764fb45e
Use array<> for Effects
2014-01-25 17:21:56 +00:00
Kp
917ef39258
Use array<> for Vclip
2014-01-23 03:48:25 +00:00
Kp
a2427f58b5
Use special type to reduce pointer/index conversions
2014-01-12 19:32:12 +00:00
Kp
da8e5459d6
Return objptridx_t from obj_create_copy
2014-01-12 19:32:10 +00:00
Kp
599af3e1ba
Return objptridx_t from obj_allocate
2014-01-12 19:14:16 +00:00
Kp
89a383e6a9
Pass objptridx_t in newdemo.cpp
2014-01-12 01:44:07 +00:00
Kp
e402b0ee51
Pass objptridx_t to draw_powerup
2014-01-12 00:33:33 +00:00
Kp
e2afc332ac
Pass objptridx_t to explode_object
2014-01-12 00:33:28 +00:00
Kp
9d2c847b02
Pass objptridx_t to do_debris_frame
2014-01-12 00:33:19 +00:00
Kp
3a889b5825
Pass objptridx_t to apply_damage_to_robot
2014-01-12 00:33:14 +00:00
Kp
b17bafa29f
Pass objptridx_t to apply_damage_to_controlcen
2014-01-12 00:33:03 +00:00
Kp
27c9bea1a8
Pass objptridx_t to object_create_badass_explosion
2014-01-12 00:32:46 +00:00
Kp
9d0cc8324e
Pass objptridx_t to net_destroy_controlcen
2014-01-12 00:32:30 +00:00
Kp
a8aa9965e8
Pass objptridx_t to collide_*_and_*
2014-01-12 00:19:12 +00:00
Kp
8cffd14b8c
Pass objptridx_t to collide_two_objects
2014-01-11 23:19:44 +00:00
Kp
c0ae10a0d6
Pass objptridx_t to explode_badass_weapon
2014-01-11 23:11:04 +00:00
Kp
1c7f58b448
Pass objptridx_t to collide_object_with_wall
2014-01-11 23:07:51 +00:00
Kp
377626541d
Pass objptridx_t to render_object
2014-01-11 23:06:33 +00:00
Kp
24570e2726
Pass objptridx_t to compute_object_light
2014-01-11 22:58:58 +00:00
Kp
a3dd2ea963
Pass objptridx_t to create_player_appearance_effect
2014-01-11 22:57:55 +00:00
Kp
2effc847aa
Pass objptridx_t to create_path_points
2014-01-11 22:55:21 +00:00
Kp
0b529d16c7
Pass objptridx_t to do_controlcen_destroyed_stuff
2014-01-11 22:54:46 +00:00
Kp
70b8a2bb6d
Disallow using operator-(objptridx_t,Objects)
...
Implicit conversions made this work, but it just does extra work for no gain.
2014-01-11 22:50:07 +00:00
Kp
e06f53feb8
Pass objptridx_t to draw_weapon_vclip
2014-01-11 22:47:38 +00:00
Kp
93db613176
Reduce includes in vclip.h
2014-01-11 22:47:38 +00:00
Kp
7af7f60ffb
Pass objptridx_t to add_stuck_object
2014-01-11 22:47:38 +00:00
Kp
f9c7311214
Pass objptridx_t to do_physics_sim
2014-01-11 22:47:37 +00:00
Kp
85b95efc70
Fix ugly hack of using -4 for fuelcen reached
2014-01-11 22:24:55 +00:00
Kp
21c9aa6c16
Remove unused ESCORT_GOAL_EXIT2
2014-01-11 22:20:48 +00:00
Kp
09767b933f
Pass objptridx_t to player_is_visible_from_object
2014-01-11 21:54:44 +00:00
Kp
8e6e450df6
Pass objptridx_t to do_controlcen_frame
2014-01-11 21:54:44 +00:00
Kp
cc6d72b9ee
Unpack player to fix build on old compilers
2014-01-11 21:53:09 +00:00
Kp
8cbd85a77d
Unpack laser_info to fix build on old compilers
2014-01-11 21:51:29 +00:00
Kp
fca105e95d
Pass objptridx_t to create_small_fireball_on_object
2014-01-11 17:25:26 +00:00
Kp
a0ac77569b
Pass objptridx_t to obj_delete
2014-01-11 17:22:11 +00:00
Kp
0b820e1e7b
Pass objptridx_t to object_move_one
2014-01-11 17:19:22 +00:00
Kp
813bbb079f
Pass objptridx_t to do_ai_frame
2014-01-11 17:14:20 +00:00
Kp
1296662e96
Pass objptridx_t to object_create_badass_explosion
2014-01-10 04:02:53 +00:00
Kp
0d49f5b55a
Use objptridx_t for object_create_badass_explosion
2014-01-10 03:23:57 +00:00
Kp
58ed12ffce
Use objptridx_t for create_morph_robot
2014-01-10 03:20:11 +00:00
Kp
ab3806af83
Use objptridx_t for object_create_explosion
2014-01-10 03:20:11 +00:00
Kp
f1a6757693
Use objptridx_t for obj_create
2014-01-10 03:20:11 +00:00
Kp
9843406588
Remove unused return value of explode_badass_weapon
2014-01-10 03:17:55 +00:00
Kp
d6fab53199
Remove unused return value of object_create_muzzle_flash
2014-01-10 03:14:14 +00:00
Kp
61ad220d42
Remove unused who_killed_controlcen
2014-01-08 03:54:44 +00:00
Kp
9a5d0f6f09
Use symbolic values for segment/object first/none
2014-01-06 04:17:55 +00:00
Kp
67741cf603
Remove unused multi_explode_robot_sub parameter killer
2014-01-04 22:04:34 +00:00
Kp
3ca0a6aca6
Remove unused return value of explode_badass_player
2014-01-04 18:03:10 +00:00
Kp
8218af34b5
Add special type to let obj_*link take either pointer or index
2014-01-03 04:04:04 +00:00
Kp
888f44336f
Use segment array for render visited[]
2014-01-01 03:42:00 +00:00
Kp
40e90fea22
Move Light_subtracted[] to Segments[].light_subtracted
2014-01-01 03:33:27 +00:00
Kp
094dfbf3d4
Reduce header inclusions
2013-12-31 03:22:03 +00:00
Kp
d7d052857a
Use bitmask for hitobj_list
...
Reduces sizeof(laser_info) from 392 to 80.
2013-12-31 03:22:03 +00:00
Kp
549d7ea261
Use correct size for flickering_light mask
2013-12-31 00:11:05 +00:00
Kp
cf7a3edee3
Move object::rtype up to improve packing
2013-12-29 04:54:22 +00:00
Kp
745633eabe
Use vector to allow rendering unlimited robots
2013-12-29 04:54:08 +00:00
Kp
7cf6877e2a
Rename D1 ai_local::wait_time to ::next_action_time to match D2
2013-12-29 04:33:30 +00:00
Kp
cf5343db18
Move ai_local into ai_static
...
Eliminates a global and some pointer math.
2013-12-29 03:59:21 +00:00
Kp
64e2ab55a0
Combine control_center_triggers_read and _swap variant
2013-12-29 03:56:41 +00:00
Kp
dd583e9c2b
Add packed *_rw versions of object subfields
2013-12-29 00:32:58 +00:00
Kp
073f00974a
Eliminate uses of the typedef struct X { ... } X; pattern
...
C++ does not require this pattern.
import re, fileinput
to = re.compile(r'^typedef struct ([a-z_A-Z]+)\s*{')
tc = re.compile(r'^}(.*?)\s*([a-z_A-Z]+);$')
osn = None
for line in fileinput.input(inplace=True):
m = to.match(line)
if m:
osn = m.group(1)
print 'struct %s\n{' % osn
continue
if osn:
m = tc.match(line)
if m:
csn = m.group(2)
if osn == csn:
print '}%s;' % m.group(1)
osn = None
continue
else:
osn = None
print line,
2013-12-28 22:48:07 +00:00
Kp
67ad7811bd
Remove unused physics_info::brakes
2013-12-28 22:47:46 +00:00
Kp
cc9f7f669d
Tighten definition of SWAPSHORT
2013-12-28 22:36:59 +00:00
Kp
38b2dbe639
Move object* -> objnum conversion into init_ai_object
2013-12-28 22:10:24 +00:00
Kp
79fe1d899c
Simplify control_center_triggers_read_n
2013-12-28 22:04:47 +00:00
Kp
aa16a01fec
Mark control_center_triggers_write input as const
2013-12-25 23:51:28 +00:00
Kp
8c63ad4d09
Use dedicated type for Objects[] array
2013-12-25 23:49:04 +00:00
Kp
a7bd19a7ca
Convert fvi to use countarray for segment list
...
Also fixes a bug where seglist could receive wrong elements when
fvi_sub recursive call returns a type other than HIT_NONE. Bug caused
by badly named variables:
int ii;
for (ii=0;i < temp_n_segs && *n_segs < MAX_FVI_SEGS-1;)
seglist[(*n_segs)++] = temp_seglist[ii++];
The wrong counter is used for first part of the conditional, so
uninitialized elements of temp_seglist could be read back if i
(==n_segs_visited) is smaller than temp_n_segs or elements could be
skipped if i is greater than temp_n_segs.
2013-12-22 20:56:53 +00:00
Kp
038bbad26a
Rearrange headers to build under all test modes
2013-12-22 20:56:35 +00:00
Kp
c28d0c984c
Combine nearby d1/d2 guard in powerup.h
2013-12-22 20:56:35 +00:00
Kp
44f1814b45
Store boss gate/teleport segments in countarray objects
2013-12-22 20:02:42 +00:00
Kp
403d412000
Remove BEFORE/AFTER arguments to for_each_multiplayer_command
2013-12-22 20:02:22 +00:00
Kp
99626b2f34
Clear visited segment array in constructor
2013-12-22 05:27:46 +00:00
Kp
c31c67c587
Store selected segments in countarray object
2013-12-22 01:54:15 +00:00
Kp
4fb6990b6c
Make Stolen_items[] a C++ array
2013-12-22 01:53:26 +00:00
Kp
5b5c8a3c6a
Remove write-only variable TmapList
2013-12-22 01:16:16 +00:00
Kp
0c30fa7cf3
Whitelist MAX flash missiles as valid laser type
2013-12-22 01:15:40 +00:00
Kp
11f7bc51ee
Use unsigned count of frames in a vclip
2013-12-22 00:05:13 +00:00
Kp
1e8036bd24
Split compiler.h for PCH compatibility
2013-12-21 05:12:38 +00:00
Kp
c2f6e9f999
Remove obsolete setjmp/longjmp
2013-12-21 01:40:56 +00:00
Kp
86a88bedbd
Use enum for CockpitMode
...
This makes the debugger output nicer.
2013-12-20 03:14:16 +00:00
Kp
d2a2103cc2
Combine MULTI_PLAYER_EXPLODE and MULTI_PLAYER_DROP
...
Add a selector byte and use a common primary command code.
2013-12-20 03:11:23 +00:00
Kp
3ca5b4af47
Inline multi_send_quit
2013-12-20 03:11:06 +00:00
Kp
c561c3d514
Move multi_send_data_direct type into template parameter
...
Optimizing compilers may now delete the size check.
2013-12-20 03:08:19 +00:00
Kp
ad90c245b6
Improve interaction of Del+F with normal map usage
...
Refactor edge computation into helper.
Let Automap_visited always be exactly what the player mapped normally.
This allows reversing Del+F.
2013-12-20 03:06:59 +00:00
Kp
f0bae2c8cd
Add EVENT_WINDOW_CREATED to centralize window init/deinit logic
2013-12-20 02:51:24 +00:00
Kp
985972186f
Use separate type for ai_static_rw in Descent, too
2013-12-19 15:11:41 +00:00
zico
35266309d0
Made version mismatch screen spill out some explanatory information about Multi protocol version
2013-12-19 14:03:00 +01:00
zico
5f005baa3b
Added MULTI_EFFECT_BLOWUP to remotely blast switches connected to triggers, ensuring sync and preventing misguided (i.e. delayed) player fire accidentially make puzzles or game progress impossible
2013-12-19 13:48:33 +01:00
Kp
d2c2dfe95c
Make Segments[] a C++ array
2013-12-19 03:31:24 +00:00
Kp
aba6c2dfee
Pass glow_values as array<> to retain size information
2013-12-19 03:31:24 +00:00
Kp
0938e819e5
Advertise map-mode via overload of typing-mode
...
Tell other clients when map mode is active, for the same reason that
typing mode is advertised.
2013-12-18 04:51:46 +00:00
Kp
8c74708ad4
Improve layout of D2 powerup_info
2013-12-18 04:51:46 +00:00
Kp
9776827a33
Make Objects[] a C++ array
2013-12-18 04:51:46 +00:00
Kp
7caf9bbcd4
Unify WALL_IS_DOORWAY
...
Both games used the same meaning, but called values by different names.
2013-12-18 04:51:46 +00:00
Kp
2f18c5037d
Store group lists as countarray objects
2013-12-18 03:48:52 +00:00
Kp
be742f8848
Use powerup_basic_str instead of powerup_basic where possible
2013-12-17 04:03:34 +00:00
Kp
65657c6809
Use nm_messagebox_str instead of nm_messagebox where possible
2013-12-17 04:03:34 +00:00
Kp
d15347f16f
Use HUD_init_message_literal instead of HUD_init_message where possible
2013-12-17 04:03:34 +00:00
Kp
21de8bc8f6
Use buddy_message_str instead of buddy_message where possible
2013-12-17 04:03:34 +00:00
Kp
38a5c03d5d
Add type checking for newmenu_listbox
2013-12-17 03:58:17 +00:00
Kp
92e8cb7a31
Add type checking to newmenu subfunction userdata
2013-12-15 21:54:38 +00:00
Kp
3908215e73
Add type checking to nm_messagebox format string
2013-12-15 21:54:17 +00:00
Kp
5d306d06be
Switch endlevel message dialog not to use nm_messagebox1
2013-12-15 19:00:59 +00:00
Kp
3fb0ffa19b
Add typedef for newmenu subfunction
2013-12-15 18:57:54 +00:00
Kp
cea46651fc
Check type of window handler function
2013-12-15 18:51:26 +00:00
Kp
f05b6f0008
Use on-stack bit array for tracking AI segment visits
2013-12-15 18:50:39 +00:00
Kp
7088720507
Use C++ array for Automap_visited
2013-12-15 18:46:42 +00:00
Kp
2ce15e5703
Remove unused extern object variables
2013-12-15 01:59:05 +00:00
Kp
ddffec01c7
Use enum for multi_send_msgsend_state values
2013-12-15 01:52:13 +00:00
Kp
6779dc4991
Remove unused command MULTI_DROP_ORB
2013-12-15 01:45:19 +00:00
Kp
00a9ca2423
Remove unused MULTI_PLAY_BY_PLAY
...
The sending function has been disabled since Bazaar import.
2013-12-15 01:45:19 +00:00
zico
ec516b5675
Disable powerup capping for cooperative game mode as it potentially deletes weapons carried over from another level
2013-12-14 02:53:45 +01:00
Kp
cb4fd7c1b4
Compact known file extension storage
2013-12-13 03:58:01 +00:00
Kp
2bd302cddd
Move Controls ubyte values into substructure
2013-12-13 03:47:57 +00:00
zico
e195290fe4
Added quick load ability for savestates
2013-12-10 18:13:32 +01:00
zico
dae83f9edc
Set PPS limits from 5 to 40
2013-12-09 14:25:32 +01:00
zico
2e407fa5a8
Removed short packets and added segment number to quaternion structure
2013-12-09 14:00:23 +01:00
Kp
38e92ddce0
Remove useless __pack__ on PlayerCfg
2013-12-08 00:15:13 +00:00
Kp
141ead1830
Move ramped controls into template structure
2013-12-07 21:13:37 +00:00
Kp
c3dd634cce
Remove unused flag OF_HARMLESS
2013-12-07 18:41:35 +00:00
Kp
9de54cfa74
Switch to C++ linkage
...
import fileinput
guard = 0
cxxguard = '#ifdef __cplusplus\n'
for line in fileinput.input(inplace=True):
if line == cxxguard:
guard = 1
continue
if guard:
if line == 'extern "C" {\n':
guard = 2
continue
if line == '}\n':
guard = 0
continue
if guard == 2:
assert(line == '#endif\n')
guard = 0
print cxxguard,
continue
print line,
2013-12-06 03:35:32 +00:00
Kp
3620392f56
Remove unused nm_messagebox_fixedfont
2013-12-06 00:24:07 +00:00
Drakona
04d84ae61d
Pass shot orientation with each weapon packet
2013-12-05 13:11:49 +01:00
Kp
18aea17f9e
Move */main/fireball.c -> similar/main/fireball.c
2013-12-02 00:21:31 +00:00
Kp
2ac98f7269
Move */main/gamemine.c -> similar/main/gamemine.c
2013-12-01 23:55:29 +00:00
Kp
38832fd1af
Restructure gamemine.c for merge
2013-12-01 23:52:27 +00:00
Kp
2d01f3a649
Optimize references to player ship
2013-12-01 22:53:25 +00:00
Kp
74ac85076f
Store joystick button text in one allocation
2013-12-01 22:42:47 +00:00
Kp
5354d05fbf
Store joystick axis text in one allocation
2013-12-01 22:42:47 +00:00
Kp
08efe14586
Remove unused Laser_player_fire parameter harmless_flag
2013-11-28 02:12:13 +00:00
Kp
3e2c0b5e1b
Switch multi_allow_powerup_text to [][] from *[]
2013-11-28 02:09:30 +00:00
Kp
5d1769cd2c
Switch RankStrings to be [][14] instead of *[]
...
Saves 10 .rel.ro entries and 6 bytes on x86 / 46 bytes on x64.
2013-11-28 02:08:54 +00:00
Kp
541961a2f7
Make Object_type_names const
2013-11-28 00:27:43 +00:00
Kp
68732756e8
Make Wall_names const
2013-11-28 00:27:43 +00:00
Kp
cbc46e343d
Remove unused MULTI_ANGER
2013-11-24 23:11:30 +00:00
Kp
a65d774c83
Improve packing of struct segment
...
Shrinks Segments[] by 36000 bytes.
2013-11-24 23:08:32 +00:00
Kp
c70c6c98b3
Remove obsolete segment::degenerated flag
...
Shrinks Segments[] by 36000 bytes.
2013-11-24 23:08:32 +00:00
Kp
6be79cadce
Unify ai_follow_path
2013-11-23 22:41:01 +00:00
Kp
7a9db6716a
Make ready_to_fire static
2013-11-18 04:51:33 +00:00
Kp
f4cbfca8e2
Use helper to test for thief flag
2013-11-18 04:51:33 +00:00
Kp
dc72fb5932
Use player_awareness_type_t for create_awareness_event
2013-11-18 04:51:33 +00:00
Kp
6becfdacca
Remove NUM_DXX_REBIRTH_CONTROLS
2013-11-18 00:54:59 +00:00
Kp
a842b31a20
Remove NUM_MOUSE_CONTROLS
2013-11-18 00:54:59 +00:00
Kp
04b0bd892d
Remove NUM_JOYSTICK_CONTROLS
2013-11-18 00:54:59 +00:00
Kp
bf7063080e
Remove NUM_KEY_CONTROLS
2013-11-18 00:54:59 +00:00
Kp
c3d328ea5c
Use helper to test for guidebot flag
2013-11-16 23:24:12 +00:00
Kp
d0514455b3
Use automap_state instead of automap_count
2013-11-16 23:24:12 +00:00
Kp
321e240744
Use rear_view_state instead of rear_view_count
2013-11-16 23:24:12 +00:00
Kp
cda0b60687
Remove unused fire_secondary_count
2013-11-16 23:24:12 +00:00
Kp
494c380abb
Switch automap to use fire_primary_state
...
Counting is unnecessary here.
2013-11-16 23:24:12 +00:00
Kp
1312369c94
Restructure ai.c for merging
2013-11-16 23:20:30 +00:00
Kp
e2a2cc579a
Remove unused piggy_dump_all
2013-11-10 19:08:12 +00:00
Kp
6e6b480082
Use enum for weapon types
2013-11-02 04:26:51 +00:00
Kp
6fc8d110f3
Only give secondaries that exist
2013-11-02 04:25:33 +00:00
Kp
58958e091b
Only give primaries that exist
2013-11-02 04:24:14 +00:00
Kp
765f34eb0a
Remove unused function med_check_all_vertices
2013-10-29 03:24:42 +00:00
Kp
aa7f36e3b7
Provide HUD prototypes in Descent 1
2013-10-29 03:24:42 +00:00
Kp
68e936b809
Disable Parallax AI path debug printing
2013-10-29 03:24:41 +00:00
Kp
4fcf34fdbb
Make create_weapon_object static
2013-10-28 04:16:45 +00:00
Kp
19fef0a51d
Simplify full_palette_save calls
2013-10-28 04:16:44 +00:00
Kp
8ed99faf5c
Make headers freestanding
2013-10-26 03:50:28 +00:00
Kp
fdd2dd65c7
Use underlying type for state_game_id
...
This avoids the need for a header to declare it.
2013-10-26 03:50:27 +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
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
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
fce2717e83
Move similar/arch/sdl/jukebox.c -> similar/arch/sdl/jukebox.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
88403fbfd8
Remove defined(SHAREWARE) code
...
Rebirth supports shareware and retail data based on runtime decisions.
2013-09-11 02:39:50 +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
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
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
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
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
400b18b78a
Mark gauges variables const
2013-08-08 03:01:47 +00:00
zico
bbaa3c21f3
HAMERS! Wait 33ms between each turn of a homing missile projectile, only scale turns if FPS are below 30
2013-08-08 00:29:56 +02:00
zico
2b632008b2
Cleaned code for homing projectiles a bit and reverted to state of Descent 1 source release; Added ticks to rule target aquisition and adjusted turn rate scaling accordingly
2013-08-06 21:04:44 +02:00
Kp
ff90315978
Use SConscript configure support to probe for format(printf) attribute
2013-07-27 22:17:13 +00:00
Kp
2215c0848d
Use SConscript configure support to probe for format_arg attribute
2013-07-26 02:54:33 +00:00
Kp
1b912463d3
Declare size of Text_string[]
2013-07-26 01:56:42 +00:00
Kp
862d1b561c
Move */main/switch.h -> common/main/switch.h
2013-07-24 01:43:02 +00:00
Kp
90cd2f4938
Move */main/multi.h -> common/main/multi.h
2013-07-24 01:43:01 +00:00
Kp
90a20de57a
Move d2x-rebirth/main/gamepal.h -> common/main/gamepal.h
...
Add stub gamepal.h for d1x-rebirth to make merging easier.
2013-07-23 02:29:25 +00:00
Kp
1686732c4e
Move */main/text.h -> common/main/text.h
2013-07-21 22:10:01 +00:00
Kp
4187648621
Remove redundant/obsolete declarations
2013-07-21 21:55:00 +00:00
Kp
4577dd3977
Merge branch 'd2x-rebirth/master' into unification/master
2013-07-21 21:34:46 +00:00
Kp
707f74883a
Make kconfig.h usable in common source files
2013-07-21 18:15:20 +00:00
Kp
e41fa25905
Make weapon.h usable in common source files
2013-07-21 18:15:20 +00:00
Kp
a1ba420031
Mark various parameters and variables as const
2013-07-20 23:12:24 +00:00
Kp
6c9c87e27c
Move */main/weapon.h -> common/main/weapon.h
2013-07-20 16:40:08 +00:00
Kp
012d8e249b
Merge branch d1x-rebirth/master into unification/master
2013-07-19 22:32:28 +00:00
Kp
06a2bb4c6b
Move */main/aistruct.h -> common/main/aistruct.h
2013-03-03 01:03:33 +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
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
a842e15d94
Merge branch d2x-rebirth into unification/master
...
Conflicts:
SConstruct
common/include/editor/ehostage.h
common/main/cntrlcen.h
common/main/laser.h
common/main/mission.h
common/main/net_udp.h
common/main/object.h
main/vers_id.h
similar/editor/kfuncs.c
similar/main/inferno.c
similar/main/lighting.c
similar/main/multibot.c
similar/main/newmenu.c
similar/main/physics.c
2013-04-21 04:52:22 +00:00
Kp
616a3a6b70
Merge branch d1x-rebirth into unification/master
...
Conflicts:
SConstruct
common/main/cntrlcen.h
common/main/fuelcen.h
common/main/fvi.h
common/main/gameseq.h
common/main/gauges.h
common/main/multibot.h
common/main/net_udp.h
common/main/object.h
common/main/player.h
common/main/vers_id.h
d1x-rebirth/main/hostage.c
d1x-rebirth/main/multi.c
main/controls.c
main/hostage.h
main/laser.h
main/screens.h
similar/arch/ogl/gr.c
similar/editor/centers.c
similar/main/inferno.c
similar/main/lighting.c
similar/main/multibot.c
similar/main/paging.c
similar/main/physics.c
similar/main/player.c
similar/main/robot.c
similar/main/wall.c
2013-04-21 04:51:35 +00:00
Kp
4bf4710aff
Move */main/menu.h -> common/main/menu.h
2013-03-03 01:03:33 +00:00
Kp
c1f9bcbf64
Move */main/cntrlcen.h -> common/main/cntrlcen.h
...
Also, adjust includes in source files that assumed cntrlcen.h would
include switch.h.
2013-03-03 01:03:33 +00:00
Kp
8a153d1f63
Allow common headers with private dependencies to be used in common
2013-03-24 20:32:01 +00:00
Kp
6ddc31fc33
Move */main/hostage.h -> common/main/hostage.h
2013-03-03 01:03:33 +00:00
Kp
3e93f2d707
Move */main/gauges.h -> common/main/gauges.h
2013-03-03 01:03:33 +00:00
Kp
ed814d313e
Move */main/multibot.h -> common/main/multibot.h
2013-03-03 01:03:33 +00:00
Kp
d2b9accbf0
Move */main/wall.h -> common/main/wall.h
2013-03-03 01:03:33 +00:00
Kp
a3515545dd
Move */main/titles.h -> common/main/titles.h
2013-03-03 01:03:33 +00:00
Kp
1b6433ec70
Move */main/texmerge.h -> common/main/texmerge.h
2013-03-03 01:03:33 +00:00
Kp
84248c65df
Move */main/terrain.h -> common/main/terrain.h
2013-03-03 01:03:33 +00:00
Kp
004ca9780f
Move */main/segpoint.h -> common/main/segpoint.h
2013-03-03 01:03:33 +00:00
Kp
887449f51b
Move */main/screens.h -> common/main/screens.h
2013-03-03 01:03:33 +00:00
Kp
14dc71243c
Move */main/scores.h -> common/main/scores.h
2013-03-03 01:03:33 +00:00
Kp
0af7543161
Move */main/robot.h -> common/main/robot.h
2013-03-03 01:03:33 +00:00
Kp
0866e9c7fd
Move */main/powerup.h -> common/main/powerup.h
2013-03-03 01:03:33 +00:00
Kp
e89d4d7765
Move */main/polyobj.h -> common/main/polyobj.h
2013-03-03 01:03:33 +00:00
Kp
3125d6bd52
Move */main/player.h -> common/main/player.h
2013-03-03 01:03:33 +00:00
Kp
4ee6714372
Move */main/physics.h -> common/main/physics.h
2013-03-03 01:03:33 +00:00
Kp
cb246551d9
Move */main/paging.h -> common/main/paging.h
2013-03-03 01:03:33 +00:00
Kp
ea2cd17e70
Move */main/object.h -> common/main/object.h
2013-03-03 01:03:33 +00:00
Kp
15f569d5b1
Move */main/newmenu.h -> common/main/newmenu.h
2013-03-03 01:03:33 +00:00
Kp
ff444c844b
Move */main/newdemo.h -> common/main/newdemo.h
2013-03-03 01:03:33 +00:00
Kp
6cc3560fbd
Move */main/net_udp.h -> common/main/net_udp.h
2013-03-03 01:03:33 +00:00
Kp
d6073aa8d2
Move */main/mission.h -> common/main/mission.h
2013-03-03 01:03:33 +00:00
Kp
3eaec8bb39
Move */main/laser.h -> common/main/laser.h
2013-03-03 01:03:33 +00:00
Kp
bd6ae78911
Move */main/kmatrix.h -> common/main/kmatrix.h
2013-03-03 01:03:33 +00:00
Kp
30d53dca16
Move */main/kconfig.h -> common/main/kconfig.h
2013-03-03 01:03:33 +00:00
Kp
3aa3b1695f
Move */main/gameseq.h -> common/main/gameseq.h
2013-03-03 01:03:33 +00:00
Kp
b4e7d2e899
Move */main/game.h -> common/main/game.h
2013-03-03 01:03:33 +00:00
Kp
a51d4fccae
Move */main/fvi.h -> common/main/fvi.h
2013-03-03 01:03:33 +00:00
Kp
62d30ec457
Move */main/fuelcen.h -> common/main/fuelcen.h
2013-03-03 01:03:33 +00:00
Kp
947de0c94f
Move */main/fireball.h -> common/main/fireball.h
2013-03-03 01:03:33 +00:00
Kp
5294b473d7
Move */main/endlevel.h -> common/main/endlevel.h
2013-03-03 01:03:33 +00:00