From: <z-...@us...> - 2012-04-16 07:34:04
|
Revision: 10403 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10403&view=rev Author: z-man Date: 2012-04-16 07:33:58 +0000 (Mon, 16 Apr 2012) Log Message: ----------- Merging branch 0.2.8 from revision 10389 to 10402: ------------------------------------------------------------------------ r10400 | bazaaarmagetron | 2012-04-16 09:10:09 +0200 (Mon, 16 Apr 2012) | 4 lines author: Manuel Moos Lowering CONNECTION_FLOOD_SENSITIVITY so by default, lost clients (changed IP address, post-server crash) don't trigger turtle mode. ------------------------------------------------------------------------ r10394 | z-man | 2012-03-31 18:45:25 +0200 (Sat, 31 Mar 2012) | 13 lines Merging branch 0.2.8.3 from revision 10004 to 10393: ------------------------------------------------------------------------ r10393 | z-man | 2012-03-31 17:59:04 +0200 (Sat, 31 Mar 2012) | 2 lines Backporting rare crashfix: Adding sound lock when alpha objects get resorted. (not merging, already here) ------------------------------------------------------------------------ r10262 | z-man | 2011-11-20 12:28:42 +0100 (Sun, 20 Nov 2011) | 1 line Backport fix: Switching to glColor4f because Intel drivers don't like it if you alternate between them and glColor3f in different glBegin()/glEnd() blocks. (not merging, already here) ------------------------------------------------------------------------ ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10389&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10400&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10394&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10004&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10393&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10262&view=rev Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg Property Changed: ---------------- armagetronad/branches/0.4/ Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10389 /armagetronad/branches/0.2.8.3:9309-10004 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10402 /armagetronad/branches/0.2.8.3:9309-10393 Modified: armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg =================================================================== --- armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg 2012-04-16 07:25:38 UTC (rev 10402) +++ armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg 2012-04-16 07:33:58 UTC (rev 10403) @@ -237,7 +237,7 @@ PING_FLOOD_TIME_50 20.0 # Minimum time for 50 ping packets to arrive. PING_FLOOD_TIME_100 100.0 # Minimum time for 100 ping packets to arrive. PING_FLOOD_GLOBAL .1 # The same times, multiplied by this value, count for all pings from all machines. Negative values disable global flood protection. -CONNECTION_FLOOD_SENSITIVITY .1 # The times PING_FLOOD_TIME_X, multiplied by this value, count for all incoming messages from clients not connected already. A flood here activates turtle mode. Negative values disable global flood protection. +CONNECTION_FLOOD_SENSITIVITY .01 # The times PING_FLOOD_TIME_X, multiplied by this value, count for all incoming messages from clients not connected already. A flood here activates turtle mode. Negative values disable global flood protection. CONNECTION_LIMIT 100 # Maximum number of packets from unknown peers to handle at one ANTI_SPOOF 0 # If set to 1, checks connecting clients for spoofed IPs are done. Only clients passing a connectivity test are allowed in. This is done in turtle mode automatically, but may be useful to have on at all times. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2012-04-22 17:53:48
|
Revision: 10406 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10406&view=rev Author: z-man Date: 2012-04-22 16:32:51 +0000 (Sun, 22 Apr 2012) Log Message: ----------- Merging branch 0.2.8 from revision 10402 to 10405: ------------------------------------------------------------------------ r10404 | bazaaarmagetron | 2012-04-21 12:17:52 +0200 (Sat, 21 Apr 2012) | 2 lines Manuel Moos: Adding DECLARE_ROUND_WINNER console command by fman23 ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10402&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10404&view=rev Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/AUTHORS armagetronad/branches/0.4/armagetronad/language/english_base.txt armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.h armagetronad/branches/0.4/armagetronad/src/tron/gGame.cpp Property Changed: ---------------- armagetronad/branches/0.4/ Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10402 /armagetronad/branches/0.2.8.3:9309-10393 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10405 /armagetronad/branches/0.2.8.3:9309-10393 Modified: armagetronad/branches/0.4/armagetronad/AUTHORS =================================================================== --- armagetronad/branches/0.4/armagetronad/AUTHORS 2012-04-22 09:21:36 UTC (rev 10405) +++ armagetronad/branches/0.4/armagetronad/AUTHORS 2012-04-22 16:32:51 UTC (rev 10406) @@ -37,6 +37,7 @@ Kurt Johnson (k_at_work, K ) Peter ? ( klaxnek, klax ) Philippe Villeneuve ( philippeqc ) +fman23 : Console commands Additional contributions from ============================= Modified: armagetronad/branches/0.4/armagetronad/language/english_base.txt =================================================================== --- armagetronad/branches/0.4/armagetronad/language/english_base.txt 2012-04-22 09:21:36 UTC (rev 10405) +++ armagetronad/branches/0.4/armagetronad/language/english_base.txt 2012-04-22 16:32:51 UTC (rev 10406) @@ -2805,6 +2805,8 @@ player_kill_collapse \1 was eradicated by its collapsing zone.\n player_win_hole \1 got \2 points for a sacrifice for the good of the team.\n player_lose_hole 0xffff00ZOMG! 0xff7f00HOLER!!1!!0xRESETT \1 lost \2 points for being a cheap ass lamer.\n +player_win_command \1 was awarded \2 points for winning the round.\n +declare_round_winner_help Declare the winner of the current round and end the round. Usage: DECLARE_ROUND_WINNER <player> player_base_respawn \1 was respawned by \2.\n player_base_enemy_respawn \1 was respawned by their enemy \2.\n Modified: armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp 2012-04-22 09:21:36 UTC (rev 10405) +++ armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp 2012-04-22 16:32:51 UTC (rev 10406) @@ -8613,7 +8613,7 @@ static tConfItemFunc se_banConf("BAN",&se_BanConf); static tAccessLevelSetter se_banConfLevel( se_banConf, tAccessLevel_Moderator ); -static ePlayerNetID * ReadPlayer( std::istream & s ) +ePlayerNetID * ePlayerNetID::ReadPlayer( std::istream & s ) { // read name of player to be returned tString name; @@ -8643,6 +8643,11 @@ return ePlayerNetID::FindPlayerByName( name ); } +static ePlayerNetID * ReadPlayer( std::istream & s ) +{ + return ePlayerNetID::ReadPlayer( s ); +} + static void Kill_conf(std::istream &s) { if ( se_NeedsServer( "KILL", s, false ) ) Modified: armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.h 2012-04-22 09:21:36 UTC (rev 10405) +++ armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.h 2012-04-22 16:32:51 UTC (rev 10406) @@ -443,6 +443,8 @@ void GreetHighscores(tString &s); // tell him his positions in the // highscore lists (defined in game.cpp) + static ePlayerNetID * ReadPlayer( std::istream & s ); //!< reads a player from the stream + static void Update(); // creates ePlayerNetIDs for new players // and destroys those of players that have left Modified: armagetronad/branches/0.4/armagetronad/src/tron/gGame.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gGame.cpp 2012-04-22 09:21:36 UTC (rev 10405) +++ armagetronad/branches/0.4/armagetronad/src/tron/gGame.cpp 2012-04-22 16:32:51 UTC (rev 10406) @@ -775,7 +775,19 @@ } } +static void sg_DeclareRoundWinner(std::istream &s) +{ + ePlayerNetID *winningPlayer = ePlayerNetID::ReadPlayer(s); + if(!winningPlayer) + { + return; + } + static const char* message="$player_win_command"; + sg_DeclareWinner( winningPlayer->CurrentTeam(), message ); +} +static tConfItemFunc sg_DeclareRoundWinner_conf("DECLARE_ROUND_WINNER",&sg_DeclareRoundWinner); + static tCONTROLLED_PTR(gGame) sg_currentGame; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2012-04-29 13:46:19
|
Revision: 10409 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10409&view=rev Author: z-man Date: 2012-04-29 13:46:13 +0000 (Sun, 29 Apr 2012) Log Message: ----------- Merging branch 0.2.8 from revision 10405 to 10408: ------------------------------------------------------------------------ r10408 | bazaaarmagetron | 2012-04-29 15:37:37 +0200 (Sun, 29 Apr 2012) | 2 lines Manuel Moos: Typo fix. ------------------------------------------------------------------------ r10407 | bazaaarmagetron | 2012-04-26 00:01:09 +0200 (Thu, 26 Apr 2012) | 2 lines Manuel Moos: Removing -1 access level language string so nobody gets stupid ideas (any more than they already do) ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10405&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10408&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10407&view=rev Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/language/english_base.txt Property Changed: ---------------- armagetronad/branches/0.4/ Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10405 /armagetronad/branches/0.2.8.3:9309-10393 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10408 /armagetronad/branches/0.2.8.3:9309-10393 Modified: armagetronad/branches/0.4/armagetronad/language/english_base.txt =================================================================== --- armagetronad/branches/0.4/armagetronad/language/english_base.txt 2012-04-29 13:37:37 UTC (rev 10408) +++ armagetronad/branches/0.4/armagetronad/language/english_base.txt 2012-04-29 13:46:13 UTC (rev 10409) @@ -1889,7 +1889,7 @@ network_opts_axesindicator_help The axes indicator is meant to show the directions the cycle can turn to as lines going out from the cycle. Good on servers with changing configs so you know what to expect before you turn. network_opts_predict_text Prediction: -network_opts_predict_help In a network game, this extrapolates the cycles' movement. Leaving it disabled makes the graphics smoother, enabling it gives yo a better image of the actual situation. I leave it disabled; the Lag-O-Meter is a good substitute for prediction. This is always disabled in server mode. +network_opts_predict_help In a network game, this extrapolates the cycles' movement. Leaving it disabled makes the graphics smoother, enabling it gives you a better image of the actual situation. I leave it disabled; the Lag-O-Meter is a good substitute for prediction. This is always disabled in server mode. network_opts_inrate_text Input Rate: network_opts_inrate_help The maximum number of kilobytes your network can receive per second. 3 for 28.8k modems, 7 for 56k modems, 8 for ISDN, more for cable modems, (A)DSL and LAN. @@ -3363,7 +3363,6 @@ nconfig_error_ignoreold Ignoring old conf message for setting \1.\n nconfig_value_changed \1 changed from \2 to \3 on server order.\n -config_accesslevel_-1 Shell config_accesslevel_0 Owner config_accesslevel_1 Administrator config_accesslevel_2 Moderator This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2012-05-05 06:53:45
|
Revision: 10417 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10417&view=rev Author: z-man Date: 2012-05-05 06:53:38 +0000 (Sat, 05 May 2012) Log Message: ----------- Merging branch 0.2.8 from revision 10408 to 10416: ------------------------------------------------------------------------ r10415 | bazaaarmagetron | 2012-05-01 17:13:18 +0200 (Tue, 01 May 2012) | 1 line Daniel Lee Harple: Revert unintended change to CONNECTION_FLOOD_SENSITIVITY from rebase. ------------------------------------------------------------------------ r10414 | bazaaarmagetron | 2012-05-01 17:05:41 +0200 (Tue, 01 May 2012) | 1 line Daniel Lee Harple: Fix pedantic warning. ------------------------------------------------------------------------ r10413 | bazaaarmagetron | 2012-05-01 17:05:08 +0200 (Tue, 01 May 2012) | 1 line Daniel Lee Harple: Added SCRIPT_ENV command ------------------------------------------------------------------------ r10412 | bazaaarmagetron | 2012-05-01 17:04:13 +0200 (Tue, 01 May 2012) | 1 line Daniel Lee Harple: Updated ignores ------------------------------------------------------------------------ r10411 | bazaaarmagetron | 2012-04-30 23:18:25 +0200 (Mon, 30 Apr 2012) | 1 line Daniel Lee Harple: Added LIST_SCRIPTS command ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10408&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10415&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10414&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10413&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10412&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10411&view=rev Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/.bzrignore armagetronad/branches/0.4/armagetronad/NEWS armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg armagetronad/branches/0.4/armagetronad/language/english_base.txt armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp Property Changed: ---------------- armagetronad/branches/0.4/ Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10408 /armagetronad/branches/0.2.8.3:9309-10393 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10416 /armagetronad/branches/0.2.8.3:9309-10393 Modified: armagetronad/branches/0.4/armagetronad/.bzrignore =================================================================== --- armagetronad/branches/0.4/armagetronad/.bzrignore 2012-05-03 13:38:47 UTC (rev 10416) +++ armagetronad/branches/0.4/armagetronad/.bzrignore 2012-05-05 06:53:38 UTC (rev 10417) @@ -86,3 +86,6 @@ ./rubbish __pycache__ ./src/armagetronad_serverquery +src/armagetronad_main_master +src/doc/COPYING.txt +rubbish Modified: armagetronad/branches/0.4/armagetronad/NEWS =================================================================== --- armagetronad/branches/0.4/armagetronad/NEWS 2012-05-03 13:38:47 UTC (rev 10416) +++ armagetronad/branches/0.4/armagetronad/NEWS 2012-05-05 06:53:38 UTC (rev 10417) @@ -165,7 +165,7 @@ TEAM_PLAYER_REMOVED <team name> <player> - Manage external scripts on Unix dedicated servers. New commands: SPAWN_SCRIPT, RESPAWN_SCRIPT, FORCE_RESPAWN_SCRIPT, KILL_SCRIPT, - CHECK_SCRIPT. + CHECK_SCRIPT, LIST_SCRIPTS, SCRIPT_ENV. - Authentication is now enabled by default. Changes since 0.2.8.3.1: Modified: armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg =================================================================== --- armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg 2012-05-03 13:38:47 UTC (rev 10416) +++ armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg 2012-05-05 06:53:38 UTC (rev 10417) @@ -413,6 +413,8 @@ # RESPAWN_SCRIPT Spawns an external script from a scripts/ subdirectory on the data path if no already running instance is found. # FORCE_RESPAWN_SCRIPT Spawns an external script from a scripts/ subdirectory on the data path after killing the other possibly running instance. # KILL_SCRIPT Kills a script. Argument must match the SPAWN_SCRIPT argument. +# LIST_SCRIPTS Lists active scripts. +# SCRIPT_ENV Set custom environment variables for scripts. Usage: SCRIPT_ENV <variable name> <value> # Should safety checks be done on script commands? Very much recommended to leave this on. CHECK_SCRIPT 1 Modified: armagetronad/branches/0.4/armagetronad/language/english_base.txt =================================================================== --- armagetronad/branches/0.4/armagetronad/language/english_base.txt 2012-05-03 13:38:47 UTC (rev 10416) +++ armagetronad/branches/0.4/armagetronad/language/english_base.txt 2012-05-05 06:53:38 UTC (rev 10417) @@ -355,6 +355,8 @@ force_respawn_script_help Spawns an external script from a scripts/ subdirectory on the data path after killing the other possibly running instance. kill_script_help Kills a script. Argument must match the SPAWN_SCRIPT argument. check_script_help Should safety checks be done on script commands? Very much recommended to leave this on. +list_scripts_help Lists active scripts. +script_env_help Set custom environment variables for scripts. Usage: SCRIPT_ENV <variable name> <value> chatter_remove_time_help Time in seconds after which a permanent chatter is removed from the game idle_remove_time_help Time in seconds after which an inactive player is removed from the game Modified: armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp 2012-05-03 13:38:47 UTC (rev 10416) +++ armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp 2012-05-05 06:53:38 UTC (rev 10417) @@ -32,6 +32,8 @@ #include "tRecorder.h" #include "tDirectories.h" +#include <map> + #include <stdio.h> #include <fcntl.h> #include <sstream> @@ -218,7 +220,7 @@ int stat; /*Kills all the zombie processes*/ - while(waitpid(-1, &stat, WNOHANG) > 0); + while(waitpid(-1, &stat, WNOHANG) > 0) {} } #endif @@ -487,6 +489,15 @@ { } + void AddAll( const std::map< tString, tString > & m ) + { + std::map< tString, tString >::const_iterator it = m.begin(); + for ( ; it != m.end(); ++it ) + { + Add( it->first, it->second ); + } + } + void Add( char const * var, tString const & value ) { strings_[strings_.Len()] = tString(var) + "=" + value; @@ -501,6 +512,20 @@ tArray< tString > strings_; }; +static std::map< tString, tString > sr_globalScriptEnv; + +static void sr_ScriptEnv( std::istream & s ) +{ + tString key, value; + s >> key; + s >> value; + sr_globalScriptEnv[key] = value; +} + +static tConfItemFunc sr_scriptEnvConf( "SCRIPT_ENV", sr_ScriptEnv ); +static tAccessLevelSetter sr_scriptEnvALS( sr_scriptEnvConf, tAccessLevel_Owner ); + + static void sr_SpawnScript( tString const & command ) { // yes, rincludes are the one bit where CASACL is forbidden. And Maps, which @@ -605,6 +630,9 @@ env.AddPath( "ARMAGETRONAD_PATH_VAR", tDirectories::Var() ); env.AddPath( "ARMAGETRONAD_PATH_SCREENSHOT", tDirectories::Screenshot() ); env.AddPath( "ARMAGETRONAD_PATH_RESOURCE", tDirectories::Resource() ); + + // add user-specified variables + env.AddAll( sr_globalScriptEnv ); // add all settings tConfItemBase::tConfItemMap const & confItemMap = tConfItemBase::GetConfItemMap(); @@ -700,6 +728,24 @@ static tConfItemFunc sr_killScript( "KILL_SCRIPT", sr_KillScriptCommand ); static tAccessLevelSetter sr_killScriptALS( sr_killScript, tAccessLevel_Owner ); -#endif -#endif +void sr_ListScriptsCommand( std::istream & s ) +{ + int numberScripts = 0; + for( int i = sr_inputStreams.Len()-1; i >= 0; --i ) + { + rScriptStream * script = dynamic_cast< rScriptStream * >( (rStream*)sr_inputStreams[i] ); + if( script ) + { + numberScripts++; + con << "Script: " << script->GetName() << '\n'; + } + } + if (!numberScripts) + con << "No scripts are currently running.\n"; +} +static tConfItemFunc sr_listScripts( "LIST_SCRIPTS", sr_ListScriptsCommand ); +static tAccessLevelSetter sr_listScriptALS( sr_listScripts, tAccessLevel_Owner ); + +#endif /* KRAWALL_SERVER */ +#endif /* HAVE_UNISTD_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2012-05-06 12:41:20
|
Revision: 10421 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10421&view=rev Author: z-man Date: 2012-05-06 12:41:13 +0000 (Sun, 06 May 2012) Log Message: ----------- Merging branch 0.2.8 from revision 10416 to 10420: ------------------------------------------------------------------------ r10420 | bazaaarmagetron | 2012-05-06 14:21:49 +0200 (Sun, 06 May 2012) | 2 lines Manuel Moos: Initialising desired audio spec with zeroes in places we do not care about. ------------------------------------------------------------------------ r10419 | bazaaarmagetron | 2012-05-06 14:21:13 +0200 (Sun, 06 May 2012) | 2 lines Manuel Moos: Added nTrueVersion -> rConsoleGraph dependency (not merged, not needed) ------------------------------------------------------------------------ r10418 | bazaaarmagetron | 2012-05-05 09:12:25 +0200 (Sat, 05 May 2012) | 1 line Daniel Lee Harple: Add ARMAGETRONAD_VERSION to env. (adapted to new tVersion structure on merge to avoid unnecessary tTrueVersion.h include) ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10416&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10420&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10419&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10418&view=rev Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/src/engine/eSound.cpp armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp Property Changed: ---------------- armagetronad/branches/0.4/ Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10416 /armagetronad/branches/0.2.8.3:9309-10393 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10420 /armagetronad/branches/0.2.8.3:9309-10393 Modified: armagetronad/branches/0.4/armagetronad/src/engine/eSound.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/eSound.cpp 2012-05-06 12:21:49 UTC (rev 10420) +++ armagetronad/branches/0.4/armagetronad/src/engine/eSound.cpp 2012-05-06 12:41:13 UTC (rev 10421) @@ -167,6 +167,7 @@ if (!sound_is_there && sound_quality!=SOUND_OFF) { SDL_AudioSpec desired; + memset( &desired, 0, sizeof( SDL_AudioSpec ) ); switch (sound_quality) { Modified: armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp 2012-05-06 12:21:49 UTC (rev 10420) +++ armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp 2012-05-06 12:41:13 UTC (rev 10421) @@ -31,6 +31,7 @@ #include "tConfiguration.h" #include "tRecorder.h" #include "tDirectories.h" +#include "tVersion.h" #include <map> @@ -631,6 +632,9 @@ env.AddPath( "ARMAGETRONAD_PATH_SCREENSHOT", tDirectories::Screenshot() ); env.AddPath( "ARMAGETRONAD_PATH_RESOURCE", tDirectories::Resource() ); + // add other data + env.Add( "ARMAGETRONAD_VERSION", st_programVersion ); + // add user-specified variables env.AddAll( sr_globalScriptEnv ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2012-08-11 11:43:13
|
Revision: 10438 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10438&view=rev Author: z-man Date: 2012-08-11 11:43:07 +0000 (Sat, 11 Aug 2012) Log Message: ----------- Merging branch 0.2.8 from revision 10420 to 10437: ------------------------------------------------------------------------ r10425 | bazaaarmagetron | 2012-06-30 04:06:22 +0200 (Sat, 30 Jun 2012) | 2 lines Daniel Lee Harple: Add ARMAGETRONAD_ENCODING environment variable for spawned scripts. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10420&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10425&view=rev Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp armagetronad/branches/0.4/armagetronad/src/tools/tLocale.cpp armagetronad/branches/0.4/armagetronad/src/tools/tLocale.h armagetronad/branches/0.4/armagetronad/src/tron/gArmagetron.cpp Property Changed: ---------------- armagetronad/branches/0.4/ Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10420 /armagetronad/branches/0.2.8.3:9309-10393 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10437 /armagetronad/branches/0.2.8.3:9309-10393 Modified: armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp 2012-08-05 22:17:09 UTC (rev 10437) +++ armagetronad/branches/0.4/armagetronad/src/render/rConsoleCout.cpp 2012-08-11 11:43:07 UTC (rev 10438) @@ -32,6 +32,7 @@ #include "tRecorder.h" #include "tDirectories.h" #include "tVersion.h" +#include "tLocale.h" #include <map> @@ -633,6 +634,7 @@ env.AddPath( "ARMAGETRONAD_PATH_RESOURCE", tDirectories::Resource() ); // add other data + env.Add( "ARMAGETRONAD_ENCODING", st_internalEncoding ); env.Add( "ARMAGETRONAD_VERSION", st_programVersion ); // add user-specified variables Modified: armagetronad/branches/0.4/armagetronad/src/tools/tLocale.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/tLocale.cpp 2012-08-05 22:17:09 UTC (rev 10437) +++ armagetronad/branches/0.4/armagetronad/src/tools/tLocale.cpp 2012-08-11 11:43:07 UTC (rev 10438) @@ -64,6 +64,8 @@ } } +const tString st_internalEncoding("utf-8"); + class tLocaleSubItem; // identifies a single string in a single language static tArray<tString> st_TemplateParameters; Modified: armagetronad/branches/0.4/armagetronad/src/tools/tLocale.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/tLocale.h 2012-08-05 22:17:09 UTC (rev 10437) +++ armagetronad/branches/0.4/armagetronad/src/tools/tLocale.h 2012-08-11 11:43:07 UTC (rev 10438) @@ -33,6 +33,8 @@ #include "tError.h" #include "tVersion.h" +extern const tString st_internalEncoding; + class tLocaleItem; class tOutputItemBase; Modified: armagetronad/branches/0.4/armagetronad/src/tron/gArmagetron.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gArmagetron.cpp 2012-08-05 22:17:09 UTC (rev 10437) +++ armagetronad/branches/0.4/armagetronad/src/tron/gArmagetron.cpp 2012-08-11 11:43:07 UTC (rev 10438) @@ -752,7 +752,7 @@ atexit(tLocale::Clear); static eLadderLogWriter sg_encodingWriter( "ENCODING", true ); - sg_encodingWriter << "utf-8"; + sg_encodingWriter << st_internalEncoding; sg_encodingWriter.write(); if ( commandLine.Execute() ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2012-10-07 10:05:44
|
Revision: 10461 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10461&view=rev Author: z-man Date: 2012-10-07 10:05:37 +0000 (Sun, 07 Oct 2012) Log Message: ----------- Merging branch 0.2.8 from revision 10437 to 10460: ------------------------------------------------------------------------ r10450 | bazaaarmagetron | 2012-09-16 23:55:05 +0200 (Sun, 16 Sep 2012) | 1 line Daniel Lee Harple: Fix and add a missing documentation string for ladderlog writers. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10437&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10450&view=rev Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/language/english_base.txt Property Changed: ---------------- armagetronad/branches/0.4/ Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10437 /armagetronad/branches/0.2.8.3:9309-10393 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10460 /armagetronad/branches/0.2.8.3:9309-10393 Modified: armagetronad/branches/0.4/armagetronad/language/english_base.txt =================================================================== --- armagetronad/branches/0.4/armagetronad/language/english_base.txt 2012-10-07 05:15:19 UTC (rev 10460) +++ armagetronad/branches/0.4/armagetronad/language/english_base.txt 2012-10-07 10:05:37 UTC (rev 10461) @@ -859,10 +859,11 @@ ladderlog_write_all_usage Usage: LADDER_LOG_WRITE_ALL 1|0 ladderlog_write_all_enabled Enabled full ladderlog output. ladderlog_write_all_disabled Disabled ladderlog output. -ladderlog_write_authority_blurb_help Write to ladderlog: AUTHORITY_BLURB <name> <value> +ladderlog_write_authority_blurb_help Write to ladderlog: AUTHORITY_BLURB <blurb> <player> <text> ladderlog_write_basezone_conquered_help Write to ladderlog: BASEZONE_CONQUERED <team> <cx> <cy> ladderlog_write_basezone_conquerer_help Write to ladderlog: BASEZONE_CONQUERER <player> ladderlog_write_chat_help Write to ladderlog: CHAT <chatter> [/me] <chat string> +ladderlog_write_command_help Write to ladderlog: COMMAND <command> <player> <text> ladderlog_write_death_frag_help Write to ladderlog: DEATH_FRAG <prey> <predator> ladderlog_write_death_suicide_help Write to ladderlog: DEATH_SUICIDE <player> ladderlog_write_death_teamkill_help Write to ladderlog: DEATH_TEAMKILL <prey> <predator> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2013-01-07 21:52:01
|
Revision: 10484 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10484&view=rev Author: z-man Date: 2013-01-07 21:51:54 +0000 (Mon, 07 Jan 2013) Log Message: ----------- Merging branch 0.2.8 from revision 10460 to 10483: ------------------------------------------------------------------------ r10483 | bazaaarmagetron | 2013-01-07 00:54:29 +0100 (Mon, 07 Jan 2013) | 4 lines author: Manuel Moos Fixing native compilation: libraries from /lib and /usr/lib can be mixed without triggering frankenbuild error. ------------------------------------------------------------------------ r10467 | bazaaarmagetron | 2012-10-12 17:48:43 +0200 (Fri, 12 Oct 2012) | 1 line Daniel Lee Harple: Write ROUND_SCORE_TEAM when team is destroyed. Fixes bug #537141. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10460&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10483&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10467&view=rev Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/src/engine/eTeam.cpp armagetronad/branches/0.4/armagetronad/src/engine/eTeam.h armagetronad/branches/0.4/build/portable/build Property Changed: ---------------- armagetronad/branches/0.4/ armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10460 /armagetronad/branches/0.2.8.3:9309-10393 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10483 /armagetronad/branches/0.2.8.3:9309-10393 Modified: armagetronad/branches/0.4/armagetronad/src/engine/eTeam.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/eTeam.cpp 2013-01-06 23:54:29 UTC (rev 10483) +++ armagetronad/branches/0.4/armagetronad/src/engine/eTeam.cpp 2013-01-07 21:51:54 UTC (rev 10484) @@ -363,6 +363,7 @@ } else if( !lastEmpty_ ) { + LogScoreDifference(); se_teamDestroyWriter << logName; se_teamDestroyWriter.write(); } @@ -633,12 +634,17 @@ void eTeam::LogScoreDifference( void ) { + LogScoreDifference( logName ); +} + +void eTeam::LogScoreDifference( const tString & teamName ) +{ if ( lastScore_ > IMPOSSIBLY_LOW_SCORE && IsHuman() ) { tString ret; int scoreDifference = score - lastScore_; lastScore_ = IMPOSSIBLY_LOW_SCORE; - se_roundScoreTeamWriter << scoreDifference << logName; + se_roundScoreTeamWriter << scoreDifference << teamName; se_roundScoreTeamWriter.write(); } } Modified: armagetronad/branches/0.4/armagetronad/src/engine/eTeam.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/eTeam.h 2013-01-06 23:54:29 UTC (rev 10483) +++ armagetronad/branches/0.4/armagetronad/src/engine/eTeam.h 2013-01-07 21:51:54 UTC (rev 10484) @@ -243,6 +243,7 @@ private: void RemovePlayerDirty( ePlayerNetID* player ); // just remove a player from the player list, no messages, no balancing + void LogScoreDifference( const tString & teamName ); }; #endif Property changes on: armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 + /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild:10461-10483 Modified: armagetronad/branches/0.4/build/portable/build =================================================================== --- armagetronad/branches/0.4/build/portable/build 2013-01-06 23:54:29 UTC (rev 10483) +++ armagetronad/branches/0.4/build/portable/build 2013-01-07 21:51:54 UTC (rev 10484) @@ -24,6 +24,9 @@ path=$(dirname ${baselib}) baselib=$(basename ${baselib}) echo "Found in ${path}." + if test "/lib" == "$path"; then + path=/usr/lib + fi if test -n "$lastpath" && test "$(dirname $lastpath)" != "$(dirname $path)"; then echo "error: different paths detected, frankenbuild!" exit 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2013-01-13 11:34:27
|
Revision: 10488 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10488&view=rev Author: z-man Date: 2013-01-13 11:34:20 +0000 (Sun, 13 Jan 2013) Log Message: ----------- Merging branch 0.2.8 from revision 10483 to 10487: ------------------------------------------------------------------------ r10487 | bazaaarmagetron | 2013-01-13 12:29:36 +0100 (Sun, 13 Jan 2013) | 2 lines Manuel Moos: Better error handling. ------------------------------------------------------------------------ r10486 | z-man | 2013-01-13 12:24:24 +0100 (Sun, 13 Jan 2013) | 2 lines Adapted to school builds with directly included moviepack. ------------------------------------------------------------------------ r10485 | bazaaarmagetron | 2013-01-10 08:17:48 +0100 (Thu, 10 Jan 2013) | 2 lines Manuel Moos: Make sure Windows build file is cleaned before we start a new build ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10483&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10487&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10486&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10485&view=rev Modified Paths: -------------- armagetronad/branches/0.4/build/WorkMakefile armagetronad/branches/0.4/build/scripts/handledist armagetronad/branches/0.4/build_visualc/armagetronad.nsi armagetronad/branches/0.4/build_visualc/armagetronad_dedicated.nsi Property Changed: ---------------- armagetronad/branches/0.4/ armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10483 /armagetronad/branches/0.2.8.3:9309-10393 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10487 /armagetronad/branches/0.2.8.3:9309-10393 Modified: armagetronad/branches/0.4/build/WorkMakefile =================================================================== --- armagetronad/branches/0.4/build/WorkMakefile 2013-01-13 11:29:36 UTC (rev 10487) +++ armagetronad/branches/0.4/build/WorkMakefile 2013-01-13 11:34:20 UTC (rev 10488) @@ -337,6 +337,7 @@ # * build windows # ***************************************** # + rm -rf $(WINSOURCEDIR).build cp -ax $(WINSOURCEDIR) $(WINSOURCEDIR).build rm -f ${RCDIR}/winlibs; ln -s $$(pwd)/${AA_WINLIBS} ${RCDIR}/winlibs cd $(WINSOURCEDIR).build/win32; if test -z "$$DISPLAY"; then DISPLAY=:0.0 xterm -e "bash ./fromunix.sh"; else bash ./fromunix.sh; fi Property changes on: armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild:10461-10483 + /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild:10461-10487 Modified: armagetronad/branches/0.4/build/scripts/handledist =================================================================== --- armagetronad/branches/0.4/build/scripts/handledist 2013-01-13 11:29:36 UTC (rev 10487) +++ armagetronad/branches/0.4/build/scripts/handledist 2013-01-13 11:34:20 UTC (rev 10488) @@ -14,7 +14,7 @@ wine C:/Program\ Files/NSIS/makensis.exe $f || exit 1 fi done -mv *.win32.exe ../ +mv *.win32.exe ../ || exit 1 rm -f *.nsi # zip up Modified: armagetronad/branches/0.4/build_visualc/armagetronad.nsi =================================================================== --- armagetronad/branches/0.4/build_visualc/armagetronad.nsi 2013-01-13 11:29:36 UTC (rev 10487) +++ armagetronad/branches/0.4/build_visualc/armagetronad.nsi 2013-01-13 11:34:20 UTC (rev 10488) @@ -117,7 +117,8 @@ File "libpng13.dll" File "libxml2.dll" SetOutPath "$INSTDIR\models" - File ".\models\*.mod" + File /nonfatal ".\models\*.mod" + File /nonfatal ".\models\*.ase" SetOutPath "$INSTDIR\resource\included" File /r ".\resource\included\*.*" SetOutPath "$INSTDIR\sound" Modified: armagetronad/branches/0.4/build_visualc/armagetronad_dedicated.nsi =================================================================== --- armagetronad/branches/0.4/build_visualc/armagetronad_dedicated.nsi 2013-01-13 11:29:36 UTC (rev 10487) +++ armagetronad/branches/0.4/build_visualc/armagetronad_dedicated.nsi 2013-01-13 11:34:20 UTC (rev 10488) @@ -101,14 +101,11 @@ File "iconv.dll" File "libxml2.dll" SetOutPath "$INSTDIR\models" - File ".\models\*.mod" SetOutPath "$INSTDIR\resource\included" File /r ".\resource\included\*.*" SetOutPath "$INSTDIR\sound" File ".\sound\*.wav" SetOutPath "$INSTDIR\textures" - File ".\textures\*.png" - File ".\textures\*.jpg" #SetOutPath "$INSTDIR\var" #File ".\var\README.txt" SectionEnd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2013-01-26 11:20:46
|
Revision: 10491 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10491&view=rev Author: z-man Date: 2013-01-26 11:20:38 +0000 (Sat, 26 Jan 2013) Log Message: ----------- Merging branch 0.2.8 from revision 10487 to 10490: ------------------------------------------------------------------------ r10490 | bazaaarmagetron | 2013-01-24 22:55:57 +0100 (Thu, 24 Jan 2013) | 2 lines Manuel Moos: Merging in Jip's implementation of Jonathan's screenshot fix. ------------------------------------------------------------------------ r10489 | bazaaarmagetron | 2013-01-18 08:21:12 +0100 (Fri, 18 Jan 2013) | 2 lines Manuel Moos: Upping fov limit to 160, clamping only done when you actually zoom out. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10487&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10490&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10489&view=rev Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/src/engine/eCamera.cpp armagetronad/branches/0.4/armagetronad/src/render/rSysdep.cpp armagetronad/branches/0.4/armagetronad/src/tron/gMenus.cpp Property Changed: ---------------- armagetronad/branches/0.4/ armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10487 /armagetronad/branches/0.2.8.3:9309-10393 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10490 /armagetronad/branches/0.2.8.3:9309-10393 Modified: armagetronad/branches/0.4/armagetronad/src/engine/eCamera.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/eCamera.cpp 2013-01-24 21:55:57 UTC (rev 10490) +++ armagetronad/branches/0.4/armagetronad/src/engine/eCamera.cpp 2013-01-26 11:20:38 UTC (rev 10491) @@ -897,9 +897,9 @@ pos=pos+dir*mf*.25+dir.Turn(eCoord(0,ml*.25)); fov/=zi; - if (fov>120) fov=120; + if (fov>160 && zi < 1) fov=160; - if (fov<30) fov=30; + if (fov<30 && zi > 1) fov=30; switch(mode){ Modified: armagetronad/branches/0.4/armagetronad/src/render/rSysdep.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/render/rSysdep.cpp 2013-01-24 21:55:57 UTC (rev 10490) +++ armagetronad/branches/0.4/armagetronad/src/render/rSysdep.cpp 2013-01-26 11:20:38 UTC (rev 10491) @@ -226,7 +226,7 @@ for (i = 0; i < sr_screenHeight; i++) { row_ptrs[i] = (png_byte *)image->pixels + (sr_screenHeight - i - 1) - * SCREENSHOT_BYTES_PER_PIXEL * sr_screenWidth; + * image->pitch; } png_write_image(png_ptr, row_ptrs); @@ -259,10 +259,10 @@ // turn image around for (idx = 0; idx < sr_screenHeight; idx++) { - memcpy(reinterpret_cast<char *>(temp->pixels) + 3 * sr_screenWidth * idx, - reinterpret_cast<char *>(image->pixels)+ 3 - * sr_screenWidth*(sr_screenHeight - idx-1), - 3*sr_screenWidth); + memcpy(reinterpret_cast<char *>(temp->pixels) + temp->pitch * idx, + reinterpret_cast<char *>(image->pixels) + + image->pitch*(sr_screenHeight - idx-1), + 3*sr_screenWidth); // Optionally, use the pitch of either surface here } if (s_videoout) Modified: armagetronad/branches/0.4/armagetronad/src/tron/gMenus.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gMenus.cpp 2013-01-24 21:55:57 UTC (rev 10490) +++ armagetronad/branches/0.4/armagetronad/src/tron/gMenus.cpp 2013-01-26 11:20:38 UTC (rev 10491) @@ -1071,7 +1071,7 @@ (&camera_menu, "$player_camera_fov_text", "$player_camera_fov_help", - p->startFOV,30,120,5); + p->startFOV,30,160,5); uMenuItemSelection<eCamMode> cam_s (&camera_menu, Property changes on: armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild:10461-10487 + /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild:10461-10490 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2013-01-26 19:43:36
|
Revision: 10494 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10494&view=rev Author: z-man Date: 2013-01-26 19:43:29 +0000 (Sat, 26 Jan 2013) Log Message: ----------- Merging branch 0.2.8 from revision 10490 to 10493: ------------------------------------------------------------------------ r10493 | bazaaarmagetron | 2013-01-26 20:05:37 +0100 (Sat, 26 Jan 2013) | 4 lines author: Manuel Moos Removing frankenbuild detection, my current setup never produces them. Adapting libpng inclusion to the very peculiar way the thing is installed on Ubuntu. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10490&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10493&view=rev Modified Paths: -------------- armagetronad/branches/0.4/build/portable/build Property Changed: ---------------- armagetronad/branches/0.4/ armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10490 /armagetronad/branches/0.2.8.3:9309-10393 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10493 /armagetronad/branches/0.2.8.3:9309-10393 Property changes on: armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild:10461-10490 + /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild:10461-10493 Modified: armagetronad/branches/0.4/build/portable/build =================================================================== --- armagetronad/branches/0.4/build/portable/build 2013-01-26 19:05:37 UTC (rev 10493) +++ armagetronad/branches/0.4/build/portable/build 2013-01-26 19:43:29 UTC (rev 10494) @@ -17,6 +17,7 @@ APPDIR=${APPDIR} $(dirname $0)/fixlinks lastpath= +otherpath= function copylib() { @@ -24,13 +25,9 @@ path=$(dirname ${baselib}) baselib=$(basename ${baselib}) echo "Found in ${path}." - if test "/lib" == "$path"; then - path=/usr/lib + if test "$lastpath" != "$path"; then + otherpath=$lastpath fi - if test -n "$lastpath" && test "$(dirname $lastpath)" != "$(dirname $path)"; then - echo "error: different paths detected, frankenbuild!" - exit 1 - fi lastpath=$path while test -n "${baselib}"; do # copy libary @@ -78,7 +75,11 @@ libmikmod.so.2 \ ; do echo "Installing library ${library} anyway, we know it's needed." - copylib ${lastpath}/${library} + if test -r ${lastpath}/${library}; then + copylib ${lastpath}/${library} + else + copylib ${otherpath}/${library} + fi done fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2013-01-27 20:53:31
|
Revision: 10497 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10497&view=rev Author: z-man Date: 2013-01-27 20:53:25 +0000 (Sun, 27 Jan 2013) Log Message: ----------- Merging branch 0.2.8 from revision 10493 to 10496: ------------------------------------------------------------------------ r10496 | z-man | 2013-01-27 19:13:42 +0100 (Sun, 27 Jan 2013) | 8 lines Merging branch 0.2.8.3 from revision 10393 to 10495: ------------------------------------------------------------------------ r10495 | z-man | 2013-01-27 16:37:31 +0100 (Sun, 27 Jan 2013) | 2 lines Fixed custom and internal camera turns when axes have angles > 90 degrees between them. Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10493&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10496&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10393&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10495&view=rev Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/src/engine/eCamera.cpp Property Changed: ---------------- armagetronad/branches/0.4/ armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10493 /armagetronad/branches/0.2.8.3:9309-10393 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10496 /armagetronad/branches/0.2.8.3:9309-10495 Modified: armagetronad/branches/0.4/armagetronad/src/engine/eCamera.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/eCamera.cpp 2013-01-27 18:13:42 UTC (rev 10496) +++ armagetronad/branches/0.4/armagetronad/src/engine/eCamera.cpp 2013-01-27 20:53:25 UTC (rev 10497) @@ -2085,7 +2085,18 @@ if ( Center() && wrongDirection > 0 ) { // if so, turn to the side using the last driving direction - newdir = newdir + Center()->LastDirection()*(wrongDirection*ts*turnSpeed*customTurnSpeed180); + eCoord normedLastDir = Center()->LastDirection(); + REAL wrongWrongDirection = -eCoord::F(cycleDir, normedLastDir); + if( wrongWrongDirection > 0) + { + normedLastDir = normedLastDir + cycleDir * (wrongWrongDirection/cycleDir.NormSquared()); + REAL n = normedLastDir.NormSquared(); + if(n > 0) + { + normedLastDir *= 1/sqrt(n); + } + } + newdir = newdir + normedLastDir*(wrongDirection*ts*turnSpeed*customTurnSpeed180); } } else Property changes on: armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild:10461-10493 + /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild:10461-10496 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2013-01-28 06:53:02
|
Revision: 10499 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10499&view=rev Author: z-man Date: 2013-01-28 06:52:52 +0000 (Mon, 28 Jan 2013) Log Message: ----------- Merging branch 0.2.8 from revision 10496 to 10498: ------------------------------------------------------------------------ r10498 | bazaaarmagetron | 2013-01-27 23:56:39 +0100 (Sun, 27 Jan 2013) | 24 lines author: Bazaarmagetron Automatic merging of commits that would change history order: ------------------------------------------------------------ revno: 1413.1.1 committer: Bazaarmagetron <z-...@us...> branch nick: 0.2.8-armagetronad-sync timestamp: Sun 2013-01-27 23:30:34 +0100 message: Automatic merging of commits that would change history order: ------------------------------------------------------------ revno: 1412.1.1 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Sun 2013-01-27 23:09:20 +0100 message: Using singleton pattern to make memory manager report leaks reliably again without a ton of false positives. ------------------------------------------------------------ revno: 1412.1.1 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Sun 2013-01-27 23:09:20 +0100 message: Using singleton pattern to make memory manager report leaks reliably again without a ton of false positives. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10496&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10498&view=rev Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/src/tools/tMemManager.cpp Property Changed: ---------------- armagetronad/branches/0.4/ armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10496 /armagetronad/branches/0.2.8.3:9309-10495 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10498 /armagetronad/branches/0.2.8.3:9309-10495 Modified: armagetronad/branches/0.4/armagetronad/src/tools/tMemManager.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/tMemManager.cpp 2013-01-27 22:56:39 UTC (rev 10498) +++ armagetronad/branches/0.4/armagetronad/src/tools/tMemManager.cpp 2013-01-28 06:52:52 UTC (rev 10499) @@ -90,7 +90,7 @@ #include "tMutex.h" -static boost::recursive_mutex st_mutex; +typedef boost::recursive_mutex MUTEX; // create an object of this class while calling external functions // that are known to have (harmless!) leaks @@ -106,13 +106,34 @@ st_knownExternalLeak--; } +static bool inited=true; + +static MUTEX & st_CreateMutex() +{ + inited = false; + static MUTEX mutex; + inited = true; + +#ifdef WIN32 + InitializeCriticalSection(&mutex); +#endif + + return mutex; +} + +static MUTEX & st_Mutex() +{ + static MUTEX & mutex = st_CreateMutex(); + return mutex; +} + class tBottleNeck { private: boost::lock_guard< boost::recursive_mutex > lock_; public: tBottleNeck() - :lock_(st_mutex) + :lock_(st_Mutex()) { } }; @@ -257,8 +278,6 @@ int semaphore; }; -static bool inited=false; - #ifdef LEAKFINDER #include <fstream> #define MAXCHECKSUM 100001 @@ -687,11 +706,6 @@ tBottleNeck neck; -#ifdef WIN32 - if (!inited) - InitializeCriticalSection(&mutex); -#endif - inited = true; } @@ -739,11 +753,6 @@ } #endif -#ifdef WIN32 - if (!inited) - InitializeCriticalSection(&mutex); -#endif - inited = true; } @@ -962,7 +971,9 @@ #define MAX_SIZE 109 -static tMemManager memman[MAX_SIZE+1]={ +static tMemManager & st_MemMan(int id) +{ + static tMemManager memman[MAX_SIZE+1]={ tMemManager(0), tMemManager(4), tMemManager(8), @@ -1073,9 +1084,14 @@ tMemManager(428), tMemManager(432), tMemManager(436) - }; + }; + tASSERT(id >= 0 && id <= MAX_SIZE); + return memman[id]; +} + + void tMemManager::Dispose(tAllocationInfo const & info, void *p, bool keep){ int size; @@ -1086,7 +1102,7 @@ #ifndef DOUBLEFREEFINDER if (inited && block){ tBottleNeck neck; - memman[size >> 2].complete_Dispose(block); + st_MemMan(size >> 2).complete_Dispose(block); #ifdef WIN32 LeaveCriticalSection(&mutex); #endif @@ -1136,7 +1152,7 @@ if (inited && s < (MAX_SIZE << 2)) { tBottleNeck neck; - ret=memman[((s+3)>>2)].Alloc( info ); + ret=st_MemMan(((s+3)>>2)).Alloc( info ); } else { @@ -1205,7 +1221,7 @@ tBottleNeck neck; for (int i=MAX_SIZE;i>=0;i--) - memman[i].Check(); + st_MemMan(i).Check(); #ifdef WIN32 LeaveCriticalSection(&mutex); Property changes on: armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild:10461-10496 + /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild:10461-10498 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2013-01-28 20:11:30
|
Revision: 10503 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10503&view=rev Author: z-man Date: 2013-01-28 20:11:23 +0000 (Mon, 28 Jan 2013) Log Message: ----------- Merging branch 0.2.8 from revision 10498 to 10502: ------------------------------------------------------------------------ r10501 | bazaaarmagetron | 2013-01-28 19:58:07 +0100 (Mon, 28 Jan 2013) | 2 lines Manuel Moos: Removed note about tMemManager needing to come last; it no longer applies. ------------------------------------------------------------------------ r10500 | bazaaarmagetron | 2013-01-28 19:01:37 +0100 (Mon, 28 Jan 2013) | 2 lines Manuel Moos: hopefully resolving windows naming conflict. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10498&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10501&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10500&view=rev Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/src/Makefile.am armagetronad/branches/0.4/armagetronad/src/tools/tMemManager.cpp Property Changed: ---------------- armagetronad/branches/0.4/ armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10498 /armagetronad/branches/0.2.8.3:9309-10495 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10502 /armagetronad/branches/0.2.8.3:9309-10495 Modified: armagetronad/branches/0.4/armagetronad/src/Makefile.am =================================================================== --- armagetronad/branches/0.4/armagetronad/src/Makefile.am 2013-01-28 19:39:54 UTC (rev 10502) +++ armagetronad/branches/0.4/armagetronad/src/Makefile.am 2013-01-28 20:11:23 UTC (rev 10503) @@ -51,9 +51,6 @@ endif INCLUDED_MODULE_SOURCES= - -# Note: tMemManager.cpp must be last to avoid false leak reports (sorry for -# the fragile dependency on undefined behaviour of the linker...) libtools_a_SOURCES = ${tools_extra} tools/tVersion.cpp tools/tVersion.h tTrueVersion.h\ tools/tArray.cpp tools/tArray.h \ tools/tCallback.cpp tools/tCallback.h tools/tCallbackString.h tools/tColor.cpp tools/tColor.h\ Modified: armagetronad/branches/0.4/armagetronad/src/tools/tMemManager.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/tMemManager.cpp 2013-01-28 19:39:54 UTC (rev 10502) +++ armagetronad/branches/0.4/armagetronad/src/tools/tMemManager.cpp 2013-01-28 20:11:23 UTC (rev 10503) @@ -127,14 +127,14 @@ static MUTEX & st_CreateMutex() { inited = false; - static MUTEX mutex; + static MUTEX newMutex; inited = true; #ifdef WIN32 InitializeCriticalSection(&mutex); #endif - return mutex; + return newMutex; } static MUTEX & st_Mutex() Property changes on: armagetronad/branches/0.4/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild:10461-10498 + /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha8429.ebuild:8751-8852,8855-9012 /armagetronad/branches/0.2.8/build/gentoo/overlay/games-action/armagetronad-live/armagetronad-live-0.3_alpha9014.ebuild:10461-10502 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2013-01-29 22:30:15
|
Revision: 10507 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10507&view=rev Author: z-man Date: 2013-01-29 22:30:09 +0000 (Tue, 29 Jan 2013) Log Message: ----------- Merging branch 0.2.8 from revision 10502 to 10506: ------------------------------------------------------------------------ r10506 | z-man | 2013-01-29 23:17:44 +0100 (Tue, 29 Jan 2013) | 8 lines Merging branch 0.2.8.3 from revision 10495 to 10505: ------------------------------------------------------------------------ r10505 | z-man | 2013-01-29 23:12:03 +0100 (Tue, 29 Jan 2013) | 2 lines Fixing possible crash due to friends list buffer overrun; no exploit potential. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10502&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10506&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10495&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10505&view=rev Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/src/tron/gServerBrowser.cpp Property Changed: ---------------- armagetronad/branches/0.4/ Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10502 /armagetronad/branches/0.2.8.3:9309-10495 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10506 /armagetronad/branches/0.2.8.3:9309-10505 Modified: armagetronad/branches/0.4/armagetronad/src/tron/gServerBrowser.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gServerBrowser.cpp 2013-01-29 22:17:44 UTC (rev 10506) +++ armagetronad/branches/0.4/armagetronad/src/tron/gServerBrowser.cpp 2013-01-29 22:30:09 UTC (rev 10507) @@ -440,7 +440,7 @@ int i; tString userNames = run->UserNames(); tString* friends = getFriends(); - for (i = MAX_FRIENDS; i>=0; i--) + for (i = MAX_FRIENDS-1; i>=0; i--) { if (run->Users() > 0 && friends[i].Len() > 1 && userNames.StrPos(friends[i]) >= 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2015-02-08 10:25:40
|
Revision: 10735 http://sourceforge.net/p/armagetronad/code/10735 Author: z-man Date: 2015-02-08 10:25:37 +0000 (Sun, 08 Feb 2015) Log Message: ----------- Merging branch 0.2.8 from revision 10711 to 10734: ------------------------------------------------------------------------ r10734 | bazaaarmagetron | 2015-02-08 00:55:57 +0100 (Sun, 08 Feb 2015) | 2 lines Manuel Moos: "Keep Window Active" now defaults to true. ------------------------------------------------------------------------ r10733 | bazaaarmagetron | 2015-02-07 00:25:13 +0100 (Sat, 07 Feb 2015) | 2 lines Manuel Moos: Kill clients that send no or wonky turn time information as soon as their rubber runs out. ------------------------------------------------------------------------ r10724 | z-man | 2015-02-01 10:45:42 +0100 (Sun, 01 Feb 2015) | 20 lines Merging branch 0.2.8.3 from revision 10505 to 10723: ------------------------------------------------------------------------ r10721 | z-man | 2015-02-01 08:02:54 +0100 (Sun, 01 Feb 2015) | 2 lines Ubuntu PPA corrections. ------------------------------------------------------------------------ r10718 | z-man | 2015-01-30 00:34:31 +0100 (Fri, 30 Jan 2015) | 1 line merging build system update ------------------------------------------------------------------------ r10717 | z-man | 2015-01-30 00:33:35 +0100 (Fri, 30 Jan 2015) | 1 line merging version script adaptions (already merged) ------------------------------------------------------------------------ r10706 | z-man | 2015-01-29 23:39:48 +0100 (Thu, 29 Jan 2015) | 1 line Merging fixes for various potential bugs from 0.2.8. (Not merged, they came from here) ------------------------------------------------------------------------ ------------------------------------------------------------------------ r10720 | bazaaarmagetron | 2015-01-30 23:35:45 +0100 (Fri, 30 Jan 2015) | 4 lines author: Manuel Moos Making sure Zeroinstall archives are not overwritten. Putting them in a BUILDNO (RC) dependant subdirectory. ------------------------------------------------------------------------ r10719 | z-man | 2015-01-30 00:38:31 +0100 (Fri, 30 Jan 2015) | 2 lines Merging version script adaptions to new svn format. ------------------------------------------------------------------------ Revision Links: -------------- http://sourceforge.net/p/armagetronad/code/10711 http://sourceforge.net/p/armagetronad/code/10734 http://sourceforge.net/p/armagetronad/code/10733 http://sourceforge.net/p/armagetronad/code/10724 http://sourceforge.net/p/armagetronad/code/10505 http://sourceforge.net/p/armagetronad/code/10721 http://sourceforge.net/p/armagetronad/code/10718 http://sourceforge.net/p/armagetronad/code/10717 http://sourceforge.net/p/armagetronad/code/10706 http://sourceforge.net/p/armagetronad/code/10720 http://sourceforge.net/p/armagetronad/code/10719 Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/batch/make/version armagetronad/branches/0.4/armagetronad/src/render/rScreen.cpp armagetronad/branches/0.4/armagetronad/src/tron/gCycleMovement.cpp armagetronad/branches/0.4/build/WorkMakefile Property Changed: ---------------- armagetronad/branches/0.4/ Index: armagetronad/branches/0.4 =================================================================== --- armagetronad/branches/0.4 2015-02-07 23:55:57 UTC (rev 10734) +++ armagetronad/branches/0.4 2015-02-08 10:25:37 UTC (rev 10735) Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo ## -1,2 +1,3 ## /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661 /armagetronad/branches/0.2.8.3:9309-10505 +/armagetronad/tags/0.2.8.3.3_rc1:10715-10716 \ No newline at end of property Modified: armagetronad/branches/0.4/armagetronad/batch/make/version =================================================================== --- armagetronad/branches/0.4/armagetronad/batch/make/version 2015-02-07 23:55:57 UTC (rev 10734) +++ armagetronad/branches/0.4/armagetronad/batch/make/version 2015-02-08 10:25:37 UTC (rev 10735) @@ -77,7 +77,7 @@ fi fi -if test -d "${srcdir}/.svn"; then +if test -d "${srcdir}/.svn" || test -d "${srcdir}/../.svn"; then # get the inter-repository path by parsing the URL URL=`svn info ${srcdir} | grep ^URL | sed -e 's,^URL: ,,'` Modified: armagetronad/branches/0.4/armagetronad/src/render/rScreen.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/render/rScreen.cpp 2015-02-07 23:55:57 UTC (rev 10734) +++ armagetronad/branches/0.4/armagetronad/src/render/rScreen.cpp 2015-02-08 10:25:37 UTC (rev 10735) @@ -970,7 +970,7 @@ bool sr_textOut=false; bool sr_FPSOut=true; -bool sr_keepWindowActive=false; +bool sr_keepWindowActive=true; tString renderer_identification; @@ -995,7 +995,7 @@ sr_infinityPlane=false; sr_lowerSky=false; sr_upperSky=false; - sr_keepWindowActive=false; + sr_keepWindowActive=true; if (software_renderer){ // A software renderer! Poor soul. Set low details: Modified: armagetronad/branches/0.4/armagetronad/src/tron/gCycleMovement.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gCycleMovement.cpp 2015-02-07 23:55:57 UTC (rev 10734) +++ armagetronad/branches/0.4/armagetronad/src/tron/gCycleMovement.cpp 2015-02-08 10:25:37 UTC (rev 10735) @@ -3969,7 +3969,13 @@ // need many attempts verletSpeed_=lastSpeed; acceleration=lastAcceleration; - return TimestepCore( runOutTime, false ) || TimestepCore( currentTime ); + + // simulate until rubber runs out (no need to recalc acceleration) + if ( TimestepCore( runOutTime, false ) ) + return true; + + // simulate post-rubber gap or, more frequently, the crash into the next wall + return TimestepCore( currentTime ); } } } @@ -4001,6 +4007,20 @@ if (step<0) step=0; + // ignore the next destination position for now. + // if the space ahead is far less that what the cycle would traverse + // until the destination turn time, die. + // the destination must have come from a 0.2.6 or cheating client with a wrong time set; + // the control code calling this has no clue that the cycle has entered the rubber gap + // and would respect the destination's position, allowing for extremely deep grinds. + if( sn_GetNetState() != nCLIENT && + currentDestination && !currentDestination->hasBeenUsed && + rubberneeded >= rubberAvailable && + space * 1.25 < (currentDestination->gameTime - lastTime) * verletSpeed_) + { + throw gCycleDeath(pos + dirDrive * space); + } + //{ // rubber+=step; // step=0; @@ -4142,10 +4162,11 @@ tASSERT( rubber >= 0 ); - // use up rubber from tunneling (calculated by CalculateAcceleration + // use up rubber from tunneling (calculated by CalculateAcceleration) if ( rubberEffectiveness > 0 ) { - rubber += rubberUsage * ts * verletSpeed_ / rubberEffectiveness; } + rubber += rubberUsage * ts * verletSpeed_ / rubberEffectiveness; + } else if ( rubberUsage > 0 ) { rubber = rubber_granted + 10; @@ -4154,7 +4175,7 @@ // decide over kill bool rubberUsedUp = false; - if ( rubber > rubber_granted || ( sg_cycleWidthRubberMax == 0 && sg_cycleWidthRubberMin == 0 ) ) + if ( rubber > rubber_granted ) { if ( sn_GetNetState() != nCLIENT ) { Modified: armagetronad/branches/0.4/build/WorkMakefile =================================================================== --- armagetronad/branches/0.4/build/WorkMakefile 2015-02-07 23:55:57 UTC (rev 10734) +++ armagetronad/branches/0.4/build/WorkMakefile 2015-02-08 10:25:37 UTC (rev 10735) @@ -13,7 +13,7 @@ include IncludesMakefile3 # everything z-man can build at home and work -z-man-home: tarsource zipsource webdoc windoc autopackage ubuntu-lucid +z-man-home: tarsource zipsource webdoc windoc autopackage z-man-work: autopackage-legacyserver autopackage-client # other builders are invited to add their build sets. @@ -50,10 +50,10 @@ echo "" > $@ # upload directory for zeroinstall archives -0UPLOAD=$(UPLOAD)/ZeroInstall +0UPLOAD=$(UPLOAD)/ZeroInstall/$(RC) 0UPLOADTAG=$(0UPLOAD)/README.txt $(0UPLOADTAG): $(UPLOAD)/.tag - test -d $(0UPLOAD) || mkdir $(0UPLOAD) + test -d $(0UPLOAD) || mkdir -p $(0UPLOAD) echo "IMPORTANT, READ ME:\nThese files are for the ZeroInstall system and hard to get working if you donwload them manually.\nStick to the files one folder up or use our ZeroInstall feeds (which we very much recommend):\nhttp://wiki.armagetronad.org/index.php/0Install" > $@ todos $@ @@ -66,7 +66,7 @@ # bump rc number bump: # update release candidate number - rm $(RCFILE).tag + rm builds/.tag .PHONY: bump SOURCEDIR=$(RCDIR)/$(PACKAGE)-$(VERSION) @@ -399,6 +399,8 @@ patch -p0 -d $(UBUNTUSOURCEDIR)$* < patches/ubuntu-docmove.patch # version dependant patches rel=$$(echo $* | sed -e "s,.*~,,"); echo patches/ubuntu~$$rel.patch; if test -r patches/ubuntu~$$rel.patch; then patch -p0 -d $(UBUNTUSOURCEDIR)$* < patches/ubuntu~$$rel.patch; fi + # we're actually using 1.0 format here still. + echo "1.0" > $(UBUNTUSOURCEDIR)$*/debian/source/format # rebrand package # for f in ../ubuntu/debian/*; do sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\./armagetronad./g" > $(UBUNTUSOURCEDIR)/debian/$$(echo $$f | sed -e s,../ubuntu/debian/,, -e "s/armagetronad/${PACKAGE}/"); done cd $(UBUNTUSOURCEDIR)$*/debian/; for f in *; do dest=$$(echo $$f | sed -e "s,armagetronad,${PACKAGE},g"); test -d $$f || sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\.net/armagetronad.net/g" --e "s/${PACKAGE}\.source/armagetronad.source/g" > $$dest.out; rm $$f; mv $$dest.out $$dest; done @@ -449,12 +451,13 @@ echo $@ upload-ubuntu-%: xupload-ubuntu-$(RC)~% echo $@ + upload-ubuntu-all: \ -upload-ubuntu-lucid \ -upload-ubuntu-maverick \ -upload-ubuntu-natty \ -upload-ubuntu-oneiric \ -upload-ubuntu-precise +upload-ubuntu-utopic \ +upload-ubuntu-trusty \ +upload-ubuntu-saucy \ +upload-ubuntu-precise \ +upload-ubuntu-lucid echo $@ # generic client build @@ -695,8 +698,8 @@ # * update zeroinstall stream # ***************************************** # - SF_DIRECTORY=$(SF_DIRECTORY) OSTAG_GENERIC=${OSTAG_GENERIC} PACKAGE=${PACKAGE} SERIES=${SERIES} FILE=${BINARY_CLIENT_TARBALL} VERSION=${VERSION} 0install/update - SF_DIRECTORY=$(SF_DIRECTORY) OSTAG_GENERIC=${OSTAG_GENERIC} PACKAGE=${PACKAGE}-dedicated SERIES=${SERIES} FILE=${BINARY_SERVER_TARBALL} VERSION=${VERSION} 0install/update + SF_DIRECTORY=$(SF_DIRECTORY) OSTAG_GENERIC=${OSTAG_GENERIC} PACKAGE=${PACKAGE} SERIES=${SERIES} FILE=${BINARY_CLIENT_TARBALL} VERSION=${VERSION} RC=${RC} 0install/update + SF_DIRECTORY=$(SF_DIRECTORY) OSTAG_GENERIC=${OSTAG_GENERIC} PACKAGE=${PACKAGE}-dedicated SERIES=${SERIES} FILE=${BINARY_SERVER_TARBALL} VERSION=${VERSION} RC=${RC} 0install/update touch $@ APFILE=$(RCDIR)/.package @@ -740,7 +743,7 @@ #echo $(SF_DIRECTORY); false cp doc/releasenotes.txt $(UPLOAD)/ todos $(UPLOAD)/releasenotes.txt - cd ${UPLOAD}; mkdir -p armagetronad/$(SF_DIRECTORY)/$(VERSION); rsync -r -e ssh armagetronad z-man,arm...@fr...:/home/frs/project/a/ar/; rm -rf armagetronad; rsync -avP -e ssh * z-man,arm...@fr...:/home/frs/project/a/ar/armagetronad/$(SF_DIRECTORY)/$(VERSION)/ + cd ${UPLOAD}; mkdir -p armagetronad/$(SF_DIRECTORY)/$(VERSION); rsync -r -e ssh armagetronad z-man,arm...@fr...:/home/frs/project/a/ar/; rm -rf armagetronad; rsync --ignore-existing -avP -e ssh * z-man,arm...@fr...:/home/frs/project/a/ar/armagetronad/$(SF_DIRECTORY)/$(VERSION)/; rsync -avP --no-R -e ssh * z-man,arm...@fr...:/home/frs/project/a/ar/armagetronad/$(SF_DIRECTORY)/$(VERSION)/ TOEMPTYLINE=sed -e "s,^$$,," -e "t q" -e "p" -e "d" -e ": q" -e "q" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2015-09-13 11:59:42
|
Revision: 10781 http://sourceforge.net/p/armagetronad/code/10781 Author: z-man Date: 2015-09-13 11:59:39 +0000 (Sun, 13 Sep 2015) Log Message: ----------- Merging branch 0.2.8 from revision 10739 to 10780: ------------------------------------------------------------------------ r10780 | bazaaarmagetron | 2015-09-11 00:25:18 +0200 (Fr, 11 Sep 2015) | 2 lines Manuel Moos: Lowering default CONNECTION_LIMIT setting from 100 to 5. ------------------------------------------------------------------------ r10779 | bazaaarmagetron | 2015-09-11 00:24:55 +0200 (Fr, 11 Sep 2015) | 2 lines Manuel Moos: Mode range check when looking up aspect ratios. ------------------------------------------------------------------------ Revision Links: -------------- http://sourceforge.net/p/armagetronad/code/10739 http://sourceforge.net/p/armagetronad/code/10780 http://sourceforge.net/p/armagetronad/code/10779 Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp armagetronad/branches/0.4/armagetronad/win32/README.txt armagetronad/branches/0.4/winlibs/SDL/VisualC/SDL/Version.rc armagetronad/branches/0.4/winlibs/SDL/VisualC/SDL/resource.h armagetronad/branches/0.4/winlibs/SDL/VisualC/SDL.dsw armagetronad/branches/0.4/winlibs/SDL/VisualC/SDLmain/SDLmain.dsp Modified: armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg =================================================================== --- armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg 2015-09-10 22:25:18 UTC (rev 10780) +++ armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg 2015-09-13 11:59:39 UTC (rev 10781) @@ -238,7 +238,7 @@ PING_FLOOD_TIME_100 100.0 # Minimum time for 100 ping packets to arrive. PING_FLOOD_GLOBAL .1 # The same times, multiplied by this value, count for all pings from all machines. Negative values disable global flood protection. CONNECTION_FLOOD_SENSITIVITY .01 # The times PING_FLOOD_TIME_X, multiplied by this value, count for all incoming messages from clients not connected already. A flood here activates turtle mode. Negative values disable global flood protection. -CONNECTION_LIMIT 100 # Maximum number of packets from unknown peers to handle at one +CONNECTION_LIMIT 5 # Maximum number of packets from unknown peers to handle at one ANTI_SPOOF 0 # If set to 1, checks connecting clients for spoofed IPs are done. Only clients passing a connectivity test are allowed in. This is done in turtle mode automatically, but may be useful to have on at all times. Modified: armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp 2015-09-10 22:25:18 UTC (rev 10780) +++ armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp 2015-09-13 11:59:39 UTC (rev 10781) @@ -1650,7 +1650,7 @@ // number of packets from unknown sources to process each call to rec_peer -static int sn_connectionLimit = 100; +static int sn_connectionLimit = 5; static tSettingItem< int > sn_connectionLimitConf( "CONNECTION_LIMIT", sn_connectionLimit ); // turtle mode control @@ -2532,7 +2532,7 @@ // #define NO_GLOBAL_FLOODPROTECTION #ifndef NO_GLOBAL_FLOODPROTECTION // flood check for pings, logins and other potential nasties; as early as possible - if( sn_turtleMode && count > sn_connectionLimit*10 ) + if( sn_turtleMode && count > sn_connectionLimit*5 ) { continue; } Modified: armagetronad/branches/0.4/armagetronad/win32/README.txt =================================================================== --- armagetronad/branches/0.4/armagetronad/win32/README.txt 2015-09-10 22:25:18 UTC (rev 10780) +++ armagetronad/branches/0.4/armagetronad/win32/README.txt 2015-09-13 11:59:39 UTC (rev 10781) @@ -1,69 +1,69 @@ -Compiling Armagetron Advanced on Windows with Code::Blocks ----------------------------------------------------------- - -Code::Blocks is an open source, cross platform C/C++ IDE. -It has multiple compiler support, and it comes in two presentations: -MinGW bundle or Standalone for use with other compilers. - -More info and download of Code::Blocks: http://www.codeblocks.org - -Armagetron Advanced can be compiled with these compilers: -* MinGw: obtained in the MinGW bundle download of Code::Blocks -* Free Microsoft Visual C++ Toolkit 2003: http://msdn.microsoft.com/visualc/vctoolkit2003/ - -Currently I use the following nightly build of Code::Blocks: - CB_20060428_rev2395_win32_wx263.7z -You also need an additional DLL: - wxmsw26u_gcc_cb_wx2.6.3.7z - -Download Link: http://developer.berlios.de/project/showfiles.php?group_id=5358 - -The sources are distributed over two SVN modules: -* armagetronad: containing generic sources and codeblocks project files -* winlibs: containing the libraries Armagetron Advanced depends on - -You need to check out the two modules from the repository at - -https://armagetronad.svn.sourceforge.net/svnroot/armagetronad - -You can just check out -https://armagetronad.svn.sourceforge.net/svnroot/armagetronad/trunk, that -way you'll have the correct directory structure, although you'll also get -some files you don't need. One way to do that is to use TortoiseSVN -(http://tortoisesvn.tigris.org/). - -1. Create a project directory (e.g. C:\Projects\Armagetron) -2. put the armagetronad source files there -3. In the same directory, put the winlibs files -4. It should look something like this: - +- Armagetron - +- armagetronad - +- winlibs -5. Check you've got python installed and set the path to the executable - inside python.bat - Same for the protobuf compiler protoc -6. Go to the armagetronad/win32 directory - run update_version.bat - run protobuf.bat -7. Start the Armagetron workspace (Armagetron.workspace) -8. To compile you will need to change the project's target to either - Release, Debug or Profile (it defaults to Release) -9. Go to the armagetronad/win32 directory - Run the makedist.bat file to copy all neccessary files into - the build directories (dist, debug or profile). - +- Armagetron - +- armagetronad - +- build - +- dist - +- debug - +- profile - -Note: Only directories that are already present will be updated. - At the end you will get a status report about missing files. - -To create an installer you need to install the nullsoft installer development -environment (http://nsis.sourceforge.net/). After that you can right click -on armagetronad.nsi in the appropriate build directory (not in the win32 -directory, it'll fail) and select "Execute NSIS script". - -In case of problems, visit forums.armagetronad.net and ask for help. +Compiling Armagetron Advanced on Windows with Code::Blocks +---------------------------------------------------------- + +Code::Blocks is an open source, cross platform C/C++ IDE. +It has multiple compiler support, and it comes in two presentations: +MinGW bundle or Standalone for use with other compilers. + +More info and download of Code::Blocks: http://www.codeblocks.org + +Armagetron Advanced can be compiled with these compilers: +* MinGw: obtained in the MinGW bundle download of Code::Blocks +* Free Microsoft Visual C++ Toolkit 2003: http://msdn.microsoft.com/visualc/vctoolkit2003/ + +Currently I use the following nightly build of Code::Blocks: + CB_20060428_rev2395_win32_wx263.7z +You also need an additional DLL: + wxmsw26u_gcc_cb_wx2.6.3.7z + +Download Link: http://developer.berlios.de/project/showfiles.php?group_id=5358 + +The sources are distributed over two SVN modules: +* armagetronad: containing generic sources and codeblocks project files +* winlibs: containing the libraries Armagetron Advanced depends on + +You need to check out the two modules from the repository at + +https://armagetronad.svn.sourceforge.net/svnroot/armagetronad + +You can just check out +https://armagetronad.svn.sourceforge.net/svnroot/armagetronad/trunk, that +way you'll have the correct directory structure, although you'll also get +some files you don't need. One way to do that is to use TortoiseSVN +(http://tortoisesvn.tigris.org/). + +1. Create a project directory (e.g. C:\Projects\Armagetron) +2. put the armagetronad source files there +3. In the same directory, put the winlibs files +4. It should look something like this: + +- Armagetron + +- armagetronad + +- winlibs +5. Check you've got python installed and set the path to the executable + inside python.bat + Same for the protobuf compiler protoc +6. Go to the armagetronad/win32 directory + run update_version.bat + run protobuf.bat +7. Start the Armagetron workspace (Armagetron.workspace) +8. To compile you will need to change the project's target to either + Release, Debug or Profile (it defaults to Release) +9. Go to the armagetronad/win32 directory + Run the makedist.bat file to copy all neccessary files into + the build directories (dist, debug or profile). + +- Armagetron + +- armagetronad + +- build + +- dist + +- debug + +- profile + +Note: Only directories that are already present will be updated. + At the end you will get a status report about missing files. + +To create an installer you need to install the nullsoft installer development +environment (http://nsis.sourceforge.net/). After that you can right click +on armagetronad.nsi in the appropriate build directory (not in the win32 +directory, it'll fail) and select "Execute NSIS script". + +In case of problems, visit forums.armagetronad.net and ask for help. Modified: armagetronad/branches/0.4/winlibs/SDL/VisualC/SDL/Version.rc =================================================================== --- armagetronad/branches/0.4/winlibs/SDL/VisualC/SDL/Version.rc 2015-09-10 22:25:18 UTC (rev 10780) +++ armagetronad/branches/0.4/winlibs/SDL/VisualC/SDL/Version.rc 2015-09-13 11:59:39 UTC (rev 10781) @@ -1,105 +1,105 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winresrc.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,14,0 - PRODUCTVERSION 1,2,14,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "\0" - VALUE "FileDescription", "SDL\0" - VALUE "FileVersion", "1, 2, 14, 0\0" - VALUE "InternalName", "SDL\0" - VALUE "LegalCopyright", "Copyright \xA9 2007 Sam Lantinga\0" - VALUE "OriginalFilename", "SDL.dll\0" - VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "1, 2, 14, 0\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winresrc.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,2,14,0 + PRODUCTVERSION 1,2,14,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "\0" + VALUE "FileDescription", "SDL\0" + VALUE "FileVersion", "1, 2, 14, 0\0" + VALUE "InternalName", "SDL\0" + VALUE "LegalCopyright", "Copyright \xA9 2007 Sam Lantinga\0" + VALUE "OriginalFilename", "SDL.dll\0" + VALUE "ProductName", "Simple DirectMedia Layer\0" + VALUE "ProductVersion", "1, 2, 14, 0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Modified: armagetronad/branches/0.4/winlibs/SDL/VisualC/SDL/resource.h =================================================================== --- armagetronad/branches/0.4/winlibs/SDL/VisualC/SDL/resource.h 2015-09-10 22:25:18 UTC (rev 10780) +++ armagetronad/branches/0.4/winlibs/SDL/VisualC/SDL/resource.h 2015-09-13 11:59:39 UTC (rev 10781) @@ -1,15 +1,15 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by Version.rc -// - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by Version.rc +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif Modified: armagetronad/branches/0.4/winlibs/SDL/VisualC/SDL.dsw =================================================================== --- armagetronad/branches/0.4/winlibs/SDL/VisualC/SDL.dsw 2015-09-10 22:25:18 UTC (rev 10780) +++ armagetronad/branches/0.4/winlibs/SDL/VisualC/SDL.dsw 2015-09-13 11:59:39 UTC (rev 10781) @@ -1,41 +1,41 @@ -Microsoft Developer Studio Workspace File, Format Version 5.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "SDL"=.\SDL\SDL.DSP - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "SDLmain"=.\SDLmain\SDLmain.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 5.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "SDL"=.\SDL\SDL.DSP - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "SDLmain"=.\SDLmain\SDLmain.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + Modified: armagetronad/branches/0.4/winlibs/SDL/VisualC/SDLmain/SDLmain.dsp =================================================================== --- armagetronad/branches/0.4/winlibs/SDL/VisualC/SDLmain/SDLmain.dsp 2015-09-10 22:25:18 UTC (rev 10780) +++ armagetronad/branches/0.4/winlibs/SDL/VisualC/SDLmain/SDLmain.dsp 2015-09-13 11:59:39 UTC (rev 10781) @@ -1,106 +1,106 @@ -# Microsoft Developer Studio Project File - Name="SDLmain" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=SDLmain - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "SDLmain.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "SDLmain.mak" CFG="SDLmain - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "SDLmain - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "SDLmain - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "SDLmain - Win32 Release_NoSTDIO" (based on\ - "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe - -!IF "$(CFG)" == "SDLmain - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\include\SDL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "SDLmain - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Z7 /Od /I "..\..\include" /I "..\..\include\SDL" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "SDLmain - Win32 Release_NoSTDIO" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "SDLmain_" -# PROP BASE Intermediate_Dir "SDLmain_" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_NOSTDIO" -# PROP Intermediate_Dir "Release_NOSTDIO" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\include\SDL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\include\SDL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "NO_STDIO_REDIRECT" /YX /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "SDLmain - Win32 Release" -# Name "SDLmain - Win32 Debug" -# Name "SDLmain - Win32 Release_NoSTDIO" -# Begin Source File - -SOURCE=..\..\Src\Main\Win32\SDL_win32_main.c -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="SDLmain" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=SDLmain - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "SDLmain.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "SDLmain.mak" CFG="SDLmain - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "SDLmain - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "SDLmain - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "SDLmain - Win32 Release_NoSTDIO" (based on\ + "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe + +!IF "$(CFG)" == "SDLmain - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\include\SDL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "SDLmain - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /Z7 /Od /I "..\..\include" /I "..\..\include\SDL" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "SDLmain - Win32 Release_NoSTDIO" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "SDLmain_" +# PROP BASE Intermediate_Dir "SDLmain_" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release_NOSTDIO" +# PROP Intermediate_Dir "Release_NOSTDIO" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\include\SDL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\include\SDL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "NO_STDIO_REDIRECT" /YX /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "SDLmain - Win32 Release" +# Name "SDLmain - Win32 Debug" +# Name "SDLmain - Win32 Release_NoSTDIO" +# Begin Source File + +SOURCE=..\..\Src\Main\Win32\SDL_win32_main.c +# End Source File +# End Target +# End Project This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2016-08-28 14:17:02
|
Revision: 10814 http://sourceforge.net/p/armagetronad/code/10814 Author: z-man Date: 2016-08-28 14:16:59 +0000 (Sun, 28 Aug 2016) Log Message: ----------- Merging branch 0.2.8 from revision 10780 to 10813: ------------------------------------------------------------------------ r10812 | bazaaarmagetron | 2016-08-28 11:47:07 +0200 (So, 28 Aug 2016) | 2 lines Manuel Moos: Applying Michael Catanzaro's desktop file fix. ------------------------------------------------------------------------ r10811 | bazaaarmagetron | 2016-07-21 20:05:20 +0200 (Do, 21 Jul 2016) | 1 line Manuel Moos: Cleaning up fix so the current code looks better. ------------------------------------------------------------------------ r10810 | bazaaarmagetron | 2016-07-21 20:04:52 +0200 (Do, 21 Jul 2016) | 1 line Manuel Moos: Applying minimal fix attempt to GCC 6 compilation. Disabling private operator<< without definition, implementing other operator<< in terms of new member function. ------------------------------------------------------------------------ r10796 | bazaaarmagetron | 2016-01-28 01:35:07 +0100 (Do, 28 Jan 2016) | 2 lines Manuel Moos: Making texture coordinates for menu background not grow without bounds over time, have them wrap around. ------------------------------------------------------------------------ r10795 | bazaaarmagetron | 2015-12-12 16:24:20 +0100 (Sa, 12 Dez 2015) | 2 lines Manuel Moos: And another Kyle fix improvement. ------------------------------------------------------------------------ r10794 | bazaaarmagetron | 2015-12-11 00:15:02 +0100 (Fr, 11 Dez 2015) | 2 lines Manuel Moos: Applying kyle's followup spawn fix. ------------------------------------------------------------------------ r10793 | bazaaarmagetron | 2015-12-09 23:33:56 +0100 (Mi, 09 Dez 2015) | 4 lines author: Manuel Moos Merging kyle's no-respawn-unless-game-is-running fix. Sounds like a good idea, even though it apparently did not fix the problem it was aimed at. ------------------------------------------------------------------------ r10792 | bazaaarmagetron | 2015-12-06 19:31:08 +0100 (So, 06 Dez 2015) | 2 lines Manuel Moos: On port bind failure, wait a bit, then try first port again. ------------------------------------------------------------------------ r10788 | bazaaarmagetron | 2015-10-11 11:48:24 +0200 (So, 11 Okt 2015) | 2 lines Manuel Moos: Adding /vote silence, voice. ------------------------------------------------------------------------ r10786 | bazaaarmagetron | 2015-09-22 23:57:38 +0200 (Di, 22 Sep 2015) | 2 lines Manuel Moos: Don't accept clientside created AIs. Just in case. ------------------------------------------------------------------------ r10785 | bazaaarmagetron | 2015-09-22 23:42:50 +0200 (Di, 22 Sep 2015) | 5 lines author: Manuel Moos Suspensions and silencings are now stored in ePlayerNetID-independent datastructures immediately. You can't wriggle your way out of them that easily any more. ------------------------------------------------------------------------ r10783 | bazaaarmagetron | 2015-09-21 00:59:32 +0200 (Mo, 21 Sep 2015) | 2 lines Manuel Moos: Compatibility with c++11's changed exception specification for operator new. ------------------------------------------------------------------------ Revision Links: -------------- http://sourceforge.net/p/armagetronad/code/10780 http://sourceforge.net/p/armagetronad/code/10812 http://sourceforge.net/p/armagetronad/code/10811 http://sourceforge.net/p/armagetronad/code/10810 http://sourceforge.net/p/armagetronad/code/10796 http://sourceforge.net/p/armagetronad/code/10795 http://sourceforge.net/p/armagetronad/code/10794 http://sourceforge.net/p/armagetronad/code/10793 http://sourceforge.net/p/armagetronad/code/10792 http://sourceforge.net/p/armagetronad/code/10788 http://sourceforge.net/p/armagetronad/code/10786 http://sourceforge.net/p/armagetronad/code/10785 http://sourceforge.net/p/armagetronad/code/10783 Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/language/english_base.txt armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.h armagetronad/branches/0.4/armagetronad/src/engine/eVoter.cpp armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp armagetronad/branches/0.4/armagetronad/src/tools/tLocale.cpp armagetronad/branches/0.4/armagetronad/src/tools/tLocale.h armagetronad/branches/0.4/armagetronad/src/tools/tMemManager.h armagetronad/branches/0.4/armagetronad/src/tron/gAIBase.h armagetronad/branches/0.4/armagetronad/src/tron/gFloor.cpp armagetronad/branches/0.4/armagetronad/src/tron/gGame.cpp Property Changed: ---------------- armagetronad/branches/0.4/ Index: armagetronad/branches/0.4 =================================================================== --- armagetronad/branches/0.4 2016-08-28 12:09:50 UTC (rev 10813) +++ armagetronad/branches/0.4 2016-08-28 14:16:59 UTC (rev 10814) Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo ## -1,3 +1,3 ## -/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661 +/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10813 /armagetronad/branches/0.2.8.3:9309-10505 /armagetronad/tags/0.2.8.3.3_rc1:10715-10716 \ No newline at end of property Modified: armagetronad/branches/0.4/armagetronad/language/english_base.txt =================================================================== --- armagetronad/branches/0.4/armagetronad/language/english_base.txt 2016-08-28 12:09:50 UTC (rev 10813) +++ armagetronad/branches/0.4/armagetronad/language/english_base.txt 2016-08-28 14:16:59 UTC (rev 10814) @@ -551,6 +551,8 @@ voting_bias_help Add virtual voters that oppose every change. voting_bias_kick_help Add virtual voters that oppose every kick vote. voting_bias_suspend_help Add virtual voters that oppose every suspend vote. +voting_bias_silence_help Add virtual voters that oppose every silence vote. +voting_bias_voice_help Add virtual voters that oppose every voice vote. voting_bias_include_help Add virtual voters that oppose every include vote. voting_bias_command_help Add virtual voters that oppose every command vote. @@ -2039,6 +2041,12 @@ demotereferee_player_details_text If accepted, \1 won't be referee anymore: He will not be able to administrate teams. demotereferee_player_text Demote \1 as referee +silence_player_details_text If accepted, \1 will be silenced. +silence_player_text Silenced \1 + +voice_player_details_text If accepted, \1 will be unsilenced. +voice_player_text Voice \1 + vote_include_details_text If accepted, the file \1 will be included as a configuration file. vote_include_text Include \1 vote_include_error Include file \1 not found or not readable.\n @@ -3508,6 +3516,7 @@ access_level_play_changed Access level required to play changed from \1 to \2.\n access_level_vote_suspend_help Minimal access level required to issue suspend votes. +access_level_vote_silence_help Minimal access level required to issue silence and voice votes. access_level_vote_kick_help Minimal access level required to issue kick votes. access_level_vote_include_help Minimal access level required to issue include votes. access_level_vote_include_execute_help Minimal access level successful include votes will be executed at. Modified: armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp 2016-08-28 12:09:50 UTC (rev 10813) +++ armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp 2016-08-28 14:16:59 UTC (rev 10814) @@ -991,9 +991,14 @@ tCONTROLLED_PTR( ePlayerNetID ) player_; // keep player referenced }; +void ePlayerNetID::SetSilenced( bool silenced ) +{ + silenced_ = silenced; + eVoter * pVoter = eVoter::GetPersistentVoter(Owner()); + if(pVoter) + pVoter->silenced_ = silenced; +} - - // menu where you can silence players void ePlayerNetID::SilenceMenu() { @@ -10182,14 +10187,6 @@ // mark chat spam as disconnected se_GetSpam(*this).lastSaid.MarkDisconnected(); - // store suspension count - eVoter *voter = eVoter::GetPersistentVoter( Owner() ); - if ( voter ) - { - voter->suspended_ = suspended_; - voter->silenced_ = silenced_; - } - registeredMachine_->RemovePlayer(); registeredMachine_ = 0; } @@ -10267,23 +10264,36 @@ rounds = 0; } - int & suspended = AccessSuspended(); - - if ( suspended == rounds ) + if ( suspended_ == rounds ) { return; } - suspended = rounds; + eVoter * pVoter = eVoter::GetPersistentVoter(Owner()); + if(pVoter) + { + // transfer suspension rounds to persistent voter, take care to only go + // into the same direction as this player + if(rounds > suspended_ && rounds > pVoter->suspended_) + { + pVoter->suspended_ = rounds; + } + if(rounds < suspended_ && rounds < pVoter->suspended_) + { + pVoter->suspended_ = rounds; + } + } - if ( suspended == 0 ) + suspended_ = rounds; + + if ( suspended_ == 0 ) { sn_ConsoleOut( tOutput( "$player_no_longer_suspended", GetColoredName() ) ); SetDefaultTeam(); } else { - sn_ConsoleOut( tOutput( "$player_suspended", GetColoredName(), suspended ) ); + sn_ConsoleOut( tOutput( "$player_suspended", GetColoredName(), suspended_ ) ); SetTeam( NULL ); if ( Object() && Object()->Alive() ) Object()->Kill(); @@ -10640,10 +10650,12 @@ static tAccessLevelSetter se_dtcConfLevel( se_disallowTeamChangesPlayerConf, tAccessLevel_TeamLeader ); //! accesses the suspension count +/* int & ePlayerNetID::AccessSuspended() { return suspended_; } +*/ //! returns the suspension count int ePlayerNetID::GetSuspended() const Modified: armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.h 2016-08-28 12:09:50 UTC (rev 10813) +++ armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.h 2016-08-28 14:16:59 UTC (rev 10814) @@ -314,6 +314,11 @@ virtual bool ActionOnQuit(); virtual void ActionOnDelete(); + // Check if a player can be respawned. Relaying on team alone is not enough. + // If a player enters as spectator, they are still assumed to be on a team. + // When a player is suspeded they are also on a team until the end of the round. + bool CanRespawn() const { return currentTeam && suspended_ == 0 && ! spectating_; } + // chatting bool IsChatting() const { return chatting_; } void SetChatting ( ChatFlags flag, bool chatting ); @@ -401,7 +406,9 @@ bool IsActive() const { return !disconnected; } bool IsSilenced( void ) const { return silenced_; } - void SetSilenced( bool silenced ) { silenced_ = silenced; } + void SetSilenced( bool silenced ); // { silenced_ = silenced; } + + // only for the menu bool& AccessSilenced( void ) { return silenced_; } bool IsSuspended ( void ) const { return suspended_ > 0; } @@ -543,7 +550,7 @@ inline ePlayerNetID & SetColoredName( tColoredString const & coloredName ); //!< Sets this player's name, cleared by the server. Use this for onscreen screen display. //! accesses the suspension count - int & AccessSuspended(); + // int & AccessSuspended(); //! returns the suspension count int GetSuspended() const; Modified: armagetronad/branches/0.4/armagetronad/src/engine/eVoter.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/eVoter.cpp 2016-08-28 12:09:50 UTC (rev 10813) +++ armagetronad/branches/0.4/armagetronad/src/engine/eVoter.cpp 2016-08-28 14:16:59 UTC (rev 10814) @@ -96,6 +96,14 @@ static int se_votingBiasKick = 0; static tSettingItem< int > se_vbKick( "VOTING_BIAS_KICK", se_votingBiasKick ); +// the number set here always acts as additional votes against a silence vote. +static int se_votingBiasSilence = 0; +static tSettingItem< int > se_vbSilence( "VOTING_BIAS_SILENCE", se_votingBiasSilence ); + +// the number set here always acts as additional votes against a voice vote. +static int se_votingBiasVoice = 0; +static tSettingItem< int > se_vbVoice( "VOTING_BIAS_VOICE", se_votingBiasVoice ); + // the number set here always acts as additional votes against a suspend vote. static int se_votingBiasSuspend = 0; static tSettingItem< int > se_vbSuspend( "VOTING_BIAS_SUSPEND", se_votingBiasSuspend ); @@ -150,6 +158,11 @@ static tSettingItem< tAccessLevel > se_accessLevelVoteKickSI( "ACCESS_LEVEL_VOTE_KICK", se_accessLevelVoteKick ); static tAccessLevelSetter se_accessLevelVoteKickSILevel( se_accessLevelVoteKickSI, tAccessLevel_Owner ); +// minimal access level for silence and voice votes +static tAccessLevel se_accessLevelVoteSilence = tAccessLevel_Program; +static tSettingItem< tAccessLevel > se_accessLevelVoteSilenceSI( "ACCESS_LEVEL_VOTE_SILENCE", se_accessLevelVoteSilence ); +static tAccessLevelSetter se_accessLevelVoteSilenceSILevel( se_accessLevelVoteSilenceSI, tAccessLevel_Owner ); + // minimal access level for suspend votes static tAccessLevel se_accessLevelVoteSuspend = tAccessLevel_Program; static tSettingItem< tAccessLevel > se_accessLevelVoteSuspendSI( "ACCESS_LEVEL_VOTE_SUSPEND", se_accessLevelVoteSuspend ); @@ -1134,7 +1147,7 @@ return m; } - virtual bool DoCheckValid( int senderID ) + bool CheckValidNoHarm(int senderID) { // always accept votes from server if ( sn_GetNetState() == nCLIENT && senderID == 0 ) @@ -1178,6 +1191,16 @@ if ( sender ) sender->lastNameChangePreventor_ = time; + return true; + } + + virtual bool DoCheckValid( int senderID ) + { + if(!CheckValidNoHarm(senderID)) + return false; + + double time = tSysTimeFloat(); + // check if player is protected from kicking if ( player_ && sn_GetNetState() != nCLIENT ) { @@ -1464,6 +1487,92 @@ } }; +// vote on silencing +class eVoteItemSilence: public virtual eVoteItemHarmServerControlled +{ +public: + // constructors/destructor + eVoteItemSilence( ePlayerNetID* player) + : eVoteItemHarm( player ) + {} + + ~eVoteItemSilence() + {} +protected: + // get the language string prefix + virtual char const * DoGetPrefix() const{ return "silence"; } + +#ifdef KRAWALL_SERVER + // access level required for this kind of vote + virtual tAccessLevel DoGetAccessLevel() const + { + return se_accessLevelVoteSilence; + } +#endif + + // return vote-specific extra bias + virtual int DoGetExtraBias() const + { + return se_votingBiasSilence; + } + + virtual void DoExecuteHarm() // called when the voting was successful + { + ePlayerNetID * player = GetPlayer(); + if ( player ) + { + player->SetSilenced(true); + } + } +}; + +// vote on giving players their voice back (not really harmful, but it's a convenient base class) +class eVoteItemVoice: public virtual eVoteItemHarmServerControlled +{ +public: + // constructors/destructor + eVoteItemVoice( ePlayerNetID* player ) + : eVoteItemHarm( player ) + {} + + ~eVoteItemVoice() + {} +protected: + // get the language string prefix + virtual char const * DoGetPrefix() const{ return "voice"; } + +#ifdef KRAWALL_SERVER + // access level required for this kind of vote + virtual tAccessLevel DoGetAccessLevel() const + { + return se_accessLevelVoteSilence; + } +#endif + + // return vote-specific extra bias + virtual int DoGetExtraBias() const + { + return se_votingBiasVoice; + } + + virtual bool DoCheckValid( int senderID ) + { + if(!CheckValidNoHarm(senderID)) + return false; + + return eVoteItem::DoCheckValid( senderID ); + } + + virtual void DoExecuteHarm() // called when the voting was successful + { + ePlayerNetID * player = GetPlayer(); + if ( player ) + { + player->SetSilenced(false); + } + } +}; + // kick vote items, server controlled class eVoteItemKickServerControlled: public virtual eVoteItemHarmServerControlled, public virtual eVoteItemKick { @@ -2390,6 +2499,28 @@ } } #ifdef DEDICATED + else if ( command == "silence" ) + { + tString name; + name.ReadLine( message ); + ePlayerNetID * toSilence = ePlayerNetID::FindPlayerByName( name, p ); + if ( toSilence ) + { + // accept message + item = tNEW( eVoteItemSilence )( toSilence ); + } + } + else if ( command == "voice" ) + { + tString name; + name.ReadLine( message ); + ePlayerNetID * toVoice = ePlayerNetID::FindPlayerByName( name, p ); + if ( toVoice ) + { + // accept message + item = tNEW( eVoteItemVoice )( toVoice ); + } + } #ifdef KRAWALL_SERVER else if ( command == "include" ) { @@ -2441,11 +2572,15 @@ #endif else { -#if defined(DEDICATED) && defined(KRAWALL_SERVER) - sn_ConsoleOut( tOutput("$vote_unknown_command", command, "command, demotereferee, include, kick, referee, suspend, scramble" ), p->Owner() ); +#if defined(DEDICATED) +#if defined(KRAWALL_SERVER) + sn_ConsoleOut( tOutput("$vote_unknown_command", command, "suspend, kick, silence, voice, command, include, referee, demotereferee, scramble" ), p->Owner() ); #else - sn_ConsoleOut( tOutput("$vote_unknown_command", command, "kick, suspend" ), p->Owner() ); + sn_ConsoleOut( tOutput("$vote_unknown_command", command, "suspend, kick, silence, voice" ), p->Owner() ); #endif +#else + sn_ConsoleOut( tOutput("$vote_unknown_command", command, "suspend, kick" ), p->Owner() ); +#endif } // nothing created Modified: armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp 2016-08-28 12:09:50 UTC (rev 10813) +++ armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp 2016-08-28 14:16:59 UTC (rev 10814) @@ -2844,6 +2844,10 @@ { con << "sn_SetNetState: Unable to open accept socket on desired port " << net_hostport << ", Trying next ports...\n"; reported = true; + + usleep(100000); + + continue; } net_hostport++; @@ -4675,7 +4679,15 @@ bool operator < ( nMachineKey const & a, nMachineKey const & b ) { - return reinterpret_cast< sockaddr_in const & >( a ).sin_addr.s_addr < reinterpret_cast< sockaddr_in const & >( b ).sin_addr.s_addr; + sockaddr_in const & sa = reinterpret_cast< sockaddr_in const & >( a ); + sockaddr_in const & sb = reinterpret_cast< sockaddr_in const & >( b ); +#ifdef DEBUG_X +// compare ports first to make different clients appear as different voters + if(sa.sin_port != sb.sin_port) + return sa.sin_port < sb.sin_port; +#endif + + return sa.sin_addr.s_addr < sb.sin_addr.s_addr; } typedef std::map< nMachineKey, nMachinePTR > nMachineMap; Modified: armagetronad/branches/0.4/armagetronad/src/tools/tLocale.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/tLocale.cpp 2016-08-28 12:09:50 UTC (rev 10813) +++ armagetronad/branches/0.4/armagetronad/src/tools/tLocale.cpp 2016-08-28 14:16:59 UTC (rev 10814) @@ -690,6 +690,18 @@ { tNEW(tOutputItemLocale)(*this, tLocale::Find(x)); } +void tOutput::AddString(char const * locale) +{ + int len = strlen(locale); + if (len == 0) + return; + if (len == 1 && locale[0] == ' ') + tNEW(tOutputItemSpace)(*this); + else if (locale[0] == '$') + tNEW(tOutputItemLocale)(*this, tLocale::Find(locale+1)); + else + tNEW(tOutputItem<tString>)(*this, tString(locale)); +} tOutput::tOutput(const std::string & x) :anchor(NULL) @@ -807,16 +819,7 @@ // and a special implementation for the locales and strings: tOutput& operator << (tOutput &o, const char *locale){ - int len = strlen(locale); - if (len == 0) - return o; - if (len == 1 && locale[0] == ' ') - tNEW(tOutputItemSpace)(o); - else if (locale[0] == '$') - tNEW(tOutputItemLocale)(o, tLocale::Find(locale+1)); - else - tNEW(tOutputItem<tString>)(o, tString(locale)); - + o.AddString(locale); return o; } Modified: armagetronad/branches/0.4/armagetronad/src/tools/tLocale.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/tLocale.h 2016-08-28 12:09:50 UTC (rev 10813) +++ armagetronad/branches/0.4/armagetronad/src/tools/tLocale.h 2016-08-28 14:16:59 UTC (rev 10814) @@ -107,7 +107,7 @@ tOutputItemBase *anchor; - tOutput& operator << (const tOutput &o); + // tOutput& operator << (const tOutput &o); public: tOutput(); ~tOutput(); @@ -117,6 +117,7 @@ void AddLiteral(const char *); // adds a language independent string void AddLocale(const char *); // adds a language dependant string void AddSpace(); // adds a simple space + void AddString(char const * pString); // checks the string, delegates to correct Add...()-Function // set a template parameter at this position of the output string template<typename T> tOutput & SetTemplateParameter(int num, T const& parameter) @@ -145,7 +146,7 @@ SetTemplateParameter(1, template1); - *this << identifier; + AddString(identifier); } template< class T1, class T2 > @@ -157,7 +158,7 @@ SetTemplateParameter(1, template1); SetTemplateParameter(2, template2); - *this << identifier; + AddString(identifier); } template< class T1, class T2, class T3 > @@ -170,7 +171,7 @@ SetTemplateParameter(2, template2); SetTemplateParameter(3, template3); - *this << identifier; + AddString(identifier); } template< class T1, class T2, class T3, class T4 > @@ -184,7 +185,7 @@ SetTemplateParameter(3, template3); SetTemplateParameter(4, template4); - *this << identifier; + AddString(identifier); } tOutput(const tOutput &o); // copy constructor Modified: armagetronad/branches/0.4/armagetronad/src/tools/tMemManager.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/tMemManager.h 2016-08-28 12:09:50 UTC (rev 10813) +++ armagetronad/branches/0.4/armagetronad/src/tools/tMemManager.h 2016-08-28 14:16:59 UTC (rev 10814) @@ -68,9 +68,14 @@ #define THROW_BADALLOC #define THROW_NOTHING #else +#if __cplusplus >= 201103L +#define THROW_BADALLOC +#define THROW_NOTHING throw () +#else #define THROW_BADALLOC throw (std::bad_alloc) #define THROW_NOTHING throw () #endif +#endif // create an object of this class while calling external functions // that are known to have (harmless!) leaks Modified: armagetronad/branches/0.4/armagetronad/src/tron/gAIBase.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gAIBase.h 2016-08-28 12:09:50 UTC (rev 10813) +++ armagetronad/branches/0.4/armagetronad/src/tron/gAIBase.h 2016-08-28 14:16:59 UTC (rev 10814) @@ -255,6 +255,11 @@ // void WriteSync( Game::AIPlayerSync & sync, bool init ); //! returns the descriptor responsible for this class virtual nNetObjectDescriptorBase const & DoGetDescriptor() const; + + // don't accept syncs from client + virtual bool AcceptClientSync() const { + return false; + } }; // the AI team Modified: armagetronad/branches/0.4/armagetronad/src/tron/gFloor.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gFloor.cpp 2016-08-28 12:09:50 UTC (rev 10813) +++ armagetronad/branches/0.4/armagetronad/src/tron/gFloor.cpp 2016-08-28 14:16:59 UTC (rev 10814) @@ -163,8 +163,8 @@ se_glFloorTexture(); se_glFloorColor(1,1); - REAL x=tSysTimeFloat()/3.0; - REAL y=tSysTimeFloat()/5.0; + double x1=tSysTimeFloat()/3.0; + double y1=tSysTimeFloat()/5.0; REAL width=16; REAL height=12; @@ -173,6 +173,21 @@ {0,0,1,0}, {0,0,0,1}}; + // make texture coordinates not too big, wrap them around. + // unfortunately, we need to transform them with tm, then clamp them, + // then transform them back. + double x2 = x1*tm[0][0] + y1*tm[1][0]; + double y2 = x1*tm[0][1] + y1*tm[1][1]; + x2-=floor(x2); + y2-=floor(y2); + REAL x = x2*tm[0][0] + y1*tm[0][1]; + REAL y = x2*tm[1][0] + y1*tm[1][1]; + const REAL det=1/(.8*.8+.2*.2); + x*=det; + y*=det; + //x=x1; + //y=y1; + TexMatrix(); glLoadMatrixf(&tm[0][0]); Modified: armagetronad/branches/0.4/armagetronad/src/tron/gGame.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gGame.cpp 2016-08-28 12:09:50 UTC (rev 10813) +++ armagetronad/branches/0.4/armagetronad/src/tron/gGame.cpp 2016-08-28 14:16:59 UTC (rev 10814) @@ -3397,7 +3397,7 @@ { ePlayerNetID *p = se_PlayerNetIDs(i); - if ( !p->CurrentTeam() ) + if ( !p->CanRespawn() ) continue; eGameObject *e=p->Object(); @@ -3522,8 +3522,8 @@ #endif #ifdef RESPAWN_HACK - // no respawining while deathzone is active. - if( !winDeathZone_ ) + // Only respawn when the round is in play mode and while the deathzone is not active. + if( state == GS_PLAY && time > 0 && winner == 0 && !winDeathZone_ ) { sg_RespawnAllAfter(0.5, time, grid, Arena); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2016-09-11 08:20:47
|
Revision: 10818 http://sourceforge.net/p/armagetronad/code/10818 Author: z-man Date: 2016-09-11 08:20:44 +0000 (Sun, 11 Sep 2016) Log Message: ----------- Merging branch 0.2.8 from revision 10813 to 10817: ------------------------------------------------------------------------ r10817 | bazaaarmagetron | 2016-09-11 09:19:52 +0200 (So, 11 Sep 2016) | 1 line Manuel Moos: Silly me, we have tDelay to use instead of usleep. ------------------------------------------------------------------------ r10816 | bazaaarmagetron | 2016-09-11 09:19:38 +0200 (So, 11 Sep 2016) | 1 line Manuel Moos: Removing unused function ------------------------------------------------------------------------ r10815 | bazaaarmagetron | 2016-09-11 09:19:20 +0200 (So, 11 Sep 2016) | 1 line Manuel Moos: No more use of usleep on Windows ------------------------------------------------------------------------ Revision Links: -------------- http://sourceforge.net/p/armagetronad/code/10813 http://sourceforge.net/p/armagetronad/code/10817 http://sourceforge.net/p/armagetronad/code/10816 http://sourceforge.net/p/armagetronad/code/10815 Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp Property Changed: ---------------- armagetronad/branches/0.4/ Index: armagetronad/branches/0.4 =================================================================== --- armagetronad/branches/0.4 2016-09-11 07:19:52 UTC (rev 10817) +++ armagetronad/branches/0.4 2016-09-11 08:20:44 UTC (rev 10818) Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo ## -1,3 +1,3 ## -/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10813 +/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10817 /armagetronad/branches/0.2.8.3:9309-10505 /armagetronad/tags/0.2.8.3.3_rc1:10715-10716 \ No newline at end of property Modified: armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp 2016-09-11 07:19:52 UTC (rev 10817) +++ armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp 2016-09-11 08:20:44 UTC (rev 10818) @@ -2844,9 +2844,10 @@ { con << "sn_SetNetState: Unable to open accept socket on desired port " << net_hostport << ", Trying next ports...\n"; reported = true; + + // just for safety, wait a bit. Does not do much good. + tDelay(100000); - usleep(100000); - continue; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2016-10-05 21:24:00
|
Revision: 10823 http://sourceforge.net/p/armagetronad/code/10823 Author: z-man Date: 2016-10-05 21:23:58 +0000 (Wed, 05 Oct 2016) Log Message: ----------- Merging branch 0.2.8 from revision 10817 to 10822: ------------------------------------------------------------------------ r10822 | bazaaarmagetron | 2016-10-05 02:11:44 +0200 (Mi, 05 Okt 2016) | 2 lines Manuel Moos: Also add yakkety. ------------------------------------------------------------------------ r10821 | bazaaarmagetron | 2016-10-04 23:53:28 +0200 (Di, 04 Okt 2016) | 2 lines Manuel Moos: These ubuntu releases seem to be still supported by the ppa build system. ------------------------------------------------------------------------ r10820 | bazaaarmagetron | 2016-10-04 23:53:21 +0200 (Di, 04 Okt 2016) | 2 lines Manuel Moos: Eek, typo. ------------------------------------------------------------------------ r10819 | bazaaarmagetron | 2016-10-04 23:53:10 +0200 (Di, 04 Okt 2016) | 2 lines Manuel Moos: Updated ubuntu release list, will sort out the ones no longer supported by the PPA builders later. ------------------------------------------------------------------------ Revision Links: -------------- http://sourceforge.net/p/armagetronad/code/10817 http://sourceforge.net/p/armagetronad/code/10822 http://sourceforge.net/p/armagetronad/code/10821 http://sourceforge.net/p/armagetronad/code/10820 http://sourceforge.net/p/armagetronad/code/10819 Modified Paths: -------------- armagetronad/branches/0.4/build/WorkMakefile Property Changed: ---------------- armagetronad/branches/0.4/ Index: armagetronad/branches/0.4 =================================================================== --- armagetronad/branches/0.4 2016-10-05 00:11:44 UTC (rev 10822) +++ armagetronad/branches/0.4 2016-10-05 21:23:58 UTC (rev 10823) Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo ## -1,3 +1,3 ## -/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10817 +/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10822 /armagetronad/branches/0.2.8.3:9309-10505 /armagetronad/tags/0.2.8.3.3_rc1:10715-10716 \ No newline at end of property Modified: armagetronad/branches/0.4/build/WorkMakefile =================================================================== --- armagetronad/branches/0.4/build/WorkMakefile 2016-10-05 00:11:44 UTC (rev 10822) +++ armagetronad/branches/0.4/build/WorkMakefile 2016-10-05 21:23:58 UTC (rev 10823) @@ -453,11 +453,12 @@ echo $@ upload-ubuntu-all: \ -upload-ubuntu-utopic \ +upload-ubuntu-yakkety \ +upload-ubuntu-xenial \ +upload-ubuntu-wily \ +upload-ubuntu-vivid \ upload-ubuntu-trusty \ -upload-ubuntu-saucy \ -upload-ubuntu-precise \ -upload-ubuntu-lucid +upload-ubuntu-precise echo $@ # generic client build This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2016-10-19 20:47:53
|
Revision: 10839 http://sourceforge.net/p/armagetronad/code/10839 Author: z-man Date: 2016-10-19 20:47:50 +0000 (Wed, 19 Oct 2016) Log Message: ----------- Merging branch 0.2.8 from revision 10822 to 10838: ------------------------------------------------------------------------ r10838 | bazaaarmagetron | 2016-10-19 01:42:36 +0200 (Mi, 19 Okt 2016) | 2 lines Manuel Moos: Adapted ubuntu build definition branch location. (already here) ------------------------------------------------------------------------ r10837 | bazaaarmagetron | 2016-10-19 01:38:05 +0200 (Mi, 19 Okt 2016) | 1 line Manuel Moos: More undefined behavior: operator<<(eTeam) was supposed to accept nulled references. Also replaced illegal bit shift with INT_MIN. ------------------------------------------------------------------------ r10836 | bazaaarmagetron | 2016-10-19 01:37:40 +0200 (Mi, 19 Okt 2016) | 1 line Manuel Moos: Undefined behavior fix: Don't allow nullptr == this. Fixing the one instance where this made known trouble in practice and the other one where the undefined code was only in an assert. (already here) ------------------------------------------------------------------------ r10828 | bazaaarmagetron | 2016-10-16 01:08:23 +0200 (So, 16 Okt 2016) | 2 lines Manuel Moos: Replaced libpng12 with plain libpng, probably also less problematic here. ------------------------------------------------------------------------ Revision Links: -------------- http://sourceforge.net/p/armagetronad/code/10822 http://sourceforge.net/p/armagetronad/code/10838 http://sourceforge.net/p/armagetronad/code/10837 http://sourceforge.net/p/armagetronad/code/10836 http://sourceforge.net/p/armagetronad/code/10828 Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/src/engine/eNetGameObject.cpp armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp armagetronad/branches/0.4/armagetronad/src/engine/eTeam.cpp armagetronad/branches/0.4/armagetronad/src/engine/eTeam.h armagetronad/branches/0.4/armagetronad/src/network/nNetObject.h armagetronad/branches/0.4/armagetronad/src/tools/tLocale.h Property Changed: ---------------- armagetronad/branches/0.4/ Index: armagetronad/branches/0.4 =================================================================== --- armagetronad/branches/0.4 2016-10-18 23:42:36 UTC (rev 10838) +++ armagetronad/branches/0.4 2016-10-19 20:47:50 UTC (rev 10839) Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo ## -1,3 +1,3 ## -/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10822 +/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10838 /armagetronad/branches/0.2.8.3:9309-10505 /armagetronad/tags/0.2.8.3.3_rc1:10715-10716 \ No newline at end of property Modified: armagetronad/branches/0.4/armagetronad/src/engine/eNetGameObject.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/eNetGameObject.cpp 2016-10-18 23:42:36 UTC (rev 10838) +++ armagetronad/branches/0.4/armagetronad/src/engine/eNetGameObject.cpp 2016-10-19 20:47:50 UTC (rev 10839) @@ -86,7 +86,7 @@ eNetGameObject::eNetGameObject(eGrid *grid, const eCoord &pos,const eCoord &dir, ePlayerNetID* p,bool autodelete) :eGameObject(grid, pos,dir,NULL,autodelete), - nNetObject(p ? p->Owner() : ::sn_myNetID),player(p){ + nNetObject(Owner(p)),player(p){ lastClientsideAction=0; if (sn_GetNetState()!=nCLIENT) RequestSync(); @@ -203,7 +203,7 @@ void eNetGameObject::SetPlayer(ePlayerNetID* a_player) { - tASSERT( !a_player || !player || Owner() == player->Owner() ); + tASSERT( !a_player || Owner() == Owner(player) ); player = a_player; if ( laggometerSmooth == 0 && sn_GetNetState() != nCLIENT ) laggometerSmooth = laggometer = se_GetPing( player ); Modified: armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp 2016-10-18 23:42:36 UTC (rev 10838) +++ armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp 2016-10-19 20:47:50 UTC (rev 10839) @@ -62,6 +62,7 @@ #include "tRuby.h" #include "eWarmup.h" #include "eLadderLog.h" +#include <climits> #include "ePlayer.pb.h" @@ -1968,9 +1969,9 @@ // foo (Red Team) --> Blue Team: some message here eTeam *senderTeam = sender->CurrentTeam(); console << tColoredString::ColorString(1,1,.5) << " ("; - console << *senderTeam; + console << senderTeam; console << tColoredString::ColorString(1,1,.5) << ") --> "; - console << *team; + console << team; } console << tColoredString::ColorString(1,1,.5) << ": "; @@ -3574,7 +3575,7 @@ eTeam *team = eTeam::teams[ i ]; std::vector< const ePlayerNetID * > invites = team->InterestingInvitedPlayers(); if ( !invites.empty() ) - out << *team << ": " << invites << '\n'; + out << team << ": " << invites << '\n'; } sn_ConsoleOut( out, receiver ? receiver->Owner() : 0 ); } @@ -4858,7 +4859,7 @@ sg_ClampPingCharity( ::pingCharity ); } -static int IMPOSSIBLY_LOW_SCORE=(-1 << 31); +static int IMPOSSIBLY_LOW_SCORE=INT_MIN; static nSpamProtectionSettings se_chatSpamSettings( 1.0f, "SPAM_PROTECTION_CHAT", tOutput("$spam_protection") ); @@ -7100,12 +7101,12 @@ const ePlayerNetID::eTeamSet & invites = player->GetInvitations(); if ( player->CurrentTeam() ) { - out << *player->CurrentTeam(); + out << player->CurrentTeam(); } else if ( !invites.empty() ) { tString invitedTeam; - invitedTeam << **invites.begin(); + invitedTeam << *invites.begin(); if ( invites.size() > 1 ) invitedTeam << ", ..."; out << tOutput( "$player_scoretable_can_join", invitedTeam ); Modified: armagetronad/branches/0.4/armagetronad/src/engine/eTeam.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/eTeam.cpp 2016-10-18 23:42:36 UTC (rev 10838) +++ armagetronad/branches/0.4/armagetronad/src/engine/eTeam.cpp 2016-10-19 20:47:50 UTC (rev 10839) @@ -33,24 +33,25 @@ #include "eLadderLog.h" #include <set> +#include <climits> #include "nProtoBuf.h" #include "eTeam.pb.h" #include "aa_config.h" -tString & operator << ( tString &s, const eTeam & team) +tString & operator << ( tString &s, const eTeam * team) { - if ( !(&team) ) + if ( !team ) return s << tOutput("$player_spectator_message"); else - return s << team.GetColoredName(); + return s << team->GetColoredName(); } -std::ostream & operator << ( std::ostream &s, const eTeam & team) +std::ostream & operator << ( std::ostream &s, const eTeam * team) { - if ( !(&team) ) + if ( !team ) return s << tOutput("$player_spectator_message"); else - return s << team.GetColoredName(); + return s << team->GetColoredName(); } #define TEAMCOLORS 8 @@ -81,7 +82,7 @@ // static tList<eTeam> se_ColoredTeams; static eTeam * se_ColoredTeams[TEAMCOLORS]={0,0,0,0,0,0,0,0}; -static int IMPOSSIBLY_LOW_SCORE=(-1 << 31); +static int IMPOSSIBLY_LOW_SCORE=INT_MIN; // class that creates config items for one team // TEAM_(NAME|RED|GREEN|BLUE)_X Modified: armagetronad/branches/0.4/armagetronad/src/engine/eTeam.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/eTeam.h 2016-10-18 23:42:36 UTC (rev 10838) +++ armagetronad/branches/0.4/armagetronad/src/engine/eTeam.h 2016-10-19 20:47:50 UTC (rev 10839) @@ -37,8 +37,8 @@ namespace Engine{ class TeamSync; } class eLadderLogWriter; -tString & operator << ( tString&, const eTeam&); -std::ostream & operator << ( std::ostream&, const eTeam&); +tString & operator << ( tString&, const eTeam*); +std::ostream & operator << ( std::ostream&, const eTeam*); template<class T> class nConfItem; Modified: armagetronad/branches/0.4/armagetronad/src/network/nNetObject.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/network/nNetObject.h 2016-10-18 23:42:36 UTC (rev 10838) +++ armagetronad/branches/0.4/armagetronad/src/network/nNetObject.h 2016-10-19 20:47:50 UTC (rev 10839) @@ -153,16 +153,16 @@ virtual void Dump( tConsole& con ); // dumps object stats - unsigned static short ID(const nNetObject *pThis) + static unsigned short ID(nNetObject const *pThis) { - if(pThis) - return pThis->ID(); + if (pThis) + return pThis->id; else return 0; } - + unsigned short ID() const{ - tASSERT( this ); + tASSERT(this); if (this) return id; else @@ -170,7 +170,7 @@ } unsigned short Owner() const{ - tASSERT( this ); + tASSERT(this); if (this) return owner; else Modified: armagetronad/branches/0.4/armagetronad/src/tools/tLocale.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/tLocale.h 2016-10-18 23:42:36 UTC (rev 10838) +++ armagetronad/branches/0.4/armagetronad/src/tools/tLocale.h 2016-10-19 20:47:50 UTC (rev 10839) @@ -278,7 +278,7 @@ else s << tOutput("$separator"); } - s << *(arr[i]); + s << arr[i]; } return s; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2016-11-12 23:23:50
|
Revision: 10869 http://sourceforge.net/p/armagetronad/code/10869 Author: z-man Date: 2016-11-12 23:23:48 +0000 (Sat, 12 Nov 2016) Log Message: ----------- Merging branch 0.2.8 from revision 10838 to 10868: ------------------------------------------------------------------------ r10868 | z-man | 2016-11-12 22:33:19 +0100 (Sa, 12 Nov 2016) | 16 lines Merging branch 0.2.8.3 from revision 10863 to 10867: ------------------------------------------------------------------------ r10866 | z-man | 2016-11-08 23:04:58 +0100 (Di, 08 Nov 2016) | 4 lines Turning the undefined crashy functions into functions that should work fine even on gcc6 by tricking it to actually perform checks on the this pointer. Just as an extra safety net. (Not merged. We'll be fine here.) ------------------------------------------------------------------------ r10865 | z-man | 2016-11-08 23:03:32 +0100 (Di, 08 Nov 2016) | 2 lines Formatting. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r10864 | z-man | 2016-11-08 22:44:15 +0100 (Di, 08 Nov 2016) | 55 lines Merging branch 0.2.8.3 from revision 10852 to 10863: ------------------------------------------------------------------------ r10862 | z-man | 2016-10-26 00:37:03 +0200 (Mi, 26 Okt 2016) | 2 lines Adding fromunix.sh from 0.2.8, technically a merge. (not merged) ------------------------------------------------------------------------ r10861 | z-man | 2016-10-25 00:19:46 +0200 (Di, 25 Okt 2016) | 2 lines More NULL checks and assertions. None of them were problematic. ------------------------------------------------------------------------ r10860 | z-man | 2016-10-25 00:19:18 +0200 (Di, 25 Okt 2016) | 5 lines Proper NULL checks for list sorting, the ones in tLinkedList just for safety (can't really be NULL at that point, but careless code changes may change that). The only problematic case would be sorting an empty list, which does not happen with the current (hardcoded) data. ------------------------------------------------------------------------ r10859 | z-man | 2016-10-25 00:15:41 +0200 (Di, 25 Okt 2016) | 2 lines Removed unused function. ------------------------------------------------------------------------ r10858 | z-man | 2016-10-25 00:14:57 +0200 (Di, 25 Okt 2016) | 3 lines In the spirit of proper testing, make calls that crash a gcc 6 build crash for everyone. Will probably revert for full release. ------------------------------------------------------------------------ r10857 | z-man | 2016-10-25 00:13:28 +0200 (Di, 25 Okt 2016) | 5 lines Fixed two misleading indentations, one of them was indeed hiding faulty logic. The effect was just stuff written to a non-open file stream in case the file could not be opened for writing, so probably harmless. ------------------------------------------------------------------------ r10856 | z-man | 2016-10-25 00:08:57 +0200 (Di, 25 Okt 2016) | 2 lines Proper fopen return value check. Sort of merged from 0.2.8. ------------------------------------------------------------------------ r10855 | z-man | 2016-10-25 00:06:48 +0200 (Di, 25 Okt 2016) | 2 lines Added tASSERT_THIS for compiler warning free assertions that the this pointer is valid. ------------------------------------------------------------------------ r10854 | z-man | 2016-10-25 00:01:43 +0200 (Di, 25 Okt 2016) | 2 lines Proper NULL pointer checks instead of this checks here, too. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r10863 | bazaaarmagetron | 2016-11-04 20:10:24 +0100 (Fr, 04 Nov 2016) | 2 lines Manuel Moos: Adding new automake generated link to ignore list. ------------------------------------------------------------------------ r10853 | z-man | 2016-10-25 00:00:16 +0200 (Di, 25 Okt 2016) | 32 lines Merging branch 0.2.8.3 from revision 10845 to 10852: ------------------------------------------------------------------------ r10852 | z-man | 2016-10-24 22:57:02 +0200 (Mo, 24 Okt 2016) | 2 lines Updated release notes for upcoming 0.2.8.3.4 (not merged) ------------------------------------------------------------------------ r10851 | z-man | 2016-10-24 02:05:22 +0200 (Mo, 24 Okt 2016) | 2 lines All builds from this branch are now probably BETA. (not merged) ------------------------------------------------------------------------ r10850 | z-man | 2016-10-24 02:04:52 +0200 (Mo, 24 Okt 2016) | 1 line Merging format change from 0.2.8, don't mess with directories during rebranding sed run ------------------------------------------------------------------------ r10848 | z-man | 2016-10-24 00:53:31 +0200 (Mo, 24 Okt 2016) | 3 lines Marked memory manager as currently broken (gcc 6 compatibility problems) and disabled its activation for debug builds. (not merged, hope we can fix it here) ------------------------------------------------------------------------ r10847 | z-man | 2016-10-24 00:29:51 +0200 (Mo, 24 Okt 2016) | 1 line Updating NEWS ------------------------------------------------------------------------ r10846 | z-man | 2016-10-24 00:20:10 +0200 (Mo, 24 Okt 2016) | 2 lines Another gcc-6 related crashfix due to undefined behavior. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r10849 | z-man | 2016-10-24 00:54:36 +0200 (Mo, 24 Okt 2016) | 49 lines Merging branch 0.2.8.3 from revision 10723 to 10845: ------------------------------------------------------------------------ r10845 | z-man | 2016-10-24 00:13:56 +0200 (Mo, 24 Okt 2016) | 1 line Merging gcc-6 fixes from 0.2.8 ------------------------------------------------------------------------ r10844 | z-man | 2016-10-23 22:41:05 +0200 (So, 23 Okt 2016) | 1 line Merging ubuntu changes ------------------------------------------------------------------------ r10843 | z-man | 2016-10-23 22:36:09 +0200 (So, 23 Okt 2016) | 1 line Merging ubuntu build changes from 0.2.8, part 4 ------------------------------------------------------------------------ r10842 | z-man | 2016-10-23 22:35:33 +0200 (So, 23 Okt 2016) | 1 line Merging ubuntu build changes from 0.2.8, part 3 ------------------------------------------------------------------------ r10841 | z-man | 2016-10-23 22:32:32 +0200 (So, 23 Okt 2016) | 1 line Merging ubuntu build changes from 0.2.8, part 2 ------------------------------------------------------------------------ r10840 | z-man | 2016-10-23 22:31:54 +0200 (So, 23 Okt 2016) | 1 line Merging ubuntu build changes from 0.2.8, part 1 ------------------------------------------------------------------------ r10740 | z-man | 2015-02-26 20:28:18 +0100 (Do, 26 Feb 2015) | 2 lines Updating NEWS and releasenotes.txt for 0.2.8.3.3 ------------------------------------------------------------------------ r10736 | z-man | 2015-02-16 06:55:52 +0100 (Mo, 16 Feb 2015) | 4 lines Merge from 0.2.8: png_sig_cmp is in both libpng12 and libpng14, where as png_check_sig is only libpng12 --ssuominen ------------------------------------------------------------------------ r10730 | z-man | 2015-02-04 23:19:32 +0100 (Mi, 04 Feb 2015) | 2 lines Radical solution: disabling generation of uninstall script. ------------------------------------------------------------------------ r10725 | z-man | 2015-02-01 10:49:46 +0100 (So, 01 Feb 2015) | 1 line Removing pointless saucy upload ------------------------------------------------------------------------ Most not really merged, they were already here. ------------------------------------------------------------------------ Revision Links: -------------- http://sourceforge.net/p/armagetronad/code/10838 http://sourceforge.net/p/armagetronad/code/10868 http://sourceforge.net/p/armagetronad/code/10863 http://sourceforge.net/p/armagetronad/code/10866 http://sourceforge.net/p/armagetronad/code/10865 http://sourceforge.net/p/armagetronad/code/10864 http://sourceforge.net/p/armagetronad/code/10852 http://sourceforge.net/p/armagetronad/code/10862 http://sourceforge.net/p/armagetronad/code/10861 http://sourceforge.net/p/armagetronad/code/10860 http://sourceforge.net/p/armagetronad/code/10859 http://sourceforge.net/p/armagetronad/code/10858 http://sourceforge.net/p/armagetronad/code/10857 http://sourceforge.net/p/armagetronad/code/10856 http://sourceforge.net/p/armagetronad/code/10855 http://sourceforge.net/p/armagetronad/code/10854 http://sourceforge.net/p/armagetronad/code/10863 http://sourceforge.net/p/armagetronad/code/10853 http://sourceforge.net/p/armagetronad/code/10845 http://sourceforge.net/p/armagetronad/code/10852 http://sourceforge.net/p/armagetronad/code/10851 http://sourceforge.net/p/armagetronad/code/10850 http://sourceforge.net/p/armagetronad/code/10848 http://sourceforge.net/p/armagetronad/code/10847 http://sourceforge.net/p/armagetronad/code/10846 http://sourceforge.net/p/armagetronad/code/10849 http://sourceforge.net/p/armagetronad/code/10723 http://sourceforge.net/p/armagetronad/code/10845 http://sourceforge.net/p/armagetronad/code/10844 http://sourceforge.net/p/armagetronad/code/10843 http://sourceforge.net/p/armagetronad/code/10842 http://sourceforge.net/p/armagetronad/code/10841 http://sourceforge.net/p/armagetronad/code/10840 http://sourceforge.net/p/armagetronad/code/10740 http://sourceforge.net/p/armagetronad/code/10736 http://sourceforge.net/p/armagetronad/code/10730 http://sourceforge.net/p/armagetronad/code/10725 Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/.bzrignore armagetronad/branches/0.4/armagetronad/NEWS armagetronad/branches/0.4/armagetronad/src/engine/eCamera.cpp armagetronad/branches/0.4/armagetronad/src/engine/eNetGameObject.cpp armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp armagetronad/branches/0.4/armagetronad/src/engine/eSound.cpp armagetronad/branches/0.4/armagetronad/src/network/nNetObject.cpp armagetronad/branches/0.4/armagetronad/src/network/nNetObject.h armagetronad/branches/0.4/armagetronad/src/tools/tError.cpp armagetronad/branches/0.4/armagetronad/src/tools/tError.h armagetronad/branches/0.4/armagetronad/src/tools/tHeap.cpp armagetronad/branches/0.4/armagetronad/src/tools/tLinkedList.cpp armagetronad/branches/0.4/armagetronad/src/tools/tSafePTR.h armagetronad/branches/0.4/armagetronad/src/ui/uInput.cpp armagetronad/branches/0.4/build/WorkMakefile Property Changed: ---------------- armagetronad/branches/0.4/ armagetronad/branches/0.4/build/ Index: armagetronad/branches/0.4 =================================================================== --- armagetronad/branches/0.4 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4 2016-11-12 23:23:48 UTC (rev 10869) Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo ## -1,3 +1,3 ## -/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10838 -/armagetronad/branches/0.2.8.3:9309-10505 +/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10868 +/armagetronad/branches/0.2.8.3:9309-10505,10724-10867 /armagetronad/tags/0.2.8.3.3_rc1:10715-10716 \ No newline at end of property Modified: armagetronad/branches/0.4/armagetronad/.bzrignore =================================================================== --- armagetronad/branches/0.4/armagetronad/.bzrignore 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/.bzrignore 2016-11-12 23:23:48 UTC (rev 10869) @@ -12,6 +12,7 @@ ChangeLog EclipseBuild ./INSTALL +./compile Makefile.in ./aclocal.m4 ./autom4te.cache Modified: armagetronad/branches/0.4/armagetronad/NEWS =================================================================== --- armagetronad/branches/0.4/armagetronad/NEWS 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/NEWS 2016-11-12 23:23:48 UTC (rev 10869) @@ -206,6 +206,24 @@ login/logout message can be announced. - Authentication is now enabled by default. +Changes since 0.2.8.3.3: +- Eliminated undefined behavior that was fine in gcc 5, but now + (rightfully!) turned into crashes in gcc 6. +- Eliminated compilation disambiguity that was just causing a mild + performance degradation in gcc 5 and is now a compilation failure in + gcc 6. + +Changes since 0.2.8.3.2: +- security fix: do not read ahead of the beginning of network buffer. +- security fix: don't attribute network errors from processing random + packets to the connection to the server +- security fix: while at it, don't process random packets unless they + may be important +- fix for potential crash with friend list filtering +- intel driver compatibility +- fix for rare crash with sound lock +- fix for camera turning for bizarre axis configurations + Changes since 0.2.8.3.1: - security fix: old style action commands from clients no loger cause hangs and crashes - security fix: oversized packets are ignored properly Modified: armagetronad/branches/0.4/armagetronad/src/engine/eCamera.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/eCamera.cpp 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/src/engine/eCamera.cpp 2016-11-12 23:23:48 UTC (rev 10869) @@ -2501,8 +2501,7 @@ #ifndef DEDICATED void eCamera::SoundMix(Uint8 *dest,unsigned int len){ - if (!this) - return; + tASSERT_THIS(); if (id>=0){ eGameObject *c=Center(); @@ -2517,6 +2516,9 @@ void eCamera::SoundMixGameObject(Uint8 *dest,unsigned int len,eGameObject *go){ + if(!go) + return; + eCoord vec((go->pos-pos).Turn(dir.Conj())); REAL dist_squared=vec.NormSquared()+(z-go->z)*(z-go->z); Modified: armagetronad/branches/0.4/armagetronad/src/engine/eNetGameObject.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/eNetGameObject.cpp 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/src/engine/eNetGameObject.cpp 2016-11-12 23:23:48 UTC (rev 10869) @@ -250,7 +250,7 @@ if ( init ) { - sync.set_player_id( player->ID() ); + sync.set_player_id( ID(player) ); sync.set_autodelete( autodelete ); } Modified: armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/src/engine/ePlayer.cpp 2016-11-12 23:23:48 UTC (rev 10869) @@ -3655,7 +3655,7 @@ tos << tCurrentAccessLevel::GetName( p2->GetAccessLevel() ); if ( hidden ) tos << tColoredString::ColorString( -1 ,-1 ,-1 ); - tos << " )"; + tos << " )"; } else { Modified: armagetronad/branches/0.4/armagetronad/src/engine/eSound.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/engine/eSound.cpp 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/src/engine/eSound.cpp 2016-11-12 23:23:48 UTC (rev 10869) @@ -89,7 +89,11 @@ int i; if (eGrid::CurrentGrid()) for(i=eGrid::CurrentGrid()->Cameras().Len()-1;i>=0;i--) - eGrid::CurrentGrid()->Cameras()(i)->SoundMix(stream,len); + { + eCamera *pCam = eGrid::CurrentGrid()->Cameras()(i); + if(pCam) + pCam->SoundMix(stream,len); + } for(i=se_globalPlayers.Len()-1;i>=0;i--) se_globalPlayers(i)->Mix(stream,len,0,1,1); Modified: armagetronad/branches/0.4/armagetronad/src/network/nNetObject.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/network/nNetObject.cpp 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/src/network/nNetObject.cpp 2016-11-12 23:23:48 UTC (rev 10869) @@ -554,14 +554,11 @@ */ void nNetObject::AddRef(){ - tASSERT ( this ); + tASSERT_THIS(); - if ( this ) - { - tASSERT( refCtr_ >= 0 ); - refCtr_++; - tASSERT( refCtr_ >= 0 ); - } + tASSERT( refCtr_ >= 0 ); + refCtr_++; + tASSERT( refCtr_ >= 0 ); } void nNetObject::ReleaseOwnership(){ @@ -581,8 +578,9 @@ } void nNetObject::Release(){ - tASSERT(this); - if (this){ + tASSERT_THIS(); + + { if (refCtr_>0) refCtr_--; else Modified: armagetronad/branches/0.4/armagetronad/src/network/nNetObject.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/network/nNetObject.h 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/src/network/nNetObject.h 2016-11-12 23:23:48 UTC (rev 10869) @@ -162,19 +162,13 @@ } unsigned short ID() const{ - tASSERT(this); - if (this) - return id; - else - return 0; + tASSERT_THIS(); + return id; } unsigned short Owner() const{ - tASSERT(this); - if (this) - return owner; - else - return ::sn_myNetID; + tASSERT_THIS(); + return owner; } unsigned static short Owner(const nNetObject *pThis) Modified: armagetronad/branches/0.4/armagetronad/src/tools/tError.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/tError.cpp 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/src/tools/tError.cpp 2016-11-12 23:23:48 UTC (rev 10869) @@ -109,3 +109,8 @@ char ERROR_MESSAGE[1000]; +bool st_CheckThis(void const *in) +{ + return in; +} + Modified: armagetronad/branches/0.4/armagetronad/src/tools/tError.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/tError.h 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/src/tools/tError.h 2016-11-12 23:23:48 UTC (rev 10869) @@ -82,6 +82,10 @@ void st_PresentError( const char* caption, const char *message ); void st_PresentMessage( const char* caption, const char *message ); +// complaint free check for THIS pointer so dereferencing null objects can get caugt in debug builds +bool st_CheckThis(void const *in); +#define tASSERT_THIS() tASSERT(st_CheckThis(this)); + /* #ifndef WIN32 Modified: armagetronad/branches/0.4/armagetronad/src/tools/tHeap.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/tHeap.cpp 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/src/tools/tHeap.cpp 2016-11-12 23:23:48 UTC (rev 10869) @@ -234,7 +234,7 @@ } void tHeapElement::RemoveFromHeap(){ - tASSERT( this ); + tASSERT_THIS(); if (hID>=0) { Modified: armagetronad/branches/0.4/armagetronad/src/tools/tLinkedList.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/tLinkedList.cpp 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/src/tools/tLinkedList.cpp 2016-11-12 23:23:48 UTC (rev 10869) @@ -59,8 +59,10 @@ void tListItemBase::Sort( Comparator* compare ) { + tASSERT_THIS(); + // early return statements: empty list or single element in list - if ( !this || !next ) + if (!next ) { return; } @@ -88,8 +90,10 @@ tListItemBase*& first = *anchor; // sort the two half lists - first->Sort( compare ); - middle->Sort( compare ); + if(first) + first->Sort( compare ); + if(middle) + middle->Sort( compare ); // merge the lists { Modified: armagetronad/branches/0.4/armagetronad/src/tools/tSafePTR.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/tSafePTR.h 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/src/tools/tSafePTR.h 2016-11-12 23:23:48 UTC (rev 10869) @@ -443,11 +443,12 @@ { #ifdef DEBUG st_AddRefBreakpint( this ); -#endif - tASSERT( this && refCtr_ >= 0 ); +#endif + tASSERT_THIS(); + tASSERT( refCtr_ >= 0 ); boost::lock_guard< MUTEX > lock( mutex_ ); ++refCtr_; - tASSERT( this && refCtr_ >= 0 ); + tASSERT( refCtr_ >= 0 ); } void Release () const @@ -456,7 +457,8 @@ st_ReleaseBreakpint( this ); #endif - tASSERT ( this && refCtr_ >= 0 ); + tASSERT_THIS(); + tASSERT ( refCtr_ >= 0 ); boost::unique_lock< MUTEX > lock( mutex_ ); --refCtr_; @@ -470,13 +472,14 @@ int GetRefcount () const { - tASSERT( this ); + tASSERT_THIS(); return refCtr_; } protected: ~tReferencable() { - tASSERT( this && ( refCtr_ == -1000 || refCtr_ == 0 ) ); + tASSERT_THIS(); + tASSERT( ( refCtr_ == -1000 || refCtr_ == 0 ) ); refCtr_ = -1000; } private: Modified: armagetronad/branches/0.4/armagetronad/src/ui/uInput.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/ui/uInput.cpp 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/armagetronad/src/ui/uInput.cpp 2016-11-12 23:23:48 UTC (rev 10869) @@ -1374,7 +1374,8 @@ static void s_InputConfigGeneric(int ePlayer, uAction *&actions,const tOutput &title){ uMenu input_menu(title); - actions->tListItemBase::Sort(&Input_Compare); + if(actions) + actions->tListItemBase::Sort(&Input_Compare); std::vector< uMenuItemInput * > inputs; for ( uAction *a = actions; a; a = a->Next() ) Index: armagetronad/branches/0.4/build =================================================================== --- armagetronad/branches/0.4/build 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/build 2016-11-12 23:23:48 UTC (rev 10869) Property changes on: armagetronad/branches/0.4/build ___________________________________________________________________ Modified: bzr:file-ids ## -0,0 +1,2 ## +patches/ubuntu%7Emaverick.patch ubuntumaverick.patch-20111127194224-tzi7vlg615g5o286-1 +patches/ubuntu%7Enatty.patch ubuntunatty.patch-20111127194224-tzi7vlg615g5o286-2 Modified: armagetronad/branches/0.4/build/WorkMakefile =================================================================== --- armagetronad/branches/0.4/build/WorkMakefile 2016-11-12 21:33:19 UTC (rev 10868) +++ armagetronad/branches/0.4/build/WorkMakefile 2016-11-12 23:23:48 UTC (rev 10869) @@ -405,7 +405,7 @@ echo "1.0" > $(UBUNTUSOURCEDIR)$*/debian/source/format # rebrand package # for f in ../ubuntu/debian/*; do sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\./armagetronad./g" > $(UBUNTUSOURCEDIR)/debian/$$(echo $$f | sed -e s,../ubuntu/debian/,, -e "s/armagetronad/${PACKAGE}/"); done - cd $(UBUNTUSOURCEDIR)$*/debian/; for f in *; do dest=$$(echo $$f | sed -e "s,armagetronad,${PACKAGE},g"); test -d $$f || sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\.net/armagetronad.net/g" -e "s/${PACKAGE}\.source/armagetronad.source/g" -e "s/${PACKAGE}-armagetronad/armagetronad-armagetronad/g" > $$dest.out; rm $$f; mv $$dest.out $$dest; done + cd $(UBUNTUSOURCEDIR)$*/debian/; for f in *; do dest=$$(echo $$f | sed -e "s,armagetronad,${PACKAGE},g"); test -d $$f || { sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\.net/armagetronad.net/g" -e "s/${PACKAGE}\.source/armagetronad.source/g" -e "s/${PACKAGE}-armagetronad/armagetronad-armagetronad/g" > $$dest.out; rm $$f; mv $$dest.out $$dest; } done chmod 755 $(UBUNTUSOURCEDIR)$*/debian/rules # build changelog DIST="`echo $* | sed -e s/^[0-9]*// -e s/.*~//`"; test -z $$DIST && DIST=hardy; sed -e "s/@distribution@/$$DIST/g" -e "s/@package@/$(PACKAGE)/g" -e "s/@version@/${DEBVERSION}$*/g" -e "s;@date@;$$(date -R);g" < doc/ubuntu-changelog.txt > $(UBUNTUSOURCEDIR)$*/debian/changelog This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2016-11-27 10:33:56
|
Revision: 10877 http://sourceforge.net/p/armagetronad/code/10877 Author: z-man Date: 2016-11-27 10:33:54 +0000 (Sun, 27 Nov 2016) Log Message: ----------- Also, translating the other auto_ptrs over to unique_ptr. Merging branch 0.2.8 from revision 10868 to 10876: ------------------------------------------------------------------------ r10876 | z-man | 2016-11-27 11:04:01 +0100 (So, 27 Nov 2016) | 7 lines Merging branch 0.2.8.3 from revision 10867 to 10875: ------------------------------------------------------------------------ r10874 | z-man | 2016-11-19 01:12:09 +0100 (Sa, 19 Nov 2016) | 1 line Disabling silly network expiration, this is a stabilization branch. (Was already here) ------------------------------------------------------------------------ ------------------------------------------------------------------------ r10873 | bazaaarmagetron | 2016-11-15 02:00:25 +0100 (Di, 15 Nov 2016) | 1 line Manuel Moos: Added version.h to ignore list ------------------------------------------------------------------------ r10872 | bazaaarmagetron | 2016-11-14 23:45:03 +0100 (Mo, 14 Nov 2016) | 1 line Manuel Moos: Since we now need C++11, adapted projects to code::blocks 13.10 which we also use for 0.4 builds currently. Activated GNU C++11 mode (plain c++11 mode disables things that are in the standard, strangely) and adapted linker targets. ------------------------------------------------------------------------ r10871 | bazaaarmagetron | 2016-11-14 00:51:15 +0100 (Mo, 14 Nov 2016) | 2 lines Manuel Moos: First use of C++ 11: Replace auto_ptr with unique_ptr. Also, first 'auto'. ------------------------------------------------------------------------ r10870 | bazaaarmagetron | 2016-11-14 00:50:22 +0100 (Mo, 14 Nov 2016) | 2 lines Manuel Moos: Activating C++ 11. ------------------------------------------------------------------------ Revision Links: -------------- http://sourceforge.net/p/armagetronad/code/10868 http://sourceforge.net/p/armagetronad/code/10876 http://sourceforge.net/p/armagetronad/code/10867 http://sourceforge.net/p/armagetronad/code/10874 http://sourceforge.net/p/armagetronad/code/10873 http://sourceforge.net/p/armagetronad/code/10872 http://sourceforge.net/p/armagetronad/code/10871 http://sourceforge.net/p/armagetronad/code/10870 Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/.bzrignore armagetronad/branches/0.4/armagetronad/configure.ac armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp armagetronad/branches/0.4/armagetronad/src/network/nNetwork.h armagetronad/branches/0.4/armagetronad/src/network/nServerInfo.cpp armagetronad/branches/0.4/armagetronad/src/network/nServerInfo.h armagetronad/branches/0.4/armagetronad/src/render/rSysdep.cpp armagetronad/branches/0.4/armagetronad/src/swig/ext/tron/gCycle.i armagetronad/branches/0.4/armagetronad/src/tools/values/vCore.h armagetronad/branches/0.4/armagetronad/src/tron/cockpit/cCockpit.h armagetronad/branches/0.4/armagetronad/src/tron/cockpit/cMap.h armagetronad/branches/0.4/armagetronad/src/tron/cockpit/cWidgetBase.h armagetronad/branches/0.4/armagetronad/src/tron/gAIBase.cpp armagetronad/branches/0.4/armagetronad/src/tron/gCycle.cpp armagetronad/branches/0.4/armagetronad/src/tron/gCycle.h armagetronad/branches/0.4/armagetronad/src/tron/gFriends.cpp armagetronad/branches/0.4/armagetronad/src/tron/gFriends.h armagetronad/branches/0.4/armagetronad/src/tron/gGame.cpp armagetronad/branches/0.4/armagetronad/src/tron/gMenus.cpp armagetronad/branches/0.4/armagetronad/src/tron/gTutorial.cpp Added Paths: ----------- armagetronad/branches/0.4/build_codeblocks/.bzrignore Property Changed: ---------------- armagetronad/branches/0.4/ Index: armagetronad/branches/0.4 =================================================================== --- armagetronad/branches/0.4 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4 2016-11-27 10:33:54 UTC (rev 10877) Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo ## -1,3 +1,3 ## -/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10868 -/armagetronad/branches/0.2.8.3:9309-10505,10724-10867 +/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10876 +/armagetronad/branches/0.2.8.3:9309-10505,10724-10875 /armagetronad/tags/0.2.8.3.3_rc1:10715-10716 \ No newline at end of property Modified: armagetronad/branches/0.4/armagetronad/.bzrignore =================================================================== --- armagetronad/branches/0.4/armagetronad/.bzrignore 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/.bzrignore 2016-11-27 10:33:54 UTC (rev 10877) @@ -87,3 +87,4 @@ desktop/armagetronad-armagetronad-handler.desktop desktop/armagetronad-link.xml *.cbTemp +./version.h Modified: armagetronad/branches/0.4/armagetronad/configure.ac =================================================================== --- armagetronad/branches/0.4/armagetronad/configure.ac 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/configure.ac 2016-11-27 10:33:54 UTC (rev 10877) @@ -502,12 +502,8 @@ test $DEBUGLEVEL -ge 4 && CXXFLAGS="$CXXFLAGS -DDEBUG_EXPENSIVE" test $DEBUGLEVEL -ge 5 && CXXFLAGS="$CXXFLAGS -DMEM_DEB" -dnl oddly, this macro needs to be called once unconditionally, or automake -dnl borks up. Backup CXXFLAGS and restore them in case the test passes. Which it does -dnl for some versions of GCC. -CXXFLAGS_BACK="${CXXFLAGS}" -AX_CXXFLAGS_GCC_OPTION(-nobodyreadsconfigureoutputanyway) -CXXFLAGS="${CXXFLAGS_BACK}" +dnl oddly, this macro needs to be called once unconditionally, or automake borks up. +AX_CXXFLAGS_GCC_OPTION(-std=c++11) if test $CODELEVEL -ge 1; then CXXFLAGS="$CXXFLAGS -Wall" Modified: armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/network/nNetwork.cpp 2016-11-27 10:33:54 UTC (rev 10877) @@ -1334,10 +1334,10 @@ static nKrawall::nSalt loginSalt; // the server we are redirected to -static std::auto_ptr< nServerInfoBase > sn_redirectTo; -std::auto_ptr< nServerInfoBase > sn_GetRedirectTo() +static std::unique_ptr< nServerInfoBase > sn_redirectTo; +std::unique_ptr< nServerInfoBase > sn_GetRedirectTo() { - return sn_redirectTo; + return std::move(sn_redirectTo); } nServerInfoBase * sn_PeekRedirectTo() @@ -1368,7 +1368,7 @@ if ( connectionName.Len() > 1 ) { // create server info and fill it with data - sn_redirectTo = std::auto_ptr< nServerInfoBase>( new nServerInfoRedirect( connectionName, port ) ); + sn_redirectTo.reset(new nServerInfoRedirect( connectionName, port ) ); } } @@ -3040,7 +3040,7 @@ sn_expired = false; // reset redirection - sn_redirectTo.release(); + sn_redirectTo.reset(); // first, get all pending messages, ignoring them. sn_SetNetState(nSTANDALONE); Modified: armagetronad/branches/0.4/armagetronad/src/network/nNetwork.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/network/nNetwork.h 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/network/nNetwork.h 2016-11-27 10:33:54 UTC (rev 10877) @@ -830,7 +830,7 @@ }; // on disconnection, this returns a server we should be redirected to (or NULL if we should not be redirected) -std::auto_ptr< nServerInfoBase > sn_GetRedirectTo(); +std::unique_ptr< nServerInfoBase > sn_GetRedirectTo(); // take a peek at the same info nServerInfoBase * sn_PeekRedirectTo(); Modified: armagetronad/branches/0.4/armagetronad/src/network/nServerInfo.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/network/nServerInfo.cpp 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/network/nServerInfo.cpp 2016-11-27 10:33:54 UTC (rev 10877) @@ -3271,8 +3271,7 @@ nServerInfoBase const & nServerInfoBase::ClearAddress() const { - std::auto_ptr< nAddress > clearedAddress; - address_ = clearedAddress; + address_.reset(); return *this; } @@ -3309,14 +3308,12 @@ // create address if it is not already there if ( !this->address_.get() ) { - std::auto_ptr< nAddress > address( tNEW( nAddress ) ); + this->address_.reset( tNEW( nAddress ) ); // fill it with hostname and port - address->SetPort( this->GetPort() ); - address->SetHostname( this->GetConnectionName() ); + address_->SetHostname( this->GetConnectionName() ); + address_->SetPort( this->GetPort() ); - this->address_ = address; - #ifdef DEBUG #endif } Modified: armagetronad/branches/0.4/armagetronad/src/network/nServerInfo.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/network/nServerInfo.h 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/network/nServerInfo.h 2016-11-27 10:33:54 UTC (rev 10877) @@ -101,7 +101,7 @@ private: tString connectionName_; //!< the internet name of the server ("192.168.10.10", "atron.dyndns.org") unsigned int port_; //!< the network port the server listens on - mutable std::auto_ptr< nAddress > address_; //!< the network address of the server + mutable std::unique_ptr< nAddress > address_; //!< the network address of the server public: inline tString const & GetConnectionName( void ) const; //!< Gets the internet name of the server ("192.168.10.10", "atron.dyndns.org") inline nServerInfoBase const & GetConnectionName( tString & connectionName ) const; //!< Gets the internet name of the server ("192.168.10.10", "atron.dyndns.org") Modified: armagetronad/branches/0.4/armagetronad/src/render/rSysdep.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/render/rSysdep.cpp 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/render/rSysdep.cpp 2016-11-27 10:33:54 UTC (rev 10877) @@ -1261,7 +1261,7 @@ sr_motionBlurTime ); // blurs the motion, time is the current time -bool sr_MotionBlur( double time, std::auto_ptr< rTextureRenderTarget > & blurTarget ) +bool sr_MotionBlur( double time, std::unique_ptr< rTextureRenderTarget > & blurTarget ) { static bool lastActive = false; bool active = false; @@ -1315,7 +1315,7 @@ // destroy existing blur texture if it is too small if ( blurTarget.get() && ( blurTarget->GetWidth() < blurWidth || blurTarget->GetHeight() < blurHeight ) ) { - blurTarget = std::auto_ptr< rTextureRenderTarget >(); + blurTarget.reset(); } // create blur texture @@ -1323,7 +1323,7 @@ { try { - blurTarget = std::auto_ptr< rTextureRenderTarget >( new rTextureRenderTarget( blurWidth, blurHeight ) ); + blurTarget.reset( tNEW( rTextureRenderTarget )( blurWidth, blurHeight ) ); } catch( rExceptionGLEW const & e ) { @@ -1364,7 +1364,7 @@ } void rSysDep::SwapGL(){ - static std::auto_ptr< rTextureRenderTarget > blurTarget(0); + static std::unique_ptr< rTextureRenderTarget > blurTarget; if ( s_benchmark ) { Modified: armagetronad/branches/0.4/armagetronad/src/swig/ext/tron/gCycle.i =================================================================== --- armagetronad/branches/0.4/armagetronad/src/swig/ext/tron/gCycle.i 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/swig/ext/tron/gCycle.i 2016-11-27 10:33:54 UTC (rev 10877) @@ -14,7 +14,7 @@ REAL timeCameIntoView; friend class gCycleChatBot; - std::auto_ptr< gCycleChatBot > chatBot_; + std::unique_ptr< gCycleChatBot > chatBot_; bool dropWallRequested_; //!< flag indicating that someone requested a wall drop public: Modified: armagetronad/branches/0.4/armagetronad/src/tools/values/vCore.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tools/values/vCore.h 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/tools/values/vCore.h 2016-11-27 10:33:54 UTC (rev 10877) @@ -133,10 +133,10 @@ Base *min = new Base, Base *max = new Base); //!< Default constructor */ - Set(); //!< Constructor using std::auto_ptr - Set(BasePtr &val); //!< Constructor using std::auto_ptr - Set(BasePtr &val, BasePtr &min, BasePtr &max); //!< Constructor using std::auto_ptr - // Set(BasePtr &val = BasePtr(), BasePtr &min = BasePtr(), BasePtr &max = BasePtr()); //!< Constructor using std::auto_ptr + Set(); //!< Constructor using std::unique_ptr + Set(BasePtr &val); //!< Constructor using std::unique_ptr + Set(BasePtr &val, BasePtr &min, BasePtr &max); //!< Constructor using std::unique_ptr + // Set(BasePtr &val = BasePtr(), BasePtr &min = BasePtr(), BasePtr &max = BasePtr()); //!< Constructor using std::unique_ptr Set(const Set &other); //!< Copy constructor ~Set(); //!< Destructor void operator=(Set const &other); //!< Overloaded assignment operator Modified: armagetronad/branches/0.4/armagetronad/src/tron/cockpit/cCockpit.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/cockpit/cCockpit.h 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/tron/cockpit/cCockpit.h 2016-11-27 10:33:54 UTC (rev 10877) @@ -124,7 +124,7 @@ widget_list_t m_Widgets; //!< All widgets void ProcessWidgets(node cur); //!< Processes all Widgets within the <Cockpit> node passed to it - std::auto_ptr<cWidget::Base> ProcessWidgetType(node cur); //!< returns a new instance of the right widget class for the given node + std::unique_ptr<cWidget::Base> ProcessWidgetType(node cur); //!< returns a new instance of the right widget class for the given node //this should be done by the cWidget::Base class one day void ProcessWidgetCamera(node cur, cWidget::Base &widget); //!< Processes the camera of the widget if given its root node Modified: armagetronad/branches/0.4/armagetronad/src/tron/cockpit/cMap.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/cockpit/cMap.h 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/tron/cockpit/cMap.h 2016-11-27 10:33:54 UTC (rev 10877) @@ -114,7 +114,7 @@ void End(); }; friend class ClipperCircle; - std::auto_ptr<Clipper> m_clipper; + std::unique_ptr<Clipper> m_clipper; class Mode { public: Modified: armagetronad/branches/0.4/armagetronad/src/tron/cockpit/cWidgetBase.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/cockpit/cWidgetBase.h 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/tron/cockpit/cWidgetBase.h 2016-11-27 10:33:54 UTC (rev 10877) @@ -99,7 +99,7 @@ void ParseTemplate(bool state) {m_ParsingTemplate = state;} }; -typedef std::auto_ptr<Base> Base_ptr; //!< simple shortcut; used in the derived classes +typedef std::unique_ptr<Base> Base_ptr; //!< simple shortcut; used in the derived classes //! Able to store and parse the position and size of a widget class WithCoordinates : virtual public Base { Modified: armagetronad/branches/0.4/armagetronad/src/tron/gAIBase.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gAIBase.cpp 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/tron/gAIBase.cpp 2016-11-27 10:33:54 UTC (rev 10877) @@ -2939,8 +2939,8 @@ // get the sensors to the left and right with the most free space int currentDirectionNumber = Object()->Grid()->DirectionWinding( dir ); REAL mindistLeft = 1E+30, mindistRight = 1E+30; - std::auto_ptr< gAISensor > left ( sg_GetSensor( currentDirectionNumber, *Object(), -1, side, range, corridor, mindistLeft ) ); - std::auto_ptr< gAISensor > right ( sg_GetSensor( currentDirectionNumber, *Object(), 1, side, range, corridor, mindistRight ) ); + std::unique_ptr< gAISensor > left ( sg_GetSensor( currentDirectionNumber, *Object(), -1, side, range, corridor, mindistLeft ) ); + std::unique_ptr< gAISensor > right ( sg_GetSensor( currentDirectionNumber, *Object(), 1, side, range, corridor, mindistRight ) ); // count intermediate walls to the left and right as if they were in front { Modified: armagetronad/branches/0.4/armagetronad/src/tron/gCycle.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gCycle.cpp 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/tron/gCycle.cpp 2016-11-27 10:33:54 UTC (rev 10877) @@ -617,7 +617,7 @@ // create if ( &(*cycle->chatBot_) == 0 ) - cycle->chatBot_ = std::auto_ptr< gCycleChatBot >( new gCycleChatBot( cycle ) ); + cycle->chatBot_.reset( new gCycleChatBot( cycle ) ); return *cycle->chatBot_; } @@ -2104,8 +2104,8 @@ // loads a specific texture from a specific folder static rSurface * LoadTextureSafe2( Slot slot, int mp ) { - static std::auto_ptr<rSurface> cache[SLOT_MAX][2]; - std::auto_ptr<rSurface> & surface = cache[slot][mp]; + static std::unique_ptr<rSurface> cache[SLOT_MAX][2]; + std::unique_ptr<rSurface> & surface = cache[slot][mp]; if ( surface.get() == NULL ) { static char const * names[SLOT_MAX]={"bike.png","cycle_body.png", "cycle_wheel.png"}; @@ -2114,7 +2114,7 @@ char const * folder = mp ? "moviepack" : "textures"; tString file = tString(folder) + tString("/") + tString( name ); - surface = std::auto_ptr<rSurface> ( tNEW( rSurface( file ) ) ); + surface.reset( tNEW( rSurface( file ) ) ); } if ( surface->GetSurface() ) Modified: armagetronad/branches/0.4/armagetronad/src/tron/gCycle.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gCycle.h 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/tron/gCycle.h 2016-11-27 10:33:54 UTC (rev 10877) @@ -172,7 +172,7 @@ REAL timeCameIntoView; friend class gCycleChatBot; - std::auto_ptr< gCycleChatBot > chatBot_; + std::unique_ptr< gCycleChatBot > chatBot_; bool dropWallRequested_; //!< flag indicating that someone requested a wall drop public: Modified: armagetronad/branches/0.4/armagetronad/src/tron/gFriends.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gFriends.cpp 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/tron/gFriends.cpp 2016-11-27 10:33:54 UTC (rev 10877) @@ -41,7 +41,7 @@ { name = "FRIEND_"; name << (i + 1); - confItems[i] = std::auto_ptr< tConfItemLine >( tNEW(tConfItemLine) (tConfItemLine(name, friends[i]))); + confItems[i].reset( tNEW(tConfItemLine) (tConfItemLine(name, friends[i]))); } } Modified: armagetronad/branches/0.4/armagetronad/src/tron/gFriends.h =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gFriends.h 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/tron/gFriends.h 2016-11-27 10:33:54 UTC (rev 10877) @@ -38,7 +38,7 @@ public: tString friends[MAX_FRIENDS]; - std::auto_ptr< tConfItemLine > confItems[MAX_FRIENDS]; + std::unique_ptr< tConfItemLine > confItems[MAX_FRIENDS]; gFriends(); static void FriendsMenu(); Modified: armagetronad/branches/0.4/armagetronad/src/tron/gGame.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gGame.cpp 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/tron/gGame.cpp 2016-11-27 10:33:54 UTC (rev 10877) @@ -1868,7 +1868,7 @@ // check for redirection while( okToRedirect ) { - std::auto_ptr< nServerInfoBase > redirectTo( sn_GetRedirectTo() ); + auto redirectTo = sn_GetRedirectTo(); // abort loop if ( !(&(*redirectTo)) ) @@ -2381,7 +2381,7 @@ uMenuItemFunction *reset=NULL; - std::auto_ptr< uMenuItemFunction > tutorials; + std::unique_ptr< uMenuItemFunction > tutorials; if (ingame && sn_GetNetState()!=nCLIENT){ reset=new uMenuItemFunction @@ -2410,7 +2410,7 @@ if (!ingame){ if( sg_TutorialsCompleted() ) { - tutorials = std::auto_ptr< uMenuItemFunction > (tNEW(uMenuItemFunction)( &game_menu, "$game_menu_tutorials_text", "$game_menu_tutorials_help", &sg_TutorialMenu )); + tutorials.reset( tNEW(uMenuItemFunction)( &game_menu, "$game_menu_tutorials_text", "$game_menu_tutorials_help", &sg_TutorialMenu ) ); } start= new uMenuItemFunction(&game_menu,"$game_menu_start_text", @@ -2423,7 +2423,7 @@ if( !sg_TutorialsCompleted() ) { - tutorials = std::auto_ptr< uMenuItemFunction > (tNEW(uMenuItemFunction)( &game_menu, "$game_menu_tutorials_text", "$game_menu_tutorials_help", &sg_TutorialMenu )); + tutorials.reset( tNEW(uMenuItemFunction)( &game_menu, "$game_menu_tutorials_text", "$game_menu_tutorials_help", &sg_TutorialMenu ) ); } } Modified: armagetronad/branches/0.4/armagetronad/src/tron/gMenus.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gMenus.cpp 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/tron/gMenus.cpp 2016-11-27 10:33:54 UTC (rev 10877) @@ -563,14 +563,14 @@ #if SDL_VERSION_ATLEAST(2,0,0) int numDisplays = SDL_GetNumVideoDisplays(); - std::auto_ptr<uMenuItemInt> pDisplayIndex; + std::unique_ptr<uMenuItemInt> pDisplayIndex; if(numDisplays > 1) { - pDisplayIndex = std::auto_ptr<uMenuItemInt>(new gDisplayMenuItem + pDisplayIndex.reset( tNEW(gDisplayMenuItem) (screen_menu_mode, "$screen_displayindex_text", "$screen_displayindex_help", - numDisplays-1)); + numDisplays-1) ); } #endif Modified: armagetronad/branches/0.4/armagetronad/src/tron/gTutorial.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gTutorial.cpp 2016-11-27 10:04:01 UTC (rev 10876) +++ armagetronad/branches/0.4/armagetronad/src/tron/gTutorial.cpp 2016-11-27 10:33:54 UTC (rev 10877) @@ -568,7 +568,7 @@ bool completed_; tConfItem< bool > completedConf_; tString name_; - std::auto_ptr< gTutorialMenuItem > menuItem_; + std::unique_ptr< gTutorialMenuItem > menuItem_; static gTutorial * anchor_; protected: @@ -675,7 +675,7 @@ void gTutorial::CreateMenu() { - menuItem_ = std::auto_ptr< gTutorialMenuItem >( tNEW( gTutorialMenuItem )( &sg_tutorialMenu, *this ) ); + menuItem_.reset( tNEW(gTutorialMenuItem)( &sg_tutorialMenu, *this ) ); } /* Copied: armagetronad/branches/0.4/build_codeblocks/.bzrignore (from rev 10876, armagetronad/branches/0.2.8/build_codeblocks/.bzrignore) =================================================================== --- armagetronad/branches/0.4/build_codeblocks/.bzrignore (rev 0) +++ armagetronad/branches/0.4/build_codeblocks/.bzrignore 2016-11-27 10:33:54 UTC (rev 10877) @@ -0,0 +1,6 @@ +*.cscope_file_list +*.depend +*.layout +./.objs +./.objs_release +./tmp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2016-12-04 12:19:18
|
Revision: 10885 http://sourceforge.net/p/armagetronad/code/10885 Author: z-man Date: 2016-12-04 12:19:15 +0000 (Sun, 04 Dec 2016) Log Message: ----------- Merging branch 0.2.8 from revision 10882 to 10884: ------------------------------------------------------------------------ r10884 | bazaaarmagetron | 2016-12-04 13:13:22 +0100 (So, 04 Dez 2016) | 2 lines Manuel Moos: Trying different C++ standard options: First 11, then 14, then 17, then the preliminary 0x. ------------------------------------------------------------------------ Revision Links: -------------- http://sourceforge.net/p/armagetronad/code/10882 http://sourceforge.net/p/armagetronad/code/10884 Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/configure.ac Property Changed: ---------------- armagetronad/branches/0.4/ Index: armagetronad/branches/0.4 =================================================================== --- armagetronad/branches/0.4 2016-12-04 12:13:22 UTC (rev 10884) +++ armagetronad/branches/0.4 2016-12-04 12:19:15 UTC (rev 10885) Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo ## -1,3 +1,3 ## -/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10882 +/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10884 /armagetronad/branches/0.2.8.3:9309-10505,10724-10881 /armagetronad/tags/0.2.8.3.3_rc1:10715-10716 \ No newline at end of property Modified: armagetronad/branches/0.4/armagetronad/configure.ac =================================================================== --- armagetronad/branches/0.4/armagetronad/configure.ac 2016-12-04 12:13:22 UTC (rev 10884) +++ armagetronad/branches/0.4/armagetronad/configure.ac 2016-12-04 12:19:15 UTC (rev 10885) @@ -503,8 +503,33 @@ test $DEBUGLEVEL -ge 5 && CXXFLAGS="$CXXFLAGS -DMEM_DEB" dnl oddly, this macro needs to be called once unconditionally, or automake borks up. +dnl pick C++11 standard if we can AX_CXXFLAGS_GCC_OPTION(-std=c++11) +if test -z "`echo $CXXFLAGS | grep "\-std="`"; then + dnl maybe it is the future and c++11 is deprecated? C++14 should work, too + AX_CXXFLAGS_GCC_OPTION(-std=c++14) + if test -z "`echo $CXXFLAGS | grep "\-std="`"; then + dnl still nothing? Maybe this one: + AX_CXXFLAGS_GCC_OPTION(-std=c++17) + if test -z "`echo $CXXFLAGS | grep "\-std="`"; then + dnl last call: pre-c++11 standard. Works on mingw, so why not here? + AX_CXXFLAGS_GCC_OPTION(-std=c++0x) + fi + fi +fi +dnl +dnl dnl maybe it is the future and c++11 is deprecated? C++14 should work, too +dnl AX_CXXFLAGS_GCC_OPTION(-std=c++14z,[],[],[ +dnl dnl still nothing? Maybe this one: +dnl AX_CXXFLAGS_GCC_OPTION(-std=c++17z,[],[],[ +dnl dnl last call: pre-c++11 standard. Works on mingw, so why not here? +dnl AX_CXXFLAGS_GCC_OPTION(-std=c++0x) +dnl ]) +dnl ]) +dnl]) + + if test $CODELEVEL -ge 1; then CXXFLAGS="$CXXFLAGS -Wall" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2016-12-10 21:14:19
|
Revision: 10890 http://sourceforge.net/p/armagetronad/code/10890 Author: z-man Date: 2016-12-10 21:14:16 +0000 (Sat, 10 Dec 2016) Log Message: ----------- Merging branch 0.2.8 from revision 10884 to 10889: ------------------------------------------------------------------------ r10889 | bazaaarmagetron | 2016-12-07 01:23:06 +0100 (Mi, 07 Dez 2016) | 1 line Manuel Moos: Corrected menu background aspect ratio for 16:9 screens and fixed jumpy scrolling. ------------------------------------------------------------------------ Revision Links: -------------- http://sourceforge.net/p/armagetronad/code/10884 http://sourceforge.net/p/armagetronad/code/10889 Modified Paths: -------------- armagetronad/branches/0.4/armagetronad/src/tron/gFloor.cpp Property Changed: ---------------- armagetronad/branches/0.4/ Index: armagetronad/branches/0.4 =================================================================== --- armagetronad/branches/0.4 2016-12-07 00:23:06 UTC (rev 10889) +++ armagetronad/branches/0.4 2016-12-10 21:14:16 UTC (rev 10890) Property changes on: armagetronad/branches/0.4 ___________________________________________________________________ Modified: svn:mergeinfo ## -1,3 +1,3 ## -/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10884 +/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10889 /armagetronad/branches/0.2.8.3:9309-10505,10724-10881 /armagetronad/tags/0.2.8.3.3_rc1:10715-10716 \ No newline at end of property Modified: armagetronad/branches/0.4/armagetronad/src/tron/gFloor.cpp =================================================================== --- armagetronad/branches/0.4/armagetronad/src/tron/gFloor.cpp 2016-12-07 00:23:06 UTC (rev 10889) +++ armagetronad/branches/0.4/armagetronad/src/tron/gFloor.cpp 2016-12-10 21:14:16 UTC (rev 10890) @@ -168,11 +168,17 @@ REAL width=16; REAL height=12; - static GLfloat tm[4][4]={{.8,.2,0,0}, - {-.2,.8,0,0}, - {0,0,1,0}, - {0,0,0,1}}; + GLfloat tm[4][4]={{.8,.2,0,0}, + {-.2,.8,0,0}, + {0,0,1,0}, + {0,0,0,1}}; + + + REAL scale = (sr_screenWidth*3.0)/(sr_screenHeight*4.0); + tm[0][0] *= scale; + tm[0][1] *= scale; + // make texture coordinates not too big, wrap them around. // unfortunately, we need to transform them with tm, then clamp them, // then transform them back. @@ -180,9 +186,9 @@ double y2 = x1*tm[0][1] + y1*tm[1][1]; x2-=floor(x2); y2-=floor(y2); - REAL x = x2*tm[0][0] + y1*tm[0][1]; - REAL y = x2*tm[1][0] + y1*tm[1][1]; - const REAL det=1/(.8*.8+.2*.2); + REAL x = x2*tm[1][1] - y2*tm[1][0]; + REAL y = -x2*tm[0][1] + y2*tm[0][0]; + const REAL det=1/(tm[0][0]*tm[1][1]-tm[0][1]*tm[1][0]); x*=det; y*=det; //x=x1; @@ -191,7 +197,8 @@ TexMatrix(); glLoadMatrixf(&tm[0][0]); - glScalef((REAL)sr_screenWidth/sr_screenHeight/4. * 3., 1., 1.); + glScalef(1., 1., 1.); + // glScalef((REAL)sr_screenWidth/sr_screenHeight/4. * 3., 1., 1.); BeginQuads(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |