From: <z-...@us...> - 2008-01-04 16:53:05
|
Revision: 7454 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7454&view=rev Author: z-man Date: 2008-01-04 08:52:34 -0800 (Fri, 04 Jan 2008) Log Message: ----------- Merging branch 0.2.8 from revision 7407 to 7453: ------------------------------------------------------------------------ r7453 | z-man | 2008-01-04 17:13:51 +0100 (Fri, 04 Jan 2008) | 2 lines Hardcoding version for mac release. ------------------------------------------------------------------------ r7452 | z-man | 2008-01-04 16:47:32 +0100 (Fri, 04 Jan 2008) | 2 lines Adapted filenames. ------------------------------------------------------------------------ r7451 | z-man | 2008-01-04 16:24:57 +0100 (Fri, 04 Jan 2008) | 2 lines added new .in file to project. ------------------------------------------------------------------------ r7450 | z-man | 2008-01-04 00:10:42 +0100 (Fri, 04 Jan 2008) | 2 lines Fixed bug that made all player names blank on the client side on the initial sync. ------------------------------------------------------------------------ r7449 | z-man | 2008-01-03 23:56:32 +0100 (Thu, 03 Jan 2008) | 2 lines Ok, ok, now it's working again. ------------------------------------------------------------------------ r7448 | z-man | 2008-01-03 23:56:12 +0100 (Thu, 03 Jan 2008) | 2 lines Should have tested the last commit :) ------------------------------------------------------------------------ r7447 | z-man | 2008-01-03 23:51:21 +0100 (Thu, 03 Jan 2008) | 2 lines Moved config_common.h to config_common.h.in for the Mac so no SVN files get modified by process_files.rb. ------------------------------------------------------------------------ r7446 | z-man | 2008-01-02 01:58:28 +0100 (Wed, 02 Jan 2008) | 2 lines Argh, reverted SVKs crappy commit. ------------------------------------------------------------------------ r7445 | z-man | 2008-01-02 00:37:37 +0100 (Wed, 02 Jan 2008) | 1 line ------------------------------------------------------------------------ r7444 | z-man | 2008-01-02 00:12:50 +0100 (Wed, 02 Jan 2008) | 2 lines Adapted some libraries to their new position, must have slipped nemo a while back. ------------------------------------------------------------------------ r7443 | z-man | 2008-01-01 23:03:55 +0100 (Tue, 01 Jan 2008) | 2 lines Updated OSX descriptions. ------------------------------------------------------------------------ r7442 | z-man | 2008-01-01 23:03:23 +0100 (Tue, 01 Jan 2008) | 2 lines Reverted version change. Need to find out how this was automated. ------------------------------------------------------------------------ r7441 | z-man | 2008-01-01 22:55:26 +0100 (Tue, 01 Jan 2008) | 1 line ------------------------------------------------------------------------ r7440 | z-man | 2008-01-01 22:52:32 +0100 (Tue, 01 Jan 2008) | 2 lines Build result of 10.2.8 build target should now be a binary that runs natively on ppc and i386 and works with OSX versions from 10.2.8 on. ------------------------------------------------------------------------ r7439 | wrtlprnft | 2008-01-01 20:51:05 +0100 (Tue, 01 Jan 2008) | 2 lines added new ladderlog stuff (used to be edlog), thanks to ed and voodoo (poke z-man) ------------------------------------------------------------------------ r7438 | z-man | 2008-01-01 18:04:17 +0100 (Tue, 01 Jan 2008) | 2 lines Fixed plist path to be relative (whatever a plist is) ------------------------------------------------------------------------ r7437 | z-man | 2008-01-01 17:12:14 +0100 (Tue, 01 Jan 2008) | 1 line strnlen does not exist on the mac, removed its usage ------------------------------------------------------------------------ r7436 | z-man | 2008-01-01 16:44:38 +0100 (Tue, 01 Jan 2008) | 1 line automatically selecting 10.2.8 specific options ------------------------------------------------------------------------ r7435 | z-man | 2007-12-31 18:18:47 +0100 (Mon, 31 Dec 2007) | 2 lines Fixed epsy's bug with MAX_PLAYERS_SAME_IP. ------------------------------------------------------------------------ r7432 | z-man | 2007-12-30 01:57:49 +0100 (Sun, 30 Dec 2007) | 2 lines Whoops :) ------------------------------------------------------------------------ r7431 | z-man | 2007-12-30 01:15:59 +0100 (Sun, 30 Dec 2007) | 2 lines Added TIME_FACTOR variable to compensate for dodgy system timers. ------------------------------------------------------------------------ r7429 | z-man | 2007-12-29 21:48:28 +0100 (Sat, 29 Dec 2007) | 2 lines Timer hickups are now swallowed with a once-per-session warning. ------------------------------------------------------------------------ r7424 | z-man | 2007-12-17 13:27:02 +0100 (Mon, 17 Dec 2007) | 2 lines silly test commit ------------------------------------------------------------------------ r7423 | z-man | 2007-12-17 11:08:57 +0100 (Mon, 17 Dec 2007) | 2 lines Small performance fix: strlen -> strnlen. Want to do something useful today :) ------------------------------------------------------------------------ r7422 | z-man | 2007-12-17 11:01:59 +0100 (Mon, 17 Dec 2007) | 2 lines Undone the last two renegade commits (/me blames SVK) ------------------------------------------------------------------------ r7421 | z-man | 2007-12-17 10:53:10 +0100 (Mon, 17 Dec 2007) | 1 line ------------------------------------------------------------------------ r7420 | z-man | 2007-12-17 10:52:25 +0100 (Mon, 17 Dec 2007) | 2 lines Next attempt at killing bizarre illegal color code constructs. ------------------------------------------------------------------------ r7418 | wrtlprnft | 2007-12-17 07:55:30 +0100 (Mon, 17 Dec 2007) | 2 lines Remove incomplete color codes in tColoredString::RemoveColors(), too. ------------------------------------------------------------------------ r7417 | z-man | 2007-12-16 22:04:50 +0100 (Sun, 16 Dec 2007) | 2 lines Color code removal now reliably removes nested color codes. ------------------------------------------------------------------------ r7416 | z-man | 2007-12-16 21:17:27 +0100 (Sun, 16 Dec 2007) | 2 lines Added release notes for 0.2.8.3 ------------------------------------------------------------------------ r7415 | z-man | 2007-12-16 21:16:53 +0100 (Sun, 16 Dec 2007) | 2 lines added HAVE_ISBLANK ------------------------------------------------------------------------ r7414 | z-man | 2007-12-16 21:16:24 +0100 (Sun, 16 Dec 2007) | 2 lines fixed typo ------------------------------------------------------------------------ r7412 | z-man | 2007-12-16 18:19:39 +0100 (Sun, 16 Dec 2007) | 2 lines added osx build handling and new releases.php layout requirements. ------------------------------------------------------------------------ r7410 | z-man | 2007-12-14 18:13:25 +0100 (Fri, 14 Dec 2007) | 2 lines Calling PumpEvents() while waiting for application to receive focus; only that way, it actually gets noticed. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7407&view=rev Modified Paths: -------------- armagetronad/trunk/armagetronad/Makefile.am armagetronad/trunk/armagetronad/NEWS armagetronad/trunk/armagetronad/README-Subversion armagetronad/trunk/armagetronad/config/settings.cfg armagetronad/trunk/armagetronad/config/settings_dedicated.cfg armagetronad/trunk/armagetronad/language/deutsch.txt armagetronad/trunk/armagetronad/language/english_base.txt armagetronad/trunk/armagetronad/language/english_base_notranslate.txt armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp armagetronad/trunk/armagetronad/src/engine/ePlayer.h armagetronad/trunk/armagetronad/src/network/nNetObject.cpp armagetronad/trunk/armagetronad/src/network/nNetwork.cpp armagetronad/trunk/armagetronad/src/render/rScreen.cpp armagetronad/trunk/armagetronad/src/tools/tString.cpp armagetronad/trunk/armagetronad/src/tools/tSysTime.cpp armagetronad/trunk/armagetronad/src/tron/gGame.cpp armagetronad/trunk/build/doc/description.txt armagetronad/trunk/build/scripts/aabeta Added Paths: ----------- armagetronad/trunk/armagetronad/src/macosx/config_common.h.in Removed Paths: ------------- armagetronad/trunk/armagetronad/src/macosx/config_common.h Modified: armagetronad/trunk/armagetronad/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/Makefile.am 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/Makefile.am 2008-01-04 16:52:34 UTC (rev 7454) @@ -69,6 +69,9 @@ # replace dynamic version in configure.ac with the version this build is configured with sed -e "s/m4_include(version)//" -e "s/AUTOMATIC_VERSION/$(VERSION)/" < @srcdir@/configure.ac > $(distdir)/configure.ac +# same for src/macosx/config_common.h.in + sed -e "s/@ver""sion@/\"$(VERSION)\"/" < @srcdir@/src/macosx/config_common.h.in > $(distdir)/src/macosx/config_common.h.in + # regenerate dependant files so they no longer reference to the file "version" which will be removed cp @srcdir@/bootstrap.sh $(distdir) cd $(distdir); rm -f aa_config.h.in version; sh ./bootstrap.sh; rm version Modified: armagetronad/trunk/armagetronad/NEWS =================================================================== --- armagetronad/trunk/armagetronad/NEWS 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/NEWS 2008-01-04 16:52:34 UTC (rev 7454) @@ -122,7 +122,7 @@ Featurelets ----------- -- The client now can hadle network traffic while it is waiting for the graphics +- The client now can handle network traffic while it is waiting for the graphics card to swap buffers. - The dedicated server no longer uses a fixed delay, but a select() call (that returns when network data arrives) to idle. When data arrives, it does @@ -149,6 +149,18 @@ - New "About" menu item in the main menu displays the version of Armagetron Advanced, the paths it uses, links to the main site, wiki and forums and the names of the project admins. +- New entries in ladderlog.txt: + - GAME_TIME <time> (only if enabled via the LADDERLOG_GAME_TIME_INTERVAL + setting): The time that has passed since the last start of a round + - BASEZONE_CONQUERED <team> <x> <y>: A fortress zone belonging to <team> + at the coordinates (<x>, <y>) has been conquered + - BASEZONE_CONQUERER <player>: at the time of the last BASEZONE_CONQUERED + message, <player> has been in the conquered zone + - ONLINE_PLAYER <player> [<ping [<team>]]: At the beginning of the round, + <player> had <ping> and was on <team>. This line is not printed for bots + - NUM_HUMANS <n>: There are <n> players that are not AIs and are part of + a team. + - ROUND_SCORE has the player's team's score appended. Bugfixes -------- Modified: armagetronad/trunk/armagetronad/README-Subversion =================================================================== --- armagetronad/trunk/armagetronad/README-Subversion 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/README-Subversion 2008-01-04 16:52:34 UTC (rev 7454) @@ -90,7 +90,6 @@ Windows + VisualC ================= - You'll need to check out the additional module build_visualc parallel to this module. In it, you'll find a README describing how to proceed; you'll need to download some libraries and put them in the right place. Modified: armagetronad/trunk/armagetronad/config/settings.cfg =================================================================== --- armagetronad/trunk/armagetronad/config/settings.cfg 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/config/settings.cfg 2008-01-04 16:52:34 UTC (rev 7454) @@ -769,6 +769,12 @@ # This one is for old clients that don't support the automatic lag adaption protocol. LAG_OFFSET_LEGACY 0.0 +# In the very unlikely event that your system timer goes slow or fast and you absolutely +# cannot do anything about that, you can make ArmagetronAd multiply time measurements +# with the following value. For example, if your system timer is about 10% too fast, you +# can use the value 0.909 to compensate. Deviations of less than 1% are usually compensated +# by the network code. +TIME_FACTOR 1.0 # deprecated settings, they'll go away unless there are protests Modified: armagetronad/trunk/armagetronad/config/settings_dedicated.cfg =================================================================== --- armagetronad/trunk/armagetronad/config/settings_dedicated.cfg 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/config/settings_dedicated.cfg 2008-01-04 16:52:34 UTC (rev 7454) @@ -196,6 +196,8 @@ CONSOLE_DECORATE_ID 1 # Decorates every line of console output with the client ID CONSOLE_DECORATE_IP 0 # Decorates every line of console output with the client IP +LADDERLOG_GAME_TIME_INTERVAL -1 # write a line to ladderlog.txt indicating how "old" the curent game is at most every n seconds. Negative values disable this feature. + SINCLUDE server_info.cfg # ping flood response DOS protection: if pings from a single machine are requested more often than this, # they are not answered. Setting the last item to a negative value disables the system. Modified: armagetronad/trunk/armagetronad/language/deutsch.txt =================================================================== --- armagetronad/trunk/armagetronad/language/deutsch.txt 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/language/deutsch.txt 2008-01-04 16:52:34 UTC (rev 7454) @@ -1952,6 +1952,8 @@ #******************************************** #******************************************** +timer_hickup Die Systemuhr scheint gerade um \1 Sekunden gesprungen zu sein. Wenn das häufger vorkommt, solltest Du ihre Funktion ueberpruefen. + #******************************************** #******************************************** # Modified: armagetronad/trunk/armagetronad/language/english_base.txt =================================================================== --- armagetronad/trunk/armagetronad/language/english_base.txt 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/language/english_base.txt 2008-01-04 16:52:34 UTC (rev 7454) @@ -667,6 +667,7 @@ console_decorate_id_help Decorates every line of console output with the client ID console_decorate_ip_help Decorates every line of console output with the client IP console_ladder_log_help Sends ladder log output to the console +ladderlog_game_time_interval If nonnegative, write a line with the current game time to the ladder log every n seconds. show_fps_help Enable fps display floor_mirror_help Floor mirror mode floor_detail_help Floor detail settings @@ -1992,6 +1993,8 @@ #******************************************** #******************************************** +timer_hickup Timer hickup of \1 seconds detected and compensated. If this happens frequently, you should check whether your system timer is operating correctly.\n + #******************************************** #******************************************** # Modified: armagetronad/trunk/armagetronad/language/english_base_notranslate.txt =================================================================== --- armagetronad/trunk/armagetronad/language/english_base_notranslate.txt 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/language/english_base_notranslate.txt 2008-01-04 16:52:34 UTC (rev 7454) @@ -7,6 +7,7 @@ #******************************************** #******************************************** +time_factor_help UNDOCUMENTED network_lock_out_028_test_help UNDOCUMENTED arena_wall_shadow_dist_help UNDOCUMENTED arena_wall_shadow_near_help UNDOCUMENTED Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-01-04 16:52:34 UTC (rev 7454) @@ -2392,6 +2392,10 @@ { // kill them sn_DisconnectUser( Owner(), "$network_kill_too_many_players" ); + + // technically has the same effect as the above function, but we also want + // to abort registering this player object and this exception will do that as well. + throw nKillHim(); } // clear old legacy spectator that may be lurking around @@ -2762,7 +2766,9 @@ { // filter colors if ( se_filterColorNames ) + { remoteName = tColoredString::RemoveColors( remoteName ); + } // don't do the fancy stuff on the client, it only makes names on score tables and // console messages go out of sync. @@ -3397,8 +3403,35 @@ return y; } +void ePlayerNetID::RankingLadderLog() { + SortByScore(); + int num_humans = 0; + int max = se_PlayerNetIDs.Len(); + for(int i = 0; i < max; ++i) { + ePlayerNetID *p = se_PlayerNetIDs(i); + if(p->Owner() == 0) continue; // ignore AIs + tString line("ONLINE_PLAYER "); + + line << p->GetUserName(); + + if(p->IsActive()) { + line << " " << p->ping; + if(p->currentTeam) { + line << " " << FilterName(p->currentTeam->Name()); + ++num_humans; + } + } + + line << '\n'; + se_SaveToLadderLog(line); + } + tString line("NUM_HUMANS "); + line << num_humans << '\n'; + se_SaveToLadderLog(line); +} + tColoredString & operator << (tColoredString &s,const ePlayer &p){ return s << tColoredString::ColorString(p.rgb[0]/15.0, p.rgb[1]/15.0, @@ -4688,7 +4721,7 @@ void ePlayerNetID::UpdateName( void ) { // don't do a thing if we're not fully synced - if ( this->ID() == 0 && nameFromClient_.Len() <= 1 ) + if ( this->ID() == 0 && nameFromClient_.Len() <= 1 && sn_GetNetState() == nSERVER ) return; // store old name for password re-request and name change message @@ -5211,7 +5244,7 @@ lastScore_ = IMPOSSIBLY_LOW_SCORE; ret << "ROUND_SCORE " << scoreDifference << " " << GetUserName(); if ( currentTeam ) - ret << " " << FilterName( currentTeam->Name() ); + ret << " " << FilterName( currentTeam->Name() ) << " " << currentTeam->Score(); ret << "\n"; se_SaveToLadderLog( ret ); } Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.h =================================================================== --- armagetronad/trunk/armagetronad/src/engine/ePlayer.h 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/src/engine/ePlayer.h 2008-01-04 16:52:34 UTC (rev 7454) @@ -272,7 +272,11 @@ static void SortByScore(); // brings the players into the right order static tString Ranking( int MAX=12, bool cut = true ); // returns a ranking list + static float RankingGraph( float y, int MAX ); // prints a ranking list + + static void RankingLadderLog(); // writes a small ranking list to ladderlog + static void ResetScore(); // resets the ranking list static void DisplayScores(); // display scores on the screen Deleted: armagetronad/trunk/armagetronad/src/macosx/config_common.h =================================================================== --- armagetronad/trunk/armagetronad/src/macosx/config_common.h 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/src/macosx/config_common.h 2008-01-04 16:52:34 UTC (rev 7454) @@ -1,170 +0,0 @@ -/* aa_config.h. Generated by configure. */ -/* aa_config.h.in. Generated from configure.ac by autoheader. */ - -/* #define MACOSX_VERSION_10_2 1 */ - -#define MACOSX_XCODE 1 -#define HAVE_LIBRUBY 1 - -/* AIX */ -/* #undef AIX */ - -/* BeOS */ -/* #undef BEOS */ - -/* Include pthread support for binary relocation? */ -/* #undef BR_PTHREAD */ - -/* Define if your system deos not like the pointer tricks in eWall.h. */ -/* #undef CAUTION_WALL */ - -/* Define if you wish to compile a dedicated server */ -/* #undef DEDICATED */ - -/* Define if you wish to use the old and dirty OpenGL initialization method */ -/* #undef DIRTY */ - -/* Define if you dont want to use a custom memory manager. */ -#define DONTUSEMEMMANAGER 1 - -/* Use binary relocation? */ -/* #undef ENABLE_BINRELOC */ - -/* Define to 1 if you have the `atan2f' function. */ -#ifndef MACOSX_VERSION_10_2 -#define HAVE_ATAN2F 1 -#endif - -/* Define to 1 if you have the `cosf' function. */ -#ifndef MACOSX_VERSION_10_2 -#define HAVE_COSF 1 -#endif - -/* Define to 1 if you have the `fabsf' function. */ -#define HAVE_FABSF 1 - -/* Define to 1 if you have the `floorf' function. */ -#define HAVE_FLOORF 1 - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `jpeg' library (-ljpeg). */ -/* #undef HAVE_LIBJPEG */ - -/* Define to 1 if you have the `pthread' library (-lpthread). */ -/* #undef HAVE_LIBPTHREAD */ - -/* Define to 1 if you have the `wsock32' library (-lwsock32). */ -/* #undef HAVE_LIBWSOCK32 */ - -/* Define if you have the X11 library (-lX11). */ -/* #undef HAVE_LIBX11 */ - -/* Define to 1 if you have the `xml2' library (-lxml2). */ -#define HAVE_LIBXML2 1 - -/* Define if your xml2 library is obsolete (lacks - xmlParserInputBufferCreateFilenameDefault). */ -/* #ifndef MACOSX_VERSION_10_2 - * #define HAVE_LIBXML2_WO_PIBCREATE 1 - * #endif - */ - -/* Define to 1 if you have the `z' library (-lz). */ -#define HAVE_LIBZ 1 - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `select' function. */ -#define HAVE_SELECT 1 - -/* Define to 1 if you have the `sinf' function. */ -#ifndef MACOSX_VERSION_10_2 -#define HAVE_SINF 1 -#endif - -/* Define if you have the type socklen_t. */ -#ifndef MACOSX_VERSION_10_2 -#define HAVE_SOCKLEN_T 1 -#endif - -/* Define to 1 if you have the `sqrtf' function. */ -#ifndef MACOSX_VERSION_10_2 -#define HAVE_SQRTF 1 -#endif - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the `tanf' function. */ -#ifndef MACOSX_VERSION_10_2 -#define HAVE_TANF 1 -#endif - -/* Define to 1 if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `wmemset' function. */ -#ifndef MACOSX_VERSION_10_2 -#define HAVE_WMEMSET 1 -#endif - -/* Define to 1 if you have the `logf' function. */ -#ifndef MACOSX_VERSION_10_2 -#define HAVE_LOGF 1 -#endif - -/* Define to 1 if you have the `expf' function. */ -#ifndef MACOSX_VERSION_10_2 -#define HAVE_EXPF 1 -#endif - -/* enables krawall */ -/* #undef KRAWALL */ - -/* enables krawall server */ -/* #undef KRAWALL_SERVER */ - -/* GNU/Linux */ -/* #undef LINUX */ - -/* Mac OS X */ -#define MACOSX 1 - -/* The size of a `Enum', as computed by sizeof. */ -#define SIZEOF_ENUM 4 - -/* The size of a `int ', as computed by sizeof. */ -#define SIZEOF_INT_ 4 - -/* Solaris */ -/* #undef SOLARIS */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Windows 9x/NT/2k/XP */ -/* #undef WIN32 */ - -/* Define to 1 if the X Window System is missing or not being used. */ -/* #undef X_DISPLAY_MISSING */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ Copied: armagetronad/trunk/armagetronad/src/macosx/config_common.h.in (from rev 7453, armagetronad/branches/0.2.8/armagetronad/src/macosx/config_common.h.in) =================================================================== --- armagetronad/trunk/armagetronad/src/macosx/config_common.h.in (rev 0) +++ armagetronad/trunk/armagetronad/src/macosx/config_common.h.in 2008-01-04 16:52:34 UTC (rev 7454) @@ -0,0 +1,175 @@ +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +#if MAC_OS_X_VERSION_MIN_REQUIRED == 1020 +#define MACOSX_VERSION_10_2 1 +#endif + +/* AIX */ +/* #undef AIX */ + +/* BeOS */ +/* #undef BEOS */ + +/* Include pthread support for binary relocation? */ +/* #undef BR_PTHREAD */ + +/* Define if your system deos not like the pointer tricks in eWall.h. */ +/* #undef CAUTION_WALL */ + +/* Define if you wish to compile a dedicated server */ +/* #undef DEDICATED */ + +/* Define if you wish to use the old and dirty OpenGL initialization method */ +/* #undef DIRTY */ + +/* Define if you dont want to use a custom memory manager. */ +#define DONTUSEMEMMANAGER 1 + +/* Use binary relocation? */ +/* #undef ENABLE_BINRELOC */ + +/* Define to 1 if you have the `atan2f' function. */ +#ifndef MACOSX_VERSION_10_2 +#define HAVE_ATAN2F 1 +#endif + +/* Define to 1 if you have the `cosf' function. */ +#ifndef MACOSX_VERSION_10_2 +#define HAVE_COSF 1 +#endif + +/* Define to 1 if you have the `fabsf' function. */ +#define HAVE_FABSF 1 + +/* Define to 1 if you have the `floorf' function. */ +#define HAVE_FLOORF 1 + +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `isblank' function. */ +#define HAVE_ISBLANK 1 + +/* Define to 1 if you have the `jpeg' library (-ljpeg). */ +/* #undef HAVE_LIBJPEG */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +/* #undef HAVE_LIBPTHREAD */ + +/* Define to 1 if you have the `wsock32' library (-lwsock32). */ +/* #undef HAVE_LIBWSOCK32 */ + +/* Define if you have the X11 library (-lX11). */ +/* #undef HAVE_LIBX11 */ + +/* Define to 1 if you have the `xml2' library (-lxml2). */ +#define HAVE_LIBXML2 1 + +/* Define if your xml2 library is obsolete (lacks + xmlParserInputBufferCreateFilenameDefault). */ +/* #ifndef MACOSX_VERSION_10_2 + * #define HAVE_LIBXML2_WO_PIBCREATE 1 + * #endif + */ + +/* Define to 1 if you have the `z' library (-lz). */ +#define HAVE_LIBZ 1 + +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `select' function. */ +#define HAVE_SELECT 1 + +/* Define to 1 if you have the `sinf' function. */ +#ifndef MACOSX_VERSION_10_2 +#define HAVE_SINF 1 +#endif + +/* Define if you have the type socklen_t. */ +#ifndef MACOSX_VERSION_10_2 +#define HAVE_SOCKLEN_T 1 +#endif + +/* Define to 1 if you have the `sqrtf' function. */ +#ifndef MACOSX_VERSION_10_2 +#define HAVE_SQRTF 1 +#endif + +/* Define to 1 if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the <strings.h> header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the `tanf' function. */ +#ifndef MACOSX_VERSION_10_2 +#define HAVE_TANF 1 +#endif + +/* Define to 1 if you have the <unistd.h> header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `wmemset' function. */ +#ifndef MACOSX_VERSION_10_2 +#define HAVE_WMEMSET 1 +#endif + +/* Define to 1 if you have the `logf' function. */ +#ifndef MACOSX_VERSION_10_2 +#define HAVE_LOGF 1 +#endif + +/* Define to 1 if you have the `expf' function. */ +#ifndef MACOSX_VERSION_10_2 +#define HAVE_EXPF 1 +#endif + +/* enables krawall */ +/* #undef KRAWALL */ + +/* enables krawall server */ +/* #undef KRAWALL_SERVER */ + +/* GNU/Linux */ +/* #undef LINUX */ + +/* Mac OS X */ +#define MACOSX 1 + +/* The size of a `Enum', as computed by sizeof. */ +#define SIZEOF_ENUM 4 + +/* The size of a `int ', as computed by sizeof. */ +#define SIZEOF_INT_ 4 + +/* Solaris */ +/* #undef SOLARIS */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION @version@ + +/* Windows 9x/NT/2k/XP */ +/* #undef WIN32 */ + +/* Define to 1 if the X Window System is missing or not being used. */ +/* #undef X_DISPLAY_MISSING */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ Modified: armagetronad/trunk/armagetronad/src/network/nNetObject.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/network/nNetObject.cpp 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/src/network/nNetObject.cpp 2008-01-04 16:52:34 UTC (rev 7454) @@ -529,10 +529,15 @@ void Cheater(int i) { + // anything to do at all? + if (i != 0 && !sn_Connections[i].socket) + { + return; + } + con << "User " << i << " tried to cheat.\n"; // st_Breakpoint(); - if ( i == 0 ) // terminate connection to server throw tGenericException("There was a network error, the connection to the server had to be terminated.", "Network Error"); @@ -700,7 +705,7 @@ */ nNetObject::nNetObject(int own):lastSyncID_(0), - id(0),refCtr_(0),owner(own){ +id(0),refCtr_(0),owner(own){ #ifdef DEBUG //con << "Netobject " << id << " created.\n"; // if (id == 383) @@ -1578,7 +1583,7 @@ // send a creation message tJUST_CONTROLLED_PTR< nMessage > m=new nMessage - (nos->CreatorDescriptor()); + (nos->CreatorDescriptor()); #ifdef DEBUG if (s == sn_WatchNetID) Modified: armagetronad/trunk/armagetronad/src/network/nNetwork.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2008-01-04 16:52:34 UTC (rev 7454) @@ -3028,6 +3028,12 @@ return; } + // anything to do at all? + if (!sn_Connections[i].socket) + { + return; + } + sn_DisconnectUserNoWarn( i, reason ); } Modified: armagetronad/trunk/armagetronad/src/render/rScreen.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/render/rScreen.cpp 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/src/render/rScreen.cpp 2008-01-04 16:52:34 UTC (rev 7454) @@ -791,7 +791,10 @@ // wait for activation if we were ALT-Tabbed away: while ( (SDL_GetAppState() & SDL_APPACTIVE) == 0) + { SDL_Delay(100); + SDL_PumpEvents(); + } if (software_renderer && !last_software_renderer && !tRecorder::IsPlayingBack()) sr_LoadDefaultConfig(); @@ -801,7 +804,10 @@ // wait for activation if we were ALT-Tabbed away: while ( (SDL_GetAppState() & SDL_APPACTIVE) == 0) + { SDL_Delay(100); + SDL_PumpEvents(); + } sr_ResetRenderState(true); Modified: armagetronad/trunk/armagetronad/src/tools/tString.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-01-04 16:52:34 UTC (rev 7454) @@ -1493,17 +1493,35 @@ { tString ret; + int len = strlen(c); + + bool removed = false; + // walk through string while (*c!='\0'){ // skip color codes - if (*c=='0' && strlen(c)>=8 && c[1]=='x') + if (*c=='0' && len >= 2 && c[1]=='x') { - c+=8; + if(len >= 8) + { + c += 8; + len -= 8; + removed = true; + } + else + { + // skip incomplete color codes, too + return RemoveColors( ret ); + } } else + { ret << (*(c++)); + len--; + } } - return ret; + + return removed ? RemoveColors( ret ) : ret; } // helper function: removes trailing color of string and returns number of chars Modified: armagetronad/trunk/armagetronad/src/tools/tSysTime.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tools/tSysTime.cpp 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/src/tools/tSysTime.cpp 2008-01-04 16:52:34 UTC (rev 7454) @@ -30,6 +30,9 @@ #include "tSysTime.h" #include "tRecorder.h" #include "tError.h" +#include "tConsole.h" +#include "tConfiguration.h" +#include "tLocale.h" #if HAVE_UNISTD_H #include <unistd.h> @@ -251,10 +254,36 @@ // get time from OS GetTime( time ); + + // test hickupery + // time.seconds -= time.seconds/10; + + // record starting point if ( start.microseconds == 0 && start.seconds == 0 ) + { start = time; - relative = time - start; + } + // detect and counter timer hickups + tTime newRelative = time - start; + tTime timeStep = newRelative - relative; + if ( timeStep.seconds < 0 || timeStep.seconds > 10 ) + { + static bool warn = true; + if ( warn ) + { + warn = false; + con << tOutput( "$timer_hickup", float( timeStep.seconds + timeStep.microseconds * 1E-6 ) ); + } + + start = start + timeStep; + } + else + { + relative = newRelative; + } + + if ( relative.seconds > 20 ) { int x; @@ -295,7 +324,7 @@ if ( usecdelay > 0 ) tDelay( usecdelay ); - tTime timeNewRelative; + static tTime timeNewRelative; tAdvanceFrameSys( timeStart, timeNewRelative ); // try to fetch time from playback @@ -351,24 +380,27 @@ #endif } +static float st_timeFactor = 1.0; +static tSettingItem< float > st_timeFactorConf( "TIME_FACTOR", st_timeFactor ); + double tSysTimeFloat () { #ifdef DEBUG - if ( ! tRecorder::IsPlayingBack() ) - { - tTime time; - tAdvanceFrameSys( timeStart, time ); - time = time - timeRelative; - // if ( time.seconds > 5 ) - // { - // std::cout << "tAdvanceFrame not called often enough!\n"; - // st_Breakpoint(); - // tAdvanceFrameSys( timeRealRelative ); - // } - } + // if ( ! tRecorder::IsPlayingBack() ) + // { + // static tTime time; + // tAdvanceFrameSys( timeStart, time ); + // tTime timeStep = time - timeRelative; + // if ( timeStep.seconds > 5 ) + // { + // std::cout << "tAdvanceFrame not called often enough!\n"; + // st_Breakpoint(); + // tAdvanceFrameSys( timeRealRelative ); + // } + // } #endif - return timeRelative.seconds + timeRelative.microseconds*0.000001; + return ( timeRelative.seconds + timeRelative.microseconds*1E-6 ) * st_timeFactor; } static struct tTime timeRealStart; // the real time at the start of the program @@ -378,5 +410,5 @@ { // get real time from real OS tAdvanceFrameSys( timeRealStart, timeRealRelative ); - return timeRealRelative.seconds + timeRealRelative.microseconds*0.000001; + return ( timeRealRelative.seconds + timeRealRelative.microseconds*1E-6 ) * st_timeFactor; } Modified: armagetronad/trunk/armagetronad/src/tron/gGame.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2008-01-04 16:52:34 UTC (rev 7454) @@ -226,6 +226,10 @@ static REAL ded_idle=24; static tSettingItem<REAL> dedicaded_idle("DEDICATED_IDLE",ded_idle); +static float sg_gameTimeInterval=-1; +static tSettingItem<float> sggti("LADDERLOG_GAME_TIME_INTERVAL", + sg_gameTimeInterval); + #define MAXAI (gAICharacter::s_Characters.Len()) #define AUTO_AI_MAXFRAC 6 @@ -2510,6 +2514,8 @@ init_game_objects(grid); + ePlayerNetID::RankingLadderLog(); + // do the first analysis of the round, now is the time to get it used to the number of teams Analysis( -1000 ); @@ -3639,6 +3645,15 @@ synced_ = true; } + static float lastTime = -1; + + if(sg_gameTimeInterval >= 0 && (gtime >= lastTime + sg_gameTimeInterval || (gtime < lastTime && gtime >= 0))) { + tOutput out; + out << "GAME_TIME " << gtime << '\n'; + se_SaveToLadderLog(out); + lastTime = gtime; + } + if (state==GS_PLAY){ if (gtime<0 && gtime>-PREPARE_TIME+.3) eCamera::s_Timestep(grid, gtime); Modified: armagetronad/trunk/build/doc/description.txt =================================================================== --- armagetronad/trunk/build/doc/description.txt 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/build/doc/description.txt 2008-01-04 16:52:34 UTC (rev 7454) @@ -14,6 +14,13 @@ ---------------------------------- + +0.2.8.3: +Lots of small improvements went into this release. There are new cycle +physics settings, chat can be moderated, new anti-lag code and the +lag-o-meter now looks correct. Players joining a server now get a nice +fullscreen message, making server specific policies more visible. + 0.2.8.2: Some smaller improvements and bugfixes went into this release. Console and chat now have a history function, spectators are now visible to other Modified: armagetronad/trunk/build/scripts/aabeta =================================================================== --- armagetronad/trunk/build/scripts/aabeta 2008-01-04 16:13:51 UTC (rev 7453) +++ armagetronad/trunk/build/scripts/aabeta 2008-01-04 16:52:34 UTC (rev 7454) @@ -21,6 +21,9 @@ rm -f releases*.php* +test -r "Armagetron Advanced.app.dmg" && mv "Armagetron Advanced.app.dmg" armagetronad-$OFFICIAL_VERSION.macosx-universal.dmg +test -r "Armagetron Advanced Dedicated.dmg" && mv "Armagetron Advanced Dedicated.dmg" armagetronad-dedicated-$OFFICIAL_VERSION.macosx-universal.dmg + for f in *; do # ignore old-libxml files if echo "$f" | grep "libxml2" >/dev/null; then @@ -70,9 +73,14 @@ SYSTEM_AABETA=windows SYSTEM_AABETA_FULL=\(Source\) EXT_AABETA=zip + # test if this is a mac build + elif test "${REST}" = "macosx-universal.dmg"; then + TARGET=${PRODUCT}-${VERSION}.macosx-universal.dmg + SYSTEM_AABETA_FULL="Mac OS X 10.3+" + SYSTEM_AABETA=macosx + ARCH_AABETA="ppc_32 & x86_32" + EXT_AABETA=dmg else - # TODO: mac files - # assume it's unix # nothing needs to be done for source packages @@ -146,7 +154,7 @@ # build in new elements into releases.php REALRELEASES=../../../../../../www-aabeta/releases.php if test -r ${REALRELEASES}; then - insertat=2 + insertat=$( grep -n "INSERT NEW" $REALRELEASES | sed -e s/:.*//g | head -n 1 ) totallines=`wc -l < ${REALRELEASES}` lines=$(( ${totallines} - ${insertat} )) tail -n ${lines} ${REALRELEASES} > releases_tail.php This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2008-01-29 21:38:01
|
Revision: 7703 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7703&view=rev Author: z-man Date: 2008-01-29 13:38:06 -0800 (Tue, 29 Jan 2008) Log Message: ----------- Merging branch 0.2.8 from revision 7539 to 7702: ------------------------------------------------------------------------ r7702 | z-man | 2008-01-29 21:55:45 +0100 (Tue, 29 Jan 2008) | 2 lines Aplied yet another GCC 4.3 patch, and this time, put all of the includes we keep forgetting into defs.h. They should be removed at a later time again. ------------------------------------------------------------------------ r7701 | z-man | 2008-01-29 19:18:27 +0100 (Tue, 29 Jan 2008) | 3 lines Added PLAYER_RANDOM_COLOR to randomly pick a collor every round. The new pick gets rejected if it is closer to the other players' colors than the old color, so the thing stabilizes you to a unique color after a while. ------------------------------------------------------------------------ r7699 | z-man | 2008-01-29 17:28:42 +0100 (Tue, 29 Jan 2008) | 2 lines Safer version of st_ToDo() to be called from signal handlers. ------------------------------------------------------------------------ r7698 | z-man | 2008-01-29 17:07:13 +0100 (Tue, 29 Jan 2008) | 2 lines Added /etc/armagetronad-dedicated/master reload to reload configuration. ------------------------------------------------------------------------ r7697 | z-man | 2008-01-29 17:03:39 +0100 (Tue, 29 Jan 2008) | 2 lines st_DoToDo() now also called while the server is napping. ------------------------------------------------------------------------ r7696 | z-man | 2008-01-29 16:57:18 +0100 (Tue, 29 Jan 2008) | 2 lines Configuration files get reloaded on SIGHUP ------------------------------------------------------------------------ r7694 | z-man | 2008-01-29 12:05:27 +0100 (Tue, 29 Jan 2008) | 2 lines Updated. ------------------------------------------------------------------------ r7693 | z-man | 2008-01-29 12:00:27 +0100 (Tue, 29 Jan 2008) | 2 lines Added extra alpha blending factors for zones. ------------------------------------------------------------------------ r7692 | z-man | 2008-01-29 11:47:51 +0100 (Tue, 29 Jan 2008) | 2 lines FORTRESS_HELD_SCORE now also applied on zones that vanish for lack of enemy contact. ------------------------------------------------------------------------ r7691 | z-man | 2008-01-29 09:44:38 +0100 (Tue, 29 Jan 2008) | 2 lines More room for instant chats in the menu. ------------------------------------------------------------------------ r7687 | z-man | 2008-01-28 23:19:38 +0100 (Mon, 28 Jan 2008) | 2 lines Fixed small wall stumps that would sometimes get left behind. ------------------------------------------------------------------------ r7686 | z-man | 2008-01-28 23:02:21 +0100 (Mon, 28 Jan 2008) | 5 lines Hole score management is now done with an extra redirection: hole->explosion->cycle. hat way, in case a cycle can produce multiple explosions (not the case with respawning, there it is a new cycle every spawn), the player can get multiple scores for holes. ------------------------------------------------------------------------ r7683 | z-man | 2008-01-28 20:09:54 +0100 (Mon, 28 Jan 2008) | 2 lines Disabling astyle for now. More trouble than it is worth with its changed default behavior. ------------------------------------------------------------------------ r7679 | z-man | 2008-01-28 19:00:40 +0100 (Mon, 28 Jan 2008) | 2 lines ZOMG HOLERZ! Added detection and scoring for tactical holes. ------------------------------------------------------------------------ r7667 | z-man | 2008-01-27 17:05:42 +0100 (Sun, 27 Jan 2008) | 2 lines Fixed behavior of fullscreen message when you hit ESC. ------------------------------------------------------------------------ r7664 | z-man | 2008-01-27 15:05:11 +0100 (Sun, 27 Jan 2008) | 2 lines Fortress holding award is only granted to teams that are still alive. ------------------------------------------------------------------------ r7657 | z-man | 2008-01-27 12:06:20 +0100 (Sun, 27 Jan 2008) | 2 lines added progname and progtitle to the variables saved in config.status. ------------------------------------------------------------------------ r7656 | z-man | 2008-01-27 12:04:37 +0100 (Sun, 27 Jan 2008) | 3 lines Added OnRoundEnd() member function to eGameObject that is called after a round winner was declared and before the round ends. Implemented SCORE_SURVIVE for player survival and FORTRESS_HELD_SCORE for not losing each fortress zone with that. (FORTRESS_HELD_SCORE does not apply here, not merged) ------------------------------------------------------------------------ r7655 | z-man | 2008-01-27 03:51:12 +0100 (Sun, 27 Jan 2008) | 2 lines Fixed bleeding colors from OVERLONG SERVER NAMES WITH OBNOXIOUSLY MANY COLORS. (not needed on merge target) ------------------------------------------------------------------------ r7651 | nemostultae | 2008-01-27 01:29:38 +0100 (Sun, 27 Jan 2008) | 3 lines * Removed "Copy Headers" build phase from dedicated target * Removed headers from "Copy Frameworks" phase of client ------------------------------------------------------------------------ r7635 | z-man | 2008-01-26 17:42:47 +0100 (Sat, 26 Jan 2008) | 1 line Added libxml2 to library dependencies; it is required for authentication. ------------------------------------------------------------------------ r7632 | z-man | 2008-01-26 17:30:01 +0100 (Sat, 26 Jan 2008) | 2 lines Increased niceness level and added a note. ------------------------------------------------------------------------ r7554 | z-man | 2008-01-19 14:35:28 +0100 (Sat, 19 Jan 2008) | 2 lines separated language strings of subculture menu from those of the server favorites. ------------------------------------------------------------------------ r7553 | z-man | 2008-01-19 12:37:51 +0100 (Sat, 19 Jan 2008) | 2 lines Minor corrections. ------------------------------------------------------------------------ r7552 | z-man | 2008-01-19 12:15:21 +0100 (Sat, 19 Jan 2008) | 2 lines Updated. ------------------------------------------------------------------------ r7551 | z-man | 2008-01-19 11:30:30 +0100 (Sat, 19 Jan 2008) | 2 lines Default comptetition subculture for everyone. ------------------------------------------------------------------------ r7550 | z-man | 2008-01-19 10:56:44 +0100 (Sat, 19 Jan 2008) | 2 lines Servers that are no longer listed on the master servers are no longer shown. This should get rid of the huge list of unreachable servers people report sometimes. ------------------------------------------------------------------------ r7549 | z-man | 2008-01-19 03:55:58 +0100 (Sat, 19 Jan 2008) | 2 lines Moved RINCLUDE to a better home. ------------------------------------------------------------------------ r7548 | z-man | 2008-01-19 03:53:13 +0100 (Sat, 19 Jan 2008) | 2 lines Everyone gets a math library, even dedicated servers. ------------------------------------------------------------------------ r7547 | z-man | 2008-01-19 02:38:25 +0100 (Sat, 19 Jan 2008) | 2 lines Added subcultures managed by one master server each. ------------------------------------------------------------------------ r7546 | z-man | 2008-01-18 23:20:18 +0100 (Fri, 18 Jan 2008) | 4 lines Added boolean return value to console (fullscreen) messages. Added escape possibility to server redirections. Removed redirection spam protection, it makes no sense any more. ------------------------------------------------------------------------ r7545 | z-man | 2008-01-18 19:59:22 +0100 (Fri, 18 Jan 2008) | 2 lines Translated new language items. ------------------------------------------------------------------------ r7544 | z-man | 2008-01-18 19:44:08 +0100 (Fri, 18 Jan 2008) | 2 lines I can't build RPMs any more, hence remove the rpm dependency of z-man-home. ------------------------------------------------------------------------ r7543 | z-man | 2008-01-18 18:29:56 +0100 (Fri, 18 Jan 2008) | 2 lines My system wasn't quite happy with the way the temporary was created, for some reason. Changed it a bit. ------------------------------------------------------------------------ r7542 | z-man | 2008-01-18 18:06:55 +0100 (Fri, 18 Jan 2008) | 2 lines Added dedicated build dependency to dedicated server release target. ------------------------------------------------------------------------ r7541 | z-man | 2008-01-18 17:59:18 +0100 (Fri, 18 Jan 2008) | 2 lines Added gFriends. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7539&view=rev Modified Paths: -------------- armagetronad/trunk/armagetronad/Makefile.manual armagetronad/trunk/armagetronad/NEWS armagetronad/trunk/armagetronad/batch/make/beautify armagetronad/trunk/armagetronad/batch/rcd_startstop.in armagetronad/trunk/armagetronad/config/astylerc armagetronad/trunk/armagetronad/config/default.cfg armagetronad/trunk/armagetronad/config/rc.config.in armagetronad/trunk/armagetronad/config/settings.cfg armagetronad/trunk/armagetronad/configure.ac armagetronad/trunk/armagetronad/language/deutsch.txt armagetronad/trunk/armagetronad/language/english_base.txt armagetronad/trunk/armagetronad/language/english_base_notranslate.txt armagetronad/trunk/armagetronad/language/spanish.txt armagetronad/trunk/armagetronad/src/defs.h armagetronad/trunk/armagetronad/src/engine/eGameObject.cpp armagetronad/trunk/armagetronad/src/engine/eGameObject.h armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp armagetronad/trunk/armagetronad/src/network/nNetwork.h armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp armagetronad/trunk/armagetronad/src/network/nServerInfo.h armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp armagetronad/trunk/armagetronad/src/tools/tConsole.cpp armagetronad/trunk/armagetronad/src/tools/tConsole.h armagetronad/trunk/armagetronad/src/tools/tResourceManager.cpp armagetronad/trunk/armagetronad/src/tools/tToDo.cpp armagetronad/trunk/armagetronad/src/tools/tToDo.h armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp armagetronad/trunk/armagetronad/src/tron/gCycle.cpp armagetronad/trunk/armagetronad/src/tron/gCycle.h armagetronad/trunk/armagetronad/src/tron/gExplosion.cpp armagetronad/trunk/armagetronad/src/tron/gExplosion.h armagetronad/trunk/armagetronad/src/tron/gFriends.h armagetronad/trunk/armagetronad/src/tron/gGame.cpp armagetronad/trunk/armagetronad/src/tron/gMenus.cpp armagetronad/trunk/armagetronad/src/tron/gServerBrowser.cpp armagetronad/trunk/armagetronad/src/tron/gServerBrowser.h armagetronad/trunk/armagetronad/src/tron/gServerFavorites.cpp armagetronad/trunk/armagetronad/src/tron/gServerFavorites.h armagetronad/trunk/armagetronad/src/tron/gWall.cpp armagetronad/trunk/armagetronad/src/tron/gWall.h armagetronad/trunk/armagetronad/src/ui/uMenu.cpp armagetronad/trunk/armagetronad/src/ui/uMenu.h armagetronad/trunk/build/WorkMakefile Added Paths: ----------- armagetronad/trunk/armagetronad/config/subcultures.srv Modified: armagetronad/trunk/armagetronad/Makefile.manual =================================================================== --- armagetronad/trunk/armagetronad/Makefile.manual 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/Makefile.manual 2008-01-29 21:38:06 UTC (rev 7703) @@ -7,20 +7,20 @@ # use this target if you're OK with the project's defaults and # want updated file timestamps rebeautify: - ARTISTIC_STYLE_OPTIONS=$(srcdir)/config/astylerc sh $(srcdir)/batch/make/beautify -t $(srcdir) .beautytag.re +# ARTISTIC_STYLE_OPTIONS=$(srcdir)/config/astylerc sh $(srcdir)/batch/make/beautify -t $(srcdir) .beautytag.re # use this target if you want to switch between your settings # (beautify-personal) and the project defaults to get back to # the defaults (timestamps stay untouched) beautify: rm -f $(srcdir)/.beautytag.personal - ARTISTIC_STYLE_OPTIONS=$(srcdir)/config/astylerc sh $(srcdir)/batch/make/beautify $(srcdir) .beautytag +# ARTISTIC_STYLE_OPTIONS=$(srcdir)/config/astylerc sh $(srcdir)/batch/make/beautify $(srcdir) .beautytag # use this target to run astyle with your personal settings for # it (but remember to do "make beautify" before comitting to Subversion!) beautify-personal: rm -f $(srcdir)/.beautytag $(srcdir)/.beautytag.re - ARTISTIC_STYLE_OPTIONS=~/.astylerc sh $(srcdir)/batch/make/beautify $(srcdir) .beautytag.personal +# ARTISTIC_STYLE_OPTIONS=~/.astylerc sh $(srcdir)/batch/make/beautify $(srcdir) .beautytag.personal ########## # Checks # Modified: armagetronad/trunk/armagetronad/NEWS =================================================================== --- armagetronad/trunk/armagetronad/NEWS 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/NEWS 2008-01-29 21:38:06 UTC (rev 7703) @@ -89,6 +89,10 @@ ------------ New settings and commands: +- ZONE_ALPHA(_SERVER) to control intensity of zone rendering. +- SCORE_HOLE for awarding sacrifice. +- SCORE_SURVIVE for player survival and FORTRESS_HELD_SCORE for not losing + each fortress zone. - KICK_TO and MOVE_TO: redirect a client to a different server - DEFAULT_KICK(_TO)_MESSAGE: default reason given to players for a kick - DEFAULT_KICK_TO_SERVER/PORT: default redirection target for KICK/MOVE_TO. @@ -140,6 +144,12 @@ Featurelets ----------- +- Added PLAYER_RANDOM_COLOR for lazy people who just want to have a + color that differs from everyone else on the server. +- Configuration files get reloaded on SIGHUP +- A subculture list for server groups that are not managed by our main master servers +- A friends list and filter for the server browser that shows you only servers with + your friends on them. - The client now can handle network traffic while it is waiting for the graphics card to swap buffers. - The dedicated server no longer uses a fixed delay, but a select() call (that Modified: armagetronad/trunk/armagetronad/batch/make/beautify =================================================================== --- armagetronad/trunk/armagetronad/batch/make/beautify 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/batch/make/beautify 2008-01-29 21:38:06 UTC (rev 7703) @@ -11,7 +11,7 @@ SRCDIR="$1" shift -if test "$SRCDIR" == "-t"; then +if test "$SRCDIR" = "-t"; then TOUCH=true SRCDIR="$1" shift Modified: armagetronad/trunk/armagetronad/batch/rcd_startstop.in =================================================================== --- armagetronad/trunk/armagetronad/batch/rcd_startstop.in 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/batch/rcd_startstop.in 2008-01-29 21:38:06 UTC (rev 7703) @@ -64,6 +64,9 @@ echo -e "${return}" ;; + reload) + kill -HUP `cat ${MAINPIDFILE}` + ;; restart) $0 stop ; sleep 1 ; $0 start || return=${rc_failed} ;; @@ -84,7 +87,7 @@ tail -f ${LOGFILE} ;; *) - echo "Usage: $0 {start|stop|status|restart|log}" + echo "Usage: $0 {start|stop|reload|status|restart|log}" exit 1 esac Modified: armagetronad/trunk/armagetronad/config/astylerc =================================================================== --- armagetronad/trunk/armagetronad/config/astylerc 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/config/astylerc 2008-01-29 21:38:06 UTC (rev 7703) @@ -1,2 +1,9 @@ # artistic style configuration: just use defaults mode=c + +# humm, the defaults for those changed recently. +# better keep them around, they cause huge pointless +# changes we don't want as long as there are changes +# from 0.2.8 to merge. + +one-line=keep-blocks Modified: armagetronad/trunk/armagetronad/config/default.cfg =================================================================== --- armagetronad/trunk/armagetronad/config/default.cfg 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/config/default.cfg 2008-01-29 21:38:06 UTC (rev 7703) @@ -5,6 +5,7 @@ SERVER_NAME Unnamed Server CM_LOCY -0.5 + KEYBOARD 333 PLAYER_BIND ZOOM_OUT 1 KEYBOARD 332 PLAYER_BIND ZOOM_IN 1 KEYBOARD 327 PLAYER_BIND BANK_DOWN 1 Modified: armagetronad/trunk/armagetronad/config/rc.config.in =================================================================== --- armagetronad/trunk/armagetronad/config/rc.config.in 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/config/rc.config.in 2008-01-29 21:38:06 UTC (rev 7703) @@ -33,6 +33,9 @@ server_args="" -# niceness level of the servers +# niceness level of the servers. +# Be aware that a too low niceness level will make the server take away +# processing time from the network scheduler of the kernel, which is not +# what you want. -niceness_level=-5 +niceness_level=-2 Modified: armagetronad/trunk/armagetronad/config/settings.cfg =================================================================== --- armagetronad/trunk/armagetronad/config/settings.cfg 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/config/settings.cfg 2008-01-29 21:38:06 UTC (rev 7703) @@ -325,6 +325,9 @@ CUSTOM_SCREEN_ASPECT 1 # aspect ratio of the pixels (only affects game # rendering, not the menu) +PLAYER_RANDOM_COLOR 0 # if set to 1, a random generator will try to pick a color for you that + # differs from the other players on the server. + ############################################################################################ # # camera settings Copied: armagetronad/trunk/armagetronad/config/subcultures.srv (from rev 7702, armagetronad/branches/0.2.8/armagetronad/config/subcultures.srv) =================================================================== --- armagetronad/trunk/armagetronad/config/subcultures.srv (rev 0) +++ armagetronad/trunk/armagetronad/config/subcultures.srv 2008-01-29 21:38:06 UTC (rev 7703) @@ -0,0 +1,8 @@ +ServerBegin +connection master1.armagetronad.net +port 4532 +method 0 +key 0 +tna 0 +name Competitions +ServerEnd Modified: armagetronad/trunk/armagetronad/configure.ac =================================================================== --- armagetronad/trunk/armagetronad/configure.ac 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/configure.ac 2008-01-29 21:38:06 UTC (rev 7703) @@ -47,6 +47,8 @@ AC_ARG_VAR(DEBUGLEVEL,[Debug level for developers, normal users can safely ignore it. Accepted values go from 0 to 5. See README-DEVELOPER for details.]) AC_ARG_VAR(CODELEVEL,[Code checking strictness level for developers, normal users can safely ignore it. Accepted values go from 0 to 4. See README-DEVELOPER for details.]) AC_ARG_VAR(docstyle,[Documentation style for cross-building of documentation. Possible values: unix, web and windows.]) +AC_ARG_VAR(progname,[Program short name, default: armagetronad.]) +AC_ARG_VAR(progtitle,[Program long name, default: Armagetron Advanced.]) dnl a modern autoconf is required to process this AC_PREREQ(2.50) @@ -552,6 +554,19 @@ fi +dnl ************************************************* +dnl math +dnl ************************************************* + +if test $MATHLIB ; then +AC_CHECK_LIB($MATHLIB, exp,, + AC_MSG_WARN([ + You do not have the standard math library libm. Check + config.log for error messages and fix that.] + ) +) +fi + if test x$build_regular = xfalse; then AC_MSG_RESULT([ @@ -580,21 +595,7 @@ fi - dnl ************************************************* -dnl math -dnl ************************************************* - -if test $MATHLIB ; then -AC_CHECK_LIB($MATHLIB, exp,, - AC_MSG_WARN([ - You do not have the standard math library libm. Check - config.log for error messages and fix that.] - ) -) -fi - -dnl ************************************************* dnl SDL dnl ************************************************* Modified: armagetronad/trunk/armagetronad/language/deutsch.txt =================================================================== --- armagetronad/trunk/armagetronad/language/deutsch.txt 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/language/deutsch.txt 2008-01-29 21:38:06 UTC (rev 7703) @@ -690,6 +690,7 @@ console_decorate_id_help Jede Ausgabezeile wird mit der ID-Nummer des Clients, der sie verursacht hat, dekoriert console_decorate_ip_help Jede Ausgabezeile wird mit der IP-Adresse des Clients, der sie verursacht hat, dekoriert console_ladder_log_help Schickt das Ladder-Log auch an die Standardausgabe +ladderlog_game_time_interval Wenn dies auf einen positiven Wert gesetz wird, so wird alle n Sekunden eine Statusmeldung ins Ladder-Log geschrieben. show_fps_help Aktiviert Performance-Anzeige floor_mirror_help Spiegelung des Bodens floor_detail_help Detail des Bodens @@ -816,6 +817,15 @@ allow_team_change_player_help Erlaubt einem bestimmten Speiler, einmal das Team zu wechseln disallow_team_change_player_help Kehrt ALLOW_TEAM_CHANGE_PLAYER um kick_help Wirft den angegebenen Spieler vom Server. +default_kick_reason_help Standardgrund f\xFCr ein KICK-Kommando. +kick_to_help Wirft den angegebenen Spieler vom Server, und, falls m\xF6glich, leitet ihn auf einen anderen Server weiter. +move_to_help Wirft den angegebenen Spieler vom Server, und, falls m\xF6glich, leitet ihn auf einen anderen Server weiter. Hat keine sch\xE4dlichen Nebenwirkungen. +default_kick_to_reason_help Standardgrund f\xFCr ein KICK_TO/MOVE_TO-Kommando. +default_kick_to_server Standard-IP bzw. Name des Servers, auf den per KICK_TO oder MOVE_TO weitergeleitet wird. +default_kick_to_port Standard-Port des Servers, auf den per KICK_TO oder MOVE_TO weitergeleitet wird. +vote_kick_to_server IP bzw. Name des Servers, auf den per Abstimmungs-Rausschmiss weitergeleitet wird. +vote_kick_to_port Port des Servers, auf den per Abstimmungs-Rausschmiss weitergeleitet wird. + ban_help Wirft den angegebenen Spieler vom Server und verbannt ihn f\xFCr eine variable Zeit in Minuten. ban_ip_help Verbannt spieler von der angegebenen IP-Adresse f\xFCr die angegebene Zeit in Minuten vom Server. ban_list_help Gibt die Liste der Verbannten IP-Adressen aus. @@ -1362,9 +1372,6 @@ network_custjoin_name_text Servername: network_custjoin_name_help Der Rechnername oder die IP-Adresse des Rechners, auf dem der Server l\xE4uft -network_custjoin_connect_text Verbindung aufbauen -network_custjoin_connect_help Teleport zum Spieleraster! - #network host menu network_host_text Spiel leiten network_host_help Startet einen Server; andere Spieler k\xF6nnen sich dann verbinden. @@ -1381,7 +1388,7 @@ bookmarks_menu Lieblings-Server bookmarks_menu_help Verwaltet die Lieblingsserver und initiiert Verbindungen. bookmarks_menu_edit Verwaltung -bookmarks_menu_edit_help Verwaltet die Lieblingsserver +bookmarks_menu_edit_help Verwaltet die Server bookmarks_menu_edit_slot Bearbeite \1 bookmarks_menu_address Adresse bookmarks_menu_address_help Die Adresse des Servers @@ -1389,6 +1396,30 @@ bookmarks_menu_name_help Der Name des Servers. Wird nur f\xFCr die Anzeige verwendet und hat keine Funktion, ist also frei w\xE4hlbar. bookmarks_menu_connect Verbindung zu \1 aufbauen +bookmarks_menu_edit_connect_text Verbindung aufbauen +bookmarks_menu_edit_connect_help Teleport zum Spieleraster! + +masters_menu Subkulturen +masters_menu_help Verbinde dich mit alternativen Gemeinschaften von Servern +masters_menu_edit Verwaltung +masters_menu_edit_help Verwaltet die Subkulturen +masters_menu_edit_slot Bearbeite \1 +masters_menu_address Adresse +masters_menu_address_help Die Adresse des Master-Servers, der die Subkultur verwaltet +masters_menu_name Name +masters_menu_name_help Der Name der Subkultur. Wird nur f\xFCr die Anzeige verwendet und hat keine Funktion, ist also frei w\xE4hlbar. +masters_menu_connect Mit Subkultur \1 verbinden + +masters_menu_edit_connect_text Subkultur Betreten +masters_menu_edit_connect_help \xD6ffnet ein Master-Server-Browser-\xE4hliches Menu mit allen Servern dieser Subkultur + +friends_menu Meine Freunde +friends_menu_help Trage hier deine Freude ein. +friends_enable Meine Freude +friends_enable_help Schaltet den Freunde-Filter an oder aus. +friend_word Freund +friend_help Server mit diesem Spieler werden angezeigt, wenn der Freunde-Filter aktiv ist. + #******************************************** #******************************************** # @@ -1952,7 +1983,7 @@ #******************************************** #******************************************** -timer_hickup Die Systemuhr scheint gerade um \1 Sekunden gesprungen zu sein. Wenn das häufger vorkommt, solltest Du ihre Funktion ueberpruefen. +timer_hickup Die Systemuhr scheint gerade um \1 Sekunden gesprungen zu sein. Wenn das häufger vorkommt, solltest Du ihre Funktion ueberpruefen. #******************************************** #******************************************** @@ -2079,7 +2110,7 @@ player_win_conquest \1 bekam \2 Punkte f\xFCr das erobern der Basis des Feindes.\n player_win_conquest_specific \1 bekam \2 Punkte f\xFCr das erobern der Basis von \3.\n player_kill_collapse \1 wurde von seiner kollabierenden Zone vernichtet.\n -player_win_survive \1 bekam \2 Punkte f\xFCr das Halten der eigenen Basis.\n +player_win_held_fortress \1 bekam \2 Punkte f\xFCr das Halten der eigenen Basis.\n zone_collapse_harmless \1s Zone verpufft harmlos wegen mangelden Feindkontakts.\n @@ -2255,6 +2286,7 @@ network_login_done Fertig!\n network_kill_log User \1 vom Server geworfen, Grund: \2\n +network_redirect \n\nDu wirst nun auf den Server \1:\2 weitergeleitet; du kannst das durch einen Druck auf ESC verhindern.\n network_kill_preface Vom Server angegebener Grund: network_kill_maxidgrabber Keine ObjektIDs mehr frei; Dein Client hatte die meisten davon f\xFCr sich selbst belegt ( Bug? ). network_kill_maxiduser Keine ObjektIDs mehr frei; Dein Client hatte die meisten davon belegt ( Bug? ). @@ -2324,7 +2356,7 @@ network_master_score Bewertung network_master_users Benutzer network_master_ping Ping -network_master_browserhelp Dr\xFCcke Return/Enter, um eine Verbindung zu diesem Server aufzubauen, "p" um diesen Server anzuPingen, "r", um die gesamte Liste aufzufRischen, "+/-" um dem Server einen Bewertungsbonus/malus zu geben, "Pfeiltaste Links/Rechts" um die Sortierung zu \xE4ndern, oder "b", um den Server zu den LieBlingsservern hinzuzuf\xFCgen. +network_master_browserhelp Dr\xFCcke Return/Enter, um eine Verbindung aufzubauen, "p" um diesen Server anzuPingen, "r", um die Liste aufzufRischen, "+/-" um dem Server einen Bewertungsbonus/malus zu geben, "Pfeiltaste Links/Rechts" um die Sortierung zu \xE4ndern, "m", um den Meine-Freude-Filter ein/auszuschalten, oder "b", um den Server zu den LieBlingsservern hinzuzuf\xFCgen. network_master_connecting Verbindung mit \1 wird aufgebaut...\n network_master_send Schicke meine Daten...\n network_master_reqlist Fordere Server-Liste an...\n @@ -2429,6 +2461,7 @@ #******************************************** config_include_not_found Zu ladende Konfigurationsdatei "\1" nicht gefunden.\n +config_rinclude_not_found ZU ladende Konfigurations-Resource "\1" nicht gefunden.\n config_command_unknown Kommando \1 unbekannt.\n config_command_other Wahrscheinlich war in deinem Sinn:\n config_command_more Es gibt noch weitere Kommandos, aber die wurden weggelassen, um die Konsole nicht zu \xFCberfluten. Modified: armagetronad/trunk/armagetronad/language/english_base.txt =================================================================== --- armagetronad/trunk/armagetronad/language/english_base.txt 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/language/english_base.txt 2008-01-29 21:38:06 UTC (rev 7703) @@ -139,10 +139,13 @@ enemy_currenttime_influence_help If set to 1, not the build time of the encountered wall, but the current time enters the comparison of enemy influences. Arbitrary blending values are allowed. enemy_suicide_timeout_help If no enemy influence can be found for the last this many seconds, a player's death counts as a suicide. score_die_help Amount of points you get for dying +score_survive_help What you get for surviving +score_hole_help What you get for making a hole for your teammates score_kill_help Amount of points you get for killing someone score_suicide_help Amount of points you get for stupidly dying score_win_help Amount of points you get for winning a round score_deathzone_help Amount of points you get for hitting the Death Zone + sp_score_win_help What you get for winning a round in single player mode sp_walls_stay_up_delay_help Number of seconds the walls stay up after a player died; negative values will keep them up forever. sp_walls_length_help Length of the cycle walls in meters; negative values will make the walls infinite. @@ -696,6 +699,9 @@ filter_name_middle_help Filter excess whitespace and other junk from the middle of player names. filter_color_server_names_help Filter color codes from server names in the server browser. +zone_alpha_help Transparency factor for zone rendering. 1.0 gives full strength. +zone_alpha_server_help Transparency factor for zone rendering, controlled by the server. 1.0 gives full strength. + #screen mode custom_screen_height_help Custom screen size custom_screen_width_help Custom screen size @@ -1388,9 +1394,6 @@ network_custjoin_name_text Server Name: network_custjoin_name_help The name or IP adress of the server you wish to join -network_custjoin_connect_text Connect To Server -network_custjoin_connect_help Enter the game grid! - #network host menu network_host_text Host Network Game network_host_help Start a server. @@ -1407,14 +1410,30 @@ bookmarks_menu Server Bookmarks bookmarks_menu_help Add, edit, and connect to your server bookmarks. bookmarks_menu_edit Edit Bookmarks -bookmarks_menu_edit_help Edit and add server bookmarks. +bookmarks_menu_edit_help Edit and add favorite servers. bookmarks_menu_edit_slot Edit \1 bookmarks_menu_address Address bookmarks_menu_address_help The address of the server to connect to. bookmarks_menu_name Name bookmarks_menu_name_help The name of the server. This is used only for display, not functional purposes. bookmarks_menu_connect Connect to \1 +bookmarks_menu_edit_connect_text Connect To Server +bookmarks_menu_edit_connect_help Enter the game grid! + +masters_menu Subcultures +masters_menu_help Add, edit, and connect to alternative master servers for special purposes. +masters_menu_edit Edit Subcultures +masters_menu_edit_help Edit and add subcultures. +masters_menu_edit_slot Edit \1 +masters_menu_address Address +masters_menu_address_help The address of the master server managing the subculture. +masters_menu_name Name +masters_menu_name_help The name of the subculture. This is used only for display, not functional purposes. +masters_menu_connect Browse \1 +masters_menu_edit_connect_text Browse Subculture +masters_menu_edit_connect_help Opens a master server like server browser specialized for servers of this subculture. + friends_menu Mates friends_menu_help Edit your mates. friends_enable Mates Enabled @@ -2147,9 +2166,12 @@ player_win_instant \1 was awarded \2 points for hitting the instant win zone.\n player_win_conquest \1 was awarded \2 points for conquering the enemy base.\n +player_win_held_fortress \1 was awarded \2 points for holding the base.\n +player_lose_held_fortress \1 lost \2 points for being too defensive.\n player_win_conquest_specific \1 was awarded \2 points for conquering \3's base.\n player_kill_collapse \1 was eradicated by its collapsing zone.\n -player_win_survive \1 was awarded \2 points for holding the base.\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 zone_collapse_harmless \1's zone collapses harmlessly for lack of enemy contacts.\n @@ -2189,6 +2211,7 @@ player_lose_suicide \1 committed suicide and lost \2 points.\n player_free_suicide \1 committed suicide.\n player_win_frag \1 core dumped \3 for \2 points.\n +player_win_survive \1 got \2 points for surviving.\n player_free_frag \1 core dumped \2.\n player_teamkill \1 core dumped teammate \2! Boo! No points for that!\n player_win_frag_ai \1 got \2 points for core dumping an AI player.\n @@ -2329,7 +2352,7 @@ network_login_done Done!\n network_kill_log User \1 kicked, reason given to him: \2\n -network_redirect \n\nYou will now be redirected to the server \1:\2.\n +network_redirect \n\nYou will now be redirected to the server \1:\2. You can prevent that by pressing ESC.\n network_kill_preface Reason given by server: network_kill_maxidgrabber It ran out of IDs; your client was the one occupying most of them for himself. The reason for this can be a bug. network_kill_maxiduser It ran out of IDs; your client was the one occupying most of them. @@ -2513,6 +2536,7 @@ config_value_changed \1 changed from \2 to \3.\n config_error_read Input error reading \1: invalid format.\n config_message_info \1 is currently set to \2.\n +config_sighup SIGHUP received, reloading configuration.\n nconfig_errror_protected No way. Only the server can change \1.\n nconfig_error_unknown Got conf message for unknown setting \1.\n\nYOU PROBABLY SHOULD UPGRADE ARMAGETRON ADVANCED!!!\n Modified: armagetronad/trunk/armagetronad/language/english_base_notranslate.txt =================================================================== --- armagetronad/trunk/armagetronad/language/english_base_notranslate.txt 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/language/english_base_notranslate.txt 2008-01-29 21:38:06 UTC (rev 7703) @@ -100,6 +100,7 @@ camera_smart_glance_height_help Elevation of the smartcam when glancing # preliminary settings for fortress dynamics +fortress_held_score_help Score you get for holding your fortress. fortress_conquest_decay_rate_help Rate a fortress zone "recovers" from being conquered fortress_conquest_rate_help Rate a fortress zone gets conquered with for each enemy in it fortress_defend_rate_help Rate a fortress zone "recovers" for each defending player Modified: armagetronad/trunk/armagetronad/language/spanish.txt =================================================================== --- armagetronad/trunk/armagetronad/language/spanish.txt 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/language/spanish.txt 2008-01-29 21:38:06 UTC (rev 7703) @@ -1888,7 +1888,7 @@ #ORIGINAL TEXT: \1 was awarded \2 points for conquering \3's base.\n #player_win_conquest_specific UNTRANSLATED player_kill_collapse \1 fue suprimido al derrumbarse su zona.\n -player_win_survive \1 consigue \2 puntos por mantener la base.\n +player_win_held_fortress \1 consigue \2 puntos por mantener la base.\n #******************************************** Modified: armagetronad/trunk/armagetronad/src/defs.h =================================================================== --- armagetronad/trunk/armagetronad/src/defs.h 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/defs.h 2008-01-29 21:38:06 UTC (rev 7703) @@ -43,6 +43,15 @@ #include <math.h> #include <iosfwd> +// Includes required for GCC 4.3 only. Remove them as soon as some of +// us developers have GCC 4.3, then it is of course better to only put them +// where they are needed. +#include <string.h> +#include <memory> +#include <typeinfo> +#include <cstdlib> +// end of GCC 4.3 includes + // maximum number of supported viewports #ifndef MAX_VIEWERS #define MAX_VIEWERS 4 Modified: armagetronad/trunk/armagetronad/src/engine/eGameObject.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eGameObject.cpp 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/engine/eGameObject.cpp 2008-01-29 21:38:06 UTC (rev 7703) @@ -588,6 +588,8 @@ } // return value: shall this object be destroyed? +void eGameObject::OnRoundEnd(){} + void eGameObject::Kill(){} // draws it to the screen using OpenGL Modified: armagetronad/trunk/armagetronad/src/engine/eGameObject.h =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eGameObject.h 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/engine/eGameObject.h 2008-01-29 21:38:06 UTC (rev 7703) @@ -150,13 +150,16 @@ return w; } - // destroys the gameobject (in the game) + //! called when the round ends + virtual void OnRoundEnd(); + + //! destroys the gameobject (in the game) virtual void Kill(); - // tells whether the object is alive + //! tells whether the object is alive virtual bool Alive() const {return false;} - // draws it to the screen using OpenGL + //! draws object to the screen using OpenGL virtual void Render(const eCamera *cam); // draws it to the screen in two dimensions using OpenGL (ie. for the HUD map) Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-01-29 21:38:06 UTC (rev 7703) @@ -3480,6 +3480,72 @@ Update(); } +static int se_ColorDistance( int a[3], int b[3] ) +{ + int distance = 0; + for( int i = 2; i >= 0; --i ) + { + int diff = a[i] - b[i]; + diff = diff < 0 ? -diff : diff; + if ( diff > distance ) + { + distance = diff; + } + } + + return distance; +} + +bool se_randomizeColor = true; +static tSettingItem< bool > se_randomizeColorConf( "PLAYER_RANDOM_COLOR", se_randomizeColor ); + +static void se_RandomizeColor( ePlayer * l, ePlayerNetID * p ) +{ + int currentRGB[3]; + int newRGB[3]; + int nullRGB[3]={0,0,0}; + + static tReproducibleRandomizer randomizer; + + for( int i = 2; i >= 0; --i ) + { + currentRGB[i] = l->rgb[i]; + newRGB[i] = randomizer.Get(15); + } + + int currentMinDiff = se_ColorDistance( currentRGB, nullRGB ) * 2; + int newMinDiff = se_ColorDistance( newRGB, nullRGB ) * 2; + + // check the minimal distance of the new random color with all players + for ( int i = se_PlayerNetIDs.Len()-1; i >= 0; --i ) + { + ePlayerNetID * other = se_PlayerNetIDs(i); + if ( other != p ) + { + int color[3] = { other->r, other->g, other->b }; + int currentDiff = se_ColorDistance( currentRGB, color ); + int newDiff = se_ColorDistance( newRGB, color ); + if ( currentDiff < currentMinDiff ) + { + currentMinDiff = currentDiff; + } + if ( newDiff < newMinDiff ) + { + newMinDiff = newDiff; + } + } + } + + // update current color + if ( currentMinDiff < newMinDiff ) + { + for( int i = 2; i >= 0; --i ) + { + l->rgb[i] = newRGB[i]; + } + } +} + static nSettingItem<int> se_pingCharityServerConf("PING_CHARITY_SERVER",sn_pingCharityServer ); static nVersionFeature se_pingCharityServerControlled( 14 ); @@ -3521,6 +3587,12 @@ if (bool(p) && in_game){ // update p->favoriteNumberOfPlayersPerTeam=ePlayer::PlayerConfig(i)->favoriteNumberOfPlayersPerTeam; p->nameTeamAfterMe=ePlayer::PlayerConfig(i)->nameTeamAfterMe; + + if ( se_randomizeColor ) + { + se_RandomizeColor(local_p,p); + } + p->r=ePlayer::PlayerConfig(i)->rgb[0]; p->g=ePlayer::PlayerConfig(i)->rgb[1]; p->b=ePlayer::PlayerConfig(i)->rgb[2]; Modified: armagetronad/trunk/armagetronad/src/network/nNetwork.h =================================================================== --- armagetronad/trunk/armagetronad/src/network/nNetwork.h 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/network/nNetwork.h 2008-01-29 21:38:06 UTC (rev 7703) @@ -36,6 +36,7 @@ #include "nObserver.h" //#include "tCrypt.h" #include "tException.h" +#include <memory> class nSocket; class nAddress; Modified: armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2008-01-29 21:38:06 UTC (rev 7703) @@ -162,6 +162,7 @@ release_("pre_0.2.5"), login2_(true), timesNotAnswered(5), + stillOnMasterServer(false), name(""), users(0), maxUsers_(MAXCLIENTS), @@ -1032,7 +1033,7 @@ } n->nServerInfoBase::CopyFrom( baseInfo ); - // n->timesNotAnswered = 1; + n->stillOnMasterServer = true; if (n->name.Len() <= 1) n->name << ToString( baseInfo ); @@ -1372,18 +1373,26 @@ } */ -tString MasterFile() +tString MasterFile( char const * suffix ) { - tString ret ( "frommaster.srv" ); - return ret; + std::ostringstream filename; + filename << "frommaster" << suffix << ".srv"; + return tString( filename.str().c_str() ); } -void nServerInfo::GetFromMaster(nServerInfo *masterInfo) +void nServerInfo::GetFromMaster(nServerInfoBase *masterInfo, char const * fileSuffix ) { sn_AcceptingFromMaster = true; + if ( !fileSuffix ) + { + fileSuffix = ""; + } + + bool multiMaster = false; if (!masterInfo) { + multiMaster = true; masterInfo = GetRandomMaster(); } @@ -1393,7 +1402,7 @@ DeleteAll(); // load all the servers we know - Load( tDirectories::Var(), MasterFile() ); + Load( tDirectories::Var(), MasterFile( fileSuffix ) ); // delete unreachable servers DeleteUnreachable(); @@ -1445,8 +1454,16 @@ break; case nTIMEOUT: // delete the master and select a new one - delete masterInfo; - masterInfo = sn_masterList; + if ( multiMaster ) + { + delete masterInfo; + masterInfo = sn_masterList; + } + else + { + masterInfo = 0; + } + if ( masterInfo ) { con << tOutput( "$network_master_timeout_retry" ); @@ -1501,8 +1518,29 @@ o << "$network_master_finish"; con << o; - Save(tDirectories::Var(), MasterFile()); + // remove servers that are no longer listed on the master + run = GetFirstServer(); + while (run) + { + nServerInfo * next = run->Next(); + if ( !run->stillOnMasterServer ) + { + // if the server has still positive score bias, just reduce that + if ( run->scoreBias_ > 0 ) + { + run->scoreBias_ -= 10; + } + else + { + // kill it + delete run; + } + } + run = next; + } + Save(tDirectories::Var(), MasterFile( fileSuffix )); + sn_SetNetState(nSTANDALONE); sn_AcceptingFromMaster = false; @@ -1590,7 +1628,7 @@ sn_SetNetState(nSTANDALONE); } -void nServerInfo::TellMasterAboutMe(nServerInfo *masterInfo) +void nServerInfo::TellMasterAboutMe(nServerInfoBase *masterInfo) { // don't reinitialize the network system nSocketResetInhibitor inhibitor; @@ -1610,12 +1648,12 @@ if (!masterInfo) { // recurse, logging in to all masters - masterInfo = GetMasters(); + nServerInfo * run = GetMasters(); - while ( masterInfo ) + while ( run ) { - TellMasterAboutMe( masterInfo ); - masterInfo = masterInfo->Next(); + TellMasterAboutMe( run ); + run = run->Next(); } return; @@ -2321,7 +2359,7 @@ nServerInfoBase::nServerInfoBase() : connectionName_(""), - port_(0) + port_(0) { } Modified: armagetronad/trunk/armagetronad/src/network/nServerInfo.h =================================================================== --- armagetronad/trunk/armagetronad/src/network/nServerInfo.h 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/network/nServerInfo.h 2008-01-29 21:38:06 UTC (rev 7703) @@ -132,6 +132,7 @@ bool login2_; // flag indicating whether the second version of the logic can be tried int timesNotAnswered; // number of times the server did not answer to information queries recently + bool stillOnMasterServer; // flag indicating whether the server is still listed on the master // human information tString name; // the human name of the server ("Z-Man's Armagetron Server"); @@ -235,9 +236,9 @@ static nServerInfo* GetMasters(); //!< get the list of master servers static nServerInfo* GetRandomMaster(); //!< gets a random master server - static void GetFromMaster(nServerInfo *masterInfo=NULL); // get all the basic infos from the master server + static void GetFromMaster(nServerInfoBase *masterInfo=NULL, char const * fileSuffix = NULL ); // get all the basic infos from the master server, stored in the server info file of the given suffix - static void TellMasterAboutMe(nServerInfo *masterInfo=NULL); // dedicated server: tell master server about my existence + static void TellMasterAboutMe(nServerInfoBase *masterInfo=NULL); // dedicated server: tell master server about my existence static void GetFromLAN(unsigned int pollBeginPort=4534, unsigned int pollEndPort=4544); // get all the basic infos from a LAN broadcast Modified: armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp 2008-01-29 21:38:06 UTC (rev 7703) @@ -45,6 +45,10 @@ #include <vector> #include <string.h> +#ifndef WIN32 +#include <signal.h> +#endif + bool tConfItemBase::printChange=true; bool tConfItemBase::printErrors=true; @@ -542,13 +546,17 @@ // config from the experimental client's wrath. char const * st_userConfigs[] = { "user_3_0.cfg", "user.cfg", 0 }; -void st_LoadConfig() +static void st_InstallSigHupHandler(); + +void st_LoadConfig( bool printChange ) { + st_InstallSigHupHandler(); + const tPath& var = tDirectories::Var(); const tPath& config = tDirectories::Config(); const tPath& data = tDirectories::Data(); - tConfItemBase::printChange=false; + tConfItemBase::printChange=printChange; #ifdef DEDICATED tConfItemBase::printErrors=false; #endif @@ -604,7 +612,35 @@ } } +void st_LoadConfig() +{ + st_LoadConfig( false ); +} +static void st_DoHandleSigHup() +{ + con << tOutput("$config_sighup"); + st_SaveConfig(); + st_LoadConfig(); +} + +static void st_HandleSigHup( int signal ) +{ + st_ToDo_Signal( st_DoHandleSigHup ); +} + +static void st_InstallSigHupHandler() +{ +#ifndef WIN32 + static bool installed = false; + if ( !installed ) + { + signal( SIGHUP, &st_HandleSigHup ); + installed = true; + } +#endif +} + void tConfItemLine::ReadVal(std::istream &s){ tString dummy; dummy.ReadLine(s, true); @@ -680,23 +716,6 @@ static tConfItemFunc s_Include("INCLUDE", &Include); static tConfItemFunc s_SInclude("SINCLUDE", &SInclude); -static void RInclude(std::istream& s) -{ - tString file; - s >> file; - - tString rclcl = tResourceManager::locateResource(NULL, file); - if ( rclcl ) { - std::ifstream rc(rclcl); - tConfItemBase::LoadAll(rc); - return; - } - - con << tOutput( "$config_rinclude_not_found", file ); -} - -static tConfItemFunc s_RInclude("RINCLUDE", &RInclude); - // obsoleted settings that still are around in some distruted configuration files static void st_Dummy(std::istream &s){tString rest; rest.ReadLine(s);} static tConfItemFunc st_DummyMpHack("MOVIEPACK_HACK",&st_Dummy); Modified: armagetronad/trunk/armagetronad/src/tools/tConsole.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tools/tConsole.cpp 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/tools/tConsole.cpp 2008-01-29 21:38:06 UTC (rev 7703) @@ -230,13 +230,14 @@ s_callback = a_callback; } -void tConsole::Message(const tOutput& message, const tOutput& interpretation, REAL timeout){ +bool tConsole::Message(const tOutput& message, const tOutput& interpretation, REAL timeout){ if (s_callback) - (*s_callback)(message, interpretation, timeout); + return (*s_callback)(message, interpretation, timeout); else { con << tString(message) << ":\n"; con << tString(interpretation) << '\n'; + return true; } } Modified: armagetronad/trunk/armagetronad/src/tools/tConsole.h =================================================================== --- armagetronad/trunk/armagetronad/src/tools/tConsole.h 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/tools/tConsole.h 2008-01-29 21:38:06 UTC (rev 7703) @@ -70,7 +70,7 @@ { public: // callback for messages the user should read - typedef void MessageCallback(const tOutput& message, const tOutput& interpretation, REAL timeout); + typedef bool MessageCallback(const tOutput& message, const tOutput& interpretation, REAL timeout); virtual ~tConsole(); @@ -85,7 +85,7 @@ void CenterDisplay(tString s,REAL timeout=5,REAL r=1,REAL g=1,REAL b=1); // give a message to the user - static void Message(const tOutput& message, const tOutput& interpetation, REAL timeout = -1); + static bool Message(const tOutput& message, const tOutput& interpetation, REAL timeout = -1); virtual tString ColorString(REAL r, REAL g, REAL b) const; Modified: armagetronad/trunk/armagetronad/src/tools/tResourceManager.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tools/tResourceManager.cpp 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/tools/tResourceManager.cpp 2008-01-29 21:38:06 UTC (rev 7703) @@ -224,3 +224,21 @@ return NULL; return fopen((const char *)filepath, "r"); } + +static void RInclude(std::istream& s) +{ + tString file; + s >> file; + + tString rclcl = tResourceManager::locateResource(NULL, file); + if ( rclcl ) { + std::ifstream rc(rclcl); + tConfItemBase::LoadAll(rc); + return; + } + + con << tOutput( "$config_rinclude_not_found", file ); +} + +static tConfItemFunc s_RInclude("RINCLUDE", &RInclude); + Modified: armagetronad/trunk/armagetronad/src/tools/tToDo.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tools/tToDo.cpp 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/tools/tToDo.cpp 2008-01-29 21:38:06 UTC (rev 7703) @@ -34,10 +34,27 @@ tToDos[tToDos.Len()]=td; } +// a lone (but relatively safe) function pointer for things to do triggered by signals. +static tTODO_FUNC * st_toDoFromSignal = 0; + void st_DoToDo(){ // do the things that have been postponed + if ( st_toDoFromSignal ) + { + st_ToDo( st_toDoFromSignal ); + st_toDoFromSignal = 0; + } while (tToDos.Len()){ tTODO_FUNC *td=tToDos[tToDos.Len()-1]; tToDos.SetLen(tToDos.Len()-1); (*td)(); } } + +void st_ToDo_Signal(tTODO_FUNC *td){ // postpone something + // simply ignore double todos from signals. + if ( st_toDoFromSignal ) + { + return; + } + st_toDoFromSignal = td; +} Modified: armagetronad/trunk/armagetronad/src/tools/tToDo.h =================================================================== --- armagetronad/trunk/armagetronad/src/tools/tToDo.h 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/tools/tToDo.h 2008-01-29 21:38:06 UTC (rev 7703) @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + *************************************************************************** */ @@ -32,6 +32,7 @@ typedef void tTODO_FUNC(); +void st_ToDo_Signal(tTODO_FUNC *td); // postpone something, callable from a signal handler void st_ToDo(tTODO_FUNC *td); // postpone something void st_DoToDo(); // do the things that have been postponed Modified: armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp 2008-01-29 21:38:06 UTC (rev 7703) @@ -75,7 +75,6 @@ #endif #endif - // data structure for command line parsing class gMainCommandLineAnalyzer: public tCommandLineAnalyzer { Modified: armagetronad/trunk/armagetronad/src/tron/gCycle.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gCycle.cpp 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/tron/gCycle.cpp 2008-01-29 21:38:06 UTC (rev 7703) @@ -197,7 +197,11 @@ //static bool moviepack_hack=false; // do we use it? //static tSettingItem<bool> ump("MOVIEPACK_HACK",moviepack_hack); +static int score_hole=0; +static tSettingItem<int> s_h("SCORE_HOLE",score_hole); +static int score_survive=0; +static tSettingItem<int> s_sur("SCORE_SURVIVE",score_survive); static int score_die=-2; static tSettingItem<int> s_d("SCORE_DIE",score_die); @@ -2313,7 +2317,7 @@ if ( this->Alive() && lastTime < se_GameTime() + 10.0f ) { Die( lastTime ); - tNEW(gExplosion)(grid, pos, lastTime, color_); + tNEW(gExplosion)(grid, pos, lastTime, color_, this); } if ( sn_GetNetState() == nSERVER ) @@ -2331,6 +2335,17 @@ joystick_ = NULL; } +// called when the round ends +void gCycle::OnRoundEnd() +{ + // give survival bonus + if ( Alive() && player ) + { + Player()->AddScore( score_survive, tOutput("$player_win_survive"), tOutput() ); + } +} + + static inline void rotate(eCoord &r,REAL angle){ REAL x=r.x; r.x+=r.y*angle; @@ -3228,12 +3243,12 @@ return gCycleMovement::EdgeIsDangerous( ww, time, a ); } -// turn one future walls of a cycle into gaping holes of nothingness if it inteed belongs to the cycle +// turn future walls of a cycle into gaping holes of nothingness if it indeed belongs to the cycle static void sg_KillFutureWall( gCycle * cycle, gNetPlayerWall * wall ) { if ( cycle && wall && wall->Cycle() == cycle && wall->Pos(1) > cycle->GetDistance() ) { - wall->BlowHole( cycle->GetDistance(), wall->Pos(1) + 100 ); + wall->BlowHole( cycle->GetDistance(), wall->Pos(1) + 100, 0 ); } } @@ -3266,6 +3281,30 @@ // request a sync for everyone if this is a non-bogus wall passage, maybe not all clients know the wall is passable if ( ( !currentWall || ww != currentWall->Wall() ) && ( !lastWall || ww != lastWall->Wall() ) ) RequestSyncAll(); + + // check whether we drove through a hole in an enemy wall made by a teammate + gPlayerWall const * w = dynamic_cast< gPlayerWall const * >( ww ); + if ( w ) + { + gExplosion * explosion = w->Holer( a, time ); + if ( explosion ) + { + gCycle * holer = explosion->GetOwner(); + if ( holer && holer->Player() && + Player() && + w->Cycle() && w->Cycle()->Player() && + holer->Player()->CurrentTeam() == Player()->CurrentTeam() && // holer must have been a teammate + w->Cycle()->Player()->CurrentTeam() != Player()->CurrentTeam() // wall must have been an enemy + ) + { + // this test must come last, it resets the flag. + if ( explosion->AccountForHole() ) + { + holer->Player()->AddScore( score_hole, tOutput("$player_win_hole"), tOutput("$player_lose_hole") ); + } + } + } + } return; } @@ -3613,7 +3652,7 @@ RequestSync(true); if (Alive()){ Die( lastTime ); - tNEW(gExplosion)(grid, pos,lastTime, color_); + tNEW(gExplosion)(grid, pos,lastTime, color_, this ); // eEdge::SeethroughHasChanged(); if ( currentWall ) @@ -5101,7 +5140,7 @@ correctDistanceSmooth=0; DropWall( false ); - tNEW(gExplosion)( grid, lastSyncMessage_.pos, lastSyncMessage_.time ,color_ ); + tNEW(gExplosion)( grid, lastSyncMessage_.pos, lastSyncMessage_.time ,color_, this ); return; } Modified: armagetronad/trunk/armagetronad/src/tron/gCycle.h =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gCycle.h 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/tron/gCycle.h 2008-01-29 21:38:06 UTC (rev 7703) @@ -197,6 +197,8 @@ virtual void RemoveFromGame(); // call this instead of the destructor + virtual void OnRoundEnd(); //!< called when the round ends + // virtual REAL DoGetDistanceSinceLastTurn ( ) const ; //!< returns the distance since the last turn public: virtual void Die ( REAL time ) ; //!< dies at the specified time Modified: armagetronad/trunk/armagetronad/src/tron/gExplosion.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gExplosion.cpp 2008-01-29 20:55:45 UTC (rev 7702) +++ armagetronad/trunk/armagetronad/src/tron/gExplosion.cpp 2008-01-29 21:38:06 UTC (rev 7703) @@ -60,6 +60,7 @@ static eCoord s_explosionCoord; static REAL s_explosionRadius; static REAL s_explosionTime; +static gExplosion * s_holer = 0; // blow a hole centered at s_explosionCoord with radius s_explosionRadius into wall w static void S_BlowHoles( eWal... [truncated message content] |
From: <z-...@us...> - 2008-02-03 17:08:16
|
Revision: 7716 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7716&view=rev Author: z-man Date: 2008-02-03 09:08:20 -0800 (Sun, 03 Feb 2008) Log Message: ----------- Disabled Ruby by default. (Also, testing bzr-svn in our real world scenario) Modified Paths: -------------- armagetronad/trunk/armagetronad/configure.ac Property Changed: ---------------- armagetronad/trunk/ Property changes on: armagetronad/trunk ___________________________________________________________________ Name: bzr:revision-info + timestamp: 2008-02-03 17:46:47.388000011 +0100 committer: Manuel Moos <manuel@kermit> properties: branch-nick: work Name: bzr:file-ids + Name: bzr:revision-id:v3-trunk1 + 449 manuel@kermit-20080203164647-0a8v9z9kzl1mg2xu Modified: armagetronad/trunk/armagetronad/configure.ac =================================================================== --- armagetronad/trunk/armagetronad/configure.ac 2008-02-01 21:09:11 UTC (rev 7715) +++ armagetronad/trunk/armagetronad/configure.ac 2008-02-03 17:08:20 UTC (rev 7716) @@ -191,8 +191,8 @@ AC_ARG_ENABLE(ruby, AC_HELP_STRING([--enable-ruby], - [enable ruby scripting api. Requires ruby to be installed. (default=enabled)]),, -enable_ruby=yes) + [enable ruby scripting api. Requires ruby to be installed. (default=disabled)]),, +enable_ruby=no) AC_SUBST(enable_ruby) AM_CONDITIONAL(ENABLE_RUBY, test "x$enable_ruby" = "xyes") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2008-02-03 17:16:47
|
Revision: 7717 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7717&view=rev Author: z-man Date: 2008-02-03 09:16:50 -0800 (Sun, 03 Feb 2008) Log Message: ----------- Silly change to test bzr-svn again. Modified Paths: -------------- armagetronad/trunk/armagetronad/configure.ac Property Changed: ---------------- armagetronad/trunk/ Property changes on: armagetronad/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-03 17:46:47.388000011 +0100 committer: Manuel Moos <manuel@kermit> properties: branch-nick: work + timestamp: 2008-02-03 18:15:29.349999905 +0100 committer: Manuel Moos <manuel@kermit> properties: branch-nick: work Name: bzr:revision-id:v3-trunk1 - 449 manuel@kermit-20080203164647-0a8v9z9kzl1mg2xu + 449 manuel@kermit-20080203164647-0a8v9z9kzl1mg2xu 450 manuel@kermit-20080203171529-a8wg1845k2i1bcpn Modified: armagetronad/trunk/armagetronad/configure.ac =================================================================== --- armagetronad/trunk/armagetronad/configure.ac 2008-02-03 17:08:20 UTC (rev 7716) +++ armagetronad/trunk/armagetronad/configure.ac 2008-02-03 17:16:50 UTC (rev 7717) @@ -614,7 +614,7 @@ AC_MSG_ERROR([You need the library SDL to compile Armagetron. Read the file doc/install_linux.html.]) ,) -dnl ********************************************* OPTIONAL STUFF AFTER THIS POINT *********************************** +dnl ***************** OPTIONAL STUFF AFTER THIS POINT ********************** dnl ************************************************* dnl Sound This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2008-02-10 11:32:49
|
Revision: 7839 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7839&view=rev Author: z-man Date: 2008-02-10 03:32:50 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Merging branch 0.2.8 from revision 7747 to 7838: ------------------------------------------------------------------------ r7838 | nemostultae | 2008-02-10 08:26:33 +0100 (Sun, 10 Feb 2008) | 4 lines * Fixed dedicated compilation by adding a "Copy Headers" build phase to every target with the correct config.h for that target. The file's role is set to Project so it doesn't actually get copied. The other solution attempts failed: tried putting the src/macosx/dedicated or src/macosx/client folder in the search path for each respective target, and header files aren't members of a target so we couldn't exclude them (annoying). * Enabled auth server support on server * Enabled ZThread support in both client and server (not merged, conflicts, as usual) ------------------------------------------------------------------------ r7837 | bazaarmagetron | 2008-02-10 01:34:23 +0100 (Sun, 10 Feb 2008) | 5 lines eGameObject::DeleteAll no longer calls Kill(), only RemoveFromGame(). Several spurious explosion generations in gCycle were removed. The desired effect: no more unwanted explosions, and a cleaner game exit at round end. Some arcane bits of ancient code were removed here, I hope without ill side effects. ------------------------------------------------------------------------ r7836 | z-man | 2008-02-10 00:45:02 +0100 (Sun, 10 Feb 2008) | 2 lines Updated description ------------------------------------------------------------------------ r7834 | wrtlprnft | 2008-02-09 23:18:19 +0100 (Sat, 09 Feb 2008) | 2 lines Write a SACRIFICE message into ladderlog containing the player who used the hole, the player who went through it and the player who got holed, in that order. ------------------------------------------------------------------------ r7831 | z-man | 2008-02-09 22:04:58 +0100 (Sat, 09 Feb 2008) | 1 line Absolute -> relative path. ------------------------------------------------------------------------ r7830 | z-man | 2008-02-09 20:20:52 +0100 (Sat, 09 Feb 2008) | 2 lines Argh, push/pop matrix chaos. Better blinking now. ------------------------------------------------------------------------ r7829 | z-man | 2008-02-09 20:04:12 +0100 (Sat, 09 Feb 2008) | 2 lines Invulnerability blinking now only affects the cycle. ------------------------------------------------------------------------ r7828 | wrtlprnft | 2008-02-09 19:06:17 +0100 (Sat, 09 Feb 2008) | 2 lines protect user.cfg from read access by other users on linux and (hopefully) mac OS ------------------------------------------------------------------------ r7827 | z-man | 2008-02-09 17:50:49 +0100 (Sat, 09 Feb 2008) | 2 lines Disabling the hacky text-mode-only autopackage installation. Perhaps the new autopackage version I'm using doesn't crash any more. ------------------------------------------------------------------------ r7826 | z-man | 2008-02-09 17:49:38 +0100 (Sat, 09 Feb 2008) | 2 lines Commented out ALLOW_TEAM_SHUFFLEUP, it triggered errors with authentication. ------------------------------------------------------------------------ r7825 | z-man | 2008-02-09 17:07:47 +0100 (Sat, 09 Feb 2008) | 2 lines Enabling armathentication on autopackage builds. ------------------------------------------------------------------------ r7824 | z-man | 2008-02-09 16:43:00 +0100 (Sat, 09 Feb 2008) | 2 lines Adapted to picky versions of bash and test. ------------------------------------------------------------------------ r7823 | z-man | 2008-02-09 16:13:12 +0100 (Sat, 09 Feb 2008) | 1 line Experimental: activating ZThread usage and Armathentication on Windows dedicated server build. ------------------------------------------------------------------------ r7822 | z-man | 2008-02-09 16:12:16 +0100 (Sat, 09 Feb 2008) | 1 line Adapted to be able to use ZThread. ------------------------------------------------------------------------ r7821 | z-man | 2008-02-09 16:11:49 +0100 (Sat, 09 Feb 2008) | 1 line Added ZThread 2.3.2 with GCC 4 fixes. ------------------------------------------------------------------------ r7820 | z-man | 2008-02-09 16:11:31 +0100 (Sat, 09 Feb 2008) | 1 line Added ZThrad code::blocks build project. ------------------------------------------------------------------------ r7819 | wrtlprnft | 2008-02-09 15:26:59 +0100 (Sat, 09 Feb 2008) | 3 lines Added a new flag that allows users to specify whether they want their identity to be hidden. Maybe the serverside handling of it can be improved a bit by allowing users (like administrators) to only hide their access level without hiding their ID. ------------------------------------------------------------------------ r7818 | bazaarmagetron | 2008-02-09 14:09:31 +0100 (Sat, 09 Feb 2008) | 2 lines Made to work with vanilla unpatched zthread (-fpermisive test was broken) ------------------------------------------------------------------------ r7817 | bazaarmagetron | 2008-02-09 13:33:32 +0100 (Sat, 09 Feb 2008) | 2 lines MOVE_TO no longer calls nMachine::OnKick; although it did so with zero severity, and that should have had no effect, it's better not to call it at all. ------------------------------------------------------------------------ r7816 | bazaarmagetron | 2008-02-09 13:15:14 +0100 (Sat, 09 Feb 2008) | 2 lines Moved game end code from DoRemoveFromGame to OnRemoveFromGame. Base class is now eReferencableGameObject. ------------------------------------------------------------------------ r7815 | bazaarmagetron | 2008-02-09 11:47:41 +0100 (Sat, 09 Feb 2008) | 2 lines added "nothing" target. ------------------------------------------------------------------------ r7814 | z-man | 2008-02-08 23:40:46 +0100 (Fri, 08 Feb 2008) | 2 lines Made resolution definition fixed size to avoid errors (there appeared to be one overwrite erorr on OSX already). ------------------------------------------------------------------------ r7813 | z-man | 2008-02-08 19:45:41 +0100 (Fri, 08 Feb 2008) | 1 line Added gFirends ------------------------------------------------------------------------ r7812 | z-man | 2008-02-08 19:45:11 +0100 (Fri, 08 Feb 2008) | 1 line Win32 compatibility. ------------------------------------------------------------------------ r7811 | z-man | 2008-02-08 19:27:16 +0100 (Fri, 08 Feb 2008) | 2 lines eAuthentication here, too. ------------------------------------------------------------------------ r7810 | z-man | 2008-02-08 19:21:54 +0100 (Fri, 08 Feb 2008) | 1 line Copied over from build_visualc. We don't use Visual C any more, so this here is a better place for the working version. ------------------------------------------------------------------------ r7809 | z-man | 2008-02-08 19:17:21 +0100 (Fri, 08 Feb 2008) | 2 lines OMG! More AuthentiFIcation. Empty stub files, but nevertheless. ------------------------------------------------------------------------ r7808 | z-man | 2008-02-08 19:11:52 +0100 (Fri, 08 Feb 2008) | 1 line Authentfication -> Authentication ------------------------------------------------------------------------ r7807 | bazaarmagetron | 2008-02-08 18:14:37 +0100 (Fri, 08 Feb 2008) | 3 lines Requiring the most recent zthreads now. Checking whether -fpermissive is required. ------------------------------------------------------------------------ r7806 | bazaarmagetron | 2008-02-08 18:04:48 +0100 (Fri, 08 Feb 2008) | 2 lines Fixed authentication compilation this time. ------------------------------------------------------------------------ r7805 | bazaarmagetron | 2008-02-08 16:25:37 +0100 (Fri, 08 Feb 2008) | 2 lines added bzrignore file. ------------------------------------------------------------------------ r7804 | bazaarmagetron | 2008-02-08 16:25:18 +0100 (Fri, 08 Feb 2008) | 2 lines Adapted to bzr branch names. ------------------------------------------------------------------------ r7803 | bazaarmagetron | 2008-02-08 14:48:41 +0100 (Fri, 08 Feb 2008) | 5 lines Let's see what happens if someone does not "bzr rebase", but "bzr merge" ro get his branch up to date. merging: Manuel Mooos 2008-02-08 More ignores for those who build directly in the source tree. ------------------------------------------------------------------------ r7802 | bazaarmagetron | 2008-02-08 14:48:03 +0100 (Fri, 08 Feb 2008) | 2 lines Fixed compilation on non-armathentication builds. ------------------------------------------------------------------------ r7801 | bazaarmagetron | 2008-02-08 14:42:51 +0100 (Fri, 08 Feb 2008) | 2 lines More ignores for those who build directly in the source tree. ------------------------------------------------------------------------ r7800 | bazaarmagetron | 2008-02-08 13:52:15 +0100 (Fri, 08 Feb 2008) | 2 lines more ignores. ------------------------------------------------------------------------ r7799 | bazaarmagetron | 2008-02-08 13:51:44 +0100 (Fri, 08 Feb 2008) | 2 lines Authentication changes are now visible in /players output right away; /logout and /login in the same round should no longer enforce keeping the authority. ------------------------------------------------------------------------ r7798 | bazaarmagetron | 2008-02-08 13:30:06 +0100 (Fri, 08 Feb 2008) | 2 lines Added bzr ignore rules. ------------------------------------------------------------------------ r7794 | bazaarmagetron | 2008-02-08 12:52:08 +0100 (Fri, 08 Feb 2008) | 1 line Empty merge to keep the peace between svn and bzr. ------------------------------------------------------------------------ r7793 | bazaarmagetron | 2008-02-08 12:51:53 +0100 (Fri, 08 Feb 2008) | 2 lines undone one silly commit. ------------------------------------------------------------------------ r7792 | z-man | 2008-02-08 12:44:38 +0100 (Fri, 08 Feb 2008) | 2 lines undone second silly commit. ------------------------------------------------------------------------ r7791 | bazaarmagetron | 2008-02-08 12:29:28 +0100 (Fri, 08 Feb 2008) | 3 lines merging: Manuel Mooos 2008-02-08 ...new algorithm handles things. ------------------------------------------------------------------------ r7790 | bazaarmagetron | 2008-02-08 12:28:59 +0100 (Fri, 08 Feb 2008) | 2 lines ...new algorithm handles things. ------------------------------------------------------------------------ r7789 | z-man | 2008-02-08 12:18:27 +0100 (Fri, 08 Feb 2008) | 2 lines Not bad, but let's see how... ------------------------------------------------------------------------ r7788 | bazaarmagetron | 2008-02-08 11:32:27 +0100 (Fri, 08 Feb 2008) | 3 lines merging: Manuel Mooos 2008-02-08 ...simultaneous commits from svn and bzr! ------------------------------------------------------------------------ r7787 | z-man | 2008-02-08 11:29:21 +0100 (Fri, 08 Feb 2008) | 3 lines Made more reliable. Also, let's find out how the svn/bzr syncing handles... ------------------------------------------------------------------------ r7786 | bazaarmagetron | 2008-02-08 10:40:32 +0100 (Fri, 08 Feb 2008) | 2 lines added ignore list. ------------------------------------------------------------------------ r7785 | bazaarmagetron | 2008-02-08 10:40:10 +0100 (Fri, 08 Feb 2008) | 2 lines whoops, set wrong variable. ------------------------------------------------------------------------ r7784 | bazaarmagetron | 2008-02-08 10:04:50 +0100 (Fri, 08 Feb 2008) | 2 lines Added source finding so this works nicely with default named bzr branches/checkouts. ------------------------------------------------------------------------ r7777 | wrtlprnft | 2008-02-07 23:29:19 +0100 (Thu, 07 Feb 2008) | 2 lines Implemented ramps and flying cycles ------------------------------------------------------------------------ r7774 | bazaarmagetron | 2008-02-07 21:42:48 +0100 (Thu, 07 Feb 2008) | 2 lines tron -> tronad ------------------------------------------------------------------------ r7770 | wrtlprnft | 2008-02-06 22:45:38 +0100 (Wed, 06 Feb 2008) | 2 lines I like z-man's version better than mine. I hope this carries over to BZR ok ------------------------------------------------------------------------ r7769 | bazaarmagetron | 2008-02-06 22:42:47 +0100 (Wed, 06 Feb 2008) | 2 lines updated. ------------------------------------------------------------------------ r7764 | wrtlprnft | 2008-02-06 18:45:11 +0100 (Wed, 06 Feb 2008) | 2 lines -?! ------------------------------------------------------------------------ r7763 | wrtlprnft | 2008-02-06 18:33:42 +0100 (Wed, 06 Feb 2008) | 3 lines Dunno if this is a very good idea, but it saves you one keystroke: If there's one of those enter password dialogs and the name that's suggested by the server matches a global ID (from any player) the password field is selected, otherwise it's the username field. Useful if you don't want to trust your password to user.cfg but still comfortably log in. ------------------------------------------------------------------------ r7761 | z-man | 2008-02-06 16:06:20 +0100 (Wed, 06 Feb 2008) | 2 lines Ok, now really fixed the libZThread compilation. ------------------------------------------------------------------------ r7760 | z-man | 2008-02-06 14:46:52 +0100 (Wed, 06 Feb 2008) | 2 lines Re-added HAVE_LIBZTHREAD define, it got lost. ------------------------------------------------------------------------ r7759 | z-man | 2008-02-06 14:36:41 +0100 (Wed, 06 Feb 2008) | 2 lines Better test for ZThread. Taken from official Automake macro, and modified that it actually works. ------------------------------------------------------------------------ r7758 | z-man | 2008-02-06 14:35:17 +0100 (Wed, 06 Feb 2008) | 2 lines Added call to delayed tasks while waiting for players. ------------------------------------------------------------------------ r7751 | wrtlprnft | 2008-02-06 10:02:11 +0100 (Wed, 06 Feb 2008) | 2 lines removed unused parameter of unused function ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7747&view=rev Modified Paths: -------------- armagetronad/trunk/armagetronad/NEWS armagetronad/trunk/armagetronad/README armagetronad/trunk/armagetronad/acinclude.m4 armagetronad/trunk/armagetronad/config/settings_authentication.cfg armagetronad/trunk/armagetronad/config/settings_dedicated.cfg armagetronad/trunk/armagetronad/configure.ac armagetronad/trunk/armagetronad/language/english_base.txt armagetronad/trunk/armagetronad/src/Makefile.am armagetronad/trunk/armagetronad/src/engine/eGameObject.cpp armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp armagetronad/trunk/armagetronad/src/engine/ePlayer.h armagetronad/trunk/armagetronad/src/macosx/config_common.h.in armagetronad/trunk/armagetronad/src/network/nNetwork.cpp armagetronad/trunk/armagetronad/src/render/rConsoleCout.cpp armagetronad/trunk/armagetronad/src/render/rFont.h armagetronad/trunk/armagetronad/src/render/rScreen.cpp armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp armagetronad/trunk/armagetronad/src/tools/tDirectories.cpp armagetronad/trunk/armagetronad/src/tools/tDirectories.h armagetronad/trunk/armagetronad/src/tron/gCycle.cpp armagetronad/trunk/armagetronad/src/tron/gExplosion.cpp armagetronad/trunk/armagetronad/src/tron/gExplosion.h armagetronad/trunk/armagetronad/src/tron/gGame.cpp armagetronad/trunk/armagetronad/src/tron/gMenus.cpp armagetronad/trunk/build/IncludesMakefile2 armagetronad/trunk/build/configure armagetronad/trunk/build/doc/description.txt armagetronad/trunk/build/package/Makefile armagetronad/trunk/build/package/default.apspec armagetronad/trunk/build/scripts/copysrc armagetronad/trunk/build_eclipse/Makefile armagetronad/trunk/build_eclipse/README armagetronad/trunk/build_eclipse/make.config.template Added Paths: ----------- armagetronad/trunk/armagetronad/.bzrignore armagetronad/trunk/armagetronad/src/engine/eAuthentication.cpp armagetronad/trunk/armagetronad/src/engine/eAuthentication.h armagetronad/trunk/build/.bzrignore armagetronad/trunk/build_codeblocks/ZThread.cbp armagetronad/trunk/build_eclipse/.bzrignore armagetronad/trunk/build_eclipse/findsource armagetronad/trunk/winlibs/ZThread/ armagetronad/trunk/winlibs/ZThread/AUTHORS armagetronad/trunk/winlibs/ZThread/BUILDING armagetronad/trunk/winlibs/ZThread/COPYING armagetronad/trunk/winlibs/ZThread/ChangeLog armagetronad/trunk/winlibs/ZThread/INSTALL armagetronad/trunk/winlibs/ZThread/LICENSE armagetronad/trunk/winlibs/ZThread/MIT.TXT armagetronad/trunk/winlibs/ZThread/Makefile.am armagetronad/trunk/winlibs/ZThread/Makefile.in armagetronad/trunk/winlibs/ZThread/NEWS armagetronad/trunk/winlibs/ZThread/README armagetronad/trunk/winlibs/ZThread/TODO armagetronad/trunk/winlibs/ZThread/aclocal.m4 armagetronad/trunk/winlibs/ZThread/config.guess armagetronad/trunk/winlibs/ZThread/config.sub armagetronad/trunk/winlibs/ZThread/configure armagetronad/trunk/winlibs/ZThread/configure.ac armagetronad/trunk/winlibs/ZThread/depcomp armagetronad/trunk/winlibs/ZThread/doc/ armagetronad/trunk/winlibs/ZThread/doc/CVS/ armagetronad/trunk/winlibs/ZThread/doc/bugs.js armagetronad/trunk/winlibs/ZThread/doc/contact.html armagetronad/trunk/winlibs/ZThread/doc/cvs.html armagetronad/trunk/winlibs/ZThread/doc/documentation.html armagetronad/trunk/winlibs/ZThread/doc/download.html armagetronad/trunk/winlibs/ZThread/doc/footer.html armagetronad/trunk/winlibs/ZThread/doc/header.html armagetronad/trunk/winlibs/ZThread/doc/html/ armagetronad/trunk/winlibs/ZThread/doc/index.html armagetronad/trunk/winlibs/ZThread/doc/zthread.css armagetronad/trunk/winlibs/ZThread/doc/zthread.doxygen armagetronad/trunk/winlibs/ZThread/include/ armagetronad/trunk/winlibs/ZThread/include/CVS/ armagetronad/trunk/winlibs/ZThread/include/zthread/ armagetronad/trunk/winlibs/ZThread/include/zthread/.Barrier.h.swp armagetronad/trunk/winlibs/ZThread/include/zthread/AtomicCount.h armagetronad/trunk/winlibs/ZThread/include/zthread/Barrier.h armagetronad/trunk/winlibs/ZThread/include/zthread/Barrier.h.orig armagetronad/trunk/winlibs/ZThread/include/zthread/BiasedReadWriteLock.h armagetronad/trunk/winlibs/ZThread/include/zthread/BlockingQueue.h armagetronad/trunk/winlibs/ZThread/include/zthread/BoundedQueue.h armagetronad/trunk/winlibs/ZThread/include/zthread/CVS/ armagetronad/trunk/winlibs/ZThread/include/zthread/Cancelable.h armagetronad/trunk/winlibs/ZThread/include/zthread/ClassLockable.h armagetronad/trunk/winlibs/ZThread/include/zthread/ConcurrentExecutor.h armagetronad/trunk/winlibs/ZThread/include/zthread/Condition.h armagetronad/trunk/winlibs/ZThread/include/zthread/Config.h armagetronad/trunk/winlibs/ZThread/include/zthread/CountedPtr.h armagetronad/trunk/winlibs/ZThread/include/zthread/CountingSemaphore.h armagetronad/trunk/winlibs/ZThread/include/zthread/Exceptions.h armagetronad/trunk/winlibs/ZThread/include/zthread/Executor.h armagetronad/trunk/winlibs/ZThread/include/zthread/FairReadWriteLock.h armagetronad/trunk/winlibs/ZThread/include/zthread/FastMutex.h armagetronad/trunk/winlibs/ZThread/include/zthread/FastRecursiveMutex.h armagetronad/trunk/winlibs/ZThread/include/zthread/Guard.h armagetronad/trunk/winlibs/ZThread/include/zthread/GuardedClass.h armagetronad/trunk/winlibs/ZThread/include/zthread/Lockable.h armagetronad/trunk/winlibs/ZThread/include/zthread/LockedQueue.h armagetronad/trunk/winlibs/ZThread/include/zthread/MonitoredQueue.h armagetronad/trunk/winlibs/ZThread/include/zthread/Mutex.h armagetronad/trunk/winlibs/ZThread/include/zthread/NonCopyable.h armagetronad/trunk/winlibs/ZThread/include/zthread/PoolExecutor.h armagetronad/trunk/winlibs/ZThread/include/zthread/Priority.h armagetronad/trunk/winlibs/ZThread/include/zthread/PriorityCondition.h armagetronad/trunk/winlibs/ZThread/include/zthread/PriorityInheritanceMutex.h armagetronad/trunk/winlibs/ZThread/include/zthread/PriorityMutex.h armagetronad/trunk/winlibs/ZThread/include/zthread/PrioritySemaphore.h armagetronad/trunk/winlibs/ZThread/include/zthread/Queue.h armagetronad/trunk/winlibs/ZThread/include/zthread/ReadWriteLock.h armagetronad/trunk/winlibs/ZThread/include/zthread/RecursiveMutex.h armagetronad/trunk/winlibs/ZThread/include/zthread/Runnable.h armagetronad/trunk/winlibs/ZThread/include/zthread/Semaphore.h armagetronad/trunk/winlibs/ZThread/include/zthread/Singleton.h armagetronad/trunk/winlibs/ZThread/include/zthread/SynchronousExecutor.h armagetronad/trunk/winlibs/ZThread/include/zthread/Task.h armagetronad/trunk/winlibs/ZThread/include/zthread/Thread.h armagetronad/trunk/winlibs/ZThread/include/zthread/ThreadLocal.h armagetronad/trunk/winlibs/ZThread/include/zthread/ThreadLocalImpl.h armagetronad/trunk/winlibs/ZThread/include/zthread/ThreadedExecutor.h armagetronad/trunk/winlibs/ZThread/include/zthread/Time.h armagetronad/trunk/winlibs/ZThread/include/zthread/Waitable.h armagetronad/trunk/winlibs/ZThread/include/zthread/ZThread.h armagetronad/trunk/winlibs/ZThread/install-sh armagetronad/trunk/winlibs/ZThread/ltmain.sh armagetronad/trunk/winlibs/ZThread/missing armagetronad/trunk/winlibs/ZThread/mkinstalldirs armagetronad/trunk/winlibs/ZThread/share/ armagetronad/trunk/winlibs/ZThread/share/CVS/ armagetronad/trunk/winlibs/ZThread/share/acinclude.m4 armagetronad/trunk/winlibs/ZThread/share/atomic-gcc.m4 armagetronad/trunk/winlibs/ZThread/share/atomic-linux.m4 armagetronad/trunk/winlibs/ZThread/share/doxygen.m4 armagetronad/trunk/winlibs/ZThread/share/ftime.m4 armagetronad/trunk/winlibs/ZThread/share/pthread.m4 armagetronad/trunk/winlibs/ZThread/share/zthread-config armagetronad/trunk/winlibs/ZThread/share/zthread-config.in armagetronad/trunk/winlibs/ZThread/share/zthread.m4 armagetronad/trunk/winlibs/ZThread/share/zthread.spec armagetronad/trunk/winlibs/ZThread/share/zthread.spec.in armagetronad/trunk/winlibs/ZThread/src/ armagetronad/trunk/winlibs/ZThread/src/AtomicCount.cxx armagetronad/trunk/winlibs/ZThread/src/ConcurrentExecutor.cxx armagetronad/trunk/winlibs/ZThread/src/Condition.cxx armagetronad/trunk/winlibs/ZThread/src/ConditionImpl.h armagetronad/trunk/winlibs/ZThread/src/CountingSemaphore.cxx armagetronad/trunk/winlibs/ZThread/src/Debug.h armagetronad/trunk/winlibs/ZThread/src/DeferredInterruptionScope.h armagetronad/trunk/winlibs/ZThread/src/FastLock.h armagetronad/trunk/winlibs/ZThread/src/FastMutex.cxx armagetronad/trunk/winlibs/ZThread/src/FastRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/FastRecursiveMutex.cxx armagetronad/trunk/winlibs/ZThread/src/IntrusivePtr.h armagetronad/trunk/winlibs/ZThread/src/Makefile.am armagetronad/trunk/winlibs/ZThread/src/Makefile.in armagetronad/trunk/winlibs/ZThread/src/Monitor.cxx armagetronad/trunk/winlibs/ZThread/src/Monitor.h armagetronad/trunk/winlibs/ZThread/src/Mutex.cxx armagetronad/trunk/winlibs/ZThread/src/MutexImpl.h armagetronad/trunk/winlibs/ZThread/src/PoolExecutor.cxx armagetronad/trunk/winlibs/ZThread/src/PriorityCondition.cxx armagetronad/trunk/winlibs/ZThread/src/PriorityInheritanceMutex.cxx armagetronad/trunk/winlibs/ZThread/src/PriorityMutex.cxx armagetronad/trunk/winlibs/ZThread/src/PrioritySemaphore.cxx armagetronad/trunk/winlibs/ZThread/src/RecursiveMutex.cxx armagetronad/trunk/winlibs/ZThread/src/RecursiveMutexImpl.cxx armagetronad/trunk/winlibs/ZThread/src/RecursiveMutexImpl.h armagetronad/trunk/winlibs/ZThread/src/Scheduling.h armagetronad/trunk/winlibs/ZThread/src/Semaphore.cxx armagetronad/trunk/winlibs/ZThread/src/SemaphoreImpl.h armagetronad/trunk/winlibs/ZThread/src/State.h armagetronad/trunk/winlibs/ZThread/src/Status.h armagetronad/trunk/winlibs/ZThread/src/SynchronousExecutor.cxx armagetronad/trunk/winlibs/ZThread/src/TSS.h armagetronad/trunk/winlibs/ZThread/src/Thread.cxx armagetronad/trunk/winlibs/ZThread/src/ThreadImpl.cxx armagetronad/trunk/winlibs/ZThread/src/ThreadImpl.h armagetronad/trunk/winlibs/ZThread/src/ThreadLocalImpl.cxx armagetronad/trunk/winlibs/ZThread/src/ThreadOps.cxx armagetronad/trunk/winlibs/ZThread/src/ThreadOps.h armagetronad/trunk/winlibs/ZThread/src/ThreadQueue.cxx armagetronad/trunk/winlibs/ZThread/src/ThreadQueue.h armagetronad/trunk/winlibs/ZThread/src/ThreadedExecutor.cxx armagetronad/trunk/winlibs/ZThread/src/Time.cxx armagetronad/trunk/winlibs/ZThread/src/TimeStrategy.h armagetronad/trunk/winlibs/ZThread/src/config.h armagetronad/trunk/winlibs/ZThread/src/config.h.in armagetronad/trunk/winlibs/ZThread/src/linux/ armagetronad/trunk/winlibs/ZThread/src/linux/AtomicCount.cxx armagetronad/trunk/winlibs/ZThread/src/linux/AtomicFastLock.h armagetronad/trunk/winlibs/ZThread/src/linux/FastRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/macos/ armagetronad/trunk/winlibs/ZThread/src/macos/FastLock.h armagetronad/trunk/winlibs/ZThread/src/macos/Monitor.cxx armagetronad/trunk/winlibs/ZThread/src/macos/Monitor.h armagetronad/trunk/winlibs/ZThread/src/macos/TSS.h armagetronad/trunk/winlibs/ZThread/src/macos/ThreadOps.cxx armagetronad/trunk/winlibs/ZThread/src/macos/ThreadOps.h armagetronad/trunk/winlibs/ZThread/src/macos/UpTimeStrategy.h armagetronad/trunk/winlibs/ZThread/src/posix/ armagetronad/trunk/winlibs/ZThread/src/posix/ConditionRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/posix/FastLock.h armagetronad/trunk/winlibs/ZThread/src/posix/FtimeStrategy.h armagetronad/trunk/winlibs/ZThread/src/posix/GetTimeOfDayStrategy.h armagetronad/trunk/winlibs/ZThread/src/posix/Monitor.cxx armagetronad/trunk/winlibs/ZThread/src/posix/Monitor.h armagetronad/trunk/winlibs/ZThread/src/posix/PriorityOps.h armagetronad/trunk/winlibs/ZThread/src/posix/TSS.h armagetronad/trunk/winlibs/ZThread/src/posix/ThreadOps.cxx armagetronad/trunk/winlibs/ZThread/src/posix/ThreadOps.h armagetronad/trunk/winlibs/ZThread/src/solaris/ armagetronad/trunk/winlibs/ZThread/src/solaris/FastRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/vanilla/ armagetronad/trunk/winlibs/ZThread/src/vanilla/DualMutexRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/vanilla/SimpleAtomicCount.cxx armagetronad/trunk/winlibs/ZThread/src/vanilla/SimpleRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/win32/ armagetronad/trunk/winlibs/ZThread/src/win32/AtomicCount.cxx armagetronad/trunk/winlibs/ZThread/src/win32/AtomicFastLock.h armagetronad/trunk/winlibs/ZThread/src/win32/AtomicFastRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/win32/FastLock.h armagetronad/trunk/winlibs/ZThread/src/win32/FastRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/win32/Monitor.cxx armagetronad/trunk/winlibs/ZThread/src/win32/Monitor.h armagetronad/trunk/winlibs/ZThread/src/win32/PerformanceCounterStrategy.h armagetronad/trunk/winlibs/ZThread/src/win32/TSS.h armagetronad/trunk/winlibs/ZThread/src/win32/ThreadOps.cxx armagetronad/trunk/winlibs/ZThread/src/win32/ThreadOps.h armagetronad/trunk/winlibs/ZThread/src/win9x/ armagetronad/trunk/winlibs/ZThread/src/win9x/AtomicCount.cxx armagetronad/trunk/winlibs/ZThread/src/win9x/AtomicFastLock.h Removed Paths: ------------- armagetronad/trunk/armagetronad/src/engine/eAuthentification.cpp armagetronad/trunk/armagetronad/src/engine/eAuthentification.h armagetronad/trunk/winlibs/ZThread/AUTHORS armagetronad/trunk/winlibs/ZThread/BUILDING armagetronad/trunk/winlibs/ZThread/COPYING armagetronad/trunk/winlibs/ZThread/ChangeLog armagetronad/trunk/winlibs/ZThread/INSTALL armagetronad/trunk/winlibs/ZThread/LICENSE armagetronad/trunk/winlibs/ZThread/MIT.TXT armagetronad/trunk/winlibs/ZThread/Makefile.am armagetronad/trunk/winlibs/ZThread/Makefile.in armagetronad/trunk/winlibs/ZThread/NEWS armagetronad/trunk/winlibs/ZThread/README armagetronad/trunk/winlibs/ZThread/TODO armagetronad/trunk/winlibs/ZThread/aclocal.m4 armagetronad/trunk/winlibs/ZThread/config.guess armagetronad/trunk/winlibs/ZThread/config.sub armagetronad/trunk/winlibs/ZThread/configure armagetronad/trunk/winlibs/ZThread/configure.ac armagetronad/trunk/winlibs/ZThread/depcomp armagetronad/trunk/winlibs/ZThread/doc/ armagetronad/trunk/winlibs/ZThread/doc/CVS/ armagetronad/trunk/winlibs/ZThread/doc/bugs.js armagetronad/trunk/winlibs/ZThread/doc/contact.html armagetronad/trunk/winlibs/ZThread/doc/cvs.html armagetronad/trunk/winlibs/ZThread/doc/documentation.html armagetronad/trunk/winlibs/ZThread/doc/download.html armagetronad/trunk/winlibs/ZThread/doc/footer.html armagetronad/trunk/winlibs/ZThread/doc/header.html armagetronad/trunk/winlibs/ZThread/doc/html/ armagetronad/trunk/winlibs/ZThread/doc/index.html armagetronad/trunk/winlibs/ZThread/doc/zthread.css armagetronad/trunk/winlibs/ZThread/doc/zthread.doxygen armagetronad/trunk/winlibs/ZThread/include/ armagetronad/trunk/winlibs/ZThread/include/CVS/ armagetronad/trunk/winlibs/ZThread/include/zthread/ armagetronad/trunk/winlibs/ZThread/include/zthread/.Barrier.h.swp armagetronad/trunk/winlibs/ZThread/include/zthread/AtomicCount.h armagetronad/trunk/winlibs/ZThread/include/zthread/Barrier.h armagetronad/trunk/winlibs/ZThread/include/zthread/Barrier.h.orig armagetronad/trunk/winlibs/ZThread/include/zthread/BiasedReadWriteLock.h armagetronad/trunk/winlibs/ZThread/include/zthread/BlockingQueue.h armagetronad/trunk/winlibs/ZThread/include/zthread/BoundedQueue.h armagetronad/trunk/winlibs/ZThread/include/zthread/CVS/ armagetronad/trunk/winlibs/ZThread/include/zthread/Cancelable.h armagetronad/trunk/winlibs/ZThread/include/zthread/ClassLockable.h armagetronad/trunk/winlibs/ZThread/include/zthread/ConcurrentExecutor.h armagetronad/trunk/winlibs/ZThread/include/zthread/Condition.h armagetronad/trunk/winlibs/ZThread/include/zthread/Config.h armagetronad/trunk/winlibs/ZThread/include/zthread/CountedPtr.h armagetronad/trunk/winlibs/ZThread/include/zthread/CountingSemaphore.h armagetronad/trunk/winlibs/ZThread/include/zthread/Exceptions.h armagetronad/trunk/winlibs/ZThread/include/zthread/Executor.h armagetronad/trunk/winlibs/ZThread/include/zthread/FairReadWriteLock.h armagetronad/trunk/winlibs/ZThread/include/zthread/FastMutex.h armagetronad/trunk/winlibs/ZThread/include/zthread/FastRecursiveMutex.h armagetronad/trunk/winlibs/ZThread/include/zthread/Guard.h armagetronad/trunk/winlibs/ZThread/include/zthread/GuardedClass.h armagetronad/trunk/winlibs/ZThread/include/zthread/Lockable.h armagetronad/trunk/winlibs/ZThread/include/zthread/LockedQueue.h armagetronad/trunk/winlibs/ZThread/include/zthread/MonitoredQueue.h armagetronad/trunk/winlibs/ZThread/include/zthread/Mutex.h armagetronad/trunk/winlibs/ZThread/include/zthread/NonCopyable.h armagetronad/trunk/winlibs/ZThread/include/zthread/PoolExecutor.h armagetronad/trunk/winlibs/ZThread/include/zthread/Priority.h armagetronad/trunk/winlibs/ZThread/include/zthread/PriorityCondition.h armagetronad/trunk/winlibs/ZThread/include/zthread/PriorityInheritanceMutex.h armagetronad/trunk/winlibs/ZThread/include/zthread/PriorityMutex.h armagetronad/trunk/winlibs/ZThread/include/zthread/PrioritySemaphore.h armagetronad/trunk/winlibs/ZThread/include/zthread/Queue.h armagetronad/trunk/winlibs/ZThread/include/zthread/ReadWriteLock.h armagetronad/trunk/winlibs/ZThread/include/zthread/RecursiveMutex.h armagetronad/trunk/winlibs/ZThread/include/zthread/Runnable.h armagetronad/trunk/winlibs/ZThread/include/zthread/Semaphore.h armagetronad/trunk/winlibs/ZThread/include/zthread/Singleton.h armagetronad/trunk/winlibs/ZThread/include/zthread/SynchronousExecutor.h armagetronad/trunk/winlibs/ZThread/include/zthread/Task.h armagetronad/trunk/winlibs/ZThread/include/zthread/Thread.h armagetronad/trunk/winlibs/ZThread/include/zthread/ThreadLocal.h armagetronad/trunk/winlibs/ZThread/include/zthread/ThreadLocalImpl.h armagetronad/trunk/winlibs/ZThread/include/zthread/ThreadedExecutor.h armagetronad/trunk/winlibs/ZThread/include/zthread/Time.h armagetronad/trunk/winlibs/ZThread/include/zthread/Waitable.h armagetronad/trunk/winlibs/ZThread/include/zthread/ZThread.h armagetronad/trunk/winlibs/ZThread/install-sh armagetronad/trunk/winlibs/ZThread/ltmain.sh armagetronad/trunk/winlibs/ZThread/missing armagetronad/trunk/winlibs/ZThread/mkinstalldirs armagetronad/trunk/winlibs/ZThread/share/ armagetronad/trunk/winlibs/ZThread/share/CVS/ armagetronad/trunk/winlibs/ZThread/share/acinclude.m4 armagetronad/trunk/winlibs/ZThread/share/atomic-gcc.m4 armagetronad/trunk/winlibs/ZThread/share/atomic-linux.m4 armagetronad/trunk/winlibs/ZThread/share/doxygen.m4 armagetronad/trunk/winlibs/ZThread/share/ftime.m4 armagetronad/trunk/winlibs/ZThread/share/pthread.m4 armagetronad/trunk/winlibs/ZThread/share/zthread-config armagetronad/trunk/winlibs/ZThread/share/zthread-config.in armagetronad/trunk/winlibs/ZThread/share/zthread.m4 armagetronad/trunk/winlibs/ZThread/share/zthread.spec armagetronad/trunk/winlibs/ZThread/share/zthread.spec.in armagetronad/trunk/winlibs/ZThread/src/ armagetronad/trunk/winlibs/ZThread/src/AtomicCount.cxx armagetronad/trunk/winlibs/ZThread/src/ConcurrentExecutor.cxx armagetronad/trunk/winlibs/ZThread/src/Condition.cxx armagetronad/trunk/winlibs/ZThread/src/ConditionImpl.h armagetronad/trunk/winlibs/ZThread/src/CountingSemaphore.cxx armagetronad/trunk/winlibs/ZThread/src/Debug.h armagetronad/trunk/winlibs/ZThread/src/DeferredInterruptionScope.h armagetronad/trunk/winlibs/ZThread/src/FastLock.h armagetronad/trunk/winlibs/ZThread/src/FastMutex.cxx armagetronad/trunk/winlibs/ZThread/src/FastRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/FastRecursiveMutex.cxx armagetronad/trunk/winlibs/ZThread/src/IntrusivePtr.h armagetronad/trunk/winlibs/ZThread/src/Makefile.am armagetronad/trunk/winlibs/ZThread/src/Makefile.in armagetronad/trunk/winlibs/ZThread/src/Monitor.cxx armagetronad/trunk/winlibs/ZThread/src/Monitor.h armagetronad/trunk/winlibs/ZThread/src/Mutex.cxx armagetronad/trunk/winlibs/ZThread/src/MutexImpl.h armagetronad/trunk/winlibs/ZThread/src/PoolExecutor.cxx armagetronad/trunk/winlibs/ZThread/src/PriorityCondition.cxx armagetronad/trunk/winlibs/ZThread/src/PriorityInheritanceMutex.cxx armagetronad/trunk/winlibs/ZThread/src/PriorityMutex.cxx armagetronad/trunk/winlibs/ZThread/src/PrioritySemaphore.cxx armagetronad/trunk/winlibs/ZThread/src/RecursiveMutex.cxx armagetronad/trunk/winlibs/ZThread/src/RecursiveMutexImpl.cxx armagetronad/trunk/winlibs/ZThread/src/RecursiveMutexImpl.h armagetronad/trunk/winlibs/ZThread/src/Scheduling.h armagetronad/trunk/winlibs/ZThread/src/Semaphore.cxx armagetronad/trunk/winlibs/ZThread/src/SemaphoreImpl.h armagetronad/trunk/winlibs/ZThread/src/State.h armagetronad/trunk/winlibs/ZThread/src/Status.h armagetronad/trunk/winlibs/ZThread/src/SynchronousExecutor.cxx armagetronad/trunk/winlibs/ZThread/src/TSS.h armagetronad/trunk/winlibs/ZThread/src/Thread.cxx armagetronad/trunk/winlibs/ZThread/src/ThreadImpl.cxx armagetronad/trunk/winlibs/ZThread/src/ThreadImpl.h armagetronad/trunk/winlibs/ZThread/src/ThreadLocalImpl.cxx armagetronad/trunk/winlibs/ZThread/src/ThreadOps.cxx armagetronad/trunk/winlibs/ZThread/src/ThreadOps.h armagetronad/trunk/winlibs/ZThread/src/ThreadQueue.cxx armagetronad/trunk/winlibs/ZThread/src/ThreadQueue.h armagetronad/trunk/winlibs/ZThread/src/ThreadedExecutor.cxx armagetronad/trunk/winlibs/ZThread/src/Time.cxx armagetronad/trunk/winlibs/ZThread/src/TimeStrategy.h armagetronad/trunk/winlibs/ZThread/src/config.h armagetronad/trunk/winlibs/ZThread/src/config.h.in armagetronad/trunk/winlibs/ZThread/src/linux/ armagetronad/trunk/winlibs/ZThread/src/linux/AtomicCount.cxx armagetronad/trunk/winlibs/ZThread/src/linux/AtomicFastLock.h armagetronad/trunk/winlibs/ZThread/src/linux/FastRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/macos/ armagetronad/trunk/winlibs/ZThread/src/macos/FastLock.h armagetronad/trunk/winlibs/ZThread/src/macos/Monitor.cxx armagetronad/trunk/winlibs/ZThread/src/macos/Monitor.h armagetronad/trunk/winlibs/ZThread/src/macos/TSS.h armagetronad/trunk/winlibs/ZThread/src/macos/ThreadOps.cxx armagetronad/trunk/winlibs/ZThread/src/macos/ThreadOps.h armagetronad/trunk/winlibs/ZThread/src/macos/UpTimeStrategy.h armagetronad/trunk/winlibs/ZThread/src/posix/ armagetronad/trunk/winlibs/ZThread/src/posix/ConditionRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/posix/FastLock.h armagetronad/trunk/winlibs/ZThread/src/posix/FtimeStrategy.h armagetronad/trunk/winlibs/ZThread/src/posix/GetTimeOfDayStrategy.h armagetronad/trunk/winlibs/ZThread/src/posix/Monitor.cxx armagetronad/trunk/winlibs/ZThread/src/posix/Monitor.h armagetronad/trunk/winlibs/ZThread/src/posix/PriorityOps.h armagetronad/trunk/winlibs/ZThread/src/posix/TSS.h armagetronad/trunk/winlibs/ZThread/src/posix/ThreadOps.cxx armagetronad/trunk/winlibs/ZThread/src/posix/ThreadOps.h armagetronad/trunk/winlibs/ZThread/src/solaris/ armagetronad/trunk/winlibs/ZThread/src/solaris/FastRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/vanilla/ armagetronad/trunk/winlibs/ZThread/src/vanilla/DualMutexRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/vanilla/SimpleAtomicCount.cxx armagetronad/trunk/winlibs/ZThread/src/vanilla/SimpleRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/win32/ armagetronad/trunk/winlibs/ZThread/src/win32/AtomicCount.cxx armagetronad/trunk/winlibs/ZThread/src/win32/AtomicFastLock.h armagetronad/trunk/winlibs/ZThread/src/win32/AtomicFastRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/win32/FastLock.h armagetronad/trunk/winlibs/ZThread/src/win32/FastRecursiveLock.h armagetronad/trunk/winlibs/ZThread/src/win32/Monitor.cxx armagetronad/trunk/winlibs/ZThread/src/win32/Monitor.h armagetronad/trunk/winlibs/ZThread/src/win32/PerformanceCounterStrategy.h armagetronad/trunk/winlibs/ZThread/src/win32/TSS.h armagetronad/trunk/winlibs/ZThread/src/win32/ThreadOps.cxx armagetronad/trunk/winlibs/ZThread/src/win32/ThreadOps.h armagetronad/trunk/winlibs/ZThread/src/win9x/ armagetronad/trunk/winlibs/ZThread/src/win9x/AtomicCount.cxx armagetronad/trunk/winlibs/ZThread/src/win9x/AtomicFastLock.h Property Changed: ---------------- armagetronad/trunk/build/ armagetronad/trunk/build_eclipse/ Copied: armagetronad/trunk/armagetronad/.bzrignore (from rev 7838, armagetronad/branches/0.2.8/armagetronad/.bzrignore) =================================================================== --- armagetronad/trunk/armagetronad/.bzrignore (rev 0) +++ armagetronad/trunk/armagetronad/.bzrignore 2008-02-10 11:32:50 UTC (rev 7839) @@ -0,0 +1,43 @@ +COPYING +ChangeLog +EclipseBuild +./INSTALL +Makefile.in +./aclocal.m4 +./autom4te.cache +./config.h.in +./config.sub +./configure +./depcomp +./install-sh +./missing +./touch +./version +src/doc/commands.txt +./.changetag +Makefile +./config.h +./config.log +./config.status +./extrapaths +./stamp-h1 +./universal_variable* +batch/relocate +batch/relocate.in +batch/sysinstall +config/Makefile +config/aiplayers.cfg +config/rc.config +desktop/armagetronad.desktop +language/languages.txt +resource/included/ +.deps +src/armagetronad_main +src/nTrueVersion.h +src/tUniversalVariables.h +src/tUniversalVariables.h.in +.dummy.dep +src/doc/Doxyfile +*.html +html.m4 +*.dep Modified: armagetronad/trunk/armagetronad/NEWS =================================================================== --- armagetronad/trunk/armagetronad/NEWS 2008-02-10 07:26:33 UTC (rev 7838) +++ armagetronad/trunk/armagetronad/NEWS 2008-02-10 11:32:50 UTC (rev 7839) @@ -89,6 +89,8 @@ ------------ New settings and commands: +- ZONE_ALPHA_TOGGLE to override the systemwide alpha blendings setting and + have zones rendered in wireframe mode even when alpha blending is on. - ZONE_ALPHA(_SERVER) to control intensity of zone rendering. - SCORE_HOLE for awarding sacrifice. - SCORE_SURVIVE for player survival and FORTRESS_HELD_SCORE for not losing @@ -140,8 +142,6 @@ "[L] " - PLAYER_MESSAGE <user ID or name> <Message>: Like /msg, but from the console -- ZONE_ALPHA_TOGGLE: When rendering zones ZONE_ALPHA_TOGGLE xor ALPHA_BLEND - determines whether to render zones as filled rectangles If --enable-armathentication was activated: - ACCESS_LEVEL_IPS to let admins see IPs of players in the list. Modified: armagetronad/trunk/armagetronad/README =================================================================== --- armagetronad/trunk/armagetronad/README 2008-02-10 07:26:33 UTC (rev 7838) +++ armagetronad/trunk/armagetronad/README 2008-02-10 11:32:50 UTC (rev 7839) @@ -1,4 +1,3 @@ All the documentation for Armagetron is now in the doc/ directory and in HTML. Starting point is, of course, doc/index.html. -The directory is usually located in /usr/local/games/armagetron. - +The directory is usually located in /usr/local/games/armagetronad. Modified: armagetronad/trunk/armagetronad/acinclude.m4 =================================================================== --- armagetronad/trunk/armagetronad/acinclude.m4 2008-02-10 07:26:33 UTC (rev 7838) +++ armagetronad/trunk/armagetronad/acinclude.m4 2008-02-10 11:32:50 UTC (rev 7839) @@ -678,3 +678,223 @@ AC_SUBST(WADPY) fi ]) + +dnl Modified ZThread test follows. This one works, AM_PATH_ZTHREAD alone does not. +dnl Changes: hacked compiler temporarily to use CXX instead of CC +dnl added zthread/ to include path +dnl added #include "zthread/Task.h" and #include "zthread/Thread.h" +dnl added HAVE_LIBZTHREAD define + +dnl Copyright (c) 2005, Eric Crahen +dnl +dnl Permission is hereby granted, free of charge, to any person obtaining a copy +dnl of this software and associated documentation files (the "Software"), to deal +dnl in the Software without restriction, including without limitation the rights +dnl to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +dnl copies of the Software, and to permit persons to whom the Software is furnished +dnl to do so, subject to the following conditions: +dnl +dnl The above copyright notice and this permission notice shall be included in all +dnl copies or substantial portions of the Software. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +dnl AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +dnl WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +dnl CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +dnl Detect the library and include paths for ZThreads, perform some test +dnl compilations. +dnl +dnl Should be used in AC_PROG_CC mode before the swtich to C++ if any is made +dnl (eg before AC_LANG_CPLUSPLUS) +dnl +dnl --with-zthread-prefix : Skip detection, use this general path +dnl --with-zthread-exec-prefix : Skip detecting the zthread-config tool +dnl +dnl Sets the following variables. +dnl +dnl ZTHREAD_CXXFLAGS +dnl ZTHREAD_LIBS +dnl +AC_DEFUN([AM_PATH_ZTHREAD_AA], +[ + + +AC_ARG_WITH(zthread-prefix,[ --with-zthread-prefix=PFX Prefix where ZTHREAD is installed (optional)], + zthread_prefix="$withval", zthread_prefix="") +AC_ARG_WITH(zthread-exec-prefix,[ --with-zthread-exec-prefix=PFX Exec prefix where ZTHREAD is installed (optional)], + zthread_exec_prefix="$withval", zthread_exec_prefix="") +AC_ARG_ENABLE(zthreadtest, [ --disable-zthreadtest Do not try to compile and run a test ZTHREAD program], + , enable_zthreadtest=yes) + + if test x$zthread_exec_prefix != x ; then + zthread_args="$zthread_args --exec-prefix=$zthread_exec_prefix" + if test x${ZTHREAD_CONFIG+set} != xset ; then + ZTHREAD_CONFIG=$zthread_exec_prefix/bin/zthread-config + fi + fi + if test x$zthread_prefix != x ; then + zthread_args="$zthread_args --prefix=$zthread_prefix" + if test x${ZTHREAD_CONFIG+set} != xset ; then + ZTHREAD_CONFIG=$zthread_prefix/bin/zthread-config + fi + fi + + AC_PATH_PROG(ZTHREAD_CONFIG, zthread-config, no) + min_zthread_version=ifelse([$1], ,0.11.0,$1) + AC_MSG_CHECKING(for ZTHREAD - version >= $min_zthread_version) + no_zthread="" + if test "$ZTHREAD_CONFIG" = "no" ; then + no_zthread=yes + else + ZTHREAD_CXXFLAGS=`$ZTHREAD_CONFIG $zthreadconf_args --cflags` + ZTHREAD_LIBS=`$ZTHREAD_CONFIG $zthreadconf_args --libs` + + zthread_major_version=`$ZTHREAD_CONFIG $zthread_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + zthread_minor_version=`$ZTHREAD_CONFIG $zthread_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + zthread_micro_version=`$ZTHREAD_CONFIG $zthread_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_zthreadtest" = "xyes" ; then + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_CFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CXXFLAGS="$CXXFLAGS $ZTHREAD_CXXFLAGS" + CFLAGS="$CFLAGS $ZTHREAD_CXXFLAGS" + LIBS="$LIBS $ZTHREAD_LIBS" + +dnl +dnl Now check if the installed ZTHREAD is sufficiently new. (Also sanity +dnl checks the results of zthread-config to some extent +dnl + rm -f conf.zthreadtest + CC_OLD=${CC} + CC=${CXX} + for extra_flags in "NONE" "-fpermissive"; do + if test NONE != ${extra_flags}; then + ZTHREAD_CXXFLAGS="$ZTHREAD_CXXFLAGS ${extra_flags}" + CXXFLAGS="$CXXFLAGS ${extra_flags}" + CFLAGS="$CFLAGS ${extra_flags}" + fi + if test "x$no_zthread" = xyes || test NONE = ${extra_flags} ; then + no_zthread="" + AC_TRY_RUN([ + + +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include "zthread/Task.h" +#include "zthread/Thread.h" +#include "zthread/ZThread.h" + +int main (int argc, char *argv[]) { + + int major, minor, micro; + char tmp_version[256]; + + { FILE *fp = fopen("conf.zthreadtest", "a"); if ( fp ) fclose(fp); } + + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + strcpy(tmp_version, "$min_zthread_version"); + + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + + printf("%s, bad version string\n", "$min_zthread_version"); + return 1; + + } + + if (($zthread_major_version > major) || + (($zthread_major_version == major) && ($zthread_minor_version > minor)) || + (($zthread_major_version == major) && ($zthread_minor_version == minor) && + ($zthread_micro_version >= micro))) { + return 0; + } else { + + printf("\n*** 'zthread-config --version' returned %d.%d.%d, but the minimum version\n", $zthread_major_version, $zthread_minor_version, $zthread_micro_version); + printf("*** of ZThread required is %d.%d.%d. If zthread-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If zthread-config was wrong, set the environment variable ZTHREAD_CONFIG\n"); + printf("*** to point to the correct copy of zthread-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + + return 1; + } + +} + +],, no_zthread=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + fi + done + CC=${CC_OLD} + CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + + if test "x$no_zthread" = x ; then + + AC_DEFINE(HAVE_LIBZTHREAD,[], [Define if you have the library ZThread.]) + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + + else + + AC_MSG_RESULT(no) + + if test "$ZTHREAD_CONFIG" = "no" ; then + + echo "*** The zthread-config script installed by ZThread could not be found" + echo "*** If ZThread was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the ZTHREAD_CONFIG environment variable to the" + echo "*** full path to zthread-config." + + else + if test -f conf.zthreadtest ; then + : + else + + echo "*** Could not run ZThread test program, checking why..." + CXXFLAGS="$CXXFLAGS $ZTHREAD_CXXFLAGS" + LIBS="$LIBS $ZTHREAD_LIBS" + + echo $LIBS; + + AC_TRY_LINK([#include "zthread/ZThread.h"], + [ return 0; ], [ + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding ZThread or finding the wrong" + echo "*** version of ZThread. If it is not finding ZThread, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means ZThread was incorrectly installed" + echo "*** or that you have moved ZThread since it was installed. In the latter case, you" + echo "*** may want to edit the zthread-config script: $ZTHREAD_CONFIG" ]) + CFLAGS="$ac_save_CXXFLAGS" + CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + + ZTHREAD_CXXFLAGS="" + ZTHREAD_LIBS="" + ifelse([$3], , :, [$3]) + + fi + + AC_SUBST(ZTHREAD_CXXFLAGS) + AC_SUBST(ZTHREAD_LIBS) + + rm -f conf.zthreadtest + +]) Modified: armagetronad/trunk/armagetronad/config/settings_authentication.cfg =================================================================== --- armagetronad/trunk/armagetronad/config/settings_authentication.cfg 2008-02-10 07:26:33 UTC (rev 7838) +++ armagetronad/trunk/armagetronad/config/settings_authentication.cfg 2008-02-10 11:32:50 UTC (rev 7839) @@ -1,6 +1,6 @@ ######################################################################### # IMPORTANT: Users should NOT edit this file. Instead, copy the -# lines you want to change into a new file named autoexec.cfg +# lines you want to change into a new file named autoexec.cfg # ( either here or in your var directory ). # This file will be overwritten when you upgrade, autoexec.cfg won't. # Be sure to save the file as plain text, not rich text, especially @@ -14,23 +14,23 @@ ######################################################################### # As all Armagetron subsystems, Authentication is complex and has many -# options for you to tweak. The policies for the default settings were +# options for you to tweak. The policies for the default settings were # chosen with the following priorities: # 1. Compatibility with old clients # 2. Security # 3. General usability -# If you are a very security aware person, you will probably disagree +# If you are a very security aware person, you will probably disagree # with the priority choilce of 1. vs 2, and want to get maximal security, # even if that means old clients will not be able to authenticate on # your server; in this case, uncomment the following line: # HASH_METHOD_BLACKLIST bmd5 -# this will disable the hash protocol clients up to 0.2.8.2.1 knew as -# the only one, which is vulnerable to relatively easy man in the -# middle attacks. New clients will, by default, refuse to use it, so +# this will disable the hash protocol clients up to 0.2.8.2.1 knew as +# the only one, which is vulnerable to relatively easy man in the +# middle attacks. New clients will, by default, refuse to use it, so # if the the admins on your server are well educated and protect their -# login data with all means available to them, which includes using an +# login data with all means available to them, which includes using an # up-to-date client, you should be safe even without this setting. # You may get the occasional faked login from a regular player, though. @@ -79,7 +79,7 @@ # Those accouts will allow login from all usernames with a name starting with # the team name. Users logged in via such an account will appear as # <user name>@L_TEAM and get the access rights of "Team Member", more -# about that later. Accounts of this type are intended to be used for organized +# about that later. Accounts of this type are intended to be used for organized # tournaments. # You can remove both kinds of accounts with USER_REMOVE. @@ -101,7 +101,7 @@ # every time a user will try to authenticate; those connections will happen # in the background and should not cause too much extra lag. -# Accounts from remote authentication servers will appear as +# Accounts from remote authentication servers will appear as # <user name>@<authority> in your logs. # Maybe you don't want to accept logins from all authorities. If you want to @@ -121,12 +121,12 @@ ######################################################################### # The old, single password inteface to the /admin command is disabled -# when you compile a server with this authentication. Instead, you +# when you compile a server with this authentication. Instead, you # can assign access rights to individual players with # USER_LEVEL <user name> <level> -# The user name is the user's full authentication name as it appears in +# The user name is the user's full authentication name as it appears in # your logs, with all the escapes and character encodings; the "Foo Bar@" # user from the example above would usually appear as Foo\_Bar@, and that # is how you need to put him there. The level is the numberic access level; @@ -136,7 +136,7 @@ # Level Meaning Details # 0 Owner The owner of the server. Commands entered on the # server console are executed with these rights. -# 1 Admin A server administrator. By default, almost as +# 1 Admin A server administrator. By default, almost as # powerful as the owner himself. # 2 Moderator A server moderator. Is still allowed to use /admin, # but is restricted to player management commands. @@ -266,7 +266,7 @@ ACCESS_LEVEL ALLOW_TEAM_CHANGE_PLAYER 7 ACCESS_LEVEL DISALLOW_TEAM_CHANGE_PLAYER 7 -# A very powerful command with access levels is CASACL, prounounced +# A very powerful command with access levels is CASACL, prounounced # like Quetzalcoatl, your friendly Aztec God. A bit like the suid flag # on Unix executables, the setuid system command, and not completely # unlike the sudo shell command or, if you go very far, Access Control @@ -339,7 +339,7 @@ # /lock -# Locks your current team. Nobody can join it any more on their own. +# Locks your current team. Nobody can join it any more on their own. # To let someone in, you need to invoke # /invite <player name> @@ -368,9 +368,9 @@ # ######################################################################### -# The log format in ladderlog.txt is picked so that no unauthenticated -# user can ever appear under the same name as an authenticated user. To -# achieve that, @ signs are escaped for unauthenticated users. That +# The log format in ladderlog.txt is picked so that no unauthenticated +# user can ever appear under the same name as an authenticated user. To +# achieve that, @ signs are escaped for unauthenticated users. That # changes their names relative to the way they appeared in older versions # of the server. If you rather want to keep the names of unauthenticated # players as they were before, change this to 1: @@ -400,21 +400,21 @@ # RESERVE_SCREEN_NAME <user> <screen name> # All other players, authenticated or not, will not be able to change their -# screen name to the picked name, then.The command is of course only +# screen name to the picked name, then.The command is of course only # of use if you have set ALLOW_IMPOSTORS to 0. # You can bend authenticated user names around with # USER_ALIAS <user> <alias> -# after doing that, a player who authenticates as <user> will appear +# after doing that, a player who authenticates as <user> will appear # as <alias>. He will get granted the access rights you gave both # IDs. # By default, the authentication names of all players are visible to # everyone. You can grant your players a certain degree of anonymity -# by hiding the user names of all players of a certain maximal access -# level with +# by allowing all players of a certain maximal access level to hide their +# identity with ACCESS_LEVEL_HIDE_OF 15 Modified: armagetronad/trunk/armagetronad/config/settings_dedicated.cfg =================================================================== --- armagetronad/trunk/armagetronad/config/settings_dedicated.cfg 2008-02-10 07:26:33 UTC (rev 7838) +++ armagetronad/trunk/armagetronad/config/settings_dedicated.cfg 2008-02-10 11:32:50 UTC (rev 7839) @@ -334,7 +334,7 @@ TEAM_BLUE_7 15 # blue portion of team 7's color TEAM_BLUE_8 7 # blue portion of team 8's color -TEAM_ALLOW_SHUFFLE_UP 0 # if set to 1, players are allowed to change their position in the team as they wish. If 0, they only can drop in rank. +#TEAM_ALLOW_SHUFFLE_UP 0 # if set to 1, players are allowed to change their position in the team as they wish. If 0, they only can drop in rank. TEAM_CENTER_IS_BOSS 1 # if set to 1, the center player is the team's boss. If at 0, it's the player who is on that team longest. ############################################################################################ Modified: armagetronad/trunk/armagetronad/configure.ac =================================================================== --- armagetronad/trunk/armagetronad/configure.ac 2008-02-10 07:26:33 UTC (rev 7838) +++ armagetronad/trunk/armagetronad/configure.ac 2008-02-10 11:32:50 UTC (rev 7839) @@ -329,7 +329,7 @@ dnl Checks for programs. dnl C Compiler: -dnl AC_PROG_CC +AC_PROG_CC AC_PROG_CPP dnl C++ Compiler: @@ -569,19 +569,10 @@ if test x$enable_armathentication = xyes; then -test -z "$ZTHREAD_CONFIG" && ZTHREAD_CONFIG=zthread-config +AM_PATH_ZTHREAD_AA(2.3.2) +CXXFLAGS="${CXXFLAGS} ${ZTHREAD_CXXFLAGS}" +LIBS="${LIBS} ${ZTHREAD_LIBS}" -if $ZTHREAD_CONFIG --libs > /dev/null; then - CPPFLAGS="$CPPFLAGS `$ZTHREAD_CONFIG --cflags`" - LIBS="`$ZTHREAD_CONFIG --libs` $LIBS" - AC_CHECK_LIB(ZThread,xmlParseMemory, - AC_DEFINE(HAVE_LIBZTHREAD,,[Define if you have the ZThread library]), - AC_MSG_WARN([ZThread library not found; $ZTHREAD_CONFIG gave non-working linker flags.]) - ,) -else - AC_MSG_WARN([ZThr... [truncated message content] |
From: <z-...@us...> - 2008-02-16 16:14:34
|
Revision: 7957 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7957&view=rev Author: z-man Date: 2008-02-16 08:14:35 -0800 (Sat, 16 Feb 2008) Log Message: ----------- Merging branch 0.2.8 from revision 7947 to 7956: ------------------------------------------------------------------------ r7956 | bazaarmagetron | 2008-02-16 16:35:47 +0100 (Sat, 16 Feb 2008) | 2 lines Manuel Moos: Wall rendering objects no longer disappear prematurely. ------------------------------------------------------------------------ r7953 | bazaarmagetron | 2008-02-16 14:08:54 +0100 (Sat, 16 Feb 2008) | 2 lines Manuel Moos: added a couple of automake variables to the registered ones. ------------------------------------------------------------------------ r7952 | bazaarmagetron | 2008-02-16 11:29:11 +0100 (Sat, 16 Feb 2008) | 2 lines Manuel Moos: more ignores. ------------------------------------------------------------------------ r7951 | bazaarmagetron | 2008-02-16 11:28:53 +0100 (Sat, 16 Feb 2008) | 2 lines Manuel Moos: Prepared for autopackage dual build. Well, the changes are mostly to my system's setup, here I only shuffled stuff around and removed old crap. ------------------------------------------------------------------------ r7950 | bazaarmagetron | 2008-02-15 22:43:32 +0100 (Fri, 15 Feb 2008) | 2 lines Manuel Moos: Disabling display list stats in release mode. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7947&view=rev Modified Paths: -------------- armagetronad/trunk/armagetronad/configure.ac armagetronad/trunk/armagetronad/src/render/rDisplayList.cpp armagetronad/trunk/armagetronad/src/tron/gCycle.cpp armagetronad/trunk/build/.bzrignore armagetronad/trunk/build/package/Makefile armagetronad/trunk/build/package/default.apspec Property Changed: ---------------- armagetronad/trunk/build/ Modified: armagetronad/trunk/armagetronad/configure.ac =================================================================== --- armagetronad/trunk/armagetronad/configure.ac 2008-02-16 15:35:47 UTC (rev 7956) +++ armagetronad/trunk/armagetronad/configure.ac 2008-02-16 16:14:35 UTC (rev 7957) @@ -10,6 +10,10 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Armagetronad,AUTOMATIC_VERSION) +#set +#echo args : "$@" +#exit 1 + dnl flag telling the status message whether some files will be installed outside of prefix OUTSIDE_OF_PREFIX=no @@ -49,6 +53,11 @@ AC_ARG_VAR(docstyle,[Documentation style for cross-building of documentation. Possible values: unix, web and windows.]) AC_ARG_VAR(progname,[Program short name, default: armagetronad.]) AC_ARG_VAR(progtitle,[Program long name, default: Armagetron Advanced.]) +AC_ARG_VAR(APBUILD_CXX1,[Autopackage ABI 1 C++ compiler.]) +AC_ARG_VAR(APBUILD_CXX2,[Autopackage ABI 2 C++ compiler.]) +AC_ARG_VAR(APBUILD_CC,[Autopackage C compiler.]) +AC_ARG_VAR(CXX_ABI,[Autopackage C++ ABI version.]) +AC_ARG_VAR(APBUILD_STATIC,[Autopackage static libraries.]) dnl a modern autoconf is required to process this AC_PREREQ(2.50) Modified: armagetronad/trunk/armagetronad/src/render/rDisplayList.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/render/rDisplayList.cpp 2008-02-16 15:35:47 UTC (rev 7956) +++ armagetronad/trunk/armagetronad/src/render/rDisplayList.cpp 2008-02-16 16:14:35 UTC (rev 7957) @@ -33,8 +33,6 @@ #define LIST_STATS #endif -#define LIST_STATS - #ifdef LIST_STATS class rListCounter { Modified: armagetronad/trunk/armagetronad/src/tron/gCycle.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gCycle.cpp 2008-02-16 15:35:47 UTC (rev 7956) +++ armagetronad/trunk/armagetronad/src/tron/gCycle.cpp 2008-02-16 16:14:35 UTC (rev 7957) @@ -2068,6 +2068,17 @@ { AddToList(); } + +#if 0 // not required + virtual ~gCycleWallRenderer() + { + } + + virtual void OnRemoveFromGame() + { + eReferencableGameObject::OnRemoveFromGame(); + } +#endif private: virtual void Render( eCamera const * camera ) { @@ -2076,9 +2087,14 @@ virtual bool Timestep( REAL currentTime ) { + if ( !cycle_ ) + { + return true; + } + Move( cycle_->Position(), lastTime, currentTime ); - return !cycle_->displayList_.Walls(); + return !cycle_->Alive() && !cycle_->displayList_.Walls(); } tJUST_CONTROLLED_PTR< gCycle > cycle_; Property changes on: armagetronad/trunk/build ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-08 16:15:06.148000002 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: 0.2.8-build-work + timestamp: 2008-02-16 11:24:25.201999903 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: release Name: bzr:file-ids - .bzrignore bzrignore-20080208151450-79fxayh12i61029j-1 + Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 20 z-...@us...-20080208151332-qfyl4nvq1os2jgvr 21 z-...@us...-20080208151506-zqp1oyr9n6rbajf3 + 20 z-...@us...-20080208151332-qfyl4nvq1os2jgvr 21 z-...@us...-20080208151506-zqp1oyr9n6rbajf3 26 z-...@us...-20080216101723-0t6yzvx546p1uzpr 27 z-...@us...-20080216102425-z38kmgyr6jh8mnvs Modified: armagetronad/trunk/build/.bzrignore =================================================================== --- armagetronad/trunk/build/.bzrignore 2008-02-16 15:35:47 UTC (rev 7956) +++ armagetronad/trunk/build/.bzrignore 2008-02-16 16:14:35 UTC (rev 7957) @@ -1,3 +1,5 @@ ./make.conf ./tarballs ./builds +./ap-client +./make.conf.bak Modified: armagetronad/trunk/build/package/Makefile =================================================================== --- armagetronad/trunk/build/package/Makefile 2008-02-16 15:35:47 UTC (rev 7956) +++ armagetronad/trunk/build/package/Makefile 2008-02-16 16:14:35 UTC (rev 7957) @@ -60,11 +60,10 @@ test-%: mkdir -p $(BUILDDIR)-test-$*/autopackage sed < default.apspec > $(BUILDDIR)-test-$*/autopackage/default.apspec ${SED.$*} ${DEBUGSED} - cd $(BUILDDIR)-test-$*; makeinstaller || makepackage; ${hack-t} - + cd $(BUILDDIR)-test-$*; makepackage || makeinstaller; ${hack-t} release-%: mkdir -p $(BUILDDIR)-$*/autopackage sed < default.apspec > $(BUILDDIR)-$*/autopackage/default.apspec ${SED.$*} ${SRCSED} - cd $(BUILDDIR)-$*; makeinstaller || makepackage; ${hack-t} + cd $(BUILDDIR)-$*; makepackage || makeinstaller; ${hack-t} Modified: armagetronad/trunk/build/package/default.apspec =================================================================== --- armagetronad/trunk/build/package/default.apspec 2008-02-16 15:35:47 UTC (rev 7956) +++ armagetronad/trunk/build/package/default.apspec 2008-02-16 16:14:35 UTC (rev 7957) @@ -11,7 +11,7 @@ URL: http://www.armagetronad.net/ License: GNU General Public License, Version 2 SoftwareVersion: CVS -AutopackageTarget: 1.0 +AutopackageTarget: 1.2 # Only uncomment InterfaceVersion if your package exposes interfaces to other software, # for instance if it includes DSOs or python/perl modules. See the developer guide for more info, @@ -34,9 +34,6 @@ #export LIBS=-L`pwd` #export APBUILD_STATIC_LIBGCC=1 -# set up dual compilation mode (not fully available yet) -# APBUILD_CXX2=/usr/local/gcc-40/bin/g++ APBUILD_CXX1=g++ - # NOTE: either APBUILD_STATIC="xml2" or require @xmlsoft.org/libxml2 2.6 # should be removed before building. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2008-02-19 09:11:23
|
Revision: 7998 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7998&view=rev Author: z-man Date: 2008-02-19 01:11:29 -0800 (Tue, 19 Feb 2008) Log Message: ----------- Merging branch 0.2.8 from revision 7976 to 7995: ------------------------------------------------------------------------ r7995 | bazaarmagetron | 2008-02-18 12:42:01 +0100 (Mon, 18 Feb 2008) | 2 lines Manuel Moos: Make sure cycle is dead when it gets removed from the game. ------------------------------------------------------------------------ r7994 | bazaarmagetron | 2008-02-18 12:41:22 +0100 (Mon, 18 Feb 2008) | 2 lines Manuel Moos: Moved glColor() call outside of the last glBegin()/glEnd() block. (not merged, does not apply) ------------------------------------------------------------------------ r7990 | wrtlprnft | 2008-02-18 11:27:51 +0100 (Mon, 18 Feb 2008) | 2 lines Added (UN)?LOCK to the list of commands accessible to moderators by default, fixed a typo and clarified that these settings are the default ------------------------------------------------------------------------ r7989 | bazaarmagetron | 2008-02-17 23:59:37 +0100 (Sun, 17 Feb 2008) | 2 lines Manuel Moos: Reordered ingame menu so "Disconnect" is agan second from below. ------------------------------------------------------------------------ r7988 | bazaarmagetron | 2008-02-17 23:37:02 +0100 (Sun, 17 Feb 2008) | 2 lines Manuel Moos: Fixed UNSUSPEND. ------------------------------------------------------------------------ r7987 | wrtlprnft | 2008-02-17 22:30:37 +0100 (Sun, 17 Feb 2008) | 2 lines I just read that you're supposed to call glGetError until it stops returning errors. I guess it can't hurt to do so. ------------------------------------------------------------------------ r7985 | z-man | 2008-02-17 18:22:53 +0100 (Sun, 17 Feb 2008) | 1 line Another absolute path gone. ------------------------------------------------------------------------ r7982 | bazaarmagetron | 2008-02-17 16:20:13 +0100 (Sun, 17 Feb 2008) | 2 lines Manuel Moos: Forgot to document the last setting. ------------------------------------------------------------------------ r7981 | bazaarmagetron | 2008-02-17 16:19:26 +0100 (Sun, 17 Feb 2008) | 2 lines Manuel Moos: VOTES_CANCEL cancels all running polls. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7976&view=rev Modified Paths: -------------- armagetronad/trunk/armagetronad/NEWS armagetronad/trunk/armagetronad/config/settings_authentication.cfg armagetronad/trunk/armagetronad/language/english_base.txt armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp armagetronad/trunk/armagetronad/src/engine/eVoter.cpp armagetronad/trunk/armagetronad/src/render/rGL.cpp armagetronad/trunk/armagetronad/src/tron/gCycle.cpp armagetronad/trunk/armagetronad/src/tron/gGame.cpp armagetronad/trunk/build_codeblocks/ZThread.cbp Modified: armagetronad/trunk/armagetronad/NEWS =================================================================== --- armagetronad/trunk/armagetronad/NEWS 2008-02-18 22:49:42 UTC (rev 7997) +++ armagetronad/trunk/armagetronad/NEWS 2008-02-19 09:11:29 UTC (rev 7998) @@ -89,6 +89,9 @@ ------------ New settings and commands: +- (UN)SUSPEND kicks a player to spectator mode with a timeout. Intended to + let new players watch before they play. +- VOTES_CANCEL cancels all running polls. - ZONE_ALPHA_TOGGLE to override the systemwide alpha blendings setting and have zones rendered in wireframe mode even when alpha blending is on. - ZONE_ALPHA(_SERVER) to control intensity of zone rendering. Modified: armagetronad/trunk/armagetronad/config/settings_authentication.cfg =================================================================== --- armagetronad/trunk/armagetronad/config/settings_authentication.cfg 2008-02-18 22:49:42 UTC (rev 7997) +++ armagetronad/trunk/armagetronad/config/settings_authentication.cfg 2008-02-19 09:11:29 UTC (rev 7998) @@ -232,7 +232,7 @@ # (no need to be a spectator), you will also see the /msg messages. -# Another change when compiling aith armathication is that the old +# Another change when compiling with armathication is that the old # setting TEAM_ALLOW_SHUFFLE_UP is replaced by an access level # that's required to shuffle up. This defaults to team members. @@ -247,13 +247,16 @@ # That command itself is by default restricted to be used by # the owner, because it is the master key to all other commands. -# Sensible commands to unlock for moderator use are: +# Sensible commands to unlock for moderator use are (this is the default): + ACCESS_LEVEL PLAYER_MESSAGE 2 ACCESS_LEVEL KICK 2 ACCESS_LEVEL BAN 2 ACCESS_LEVEL KICK_TO 2 ACCESS_LEVEL MOVE_TO 2 +ACCESS_LEVEL SUSPEND 2 +ACCESS_LEVEL UNSUSPEND 2 ACCESS_LEVEL KILL 2 ACCESS_LEVEL SILENCE 2 ACCESS_LEVEL VOICE 2 Modified: armagetronad/trunk/armagetronad/language/english_base.txt =================================================================== --- armagetronad/trunk/armagetronad/language/english_base.txt 2008-02-18 22:49:42 UTC (rev 7997) +++ armagetronad/trunk/armagetronad/language/english_base.txt 2008-02-19 09:11:29 UTC (rev 7998) @@ -447,6 +447,7 @@ allow_voting_spectator_help If set to 1, voting will be allowed for spectators. min_voters_help Number of voters that need to be online to enable voting. max_votes_help The maximum number of total votes that can be active at any given moment. +votes_cancel_help Cancels all running polls. max_votes_per_voter_help The maximum number of votes suggested by each voter that can be active at any given moment. voting_start_decay_help Number of seconds after that the non-voters start to get ignored. voting_decay_help One non-voter is ignored everytime this many secons pass. @@ -2178,6 +2179,7 @@ instant_win_activated Instant win zone activated! Enter it to win the round.\n instant_death_activated Death zone activated! Avoid it!\n +player_admin_kill \1 0xRESETTwas smitten by an administrator.\n player_win_instant \1 was awarded \2 points for hitting the instant win zone.\n player_win_conquest \1 was awarded \2 points for conquering the enemy base.\n player_win_held_fortress \1 was awarded \2 points for holding the base.\n @@ -2420,6 +2422,7 @@ vote_accepted Poll "\1" has been accepted. (\2 Players voted for the poll, \3 against, \4 didn't vote)\n vote_rejected Poll "\1" has been rejected. (\2 Players voted for the poll, \3 against, \4 didn't vote)\n vote_timeout Poll "\1" timed out.\n +vote_cancel_all All polls have been canceled by an administrator.\n vote_new New poll: "\1". Enter the main menu vote on it.\n vote_redundant Poll rejected, same suggestion was made already.\n vote_maturity Poll rejected, you're not old enough to issue votes, wait \1 seconds.\n Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-02-18 22:49:42 UTC (rev 7997) +++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-02-19 09:11:29 UTC (rev 7998) @@ -6638,7 +6638,10 @@ ePlayerNetID * p = ReadPlayer( s ); if ( p && p->Object() ) + { p->Object()->Kill(); + sn_ConsoleOut( tOutput( "$player_admin_kill", p->GetColoredName() ) ); + } } static tConfItemFunc kill_conf("KILL",&Kill_conf); @@ -6672,7 +6675,7 @@ static void UnSuspend_conf(std::istream &s ) { - Suspend_conf_base( s, 5 ); + Suspend_conf_base( s, 0 ); } static tConfItemFunc suspend_conf("SUSPEND",&Suspend_conf); @@ -7332,12 +7335,12 @@ if ( suspended_ == 0 ) { - sn_ConsoleOut( tOutput( "$player_no_longer_suspended", GetName() ) ); + sn_ConsoleOut( tOutput( "$player_no_longer_suspended", GetColoredName() ) ); FindDefaultTeam(); } else { - sn_ConsoleOut( tOutput( "$player_suspended", GetName(), suspended_ ) ); + sn_ConsoleOut( tOutput( "$player_suspended", GetColoredName(), suspended_ ) ); SetTeam( NULL ); } } Modified: armagetronad/trunk/armagetronad/src/engine/eVoter.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eVoter.cpp 2008-02-18 22:49:42 UTC (rev 7997) +++ armagetronad/trunk/armagetronad/src/engine/eVoter.cpp 2008-02-19 09:11:29 UTC (rev 7998) @@ -486,6 +486,25 @@ tList< eVoteItem > eVoteItem::items_; // list of vote items +void se_CancelAllVotes( std::istream & ) +{ + if ( sn_GetNetState() == nCLIENT ) + { + return; + } + + sn_ConsoleOut( tOutput( "$vote_cancel_all" ) ); + + tList< eVoteItem > const & items = eVoteItem::GetItems(); + + while ( items.Len() ) + { + delete items(0); + } +} + +static tConfItemFunc se_cancelAllVotes_conf( "VOTES_CANCEL", &se_CancelAllVotes ); + static nDescriptor vote_handler(230,eVoteItem::GetControlMessage,"vote cast"); // called on the clients to accept or decline the vote Modified: armagetronad/trunk/armagetronad/src/render/rGL.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/render/rGL.cpp 2008-02-18 22:49:42 UTC (rev 7997) +++ armagetronad/trunk/armagetronad/src/render/rGL.cpp 2008-02-19 09:11:29 UTC (rev 7998) @@ -34,8 +34,8 @@ #ifdef AA_GL_ERROR_CHECKING void sr_CheckGLError() { - GLenum error = glGetError(); - if ( error != GL_NO_ERROR ) + GLenum error; + while ( (error = glGetError()) != GL_NO_ERROR ) { std::stringstream s; s << "GL error 0X" << std::hex << error << " (" << (char const *)gluErrorString(error) << ")\n"; Modified: armagetronad/trunk/armagetronad/src/tron/gCycle.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gCycle.cpp 2008-02-18 22:49:42 UTC (rev 7997) +++ armagetronad/trunk/armagetronad/src/tron/gCycle.cpp 2008-02-19 09:11:29 UTC (rev 7998) @@ -2365,6 +2365,12 @@ RequestSync(); } + // make sure we're dead, so our walls know they need to time out. + if ( Alive() ) + { + Die( lastTime ); + } + if (currentWall) currentWall->CopyIntoGrid(0); currentWall=NULL; Modified: armagetronad/trunk/armagetronad/src/tron/gGame.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2008-02-18 22:49:42 UTC (rev 7997) +++ armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2008-02-19 09:11:29 UTC (rev 7998) @@ -2033,24 +2033,7 @@ uMenuItemExit exx(&MainMenu,extitle, exhelp); - uMenuItemFunction * auth = 0; - static nVersionFeature authentication( 15 ); - if ( sn_GetNetState() == nCLIENT && ingame && authentication.Supported(0) ) - { - auth =tNEW(uMenuItemFunction)(&MainMenu, - "$player_authenticate_text", - "$player_authenticate_help", - &PlayerLogIn ); - } - - uMenuItemFunction abb(&MainMenu, - "$main_menu_about_text", - "$main_menu_about_help", - &sg_DisplayVersionInfo); - - uMenuItemFunction *return_to_main=NULL; - if (ingame){ if (sn_GetNetState()==nSTANDALONE) return_to_main=new uMenuItemFunction @@ -2070,8 +2053,22 @@ &ret_to_MainMenu); } + uMenuItemFunction * auth = 0; + static nVersionFeature authentication( 15 ); + if ( sn_GetNetState() == nCLIENT && ingame && authentication.Supported(0) ) + { + auth =tNEW(uMenuItemFunction)(&MainMenu, + "$player_authenticate_text", + "$player_authenticate_help", + &PlayerLogIn ); + } + uMenuItemFunction abb(&MainMenu, + "$main_menu_about_text", + "$main_menu_about_help", + &sg_DisplayVersionInfo); + uMenu Settings("$system_settings_menu_text"); uMenuItemSubmenu subm_settings Modified: armagetronad/trunk/build_codeblocks/ZThread.cbp =================================================================== --- armagetronad/trunk/build_codeblocks/ZThread.cbp 2008-02-18 22:49:42 UTC (rev 7997) +++ armagetronad/trunk/build_codeblocks/ZThread.cbp 2008-02-19 09:11:29 UTC (rev 7998) @@ -9,7 +9,7 @@ <Option compiler="0"/> <Build> <Target title="release"> - <Option output="D:\Development\AADevel\workspaces\liquid\build_codeblocks\libZThread.a"/> + <Option output=".\libZThread.a"/> <Option working_dir=""/> <Option object_output=".objs_release"/> <Option deps_output=".deps_release"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-04-02 12:34:17
|
Revision: 8395 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8395&view=rev Author: bazaarmagetron Date: 2008-04-02 05:34:13 -0700 (Wed, 02 Apr 2008) Log Message: ----------- wrtlprnft: Fixed erroneous update of spawnDir that caused the minimap to rotate sometimes when it wasn't supposed to. Modified Paths: -------------- armagetronad/trunk/armagetronad/src/tron/gCycle.cpp Added Paths: ----------- armagetronad/trunk/armagetronad/ Removed Paths: ------------- armagetronad/trunk/armagetronad/ Copied: armagetronad/trunk/armagetronad (from rev 8393, armagetronad/trunk/armagetronad) Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info + timestamp: 2008-04-02 06:21:17.999000072 -0600 committer: wrtlprnft <wrt...@us...> properties: branch-nick: trunk-armagetronad-work bugs: https://launchpad.net/bugs/210548 fixed Name: svn:external + https://svn.sourceforge.net/svnroot/armagetronad/armagetronad/trunk/armagetronad Name: bzr:file-ids + Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 Name: svn:ignore + compile config.sub install-sh Eclipse* configure version.h CVS doc_bak log leak.history config.cache config.log .gdbinit config.h Makefile leak.log diff scorelog.txt ladder.txt highscores.txt config.status won_matches.txt mainicon.ico .dont_update screenshot_1.bmp won_rounds.txt Makefile.global memprofile* frommaster.srv screenshot* ml astat master bindist master_list.srv big_brother master.srv *.dll *.ilk README.txt README-SDL.txt update.bat tagcvs .infiles autom4te.cache config.h.stamp Testme html.m4 var ded .beautytag* config.h.in aclocal.m4 ChangeLog INSTALL Makefile.in missing COPYING version depcomp .version.new .cvsfiles stamp-h1 touch aa_config.h aa_config.h.in Name: svk:merge + 02982148-85d2-4202-9ec6-589ac3039d34:/local/armagetronad:10 Modified: armagetronad/trunk/armagetronad/src/tron/gCycle.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gCycle.cpp 2008-03-30 20:19:04 UTC (rev 8393) +++ armagetronad/trunk/armagetronad/src/tron/gCycle.cpp 2008-04-02 12:34:13 UTC (rev 8395) @@ -2871,7 +2871,6 @@ spawnTime_ += -1E+20; DropWall(); spawnTime_ = lastSpawn; - dirSpawn = dirDrive; lastTurnPos_ = pos; // hack last turn position to generate good wall } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |