Commit graph

6666 commits

Author SHA1 Message Date
Kp c20cfc02cb Remove unused D1 definition of POW_FULL_MAP 2015-04-19 04:18:52 +00:00
Kp ae8a8c98ce Reduce player.h includes 2015-04-19 04:18:52 +00:00
Kp 83afd8d96f Reduce piggy.h includes 2015-04-19 04:18:52 +00:00
Kp 51ab9ff9d6 Simplify DXX guard on object.h 2015-04-19 04:18:52 +00:00
Kp 808d5c1cf2 Switch joystick_text_length to integral_constant 2015-04-19 04:18:52 +00:00
Kp cd6be09547 Reduce kconfig.h includes 2015-04-19 04:18:51 +00:00
Kp c338862ad6 Reduce gauges.h includes 2015-04-19 04:18:51 +00:00
Kp 4149ab6e5f Reduce gameseq.h includes 2015-04-19 04:18:51 +00:00
Kp 714fd36241 Reduce gamemine.h includes 2015-04-19 04:18:51 +00:00
Kp 27b6ad1630 Reduce game.h includes 2015-04-19 04:18:51 +00:00
Kp 75162a6fe9 Reduce controls.h includes 2015-04-19 04:18:51 +00:00
Kp 516b8b2397 Reduce collide.h includes 2015-04-19 04:18:51 +00:00
Kp 8c6ddf1abf Reduce cntrlcen.h includes 2015-04-19 04:18:51 +00:00
Kp 726e5737bb Reduce bm.h includes 2015-04-19 04:18:51 +00:00
Kp 8582907b91 Reduce ai.h includes 2015-04-19 04:18:51 +00:00
Kp 4e937ae239 Reduce playsave.h includes
Move non-common includes into defined(D1||D2)
2015-04-19 04:18:50 +00:00
Kp aa4c5efbb9 Replace HAS_PRIMARY_FLAG(x) with HAS_x_FLAG 2015-04-19 04:18:50 +00:00
Kp 12673084a0 Remove obsolete player_has_primary_weapon D1 special case 2015-04-19 04:18:50 +00:00
Kp 9d213b5282 Wrap player_has_weapon return type 2015-04-19 04:18:50 +00:00
Kp f74f879145 Simplify do_weapon_select call 2015-04-19 04:18:50 +00:00
Kp 0a1d643442 Remove obsolete weapon_num check 2015-04-19 04:18:50 +00:00
Kp 9595aec2fb Use integral_constant for endian constants 2015-04-19 04:18:50 +00:00
Kp 9751022b1b Use static_assert for player_rw size check 2015-04-19 04:18:50 +00:00
Kp 5c73a98827 Remove !__cplusplus directives 2015-04-19 04:18:50 +00:00
Kp 239f633356 Remove unused include directory 2015-04-19 04:18:50 +00:00
Kp 4240017193 Remove unused D1 definition of POW_HEADLIGHT 2015-04-19 04:18:49 +00:00
Kp 84c638ed64 Move PHYSFS_list_t to separate header 2015-04-19 04:18:49 +00:00
Kp 29a57b0dc0 Remove unused net_udp parameters 2015-04-19 04:18:49 +00:00
Kp 150e2d2686 Convert local arrays to array<> 2015-04-19 04:18:49 +00:00
Kp 3e520afc89 Reduce size of hmp_open buffer 2015-04-19 04:18:49 +00:00
Kp 7fd4ccb004 Simplify info_display_object_placement cache override 2015-04-19 04:18:49 +00:00
Kp 32b4b8f0bb Use enum class for level save/load 2015-04-19 04:18:49 +00:00
zico 17f5f67948 Fixed regression from 2645d41b5f - must use UDP_MDATA_STOR_QUEUE_SIZE for UDP_mdata_trace as it it a looping list 2015-04-18 22:15:52 +02:00
zico 03f9f11b6d Reworked net_udp_noloss_validate_mdata() to properly REsend MDATA ACK for packets that have been received before 2015-04-18 15:00:24 +02:00
Kp 534fe7a160 Refactor valptr range checks 2015-04-18 01:21:54 +00:00
Kp be4eef36dd Always add -g to CXXFLAGS 2015-04-17 02:38:12 +00:00
Kp 6633eef18b Fix spurious quote on version string 2015-04-16 01:48:15 +00:00
Kp 8c106ea2e9 Avoid potential underflow when n_phys_segs==0 2015-04-11 04:01:29 +00:00
Kp e99a9236cf Avoid redundant vsegptridx calculation in object_move_one 2015-04-11 04:01:29 +00:00
Kp fa82c1bd3b Add special case for physfs requiring zlib
Dynamic linked physfs handles its own zlib dependencies.  If the user
links to a static physfs and physfs is built with support for zip files,
then we need to add zlib to the link line.
2015-04-09 02:29:58 +00:00
zico 1fd7cb8929 Fusion cannon in Descent 1 was nerfed for Multiplayer after it was made stronger in 1.1 patch. This is fine but players expressed it being not desirable for Coop - which makes sense to me. This fix only applies the nerf to non-Coop games. 2015-04-08 15:05:03 +02:00
zico c60eb9c412 since the game keeps running during kmatrix, bail out of start_player_death_sequence if connect state != CONNECT_PLAYING to prevent incorrect suicide scoring 2015-04-08 14:37:33 +02:00
zico b512127328 fixed player ships not disappearing upon kill which was caused by removal of PKilledFlags and the improper undoing of hack to keep player exploding and respawning events in order 2015-04-08 14:23:55 +02:00
Kp 55fada5c14 Fix texture filtering menu
Reported-by: derhass <https://github.com/dxx-rebirth/dxx-rebirth/issues/59>
Fixes: a84a05c701 ("Move graphics menu to macro")
2015-04-07 01:55:57 +00:00
derhass e00b318bee Fix the INTEL_*() byte swapping functions
This fixes a regression from 6e96ff3e00
where WORDS_BIGENDIAN somehow was confused with WORDS_NEED_ALIGNMENT,
so that setting WORDS_NEED_ALIGNMENT resulted in assuming a big endian
machine. This completely broke the RPi build, which is little endian.

Fixes: 6e96ff3e00 ("Fix ambiguous use of INTEL_SHORT/INTEL_INT")
[Kp: added Fixes tag.]
2015-04-05 16:08:52 +00:00
Kp ba39d232e7 Merge 'RPi updates' into unification/master
Requested-by: derhass <https://github.com/dxx-rebirth/dxx-rebirth/pull/57>
2015-04-04 23:24:49 +00:00
Kp efc5b071de Remove object_rw::pad, pad2
The presence of these fields breaks network compatibility between
aligned and unaligned users.  Removing these fields breaks the ability
to use aligned savegames.  Per discussion in
<fdaa09d7f9>,
this is acceptable to clean up the code.

Reported-by: derhass <http://www.dxx-rebirth.com/frm/index.php/topic,1986.msg21232.html>
Approved-by: zico <fdaa09d7f9 (commitcomment-10575014)>
2015-04-04 23:20:12 +00:00
derhass 1c01698e88 GLES: fix use of uninitialized variables in ogl_texture_stats()
Querying GL_INDEX_BITS and GL_DOUBLEBUFFER is not allowed in GLES, so
just use a reasonable default values for both. This is only used to
estimate memory consumption by the framebuffer (which is a questionable
approach in itself, since all those are implementation details not exposed
by the GL, and the actual memory used is likely to be higher anyway).
2015-04-04 23:04:24 +02:00
derhass 49e7cfe37e GLES: never declare the unused variable gl_draw_buffer
Move the declarition directly to the code part where it is used
(always in a #ifndef OGLES block).
2015-04-04 22:58:02 +02:00
derhass fdaa09d7f9 RPi: fix network protocol incompatibilities when WORDS_NEED_ALIGNMENT is defined
I got a bug report about erros connecting from RPI builds to normal games
on desktop machines. Unfortunately, this patch also changes the savegame
format (which was incompatible to normal desktop builds before, too).
This is discussed in more detail in:

http://www.dxx-rebirth.com/frm/index.php/topic,1986.msg21232.html#msg21232
2015-04-04 22:54:38 +02:00