diff --git a/code/missionui/missiondebrief.cpp b/code/missionui/missiondebrief.cpp index 06011ef60c..4d19cab186 100644 --- a/code/missionui/missiondebrief.cpp +++ b/code/missionui/missiondebrief.cpp @@ -9,13 +9,16 @@ /* * $Logfile: /Freespace2/code/MissionUI/MissionDebrief.cpp $ - * $Revision: 2.56 $ - * $Date: 2006-09-11 06:51:17 $ + * $Revision: 2.57 $ + * $Date: 2006-09-20 05:05:28 $ * $Author: taylor $ * * C module for running the debriefing * * $Log: not supported by cvs2svn $ + * Revision 2.56 2006/09/11 06:51:17 taylor + * fixes for stuff_string() bounds checking + * * Revision 2.55 2006/09/08 06:17:07 taylor * add support for a server name in fs2open_pxo.cfg, rather than just an IP address for the server * @@ -2564,14 +2567,15 @@ void debrief_init() cf_chksum_long(Netgame.mission_name, &CurrentMissionChsum); int mValidStatus = 0; - if (Om_tracker_flag) + + if (Om_tracker_flag && FS2OpenPXO_Socket.isInitialized()) mValidStatus = CheckSingleMission(Netgame.mission_name, CurrentMissionChsum, FS2OpenPXO_Socket, PXO_Server, PXO_port); // // Netgame.mission_name - if (Om_tracker_flag && multi_num_players() > 1 && !game_hacked_data() && mValidStatus) + if (Om_tracker_flag && FS2OpenPXO_Socket.isInitialized() && (multi_num_players() > 1) && !game_hacked_data() && mValidStatus) { // --------------------- STICK STATS STORAGE CODE IN HERE --------------------- int spd_ret = SendPlayerData(PXO_SID, Players[Player_num].callsign, Multi_tracker_login, &Players[Player_num], PXO_Server, FS2OpenPXO_Socket, PXO_port); diff --git a/code/network/multi_dogfight.cpp b/code/network/multi_dogfight.cpp index 0d76a18729..55867bce4e 100644 --- a/code/network/multi_dogfight.cpp +++ b/code/network/multi_dogfight.cpp @@ -9,11 +9,14 @@ /* * $Logfile: /Freespace2/code/Network/multi_dogfight.cpp $ - * $Revision: 2.14 $ - * $Date: 2006-01-16 11:02:23 $ - * $Author: wmcoolmon $ + * $Revision: 2.15 $ + * $Date: 2006-09-20 05:05:28 $ + * $Author: taylor $ * * $Log: not supported by cvs2svn $ + * Revision 2.14 2006/01/16 11:02:23 wmcoolmon + * Various warning fixes, scripting globals fix; added "plr" and "slf" global variables for in-game hooks; various lua functions; GCC fixes for scripting. + * * Revision 2.13 2006/01/13 03:31:09 Goober5000 * übercommit of custom IFF stuff :) * @@ -350,14 +353,15 @@ void multi_df_debrief_init() cf_chksum_long(Netgame.mission_name, &CurrentMissionChsum); int mValidStatus = 0; - if (Om_tracker_flag) + + if (Om_tracker_flag && FS2OpenPXO_Socket.isInitialized()) mValidStatus = CheckSingleMission(Netgame.mission_name, CurrentMissionChsum, FS2OpenPXO_Socket, PXO_Server, PXO_port); // // Netgame.mission_name - if (Om_tracker_flag && multi_num_players() > 1 && !game_hacked_data() && mValidStatus) + if (Om_tracker_flag && FS2OpenPXO_Socket.isInitialized() && (multi_num_players() > 1) && !game_hacked_data() && mValidStatus) { // --------------------- STICK STATS STORAGE CODE IN HERE --------------------- int spd_ret = SendPlayerData(PXO_SID, Players[Player_num].callsign, Multi_tracker_login, &Players[Player_num], PXO_Server, FS2OpenPXO_Socket, PXO_port); diff --git a/code/network/multiutil.cpp b/code/network/multiutil.cpp index e581abd937..b03aba50ae 100644 --- a/code/network/multiutil.cpp +++ b/code/network/multiutil.cpp @@ -9,13 +9,16 @@ /* * $Logfile: /Freespace2/code/Network/MultiUtil.cpp $ - * $Revision: 2.46 $ - * $Date: 2006-08-20 00:51:06 $ + * $Revision: 2.47 $ + * $Date: 2006-09-20 05:05:28 $ * $Author: taylor $ * * C file that contains misc. functions to support multiplayer * * $Log: not supported by cvs2svn $ + * Revision 2.46 2006/08/20 00:51:06 taylor + * maybe optimize the (PI/2), (PI*2) and (RAND_MAX/2) stuff a little bit + * * Revision 2.45 2006/02/06 02:06:02 wmcoolmon * Various fixes; very beginnings of Directives scripting support * @@ -3437,7 +3440,7 @@ void multi_update_validate_missions_DrawString(char *str) void multi_update_ban_list() { // if we're not on FS2NetD (PXO) then don't bother with this function - if (!Om_tracker_flag) + if (!Om_tracker_flag || !FS2OpenPXO_Socket.isInitialized()) return; // destroy the file prior to updating @@ -3487,7 +3490,7 @@ void multi_update_ban_list() bool fs2netd_player_banned(net_addr *addr) { - if (!Om_tracker_flag) + if (!Om_tracker_flag || !FS2OpenPXO_Socket.isInitialized()) return false; // no tracker, no bannination char line[32]; // no line should be larger than 16, but let's be safe @@ -3520,7 +3523,7 @@ void multi_update_valid_missions() { // if we're not on FS2NetD (PXO) then don't bother with this function - if (!Om_tracker_flag) + if (!Om_tracker_flag || !FS2OpenPXO_Socket.isInitialized()) return; // destroy the file prior to updating @@ -3702,7 +3705,7 @@ void Kaz_NoBackGround_DrawString(char *str) void multi_update_valid_tables() { // if we're not on FS2NetD (PXO) then don't bother with this function - if (!Om_tracker_flag) + if (!Om_tracker_flag || !FS2OpenPXO_Socket.isInitialized()) return; static char Server[32];