zico
0215759746
Merge branch 'unification/master' of github.com:dxx-rebirth/dxx-rebirth into unification/master
2016-02-15 13:05:38 +01:00
zico
4ef50976ed
Revised a055aecee5
. Removed secondaries cap for Multiplayer but restared for Singleplayer (for gameplay/balance). Limit could be restored for Multiplayer if levels were otherwise properly repopulated (planned)
2016-02-15 13:05:17 +01:00
Kp
90de22b2a5
Fix invalid access reading demos
...
Fixes: 74dfa29d31
("Convert most Trigger references to valptridx")
2016-02-14 18:40:57 +00:00
Kp
e36abb25cb
Fix invalid access reading demos
...
Casting the address of a short to `sbyte*` invites trouble. In this
case, it allows uninitialized garbage to be used as the high bits of the
wall index.
Fixes: 553b313099
("Use vwallptr")
2016-02-14 18:40:57 +00:00
zico
081e5d5e3c
Removed rounding offset of x starting coordinate in ogl_ulinec which should hopefully unwanted horizontal offsets in Status Bar energy and afterburner gauges (without causing more problems) if Multisampling is applied
2016-02-14 13:59:02 +01:00
zico
a055aecee5
Apply count cap in maybe_drop_secondary_weapon_egg to bombs only
2016-02-14 12:49:45 +01:00
zico
ed25a5c38d
Eliminate frame dependent damage with blast weapons - as seen in DXX-Retro 532f271af26d6341563d3763d5bb2dce33de7582
2016-02-14 12:15:30 +01:00
Kp
6091b65707
Move score to screen edge for CM_FULL_SCREEN
...
The score is moved in from the edge to avoid overlapping the cockpit
graphic, but the move was applied even when no cockpit was shown.
Change it to align the score when running without the cockpit graphic.
Reported-by: roncli <https://github.com/dxx-rebirth/dxx-rebirth/issues/175 >
2016-02-12 04:02:28 +00:00
Kp
6edab5ca0a
Pass cv_font to get_centered_x
2016-02-12 04:02:28 +00:00
Kp
a92ab4079f
Cache font extent while drawing
2016-02-12 04:02:28 +00:00
Kp
85129248c9
Combine gr_internal_string0_template VideoOffset updates
2016-02-12 04:02:28 +00:00
Kp
938032e51d
Unify gauges draw paths
2016-02-12 04:02:28 +00:00
Kp
cc18ad2b68
Fix some -Wshadow warnings
2016-02-12 04:02:28 +00:00
Kp
08de1bbff0
Remove cv_color
...
It is only ever set to 0 or copied from other canvases. Set it to zero
everywhere.
2016-02-12 04:02:28 +00:00
Kp
f4e1ebb576
Remove unnecessary gr_setcolor calls
2016-02-12 04:02:28 +00:00
Kp
5f073b6546
Avoid reloading cv_color in reticle drawer
2016-02-12 04:02:28 +00:00
Kp
972654c140
Pass color to draw_listed_segments
2016-02-12 04:02:28 +00:00
Kp
9d2659ab26
Pass color to draw_wall_side
2016-02-12 04:02:28 +00:00
Kp
12bd8bce35
Pass color to draw_trigger_side
2016-02-12 04:02:28 +00:00
Kp
cc8bed5b95
Pass color to draw_side_edge
2016-02-12 04:02:28 +00:00
Kp
7694fff456
Pass color to draw_seg_side
2016-02-12 04:02:28 +00:00
Kp
fd834f0924
Pass color to draw_segment
2016-02-12 04:02:28 +00:00
Kp
8066361076
Pass color to draw_player
2016-02-12 04:02:28 +00:00
Kp
68cf7939a2
Pass color to draw_line
2016-02-12 04:02:28 +00:00
Kp
e09a590e6f
Pass color to Vline
2016-02-12 04:02:28 +00:00
Kp
76d0e01b6e
Pass color to Hline
2016-02-12 04:02:28 +00:00
Kp
d08bfc3170
Pass color to g3_draw_sphere
2016-02-12 04:02:28 +00:00
Kp
1b4b6673ee
Pass color to g3_draw_poly
2016-02-12 04:02:28 +00:00
Kp
a98d553f3e
Pass color to must_clip_flat_face
2016-02-12 04:02:28 +00:00
Kp
8c24eaa721
Pass color to g3_draw_line
2016-02-12 04:02:28 +00:00
Kp
6b9a03cf2d
Pass color to gr_upoly_tmap
2016-02-12 04:02:28 +00:00
Kp
61821d0b42
Pass color to gr_upoly_tmap_ylr
2016-02-12 04:02:28 +00:00
Kp
36bd39babe
Pass color to gr_line
2016-02-12 04:02:28 +00:00
Kp
3c73d44771
Pass color to gr_disk
2016-02-12 04:02:28 +00:00
Kp
ecb71ba22e
Pass color to gr_ucircle
2016-02-12 04:02:28 +00:00
Kp
edd2acc86b
Pass color to gr_box
2016-02-12 04:02:28 +00:00
Kp
8135577315
Pass color to gr_ubox12
2016-02-12 04:02:28 +00:00
Kp
de08a67321
Pass color to gr_ubox
2016-02-12 04:02:28 +00:00
Kp
23047b1165
Pass color to gr_rect
2016-02-12 04:02:28 +00:00
Kp
35a4736df0
Pass color to gr_urect
2016-02-12 04:02:28 +00:00
Kp
f235d6b12b
Pass color to gr_pixel
2016-02-12 04:02:28 +00:00
Kp
053901b62b
Pass color to gr_uline
2016-02-12 04:02:28 +00:00
Kp
5aeb7559fb
Pass color to 2d/line.cpp workers
2016-02-12 04:02:28 +00:00
Kp
659f0fb3ab
Pass color to gr_upixel
2016-02-12 04:02:28 +00:00
Kp
0dcfa6fba5
Pass color to ogl_urect
2016-02-12 04:02:28 +00:00
Kp
fabe774291
Pass color to gr_scanline
2016-02-12 04:02:28 +00:00
Kp
228bbe999a
Unify draw_automap key color lookup
2016-02-12 04:02:28 +00:00
Kp
d2d9d2bf5a
Unify op_flatpoly color setup
2016-02-12 04:02:28 +00:00
Kp
8e186e93e2
Unify g3_draw_sphere must_clip_line paths
2016-02-12 04:02:28 +00:00
Kp
1c04cb70d9
Change ogl_ubitmapm_cs constant -1 to const white
2016-02-12 04:02:28 +00:00