Bradley Bell
5d6e6dc2e4
check for GM_MULTI before trying to do network jobs
2014-12-06 22:14:22 -08:00
Bradley Bell
ebb77544aa
reenable Int3 debugging
2014-12-06 22:14:19 -08:00
Kp
6798c8410b
Refactor callsign_t constants
2014-12-07 00:53:15 +00:00
Kp
0c8191db94
Fix player clear range
2014-12-07 00:49:18 +00:00
Kp
a0727f4f84
Throw on net_udp_read_sync_packet failure
...
Callers expect sane Player_num, but on failure, it is invalid.
Returning a failure status causes net_udp_level_sync to fault using
Players[Player_num].connected, so throw an exception instead.
2014-12-07 00:00:22 +00:00
Kp
2b627f0158
Pass net_udp buffers as const
2014-12-06 23:59:34 +00:00
Kp
9d700aab08
Make kill_matrix uint16_t, not short
2014-12-06 23:30:55 +00:00
Kp
1b924c5dd3
Truncate pilot name at null
2014-12-06 23:13:38 +00:00
Kp
73b0a016a8
Fix loading robots-?.mvl
...
Rework movie loading to fix loading built-in robot movies. The previous
code always ignored loading the last entry in the movie array, which was
blank until 18f6919b33
. The last entry
was unused after d38a3d1362
, so it was
removed, which caused the code to skip the robots entry.
Commit d38a3d1362
broke unloading add-on
movies by removing the strcpy which saved their name. Add code to save
the name to extra_robot_movie_mission and call it when switching
missions.
Reported by btb: https://github.com/dxx-rebirth/dxx-rebirth/pull/17
2014-12-06 17:56:56 +00:00
Kp
cfe0f89dae
Use array<> for team_kills
2014-12-06 04:52:53 +00:00
Kp
a55028d5b4
Fix crash on UDP initialization
2014-12-06 02:16:28 +00:00
Kp
7338bb2402
Extend in-game esc menu with options and saving
2014-12-06 01:38:30 +00:00
Kp
e216b709d4
Use pkg-config on Darwin if available
2014-12-05 04:11:37 +00:00
Kp
bb8445f70c
Fix some -Wsign-compare warnings
2014-12-05 04:11:37 +00:00
Kp
0dfbe46318
Rewrite scale_line to use std::fill
...
Eliminate inline byte-by-byte store.
2014-12-05 04:11:37 +00:00
Kp
241b3140fd
Use range_for in light rendering
2014-12-05 04:11:37 +00:00
Kp
99f826d14d
Pack listbox better
2014-12-05 04:11:37 +00:00
Kp
97718e9b9c
Refactor gr_ubitmap012
2014-12-05 04:11:37 +00:00
Kp
58c9c98124
Rewrite gr_linear_rep_movsdm with std::transform
...
Eliminate deprecated register.
2014-12-05 04:11:37 +00:00
Kp
84932930c8
Fix escaping empty flags
2014-12-05 04:11:37 +00:00
Kp
813d88bb55
Combine pkg-config caches
2014-12-05 04:11:37 +00:00
Matt Vandermeulen
b94274e5a5
Merge pull request #16 from btb/osx-issues
...
Osx issues
2014-12-04 21:46:19 -05:00
Bradley Bell
fdf70b017e
<string> required for std::string
2014-12-04 18:11:57 -08:00
Bradley Bell
0cc88280ba
Simplify by using generic Info.plist, builtin substitions
2014-12-04 18:11:57 -08:00
Bradley Bell
876c4522b3
use correct path for localized strings
2014-12-04 16:39:45 -08:00
Bradley Bell
6cf4e86185
use correct path for bundle executable
2014-12-04 15:58:50 -08:00
Kp
a977d5d202
Search for SDL_mixer pkg-config too
...
Users might install SDL and SDL_mixer to separate paths, so search for
SDL_mixer.pc too.
2014-12-04 03:31:07 +00:00
Kp
db1043a700
Merge commit 'osx-fixes' into unification/master
...
SDL on OS X does not include pkg-config files, so assume the user put it
in the OS X specific "framework" directory.
Reported by btb: https://github.com/dxx-rebirth/dxx-rebirth/issues/14
Requested by btb: https://github.com/dxx-rebirth/dxx-rebirth/issues/15
2014-12-04 03:27:17 +00:00
Bradley Bell
3daa0f63b1
Add search SDL_mixer framework paths for headers instead of using <Framework/Header.h> notation
2014-12-03 15:14:18 -08:00
Bradley Bell
782e12fd49
For Darwin, code expects SDL_mixer to be in the framework path.
...
Use that here too.
2014-12-02 14:29:41 -08:00
Kp
8b3d9b9d31
Bypass NULL check copying valptr_t
2014-12-02 04:36:19 +00:00
Kp
6dc36deb74
Pass get_font_total_width arg by &
2014-12-02 03:35:01 +00:00
Kp
3097a5b247
Pass gr_bitblt_find_transparent_area arg by &
2014-12-02 03:35:01 +00:00
Kp
c990701d87
Pass show_fullscr arg by &
2014-12-02 03:35:01 +00:00
Kp
c89e3b7452
Pass gr_bitmapm arg as &
2014-12-02 03:35:01 +00:00
Kp
355df375a0
Pass gr_bitmap arg as &
2014-12-02 03:35:01 +00:00
Kp
5955bac683
Pass gr_bitmap_scale_to arg by &
2014-12-02 03:35:01 +00:00
Kp
6334327ccc
Remove unused gr_bm_bitblt
2014-12-02 03:35:01 +00:00
Kp
0375876a08
Pass gr_bm_ubitbltm arg by &
2014-12-02 03:35:01 +00:00
Kp
25948a4b96
Pass gr_bm_ubitblt00m arg by &
2014-12-02 03:35:01 +00:00
Kp
95539512d5
Pass pcx_read_bitmap arg by &
2014-12-02 03:35:01 +00:00
Kp
31d6b151da
Pass gr_bm_ubitblt arg by &
2014-12-02 03:35:01 +00:00
Kp
50e24ee0ef
Pass gr_bm_ubitblt00 arg by &
2014-12-02 03:35:01 +00:00
Kp
15f9d5d3f5
Pass ogl_ubitblt arg by &
2014-12-02 03:35:01 +00:00
Kp
e7aae37c8d
Pass ogl_ubitblt_i arg by &
2014-12-02 03:35:01 +00:00
Kp
130d7a6e52
Pass ogl_loadtexture arg by &
2014-12-02 03:35:01 +00:00
Kp
5e03871f81
Pass tex_set_size arg by &
2014-12-02 03:35:01 +00:00
Kp
818b2c61ed
Pass tex_set_size1 arg as &
2014-12-02 03:35:01 +00:00
Kp
7031c809fc
Pass gr_ubitmapm arg by &
2014-12-02 03:35:01 +00:00
Kp
5eddc2c197
Make bitmap bm_data const where easy
2014-12-02 03:24:38 +00:00