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
Kp
df9ce26dfb
Fix WORDS_NEED_ALIGNMENT build
...
Integer promotion changed short+short into an int, but INTEL_SHORT only
takes short or unsigned short. Add a cast to force the result back to
short.
Reported-by: derhass <https://github.com/dxx-rebirth/dxx-rebirth/issues/56 >
2015-04-04 17:23:47 +00:00
Kp
add7107cc7
Fix preserving CCACHE_PREFIX
2015-04-04 17:23:47 +00:00
Kp
942f867926
Always set -Wredundant-decls
...
<gcc-4.7 no longer builds due to incomplete decltype handling
>=gcc-4.7 handles -Wredundant-decls correctly
Remove the SConf test and always set -Wredundant-decls.
2015-04-03 02:46:25 +00:00
Kp
5e4bd5c73f
vm_vec_delta_ang: check for vm_vec_copy_normalize failure
...
derhass reports that Raspbian g++-4.8.2 rejects vecmat.cpp for
-Wmaybe-uninitialized on t0, t1. Fix it by adding code to return 0 if
vm_vec_copy_normalize leaves the temporary uninitialized.
Reported-by: derhass <https://github.com/dxx-rebirth/dxx-rebirth/issues/55 >
2015-04-03 02:46:25 +00:00
Kp
a9c81c5614
Move Weapon_is_energy to collide.cpp
2015-04-02 02:36:57 +00:00
Kp
1c7bae4fc4
Use local array<> for object_buffer
2015-04-02 02:36:57 +00:00
Kp
5ae5033fed
Use enum for AIB constants
2015-04-02 02:36:57 +00:00
Kp
6b6eaef226
Include polyobj.h from robot.h
...
Swap the inclusion order since all robots are polyobjects, but not all
polyobjects are robots.
2015-04-02 02:36:57 +00:00
Kp
2f86499144
Remove do_cockpit_window_view unused parameters
2015-04-02 02:36:57 +00:00
Kp
b0ec49f8e5
Remove unused file+line from get_seg_masks
2015-04-02 02:36:56 +00:00
Kp
8a28f7e1c2
Use array<> for movie decoder
2015-04-02 02:36:56 +00:00
Kp
16a1fcbb37
Cache g3_draw_bitmap constants
2015-04-02 02:36:56 +00:00
Kp
68241ffbad
Convert g3_draw_bitmap floats to structures
2015-04-02 02:36:56 +00:00
Kp
4e6d9b9901
Make xlate_previous const
2015-04-02 02:36:56 +00:00
Kp
1469e2e34c
Simplify print_clock
2015-04-02 02:36:56 +00:00
Kp
2f92078413
Move ui_add_gadget_scrollbar arrows off stack
2015-04-02 02:36:56 +00:00
Kp
36e1612ecb
Make undo_status array<const char *>
2015-04-02 02:36:56 +00:00
Kp
aa75a398d9
Move Wall_names to dumpmine.cpp
2015-04-02 02:36:56 +00:00
Kp
f71b3fb759
Make dark_lca,bright_lca array<>
2015-04-02 02:36:56 +00:00
Kp
5a4989c86d
Make cross_lva const array<>
2015-04-02 02:36:55 +00:00
Kp
1677d4159c
Make primary_lva const array<>
2015-04-02 02:36:55 +00:00
Kp
b712ae4603
Avoid unnecessary primary_lca initialization
2015-04-02 02:36:55 +00:00
Kp
27f50082f0
Avoid unnecessary cross_lca initialization
2015-04-02 02:36:55 +00:00
Kp
32d99ada2e
Make ret_rgba const array<>
2015-04-02 02:36:55 +00:00
Kp
ae8b99ae7d
Use RAIIdigi_sound for briefing printing_channel
2015-04-02 02:36:55 +00:00
Kp
b60c603e21
Avoid redundant PHYSFSX_exists checks
2015-04-02 02:36:55 +00:00
Kp
61ee6463aa
Remove unused show_title_screen return value
2015-04-02 02:36:55 +00:00
Kp
b36ce28382
Remove unnecessary strcpy in titles.cpp
2015-04-02 02:36:55 +00:00
Kp
efcf7ce6cf
Remove unnecessary strcpy in info.cpp
2015-04-02 02:36:55 +00:00
Kp
b8f9c1a1de
Expand EXCHG
2015-04-02 02:36:54 +00:00
Kp
2a1df52f71
Remove unused g3_draw_bitmap return value
2015-04-02 02:36:54 +00:00
Kp
2059c5a4ad
Remove unused must_clip_flat_face return value
2015-04-02 02:36:54 +00:00
Kp
72d349b0e0
Remove unused g3_draw_sphere return value
2015-04-02 02:36:54 +00:00
Kp
1125a751db
Remove unused g3_draw_poly return value
2015-04-02 02:36:54 +00:00
Kp
916cf69e37
Remove unused gr_uline return value
2015-04-02 02:36:54 +00:00
Kp
ca123b6cde
Remove unused gr_line return value
2015-04-02 02:36:54 +00:00
Kp
c3161d08d5
Remove unused g3_draw_line return value
2015-04-02 02:36:54 +00:00
Kp
95e3ac1e5b
Use integral_constant for UI kind
2015-04-02 02:36:54 +00:00
Kp
f88eaf43ac
Make UI_GADGET_LISTBOX char* const
2015-04-02 02:36:54 +00:00
Kp
9f04c0c3d8
Make OGL_ENABLE safe for single statement blocks
2015-04-02 02:36:54 +00:00
Kp
6a4c7ed78e
Inline away D1 secret_restore values
2015-04-02 02:36:53 +00:00