Commit graph

4394 commits

Author SHA1 Message Date
Kp 79a4a19711 Pass player to init_player_stats_level 2017-04-30 16:25:16 +00:00
Kp bd82516983 Pass player position to teleport_boss 2017-04-30 16:25:15 +00:00
Kp 57bf5d6e41 Validate segment walls on load 2017-04-22 21:23:56 +00:00
Kp 9478d1e6a5 Add custom terminate handler on Windows 2017-04-22 21:23:56 +00:00
Kp b98053a34f Fix Windows net_udp.cpp build
The Windows implementation of inet_ntop incorrectly omits the `const`
qualifier on the input address.  This broke the Windows build, since
Rebirth passes a const-qualified input address, as permitted by POSIX.

Some Windows cross-compilers, such as mingw32, lack a definition of
inet_ntop entirely.  For such environments, fall back to inet_ntoa and
disallow building with IPv6.

Rework the formatting and add a Windows-specific test for whether
inet_ntop is available.  As inet_ntop is specified by POSIX, assume all
modern non-Windows platforms support it.
2017-04-22 21:23:56 +00:00
Kp 466536b101 Remove abandoned powerup_cap_state
Commit b32298df5a ("Rewrite powerup cap
code to centralize logic") centralized powerup cap code in the
powerup_cap_state class.

Commit 901a554e96 ("New powerup management
code: Addeed functions and packet type to ...") removed all use of
powerup_cap_state, but left the dead implementation present.

Commit 479f5ed584 ("Fix 'format specifies
type 'unsigned short' but the argument has type 'unsigned char''
warning") switched the already dead (but still compiled) code from %hu
to %hhu to fix a warning on OS X.  Although the commit was written by
Chris, it was my suggestion to use %hhu.  I neglected to test Windows
before suggesting it, so the change went in even though Windows does not
accept %hhu; this broke the Windows build.  Fortunately, the code had
been dead for 11 months when the change was made, so the fix for Windows
is to remove the long dead code.
2017-04-22 21:23:55 +00:00
Kp 9cfbf44834 Pass object &to toggle_headlight_active 2017-04-22 21:23:55 +00:00
Kp b5915abdcc Change station/robotmaker consistency check to LevelError 2017-04-15 17:46:44 +00:00
Kp 170d0ac777 Pass canvas &to nm_draw_background 2017-04-08 16:48:20 +00:00
Kp aaf7874235 Remove canvas juggling in nm_draw_background 2017-04-08 16:48:19 +00:00
Kp 94fe1117d7 Remove canvas juggling in save_screen_shot 2017-04-08 16:48:19 +00:00
Kp d827e73de9 Pass canvas &to draw_item 2017-04-08 16:48:19 +00:00
Kp 71fdb5b8f0 Cache canvas in polygon_models_viewer_handler 2017-04-08 16:48:18 +00:00
Kp 795eeecb3f Move marquee data to substructure 2017-03-26 21:53:47 +00:00
Kp d580328698 Combine direct_join allocations 2017-03-25 19:34:03 +00:00
Kp 7e19a790ae Use array<> for port strings 2017-03-25 19:34:02 +00:00
Kp b358946924 Show host address/port in timeout message 2017-03-25 19:34:02 +00:00
Kp d5ed019014 Add experimental MP-aware mouselook 2017-03-25 19:34:02 +00:00
Kp 17a09d83d2 Pass canvas to render_object_search 2017-03-18 18:07:39 +00:00
Kp ea7c44c680 Pass vcobjptridx_t to draw_polygon_object 2017-03-18 18:07:39 +00:00
Kp bafc96c76a Pass bounding bitmap to DefineBriefingBox 2017-03-18 18:07:38 +00:00
Kp 179b2e3fd4 Pass canvas to init_spinning_robot 2017-03-18 18:07:38 +00:00
Kp 866516f8f2 Shorten set_briefing_fontcolor 2017-03-18 18:07:38 +00:00
Kp 8fd6c13383 Fold briefing N/O handling 2017-03-18 18:07:38 +00:00
Kp d987f9e4ef Pass canvas to briefing_process_char 2017-03-18 18:07:38 +00:00
Kp f837cc9675 Clean up briefing get_message_name 2017-03-18 18:07:38 +00:00
Kp 99d45e8651 Pass font to put_char_delay 2017-03-18 18:07:38 +00:00
Kp ca8d62b108 Make briefing Current_color point to chosen element 2017-03-18 18:07:37 +00:00
Kp 6f086dbf90 Propagate briefing constants
Check array sizes, not the magic numbers which happen to match that
size.
2017-03-18 18:07:37 +00:00
Kp 8f0f7b7319 Simplify get_new_message_num 2017-03-18 18:07:37 +00:00
Kp 1335af4b51 Simplify get_message_num 2017-03-18 18:07:37 +00:00
Kp dd4bdcb770 Inline OGL_TEXTURE_LIST_SIZE 2017-03-18 18:07:37 +00:00
Kp 056115642b Move console.cpp specific constants out of header 2017-03-18 18:07:36 +00:00
Kp 0f57787601 Use enum for console priorities 2017-03-18 18:07:36 +00:00
Kp 297746024b Use enum for GR blending mode 2017-03-18 18:07:36 +00:00
Kp 829e95b6f8 Separate hoard/proximity tracking 2017-03-18 18:07:36 +00:00
Kp 104169dada Move multi_maybe_disable_friendly_fire to dcx 2017-03-18 18:07:36 +00:00
Kp 274f9047aa Fix -Wodr for _g3_draw_poly
x86_64-pc-linux-gnu-g++-6.3 issues a -Wodr diagnostic for the mismatch
between

common/include/3d.h:	void _g3_draw_poly(grs_canvas &, uint_fast32_t nv, cg3s_point *const *pointlist, uint8_t color);
similar/arch/ogl/ogl.cpp:	void _g3_draw_poly(grs_canvas &canvas, const uint_fast32_t nv, const g3s_point *const *const pointlist, const uint8_t palette_color_index)

The declaration and definition are compatible because `cg3s_point` is a
type alias for `const g3s_point`, so the code worked as it was.  Switch
the definition to use `cg3s_point` like the declaration to prevent this
warning and to protect against any future (unlikely) changes to the
definition of `cg3s_point`.
2017-03-18 18:07:35 +00:00
Kp 9878ba2311 Move intro_played to dsx 2017-03-18 18:07:35 +00:00
Kp 59c8da2ac7 Pass bitmap to rescale_y 2017-03-11 19:56:30 +00:00
Kp f9aa31ed64 Pass bitmap to rescale_x 2017-03-11 19:56:30 +00:00
Kp 6c0be636ea Combine draw_item case branches 2017-03-11 19:56:29 +00:00
Kp a245e47fcc Pass canvas to nm_string_inputbox 2017-03-11 19:56:29 +00:00
Kp b21fc54ba4 Pass canvas to nm_string_black 2017-03-11 19:56:29 +00:00
Kp a7344b7dd0 Pass canvas to nm_string_slider 2017-03-11 19:56:29 +00:00
Kp 51a69a5a65 Pass canvas to nm_draw_background1 2017-03-11 19:56:29 +00:00
Kp 089f185d3c Remove unused rule classes
zico removed all uses of these classes in 3366658a5b, but did not
remove their definitions.  No one has tried to repurpose them, so remove
the definitions.

Fixes: 3366658a5b ("Updated 'Netgame Rules & Info' screen, added option to toggle it ingame via SHIFT-PAUSE, added hint to netgame help menu")
2017-03-11 19:56:29 +00:00
Kp 869baefa07 Fold calls to kmatrix_status_msg 2017-03-11 19:56:29 +00:00
Kp 8dff2f0048 Pass canvas to kmatrix_status_msg 2017-03-11 19:56:28 +00:00
Kp 98b34b9328 Pass canvas to kmatrix_draw_coop_names 2017-03-11 19:56:28 +00:00