From: <wrt...@us...> - 2008-03-19 19:15:20
|
Revision: 8353 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8353&view=rev Author: wrtlprnft Date: 2008-03-19 12:15:20 -0700 (Wed, 19 Mar 2008) Log Message: ----------- Paste support: press ctrl-v in any place that expects text to paste the clipboard contents. Tested on linux and windows, it should work on macos, too, in theory. No clue if it really does, though, someone will need to test that. The code for getting the clipboard contents comes from http://www.libsdl.org/projects/scrap/ and is released in the public domain Modified Paths: -------------- armagetronad/trunk/armagetronad/configure.ac armagetronad/trunk/armagetronad/src/Makefile.am armagetronad/trunk/armagetronad/src/thirdparty/Makefile.am armagetronad/trunk/armagetronad/src/ui/uMenu.cpp armagetronad/trunk/armagetronad/src/ui/uMenu.h Added Paths: ----------- armagetronad/trunk/armagetronad/src/thirdparty/scrap/ armagetronad/trunk/armagetronad/src/thirdparty/scrap/COPYING armagetronad/trunk/armagetronad/src/thirdparty/scrap/Makefile.am armagetronad/trunk/armagetronad/src/thirdparty/scrap/scrap.cpp armagetronad/trunk/armagetronad/src/thirdparty/scrap/scrap.h Modified: armagetronad/trunk/armagetronad/configure.ac =================================================================== --- armagetronad/trunk/armagetronad/configure.ac 2008-03-19 19:05:44 UTC (rev 8352) +++ armagetronad/trunk/armagetronad/configure.ac 2008-03-19 19:15:20 UTC (rev 8353) @@ -1110,6 +1110,7 @@ src/thirdparty/Makefile src/thirdparty/particles/Makefile src/thirdparty/mathexpr/Makefile +src/thirdparty/scrap/Makefile src/swig/Makefile resource/Makefile config/Makefile Modified: armagetronad/trunk/armagetronad/src/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/src/Makefile.am 2008-03-19 19:05:44 UTC (rev 8352) +++ armagetronad/trunk/armagetronad/src/Makefile.am 2008-03-19 19:15:20 UTC (rev 8353) @@ -180,7 +180,7 @@ libtools_a_CXXFLAGS =$(AM_CXXFLAGS) -I@srcdir@/tools -I@srcdir@/thirdparty/mathexpr libnetwork_a_CXXFLAGS=$(libtools_a_CXXFLAGS) -I@srcdir@/network librender_a_CXXFLAGS =$(libtools_a_CXXFLAGS) -I@srcdir@/render -libui_a_CXXFLAGS =$(librender_a_CXXFLAGS) -I@srcdir@/ui -I@srcdir@/thirdparty/shttpd +libui_a_CXXFLAGS =$(librender_a_CXXFLAGS) -I@srcdir@/ui -I@srcdir@/thirdparty/shttpd -I@srcdir@/thirdparty/scrap libengine_a_CXXFLAGS =$(libui_a_CXXFLAGS) -I@srcdir@/network -I@srcdir@/engine -I@srcdir@/engine/sound libtron_a_CXXFLAGS =$(libengine_a_CXXFLAGS) -I@srcdir@/thirdparty/particles -I@srcdir@/tron -I@srcdir@/tron/cockpit @@ -236,7 +236,7 @@ armagetronad_main_SOURCES = tron/gFloor.cpp tron/cockpit/cCockpit.cpp tron/cockpit/cMap.cpp armagetronad_main_CXXFLAGS =$(libtron_a_CXXFLAGS) -armagetronad_main_LDADD= libtron.a libenginecore.a libengine.a libnetwork.a libui.a librender.a libtools.a librubywrap.a thirdparty/mathexpr/libmathexpr.a ${extralibs} +armagetronad_main_LDADD= libtron.a libenginecore.a libengine.a libnetwork.a libui.a librender.a libtools.a librubywrap.a thirdparty/mathexpr/libmathexpr.a thirdparty/scrap/libscrap.a ${extralibs} # armagetronad_main_LDFLAGS= armagetronad_main_master_SOURCES = network/master.cpp Modified: armagetronad/trunk/armagetronad/src/thirdparty/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/src/thirdparty/Makefile.am 2008-03-19 19:05:44 UTC (rev 8352) +++ armagetronad/trunk/armagetronad/src/thirdparty/Makefile.am 2008-03-19 19:15:20 UTC (rev 8353) @@ -5,7 +5,7 @@ SUBDIRS=mathexpr else if BUILDREGULAR -SUBDIRS=particles mathexpr +SUBDIRS=particles scrap mathexpr endif endif endif Added: armagetronad/trunk/armagetronad/src/thirdparty/scrap/COPYING =================================================================== --- armagetronad/trunk/armagetronad/src/thirdparty/scrap/COPYING (rev 0) +++ armagetronad/trunk/armagetronad/src/thirdparty/scrap/COPYING 2008-03-19 19:15:20 UTC (rev 8353) @@ -0,0 +1,4 @@ +This source code is placed in the public domain. + +- Sam Lantinga <sl...@de...> + Added: armagetronad/trunk/armagetronad/src/thirdparty/scrap/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/src/thirdparty/scrap/Makefile.am (rev 0) +++ armagetronad/trunk/armagetronad/src/thirdparty/scrap/Makefile.am 2008-03-19 19:15:20 UTC (rev 8353) @@ -0,0 +1,6 @@ +noinst_LIBRARIES = libscrap.a +libscrap_a_SOURCES = scrap.cpp scrap.h + +EXTRA_DIST = COPYING + +libscrap_a_CXXFLAGS = ${AM_CXXFLAGS} -I${top_srcdir}/src -I./ Added: armagetronad/trunk/armagetronad/src/thirdparty/scrap/scrap.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/thirdparty/scrap/scrap.cpp (rev 0) +++ armagetronad/trunk/armagetronad/src/thirdparty/scrap/scrap.cpp 2008-03-19 19:15:20 UTC (rev 8353) @@ -0,0 +1,626 @@ + +/* Handle clipboard text and data in arbitrary formats */ + +#include <stdio.h> +#include <limits.h> + +#include "SDL.h" +#include "SDL_syswm.h" + +#include "scrap.h" + +/* Determine what type of clipboard we are using */ +#if defined(__unix__) && !defined(__QNXNTO__) + #define X11_SCRAP +#elif defined(__WIN32__) + #define WIN_SCRAP +#elif defined(__QNXNTO__) + #define QNX_SCRAP +#else + //#error Unknown window manager for clipboard handling +#endif /* scrap type */ + +/* System dependent data types */ +#if defined(X11_SCRAP) +/* * */ +typedef Atom scrap_type; + +#elif defined(WIN_SCRAP) +/* * */ +typedef UINT scrap_type; + +#elif defined(QNX_SCRAP) +/* * */ +typedef uint32_t scrap_type; +#define Ph_CL_TEXT SCRAP_TEXT + +#endif /* scrap type */ + +/* System dependent variables */ +#if defined(X11_SCRAP) +/* * */ +static Display *SDL_Display; +static Window SDL_Window; +static void (*Lock_Display)(void); +static void (*Unlock_Display)(void); + +#elif defined(WIN_SCRAP) +/* * */ +static HWND SDL_Window; + +#elif defined(QNX_SCRAP) +/* * */ +static unsigned short InputGroup; + +#endif /* scrap type */ + +#define FORMAT_PREFIX "SDL_scrap_0x" + +static scrap_type convert_format(int type) +{ + switch (type) + { + + case SCRAP_TEXT: +#if defined(X11_SCRAP) +/* * */ + return XA_STRING; + +#elif defined(WIN_SCRAP) +/* * */ + return CF_TEXT; + +#elif defined(QNX_SCRAP) +/* * */ + return Ph_CL_TEXT; + +#endif /* scrap type */ + + default: + { + char format[sizeof(FORMAT_PREFIX)+8+1]; + + sprintf(format, "%s%08lx", FORMAT_PREFIX, (unsigned long)type); + +#if defined(X11_SCRAP) +/* * */ + return XInternAtom(SDL_Display, format, False); + +#elif defined(WIN_SCRAP) +/* * */ + return RegisterClipboardFormat(format); + +#endif /* scrap type */ + } + } +} + +/* Convert internal data to scrap format */ +static int convert_data(int type, char *dst, char *src, int srclen) +{ + int dstlen; + + dstlen = 0; + switch (type) + { + case SCRAP_TEXT: + if ( dst ) + { + while ( --srclen >= 0 ) + { +#if defined(__unix__) + if ( *src == '\r' ) + { + *dst++ = '\n'; + ++dstlen; + } + else +#elif defined(__WIN32__) + if ( *src == '\r' ) + { + *dst++ = '\r'; + ++dstlen; + *dst++ = '\n'; + ++dstlen; + } + else +#endif + { + *dst++ = *src; + ++dstlen; + } + ++src; + } + *dst = '\0'; + ++dstlen; + } + else + { + while ( --srclen >= 0 ) + { +#if defined(__unix__) + if ( *src == '\r' ) + { + ++dstlen; + } + else +#elif defined(__WIN32__) + if ( *src == '\r' ) + { + ++dstlen; + ++dstlen; + } + else +#endif + { + ++dstlen; + } + ++src; + } + ++dstlen; + } + break; + + default: + if ( dst ) + { + *(int *)dst = srclen; + dst += sizeof(int); + memcpy(dst, src, srclen); + } + dstlen = sizeof(int)+srclen; + break; + } + return(dstlen); +} + +/* Convert scrap data to internal format */ +static int convert_scrap(int type, char *dst, char *src, int srclen) +{ + int dstlen; + + dstlen = 0; + switch (type) + { + case SCRAP_TEXT: + { + if ( srclen == 0 ) + srclen = strlen(src); + if ( dst ) + { + while ( --srclen >= 0 ) + { +#if defined(__WIN32__) + if ( *src == '\r' ) + /* drop extraneous '\r' */; + else +#endif + if ( *src == '\n' ) + { + *dst++ = '\r'; + ++dstlen; + } + else + { + *dst++ = *src; + ++dstlen; + } + ++src; + } + *dst = '\0'; + ++dstlen; + } + else + { + while ( --srclen >= 0 ) + { +#if defined(__WIN32__) + if ( *src == '\r' ) + /* drop extraneous '\r' */; + else +#endif + ++dstlen; + ++src; + } + ++dstlen; + } + } + break; + + default: + dstlen = *(int *)src; + if ( dst ) + { + if ( srclen == 0 ) + memcpy(dst, src+sizeof(int), dstlen); + else + memcpy(dst, src+sizeof(int), srclen-sizeof(int)); + } + break; + } + return dstlen; +} + +#if defined(X11_SCRAP) +/* The system message filter function -- handle clipboard messages */ +static int clipboard_filter(const SDL_Event *event); +#endif + +int init_scrap(void) +{ + SDL_SysWMinfo info; + int retval; + + /* Grab the window manager specific information */ + retval = -1; + SDL_SetError("SDL is not running on known window manager"); + + SDL_VERSION(&info.version); + if ( SDL_GetWMInfo(&info) ) + { + /* Save the information for later use */ +#if defined(X11_SCRAP) +/* * */ + if ( info.subsystem == SDL_SYSWM_X11 ) + { + SDL_Display = info.info.x11.display; + SDL_Window = info.info.x11.window; + Lock_Display = info.info.x11.lock_func; + Unlock_Display = info.info.x11.unlock_func; + + /* Enable the special window hook events */ + SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE); + SDL_SetEventFilter(clipboard_filter); + + retval = 0; + } + else + { + SDL_SetError("SDL is not running on X11"); + } + +#elif defined(WIN_SCRAP) +/* * */ + SDL_Window = info.window; + retval = 0; + +#elif defined(QNX_SCRAP) +/* * */ + InputGroup=PhInputGroup(NULL); + retval = 0; + +#endif /* scrap type */ + } + return(retval); +} + +int lost_scrap(void) +{ + int retval; + +#if defined(X11_SCRAP) +/* * */ + Lock_Display(); + retval = ( XGetSelectionOwner(SDL_Display, XA_PRIMARY) != SDL_Window ); + Unlock_Display(); + +#elif defined(WIN_SCRAP) +/* * */ + retval = ( GetClipboardOwner() != SDL_Window ); + +#elif defined(QNX_SCRAP) +/* * */ + retval = ( PhInputGroup(NULL) != InputGroup ); + +#endif /* scrap type */ + + return(retval); +} + +void put_scrap(int type, int srclen, char *src) +{ + scrap_type format; + int dstlen; + char *dst; + + format = convert_format(type); + dstlen = convert_data(type, NULL, src, srclen); + +#if defined(X11_SCRAP) +/* * */ + dst = new char[dstlen]; + if ( dst != NULL ) + { + Lock_Display(); + convert_data(type, dst, src, srclen); + XChangeProperty(SDL_Display, DefaultRootWindow(SDL_Display), + XA_CUT_BUFFER0, format, 8, PropModeReplace, (unsigned char *)dst, dstlen); + delete[] dst; + if ( lost_scrap() ) + XSetSelectionOwner(SDL_Display, XA_PRIMARY, SDL_Window, CurrentTime); + Unlock_Display(); + } + +#elif defined(WIN_SCRAP) +/* * */ + if ( OpenClipboard(SDL_Window) ) + { + HANDLE hMem; + + hMem = GlobalAlloc((GMEM_MOVEABLE|GMEM_DDESHARE), dstlen); + if ( hMem != NULL ) + { + dst = (char *)GlobalLock(hMem); + convert_data(type, dst, src, srclen); + GlobalUnlock(hMem); + EmptyClipboard(); + SetClipboardData(format, hMem); + } + CloseClipboard(); + } + +#elif defined(QNX_SCRAP) +/* * */ + #if (_NTO_VERSION < 620) /* before 6.2.0 releases */ + { + PhClipHeader clheader={Ph_CLIPBOARD_TYPE_TEXT, 0, NULL}; + int* cldata; + int status; + + dst = new char[dstlen + 4]; + if (dst != NULL) + { + cldata=(int*)dst; + *cldata=type; + convert_data(type, dst+4, src, srclen); + clheader.data=dst; + if (dstlen>65535) + { + clheader.length=65535; /* maximum photon clipboard size :( */ + } + else + { + clheader.length=dstlen+4; + } + status=PhClipboardCopy(InputGroup, 1, &clheader); + if (status==-1) + { + fprintf(stderr, "Photon: copy to clipboard was failed !\n"); + } + delete[] dst; + } + } + #else /* 6.2.0 and 6.2.1 and future releases */ + { + PhClipboardHdr clheader={Ph_CLIPBOARD_TYPE_TEXT, 0, NULL}; + int* cldata; + int status; + + dst = char[dstlen+4]; + if (dst != NULL) + { + cldata=(int*)dst; + *cldata=type; + convert_data(type, dst+4, src, srclen); + clheader.data=dst; + clheader.length=dstlen+4; + status=PhClipboardWrite(InputGroup, 1, &clheader); + if (status==-1) + { + fprintf(stderr, "Photon: copy to clipboard was failed !\n"); + } + delete[] dst; + } + } + #endif +#endif /* scrap type */ +} + +void get_scrap(int type, int *dstlen, char **dst) +{ + scrap_type format; + + *dstlen = 0; + format = convert_format(type); + +#if defined(X11_SCRAP) +/* * */ + { + Window owner; + Atom selection; + Atom seln_type; + int seln_format; + unsigned long nbytes; + unsigned long overflow; + char *src; + + Lock_Display(); + owner = XGetSelectionOwner(SDL_Display, XA_PRIMARY); + Unlock_Display(); + if ( (owner == None) || (owner == SDL_Window) ) + { + owner = DefaultRootWindow(SDL_Display); + selection = XA_CUT_BUFFER0; + } + else + { + int selection_response = 0; + SDL_Event event; + + owner = SDL_Window; + Lock_Display(); + selection = XInternAtom(SDL_Display, "SDL_SELECTION", False); + XConvertSelection(SDL_Display, XA_PRIMARY, format, + selection, owner, CurrentTime); + Unlock_Display(); + while ( ! selection_response ) + { + SDL_WaitEvent(&event); + if ( event.type == SDL_SYSWMEVENT ) + { + XEvent xevent = event.syswm.msg->event.xevent; + + if ( (xevent.type == SelectionNotify) && + (xevent.xselection.requestor == owner) ) + selection_response = 1; + } + } + } + Lock_Display(); + if ( XGetWindowProperty(SDL_Display, owner, selection, 0, INT_MAX/4, + False, format, &seln_type, &seln_format, + &nbytes, &overflow, (unsigned char **)&src) == Success ) + { + if ( seln_type == format ) + { + *dstlen = convert_scrap(type, NULL, src, nbytes); + *dst = (char *)realloc(*dst, *dstlen); + if ( *dst == NULL ) + *dstlen = 0; + else + convert_scrap(type, *dst, src, nbytes); + } + XFree(src); + } + } + Unlock_Display(); + +#elif defined(WIN_SCRAP) +/* * */ + if ( IsClipboardFormatAvailable(format) && OpenClipboard(SDL_Window) ) + { + HANDLE hMem; + char *src; + + hMem = GetClipboardData(format); + if ( hMem != NULL ) + { + src = (char *)GlobalLock(hMem); + *dstlen = convert_scrap(type, NULL, src, 0); + *dst = (char *)realloc(*dst, *dstlen); + if ( *dst == NULL ) + *dstlen = 0; + else + convert_scrap(type, *dst, src, 0); + GlobalUnlock(hMem); + } + CloseClipboard(); + } +#elif defined(QNX_SCRAP) +/* * */ + #if (_NTO_VERSION < 620) /* before 6.2.0 releases */ + { + void* clhandle; + PhClipHeader* clheader; + int* cldata; + + clhandle=PhClipboardPasteStart(InputGroup); + if (clhandle!=NULL) + { + clheader=PhClipboardPasteType(clhandle, Ph_CLIPBOARD_TYPE_TEXT); + if (clheader!=NULL) + { + cldata=clheader->data; + if ((clheader->length>4) && (*cldata==type)) + { + *dstlen = convert_scrap(type, NULL, (char*)clheader->data+4, clheader->length-4); + *dst = (char *)realloc(*dst, *dstlen); + if (*dst == NULL) + { + *dstlen = 0; + } + else + { + convert_scrap(type, *dst, (char*)clheader->data+4, clheader->length-4); + } + } + } + PhClipboardPasteFinish(clhandle); + } + } + #else /* 6.2.0 and 6.2.1 and future releases */ + { + void* clhandle; + PhClipboardHdr* clheader; + int* cldata; + + clheader=PhClipboardRead(InputGroup, Ph_CLIPBOARD_TYPE_TEXT); + if (clheader!=NULL) + { + cldata=clheader->data; + if ((clheader->length>4) && (*cldata==type)) + { + *dstlen = convert_scrap(type, NULL, (char*)clheader->data+4, clheader->length-4); + *dst = (char *)realloc(*dst, *dstlen); + if (*dst == NULL) + { + *dstlen = 0; + } + else + { + convert_scrap(type, *dst, (char*)clheader->data+4, clheader->length-4); + } + } + } + } + #endif +#endif /* scrap type */ +} + +#if defined(X11_SCRAP) +int filter(const SDL_Event *event); +static int clipboard_filter(const SDL_Event *event) +{ + /* Post all non-window manager specific events */ + if ( event->type != SDL_SYSWMEVENT ) { + return filter(event); + } + + /* Handle window-manager specific clipboard events */ + switch (event->syswm.msg->event.xevent.type) { + /* Copy the selection from XA_CUT_BUFFER0 to the requested property */ + case SelectionRequest: { + XSelectionRequestEvent *req; + XEvent sevent; + int seln_format; + unsigned long nbytes; + unsigned long overflow; + unsigned char *seln_data; + + req = &event->syswm.msg->event.xevent.xselectionrequest; + sevent.xselection.type = SelectionNotify; + sevent.xselection.display = req->display; + sevent.xselection.selection = req->selection; + sevent.xselection.target = None; + sevent.xselection.property = None; + sevent.xselection.requestor = req->requestor; + sevent.xselection.time = req->time; + if ( XGetWindowProperty(SDL_Display, DefaultRootWindow(SDL_Display), + XA_CUT_BUFFER0, 0, INT_MAX/4, False, req->target, + &sevent.xselection.target, &seln_format, + &nbytes, &overflow, &seln_data) == Success ) + { + if ( sevent.xselection.target == req->target ) + { + if ( sevent.xselection.target == XA_STRING ) + { + if ( seln_data[nbytes-1] == '\0' ) + --nbytes; + } + XChangeProperty(SDL_Display, req->requestor, req->property, + sevent.xselection.target, seln_format, PropModeReplace, + seln_data, nbytes); + sevent.xselection.property = req->property; + } + XFree(seln_data); + } + XSendEvent(SDL_Display,req->requestor,False,0,&sevent); + XSync(SDL_Display, False); + } + break; + } + + /* Post the event for X11 clipboard reading above */ + return(1); +} +#endif /* X11_SCRAP */ Added: armagetronad/trunk/armagetronad/src/thirdparty/scrap/scrap.h =================================================================== --- armagetronad/trunk/armagetronad/src/thirdparty/scrap/scrap.h (rev 0) +++ armagetronad/trunk/armagetronad/src/thirdparty/scrap/scrap.h 2008-03-19 19:15:20 UTC (rev 8353) @@ -0,0 +1,10 @@ + +/* Handle clipboard text and data in arbitrary formats */ + +/* Miscellaneous defines */ +#define SCRAP_TEXT 0x54455854 + +extern int init_scrap(void); +extern int lost_scrap(void); +extern void put_scrap(int type, int srclen, char *src); +extern void get_scrap(int type, int *dstlen, char **dst); Modified: armagetronad/trunk/armagetronad/src/ui/uMenu.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/ui/uMenu.cpp 2008-03-19 19:05:44 UTC (rev 8352) +++ armagetronad/trunk/armagetronad/src/ui/uMenu.cpp 2008-03-19 19:15:20 UTC (rev 8353) @@ -26,6 +26,7 @@ */ +#include "scrap.h" #include "tSysTime.h" #include "uMenu.h" #include "rSysdep.h" @@ -836,26 +837,34 @@ ret = false; // c.sym = SDLK_DOWN; } - else { - if (32 <= c.unicode && c.unicode < 256) - { - ret=true; + else if (c.sym == SDLK_v && mod & KMOD_CTRL) { + char *scrap = 0; + int scraplen; + static bool initialized_scrap = false; - // insert character if there is room - if (content->Len() < maxLength_) - { - tString beg = content->SubStr(0,cursorPos); - tString end = content->SubStr(cursorPos); - *content = beg; - *content += tString::CHAR(c.unicode); - *content += end; - cursorPos++; + ret = false; + + if(!initialized_scrap && init_scrap() >= 0) { + initialized_scrap = true; + } + if(initialized_scrap) { + get_scrap(SCRAP_TEXT, &scraplen, &scrap); + if(scraplen > 0) { + std::cerr << "scrap: " << scrap << std::endl; + for(unsigned char *c = (unsigned char *)scrap; *c; ++c) { + if(!InsertChar(*c)) { + break; // we hit a newline or were trying to + // paste binary stuff + } + ret = true; + } + //free(scrap); } } - else { - ret=false; - } } + else { + ret = InsertChar(c.unicode); + } if (cursorPos<0) cursorPos=0; if (cursorPos > content->Len()-1) cursorPos=content->Len()-1; @@ -866,6 +875,29 @@ #endif } +bool uMenuItemString::InsertChar(int unicode) { +#ifndef DEDICATED + if (32 <= unicode && unicode < 256) + { + // insert character if there is room + if (content->Len() < maxLength_) + { + tString beg = content->SubStr(0,cursorPos); + tString end = content->SubStr(cursorPos); + *content = beg; + *content += tString::CHAR(unicode); + *content += end; + cursorPos++; + } + + return true; + } + else { + return false; + } +#endif +} + //! @param words a deque containing the possible words that can be used for completion uAutoCompleter::uAutoCompleter(std::deque<tString> &words) : m_PossibleWords(words), Modified: armagetronad/trunk/armagetronad/src/ui/uMenu.h =================================================================== --- armagetronad/trunk/armagetronad/src/ui/uMenu.h 2008-03-19 19:05:44 UTC (rev 8352) +++ armagetronad/trunk/armagetronad/src/ui/uMenu.h 2008-03-19 19:15:20 UTC (rev 8353) @@ -380,8 +380,10 @@ tOutput description; tString *content; int cursorPos; - int maxLength_; + int maxLength_; + bool InsertChar(int unicode); + // color mode used for rendering rTextField::ColorMode colorMode_; public: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <z-...@us...> - 2008-03-19 23:47:00
|
Revision: 8364 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8364&view=rev Author: z-man Date: 2008-03-19 16:47:02 -0700 (Wed, 19 Mar 2008) Log Message: ----------- Merging branch 0.2.8 from revision 8286 to 8363: ------------------------------------------------------------------------ r8363 | z-man | 2008-03-19 21:31:09 +0100 (Wed, 19 Mar 2008) | 2 lines Undid test commits. ------------------------------------------------------------------------ r8362 | bazaarmagetron | 2008-03-19 21:24:54 +0100 (Wed, 19 Mar 2008) | 45 lines author: Manuel Moos Automatic merging of commits that would change history order: ------------------------------------------------------------ revno: 775.1.2 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Wed 2008-03-19 21:02:00 +0100 message: Test commit from bzr. ------------------------------------------------------------ revno: 775.1.1 committer: Manuel Moos <z-...@us...> branch nick: 0.2.8-armagetronad-work timestamp: Wed 2008-03-19 20:45:00 +0100 message: Empty merge to keep the peace between svn and bzr. ------------------------------------------------------------ revno: 770.1.4 committer: epsy branch nick: 0.2.8 timestamp: Wed 2008-03-19 20:21:23 +0100 message: redo ------------------------------------------------------------ revno: 770.1.3 committer: epsy branch nick: 0.2.8 timestamp: Wed 2008-03-19 20:19:36 +0100 message: undo ------------------------------------------------------------ revno: 770.1.2 committer: Manuel Moos <z-...@us...> branch nick: 0.2.8-armagetronad-work timestamp: Wed 2008-03-19 20:12:10 +0100 message: Empty merge to keep the peace between svn and bzr. ------------------------------------------------------------ revno: 770.1.1 committer: Manuel Moos <z-...@us...> branch nick: 0.2.8 timestamp: Wed 2008-03-19 19:56:58 +0100 message: Fixed AI player names in client and removed debug breakpoints from tColoredString:RemoveColors ------------------------------------------------------------------------ r8361 | z-man | 2008-03-19 21:03:11 +0100 (Wed, 19 Mar 2008) | 2 lines Test commit from svn. ------------------------------------------------------------------------ r8360 | bazaarmagetron | 2008-03-19 20:48:16 +0100 (Wed, 19 Mar 2008) | 2 lines Manuel Moos: redo ------------------------------------------------------------------------ r8359 | bazaarmagetron | 2008-03-19 20:47:38 +0100 (Wed, 19 Mar 2008) | 2 lines Manuel Moos: undo ------------------------------------------------------------------------ r8358 | bazaarmagetron | 2008-03-19 20:47:00 +0100 (Wed, 19 Mar 2008) | 1 line Manuel Moos: Empty merge to keep the peace between svn and bzr. ------------------------------------------------------------------------ r8357 | bazaarmagetron | 2008-03-19 20:46:37 +0100 (Wed, 19 Mar 2008) | 2 lines Manuel Moos: Fixed AI player names in client and removed debug breakpoints from tColoredString:RemoveColors ------------------------------------------------------------------------ r8352 | z-man | 2008-03-19 20:05:44 +0100 (Wed, 19 Mar 2008) | 2 lines Removing annoying debug breakpoints. ------------------------------------------------------------------------ r8351 | z-man | 2008-03-19 20:03:27 +0100 (Wed, 19 Mar 2008) | 3 lines Only clients really supporting the new votes get them now, and only they count for the totals. Undesired side effect so far: MIN_VOTERS is not taken into account properly, that still uses the total number of voters. ------------------------------------------------------------------------ r8350 | z-man | 2008-03-19 12:06:46 +0100 (Wed, 19 Mar 2008) | 2 lines Fixed one-off error with kick vote to suspend vote transmogrification, converted epsy's TABS to spaces. ------------------------------------------------------------------------ r8347 | nemostultae | 2008-03-19 01:06:06 +0100 (Wed, 19 Mar 2008) | 3 lines * Removed rDisplayList.h from Copy Headers task * Moved tColor.cpp to tools/ subgroup ------------------------------------------------------------------------ r8346 | bazaarmagetron | 2008-03-19 01:01:29 +0100 (Wed, 19 Mar 2008) | 1 line Manuel Moos: Empty merge to keep the peace between svn and bzr. ------------------------------------------------------------------------ r8345 | wrtlprnft | 2008-03-18 23:09:08 +0100 (Tue, 18 Mar 2008) | 6 lines - fixed a client compilation warning - /rtfm now prints the message to the invoker, too, to catch errors - some language file fixes - whitespace corrections ------------------------------------------------------------------------ r8344 | bazaarmagetron | 2008-03-18 21:43:49 +0100 (Tue, 18 Mar 2008) | 1 line Manuel Moos: Empty merge to keep the peace between svn and bzr. ------------------------------------------------------------------------ r8343 | wrtlprnft | 2008-03-18 21:32:00 +0100 (Tue, 18 Mar 2008) | 2 lines Fixed a bug with the display of authenticated names in the server browser. ------------------------------------------------------------------------ r8342 | bazaarmagetron | 2008-03-18 21:13:57 +0100 (Tue, 18 Mar 2008) | 1 line Manuel Moos: Empty merge to keep the peace between svn and bzr. ------------------------------------------------------------------------ r8341 | bazaarmagetron | 2008-03-18 21:13:30 +0100 (Tue, 18 Mar 2008) | 2 lines Manuel Moos: eek, forgot help texts ------------------------------------------------------------------------ r8340 | bazaarmagetron | 2008-03-18 21:11:35 +0100 (Tue, 18 Mar 2008) | 4 lines author: Manuel Moos * FILTER_COLOR_TEAM filters color in team messages * FILTER_DARK_COLOR_(STRINGS|SERVER_NAMES|NAMES|TEAM) ------------------------------------------------------------------------ r8339 | wrtlprnft | 2008-03-18 20:33:05 +0100 (Tue, 18 Mar 2008) | 2 lines Durka's xcode file that includes tColor.cpp ------------------------------------------------------------------------ r8337 | wrtlprnft | 2008-03-18 20:06:36 +0100 (Tue, 18 Mar 2008) | 2 lines new /rtfm command to send help messages to other players. ------------------------------------------------------------------------ r8336 | bazaarmagetron | 2008-03-18 17:58:29 +0100 (Tue, 18 Mar 2008) | 2 lines Manuel Moos: "we" forgot to initialize the alpha value :) ------------------------------------------------------------------------ r8335 | bazaarmagetron | 2008-03-18 17:48:19 +0100 (Tue, 18 Mar 2008) | 2 lines Manuel Moos: Fixed performance problems (string duplication) and bugs in color code interpretation. ------------------------------------------------------------------------ r8334 | bazaarmagetron | 2008-03-18 16:53:02 +0100 (Tue, 18 Mar 2008) | 2 lines Manuel Moos: Avoiding needless copies of default help topics in memory (and fixing array element count bug on the go). ------------------------------------------------------------------------ r8333 | wrtlprnft | 2008-03-18 15:21:36 +0100 (Tue, 18 Mar 2008) | 2 lines Primitive help system. See settings_dedicated.cfg:339 for a description of the new commands ------------------------------------------------------------------------ r8332 | bazaarmagetron | 2008-03-17 21:47:10 +0100 (Mon, 17 Mar 2008) | 4 lines author: epsy Ah, i shouldn't code on mornings, names on client will really, i promise, appear again. Also restructured tColor, changed it to a class, added tColor::IsDark() and construction of a tColor from a color code. Set rFont.cpp to use it. ------------------------------------------------------------------------ r8331 | bazaarmagetron | 2008-03-17 12:06:52 +0100 (Mon, 17 Mar 2008) | 2 lines Manuel Moos: numeric access level -> named access level in one server message. ------------------------------------------------------------------------ r8330 | bazaarmagetron | 2008-03-17 11:46:09 +0100 (Mon, 17 Mar 2008) | 2 lines Manuel Moos: Better feedback messages; the vote submitter is now always informed that his vote was accepted, and the new vote notification is back. ------------------------------------------------------------------------ r8329 | z-man | 2008-03-17 11:15:44 +0100 (Mon, 17 Mar 2008) | 2 lines Added missing output parameter. ------------------------------------------------------------------------ r8328 | bazaarmagetron | 2008-03-17 08:36:18 +0100 (Mon, 17 Mar 2008) | 2 lines epsy: Player names really appears again. :) ------------------------------------------------------------------------ r8326 | wrtlprnft | 2008-03-16 23:16:35 +0100 (Sun, 16 Mar 2008) | 2 lines Append (and parse) a list of authenticated names to the big server info messages (the ones that make up the details you see on the server browser) ------------------------------------------------------------------------ r8325 | bazaarmagetron | 2008-03-16 16:40:57 +0100 (Sun, 16 Mar 2008) | 2 lines epsy: The Players name appear again in standalone mode. Also added VOTING_SUSPEND and RENAME to NEWS. ------------------------------------------------------------------------ r8324 | bazaarmagetron | 2008-03-16 16:40:09 +0100 (Sun, 16 Mar 2008) | 4 lines author: Manuel Moos Full case insensitive matches now take precedence over partial case sensitive matches. "KILL Z", if players z and Z-Man are online, now kills z. ------------------------------------------------------------------------ r8323 | wrtlprnft | 2008-03-16 16:17:24 +0100 (Sun, 16 Mar 2008) | 2 lines Minor annoyance: the round end zone on freestyle game is now announced correctly ------------------------------------------------------------------------ r8322 | bazaarmagetron | 2008-03-16 00:56:03 +0100 (Sun, 16 Mar 2008) | 2 lines Manuel Moos: Map load failures (including missing spawn points) now let the map be reverted to the last known working map. ------------------------------------------------------------------------ r8321 | bazaarmagetron | 2008-03-15 01:56:28 +0100 (Sat, 15 Mar 2008) | 2 lines Manuel Moos: Voter always gets messages about the voting, no matter what privacy level is set. ------------------------------------------------------------------------ r8320 | bazaarmagetron | 2008-03-15 01:55:56 +0100 (Sat, 15 Mar 2008) | 2 lines Manuel Moos: Typo. ------------------------------------------------------------------------ r8318 | bazaarmagetron | 2008-03-14 13:35:44 +0100 (Fri, 14 Mar 2008) | 2 lines Manuel Moos: Added settings_authentication.cfg to list of configuration files to be distributed and installed. Whoops. ------------------------------------------------------------------------ r8317 | nemostultae | 2008-03-14 03:22:19 +0100 (Fri, 14 Mar 2008) | 2 lines Only use ZThread in dedicated build ------------------------------------------------------------------------ r8316 | wrtlprnft | 2008-03-13 23:54:34 +0100 (Thu, 13 Mar 2008) | 2 lines Have the server log the version of each connecting clients (I hope the max version the client sends is its current version) ------------------------------------------------------------------------ r8315 | wrtlprnft | 2008-03-12 21:56:31 +0100 (Wed, 12 Mar 2008) | 2 lines Don't look at this patch. Especially not z-man. ------------------------------------------------------------------------ r8313 | z-man | 2008-03-12 12:31:32 +0100 (Wed, 12 Mar 2008) | 2 lines Shuffling no longer uses tString::toInt so it can (and does) report input errors. ------------------------------------------------------------------------ r8312 | wrtlprnft | 2008-03-12 11:15:46 +0100 (Wed, 12 Mar 2008) | 2 lines Add new default settings to settings_authentication.cfg ------------------------------------------------------------------------ r8311 | bazaarmagetron | 2008-03-11 23:26:57 +0100 (Tue, 11 Mar 2008) | 4 lines author: Manuel Moos No more double "not allowed to rename" messages. Immediate response to admin player rename is "player will be renamed". ------------------------------------------------------------------------ r8310 | bazaarmagetron | 2008-03-11 23:25:06 +0100 (Tue, 11 Mar 2008) | 2 lines Manuel Moos: Applied epsy's name forcing patch with minor adaptions. ------------------------------------------------------------------------ r8309 | wrtlprnft | 2008-03-11 20:51:24 +0100 (Tue, 11 Mar 2008) | 2 lines more helpful "you can't shuffle up" message ------------------------------------------------------------------------ r8308 | wrtlprnft | 2008-03-11 20:36:35 +0100 (Tue, 11 Mar 2008) | 3 lines Actually make ACCESS_LEVEL_SHUFFLE_UP work... Don't look at the error, and if you do, please don't remember that I ever did such a stupid mistake. ------------------------------------------------------------------------ r8306 | nemostultae | 2008-03-11 02:20:36 +0100 (Tue, 11 Mar 2008) | 3 lines Xcode changed something. armagetronad-dedicated is now explicitly known as compiled.mach-o.executable filetype. Well done Xcode... ------------------------------------------------------------------------ r8305 | nemostultae | 2008-03-11 02:17:13 +0100 (Tue, 11 Mar 2008) | 2 lines Updated Mac OS X build instructions. ------------------------------------------------------------------------ r8304 | bazaarmagetron | 2008-03-10 22:14:59 +0100 (Mon, 10 Mar 2008) | 4 lines author: Manuel Moos QUIT now also works in the 'waiting for players, only spectators online' break. ------------------------------------------------------------------------ r8303 | bazaarmagetron | 2008-03-10 21:51:03 +0100 (Mon, 10 Mar 2008) | 2 lines Manuel Moos: Disabling silly displaylist stats for the dedicated server. ------------------------------------------------------------------------ r8302 | bazaarmagetron | 2008-03-10 17:12:58 +0100 (Mon, 10 Mar 2008) | 4 lines author: Manuel Moos Cleaned up a bit of the configuration recording and playback chaos. "Quit" console command is broken on playback currently in some situations. Silenced /msg chat no longer echoed to administrators and server console. ------------------------------------------------------------------------ r8301 | bazaarmagetron | 2008-03-09 21:52:55 +0100 (Sun, 09 Mar 2008) | 2 lines Manuel Moos: Removed unused variable. ------------------------------------------------------------------------ r8300 | bazaarmagetron | 2008-03-09 21:52:19 +0100 (Sun, 09 Mar 2008) | 2 lines Manuel Moos: Small fix: made non-krawall compilation of epsy's patch work. ------------------------------------------------------------------------ r8299 | bazaarmagetron | 2008-03-09 21:51:49 +0100 (Sun, 09 Mar 2008) | 2 lines Manuel Moos: Applied epsy's VOTING_SUSPEND patch. ------------------------------------------------------------------------ r8296 | wrtlprnft | 2008-03-09 18:10:34 +0100 (Sun, 09 Mar 2008) | 2 lines Added WAIT_FOR_EXTERNAL_SCRIPT, a feature found in armahacktron that facilitates stdio scripting. Thanks epsy for isolating it from the rest of armahacktron ------------------------------------------------------------------------ r8293 | z-man | 2008-03-09 16:07:30 +0100 (Sun, 09 Mar 2008) | 2 lines Typo. ------------------------------------------------------------------------ r8292 | z-man | 2008-03-09 16:05:28 +0100 (Sun, 09 Mar 2008) | 2 lines Added ROUND_SCORE_TEAM ladderlog message. ------------------------------------------------------------------------ r8291 | bazaarmagetron | 2008-03-08 21:25:28 +0100 (Sat, 08 Mar 2008) | 2 lines Manuel Moos: added bits. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8286&view=rev Modified Paths: -------------- armagetronad/trunk/armagetronad/AUTHORS armagetronad/trunk/armagetronad/NEWS armagetronad/trunk/armagetronad/README-Subversion armagetronad/trunk/armagetronad/config/Makefile.am armagetronad/trunk/armagetronad/config/settings_authentication.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/french.txt armagetronad/trunk/armagetronad/src/Makefile.am armagetronad/trunk/armagetronad/src/engine/eDisplay.cpp armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp armagetronad/trunk/armagetronad/src/engine/ePlayer.h armagetronad/trunk/armagetronad/src/engine/eTeam.cpp armagetronad/trunk/armagetronad/src/engine/eTeam.h armagetronad/trunk/armagetronad/src/engine/eVoter.cpp armagetronad/trunk/armagetronad/src/network/nConfig.cpp armagetronad/trunk/armagetronad/src/network/nConfig.h armagetronad/trunk/armagetronad/src/network/nNetwork.cpp armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp armagetronad/trunk/armagetronad/src/network/nServerInfo.h armagetronad/trunk/armagetronad/src/render/rConsoleCout.cpp armagetronad/trunk/armagetronad/src/render/rDisplayList.cpp armagetronad/trunk/armagetronad/src/render/rFont.cpp armagetronad/trunk/armagetronad/src/tools/tColor.h armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp armagetronad/trunk/armagetronad/src/tools/tConfiguration.h armagetronad/trunk/armagetronad/src/tools/tResourceManager.cpp armagetronad/trunk/armagetronad/src/tools/tString.cpp armagetronad/trunk/armagetronad/src/tools/tString.h armagetronad/trunk/armagetronad/src/tron/gArena.cpp armagetronad/trunk/armagetronad/src/tron/gGame.cpp armagetronad/trunk/armagetronad/src/tron/gGame.h armagetronad/trunk/armagetronad/src/tron/gMenus.cpp armagetronad/trunk/armagetronad/src/tron/gParser.cpp armagetronad/trunk/armagetronad/src/tron/gServerBrowser.cpp armagetronad/trunk/armagetronad/src/tron/gWinZone.cpp armagetronad/trunk/armagetronad/src/ui/uMenu.cpp Added Paths: ----------- armagetronad/trunk/armagetronad/src/tools/tColor.cpp Modified: armagetronad/trunk/armagetronad/AUTHORS =================================================================== --- armagetronad/trunk/armagetronad/AUTHORS 2008-03-19 20:31:09 UTC (rev 8363) +++ armagetronad/trunk/armagetronad/AUTHORS 2008-03-19 23:47:02 UTC (rev 8364) @@ -39,7 +39,8 @@ ? ? subby where and when did he go? - +epsy : VOTING_SUSPEND console command + Additional contributions from ============================= Modified: armagetronad/trunk/armagetronad/NEWS =================================================================== --- armagetronad/trunk/armagetronad/NEWS 2008-03-19 20:31:09 UTC (rev 8363) +++ armagetronad/trunk/armagetronad/NEWS 2008-03-19 23:47:02 UTC (rev 8364) @@ -89,16 +89,23 @@ ------------ New settings and commands: +- FORTRESS_COLLAPSE_SPEED: tune the collapse speed of fortress zones. - VOTE_KICK_REASON: default reason given on kick votes. - "/vote" chat interface to votes; "/vote kick <player>" issues a kick vote. - new vote type "/vote suspend <player>" suspends a player for VOTING_SUSPEND_ROUNDS rounds. +- new vote type "/vote include <file>", includes configuration file + vote/<file>. +- new vote type "/vote command <command>" executes console command + <command>. (Both that and /vote include are by default only available + to moderators). - VOTING_HARM_TIME: time between all harmful votes against a player - VOTING_KICK_MINHARM: auto-transform the first few menu issued kick votes to suspensions - (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. +- VOTING_SUSPEND [<minutes>] disallows voting during a specified amount of time. - 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. @@ -108,6 +115,7 @@ - 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. +- RENAME renames a player. - If all clients support it, PING_CHARITY_MIN/MAX can be used to constrain ping charity. - VOTE_KICK_TO_SERVER/PORT: redirection target for vote kicks. - SILENCE and VOICE allow to control chat of annoying players. @@ -228,9 +236,17 @@ <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. -- Wrapped console lines are indented by an amount of spaces that can be + - ROUND_SCORE has the player's team name appended. + - ROUND_SCORE_TEAM: score a team accumulated during the last round. + - WAIT_FOR_EXTENAL_SCRIPT: printed if the setting of the same name is + enabled. In this case the server will delay the start of the next round + until WAIT_FOR_EXTENAL_SCRIPT_TIMEOUT is reached or the setting is + disabled. +- Wrapped console lines are indented by an amount of spaces that can be specified using the setting CONSOLE_INDENT. +- /help command that supports multiple help topics. Use + HELP_INTRODUCTORY_BLURB and ADD_HELP_TOPIC to control its contents +- /rtfm command that allows moderators to send help messages to newbies Bugfixes -------- Modified: armagetronad/trunk/armagetronad/README-Subversion =================================================================== --- armagetronad/trunk/armagetronad/README-Subversion 2008-03-19 20:31:09 UTC (rev 8363) +++ armagetronad/trunk/armagetronad/README-Subversion 2008-03-19 23:47:02 UTC (rev 8364) @@ -65,25 +65,29 @@ If all goes smoothly, you can now edit Armagetron Advanced and run it. Mac OS X -======== -This will only open in Xcode >= 2.1. It has these targets: +======= +This will only open in Xcode >= 2.4. It has these targets: * Armagetron Advanced -- The client * Armagetron Advanced 10.2.8 -- The client for Mac OS X 10.2.8 * Armagetron Advanced Dedicated -- Dedicated Server -* Create Client Release -- Create a distributable disk image of the client. This target checks to see if you have an $AA_RECORDER_APP environment variable set, and if you do the recorder app will be included in the disk image. For example I have in my .bash_profile: +* Create Client Release -- Create a distributable disk image of the client. + This target checks to see if you have an $AA_RECORDER_APP environment + variable set, and if you do the recorder app will be included in the disk + image. For example I have in my .bash_profile: Prerequisites ------------- AA_RECORDER_APP="/Users/Shared/Applications/Games/Armagetron Advanced Recorder.app" -* Create Dedicated Release -- Create a distributable disk image of the dedicated server. -* Create Full Release -- Runs both "Create Client Release" and "Create Dedicated Release" +* Create Dedicated Release -- Create a distributable disk image of the + dedicated server. +* Create Full Release -- Runs both "Create Client Release" and "Create + Dedicated Release" + +All required libraries required to build Armagetron Advanced for Mac OS X may +be download from the the Sourceforge project page: -Armagetron Advanced requires: -* SDL.framework -* SDL_mixer.framework -* SDL_image.framework -* libpng.framework +https://sf.net/project/showfiles.php?group_id=110997&package_id=266788 - Apple developer tools (http://developer.apple.com) - Xcode 2.4 or greater is required. Modified: armagetronad/trunk/armagetronad/config/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/config/Makefile.am 2008-03-19 20:31:09 UTC (rev 8363) +++ armagetronad/trunk/armagetronad/config/Makefile.am 2008-03-19 23:47:02 UTC (rev 8364) @@ -7,6 +7,7 @@ settings_dedicated.cfg aiplayers.cfg rc.config\ settings_visual.cfg\ settings_dedicated.cfg aiplayers.cfg rc.config\ + settings_authentication.cfg\ examples/breakfast_in_hell.cfg examples/single_use_turbo.cfg\ examples/fortress_soccer.cfg examples/death_zone.cfg\ examples/cvs_test/fortress_physics.cfg examples/cvs_test/fortress_scoring.cfg\ Modified: armagetronad/trunk/armagetronad/config/settings_authentication.cfg =================================================================== --- armagetronad/trunk/armagetronad/config/settings_authentication.cfg 2008-03-19 20:31:09 UTC (rev 8363) +++ armagetronad/trunk/armagetronad/config/settings_authentication.cfg 2008-03-19 23:47:02 UTC (rev 8364) @@ -145,7 +145,7 @@ # 12 Local User Players with local accounts get this level. # 15 Remote User Players with remote accounts get this level by default. # 16 Fallen from Grace Authenticated players who abused default rights given - to them. +# to them. # 17 Shunned Same, only worse :) # 19 Authenticated Minimal level authenticated players can get. # 20 Program Unauthenticated players. @@ -177,6 +177,10 @@ ACCESS_LEVEL_ADMIN 2 +# To use the /teach or /rtfm command you need at least + +ACCESS_LEVEL_RTFM 2 + # To use the /op, /dop, /promote and /demote ad-hoc access level modifying # commands, you need ot have at least @@ -280,6 +284,9 @@ ACCESS_LEVEL KILL 2 ACCESS_LEVEL SILENCE 2 ACCESS_LEVEL VOICE 2 +ACCESS_LEVEL ALLOW_RENAME_PLAYER 2 +ACCESS_LEVEL DISALLOW_RENAME_PLAYER 2 +ACCESS_LEVEL RENAME 2 ACCESS_LEVEL CONSOLE_MESSAGE 2 ACCESS_LEVEL CENTER_MESSAGE 2 Modified: armagetronad/trunk/armagetronad/config/settings_dedicated.cfg =================================================================== --- armagetronad/trunk/armagetronad/config/settings_dedicated.cfg 2008-03-19 20:31:09 UTC (rev 8363) +++ armagetronad/trunk/armagetronad/config/settings_dedicated.cfg 2008-03-19 23:47:02 UTC (rev 8364) @@ -291,6 +291,9 @@ MIN_PLAYERS 0 # minimum number of players; missing humans are filled up with AIs NUM_AIS 0 # minimum number of AIs +WAIT_FOR_EXTERNAL_SCRIPT 0 # set to 1 if you want the server to sleep between rounds until it is set back to 0 or +WAIT_FOR_EXTERNAL_SCRIPT_TIMEOUT 3 # seconds + # team name ALLOW_TEAM_NAME_COLOR 1 # allow teams to be named after a color ALLOW_TEAM_NAME_PLAYER 1 # allow teams to be named after the leading player @@ -336,6 +339,30 @@ TEAM_BLUE_7 15 # blue portion of team 7's color TEAM_BLUE_8 7 # blue portion of team 8's color +# Help stuff + +# This is a message that will be displayed if someone uses the /help chat +# command without arguments: + +HELP_INTRODUCTORY_BLURB + +# to add your own help topics you can use the following command: + +# ADD_HELP_TOPIC <identifier> "short description" "help\ntext\nthat\ncan\nspan\nmany\nlines" + +# the quotes are required if you want to use spaces. +# if the identifier contains underscores (_) it will be treated as a +# sub-identifier. For example, if you have an identifier "rules" and an +# identifier "rules_swearing", the last one will not appear on the listing +# you get with a plain "/help", but it will be at the bottom of the text +# you get with /help rules. You can nest them as deeply as you want, but +# remember that the player who seeks help has to type your identifiers... + +# to get rid of a help command (either in scripts of if it was added by +# accident you can use + +# REMOVE_HELP_TOPIC <identifier> + #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/language/deutsch.txt =================================================================== --- armagetronad/trunk/armagetronad/language/deutsch.txt 2008-03-19 20:31:09 UTC (rev 8363) +++ armagetronad/trunk/armagetronad/language/deutsch.txt 2008-03-19 23:47:02 UTC (rev 8364) @@ -2104,6 +2104,7 @@ gamestate_winner_humans Menschen. instant_win_activated Die Siegzone wurde aktiviert! Finde sie und fahre hinein um zu gewinnen.\n +instant_round_end_activated Die Rundenendzone wurde aktiviert! Finde sie und fahre hinein um die Runde zu beenden.\n instant_death_activated Die Todeszone wurde aktiviert! Vermeide sie!\n player_win_instant \1 bekam \2 Punkte durch das Erreichen der Siegzone.\n @@ -2142,7 +2143,7 @@ player_left_game \1 0xff7f7fwurde mit \2 Punkten endg\xFCltig gel\xF6scht.\n player_leaving_game \1 0xff7f7fhat das Spiel verlassen.\n player_renamed \2 hat sich auf \1 umbenannt.\n -player_rename_rejected \1 0xffffffdarf sich nicht in \2 0xffffffumbenennen, das k\xF6nnte die Abstimmenden verwirren.\n +player_rename_rejected_votekick \1 0xffffffdarf sich nicht in \2 0xffffffumbenennen, das k\xF6nnte die Abstimmenden verwirren.\n player_welcome \n\nWilkommen \1! Auf diesem Server l\xE4uft Version \2.\n player_win_default \1 erh\xE4lt aus sehr seltsamen Gr\xFCnden \2 Punkte.\n player_lose_default \1 verliert aus sehr seltsamen Gr\xFCnden \2 Punkte.\n Modified: armagetronad/trunk/armagetronad/language/english_base.txt =================================================================== --- armagetronad/trunk/armagetronad/language/english_base.txt 2008-03-19 20:31:09 UTC (rev 8363) +++ armagetronad/trunk/armagetronad/language/english_base.txt 2008-03-19 23:47:02 UTC (rev 8364) @@ -303,6 +303,9 @@ player_chat_wait_single_help Set to 1 if only one player should get his chat wait time reduced at any given time. player_chat_wait_teamleader_help Set to 1 if only team leaders, and 0 if all players, should be allowed to pause the timer. +wait_for_external_script_help Let the server wait for an external script between two rounds until the script switches this setting back to 0. +wait_for_external_script_timeout_help If the server has been paused by WAIT_FOR_EXTERNAL_SCRIPT for more seconds than this, kickstart the game. + chatter_remove_time_help Time in seconds after which a permanent chatter is removed from the game idle_remove_time_help Time in seconds after which an inactive player is removed from the game idle_kick_time_help Time in seconds after which an inactive player is kicked @@ -465,6 +468,12 @@ voting_maturity_help The minimum time in seconds a player needs to be online with the same name before he can issue votes. voting_suspend_rounds_help The number of rounds "/vote suspend <player>" suspends a player for. voting_kick_minharm_help Minimal number of harmful votes (suspension, kick,..) that need to have been issued (success is not required) against a player before a kick vote issued via the menu really results in a kick; otherwise, the result is a simple suspension. +voting_suspend_help Suspends voting for n minutes. +voting_suspend_default_help Default value for VOTING_SUSPEND. +voting_unsuspend_help Allows voting again. +voting_suspended Voting has been suspended for the next \1 minutes.\n +voting_unsuspended Voting is allowed again.\n +vote_rejected_voting_suspended Voting has been suspended by the Administrator.\n #******************************************** #******************************************** @@ -703,10 +712,15 @@ floor_mirror_int_help Intensity of the floor mirror effect color_strings_help Generate strings that will be rendered with color effects. filter_color_strings_help Filter color codes from strings coming in over the network. +filter_dark_color_strings_help Filter dark color codes from strings coming in over the network. filter_color_names_help Filter color codes from player names. +filter_dark_color_names_help Filter dark color codes from player names. filter_name_ends_help Filter whitespace and other junk from beginnings and ends of player names. 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. +filter_dark_color_server_names_help Filter dark color codes from server names in the server browser. +filter_color_team_help Filter color codes from /team messages. +filter_dark_color_team_help Filter dark color codes from /team messages. 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. @@ -836,6 +850,9 @@ center_message_help Prints a big message on the screen of all connected clients. fullscreen_message_help Prints a big message all over the screen, interrupting gameplay for a configurable timeout. Use with care. say_help Dedicated server only: let the server administator say something. +rename_help Renames the given player. +allow_rename_player_help Gives the given player the ability to rename. +disallow_rename_player_help Prevents the given player from renameing. #******************************************** #******************************************** @@ -2197,6 +2214,7 @@ gamestate_winner_humans Humans. instant_win_activated Instant win zone activated! Enter it to win the round.\n +instant_round_end_activated Round end zone activated! Enter it to end the round.\n instant_death_activated Death zone activated! Avoid it!\n player_admin_kill \1 0xRESETTwas smitten by an administrator.\n @@ -2246,7 +2264,12 @@ player_leaving_game \1 0xff7f7fleft the game.\n player_renamed \2 renamed to \1.\n player_renamed_teamname \2 changed teamname to \1.\n -player_rename_rejected \1 0xffffffis not allowed to rename to \2 0xffffffright now to avoid confusion with kick votes.\n +player_got_renamed \2 has been renamed to \1.\n +player_will_be_renamed \2 will be renamed to \1.\n +player_rename_rejected_votekick \1 0xffffffis not allowed to rename to \2 0xffffffright now to avoid confusion with kick votes.\n +player_rename_rejected_admin \1 0xffffffis not allowed to rename to \20xffffff, as its name was locked by the administrator.\n +player_allowed_rename \1 0x7fff7fis allowed to rename again.\n +player_disallowed_rename \1 0xff7f7fis not allowed to rename anymore.\n player_welcome \n\nWelcome \1! This server is running version \2.\n player_win_default \1 got \2 points for a very strange reason.\n player_lose_default \1 lost \2 points for a very strange reason.\n @@ -2282,7 +2305,50 @@ team_shuffle \1 gets shuffled from rank \2 to \3.\n player_noshuffleup You are not allowed to shuffle up.\n player_noshuffle Your shuffling wish has no effect.\n +player_shuffle_error /shuffle expects a number as argument; an explicit sign (+/-) will change your position by the indicated number of steps, no sign will shuffle you to the given position.\n +add_help_topic_help Add a new help topic to be used with /help. Usage: ADD_HELP_TOPIC <topic> <short description> <text> +add_help_topic_usage Usage: ADD_HELP_TOPIC <topic> <short description> <text>\n +add_help_topic_success Added help topic "\1".\n +remove_help_topic_help Remove a help topic. +remove_help_topic_success Removed help topic "\1".\n +remove_help_topic_notfound Help topic "\1" doesn't exist.\n + +rtfm_announcement \1 wants you to know about the following help topic:\n +rtfm_success \1 got the following message:\n + +help_introductory_blurb_help Message that is displayed before the list of help topics if someone uses /help without arguments + +help_topics_list_start Say /help TOPIC to get help on the following topics.\n +help_topic_not_found Help topic \1 not found. Try /help with no arguments to see a list of available topics.\n + +help_commands_shortdesc List of all chat commands +help_commands_text This help topic is empty. Use one of the following sub-topics instead: + +help_commands_chat_shortdesc Basic chat commands +help_commands_chat_text 0x88ff88/me <message>0xffff88: Transmit an action, as in "/me is a noob."\n0x88ff88/msg <part of a nickname> <message>0xffff88: Send a private message that only a specific player can see\n0x88ff88/team <message>0xffff88: Send a message to your teammates, or to all spectators if you're not on a team + +help_commands_team_shortdesc Basic team management commands +help_commands_team_text 0x88ff88/teamshuffle0xffff88: Shuffle yourself to be at the outside of your team's wingmen formation\n0x88ff88/teamshuffle <position>0xffff88: Shuffle yourself to be at a specific position\n0x88ff88/teamshuffle [+|-]<offset>0xffff88: Shuffle yourself up/down by a certain number of ranks\n0x88ff88/teamleave0xffff88: Leave your current team. Only works on some servers\n0x88ff88/teams0xffff88: Get a list of all teams with a somewhat graphic representation of their formation + +help_commands_pp_shortdesc Player police commands +help_commands_pp_text 0x88ff88/players0xffff88: Get a list of all players, along with some other information\n0x88ff88/vote kick|suspend <player>0xffff88: Start a poll to kick or suspend a player + +help_commands_auth_shortdesc Authentication related commands +help_commands_auth_text 0x88ff88/login [<user>]@<authority>0xffff88: Authenticate yourself using a given authority. Try @forums if you have an account at http://forums.armagetronad.net/\n0x88ff88/logout0xffff88: Log out so you can log back in as another player\n0x88ff88/vote include <file>0xffff88: Start a poll to include a given file\n0x88ff88/vote command <command>0xffff88: Start a poll to execute an admin command\n0x88ff88/admin <command>0xffff88: Execute a console command on the server if you have sufficient access rights\n0x88ff88/op <player> <optional access level>0xffff88: Gives another player a higher access level; the level defaults to the level one lower than you access level, which is also the maximal possible level\n0x88ff88/deop <player>0xffff88: Reverses /op; it takes away a player's access level, effectively making him unauthenticated again. Only works on players of lower access level than yours, of course.\n0x88ff88/promote <player> <optional steps>0xffff88: elevates a player's access level the given number of steps (default: one)\n0x88ff88/demote <player> <optional steps>0xffff88: lowers a player's access level the given number of steps (default: one) + +help_commands_auth_levels_shortdesc List of all access levels +help_commands_auth_levels_text 0x88ff880 (Owner)0xffff88: The owner of the server. Commands entered on the server console are executed with these rights.\n0x88ff881 (Admin)0xffff88: A server administrator. By default, almost as powerful as the owner himself.\n0x88ff882 (Moderator)0xffff88: A server moderator. Is still allowed to use /admin, but is restricted to player management commands.\n0x88ff887 (Team Leader)0xffff88: Leader of a team. By default, no admin rights at all.\n0x88ff888 (Team Member)0xffff88: Member of a team. Local team accounts get this level.\n0x88ff8812 (Local User)0xffff88: Players with local accounts get this level.\n0x88ff8815 (Remote User)0xffff88: Players with remote accounts get this level by default.\n0x88ff8816 (Fallen from Grace)0xffff88: Authenticated players who abused default rights given to them.\n0x88ff8817 (Shunned)0xffff88: Same, only worse :)\n0x88ff8819 (Authenticated)0xffff88: Minimal level authenticated players can get.\n0x88ff8820 (Program)0xffff88: Unauthenticated players. + +help_commands_ra_shortdesc Remote admin commands +help_commands_ra_text 0x88ff88/login <password>0xffff88: Log in as the server administrator using the server-specific password\n0x88ff88/logout0xffff88: Drop your logged in status so that other players can't see that you're an administrator\n0x88ff88/admin <command>0xffff88: Execute a console command as if it were entered on the server + +help_commands_misc_shortdesc Miscellaneous commands +help_commands_misc_text 0x88ff88/help0xffff88: You just found out about this one :-)\n0x88ff88/teach <player> <topic>0xffff88: same as /help, but the the output gets sent to another player.\n0x88ff88/rtfm0xffff88: alias for /teach\n0x88ff88/command <command>0xffff88: Execute a command on your own client. Useful for instant chats + +help_commands_tourney_shortdesc Tourney related commands +help_commands_tourney_text 0x88ff88/lock0xffff88: Locks your current team. Nobody can join it any more on their own. To let someone in, you need to invoke\n0x88ff88/invite <player>0xffff88: From that moment on, the player is allowed to join you. Another effect of /invite, even if your team is not locked, is that the invited player can read all of your team's /team messages. Invitations are permanent until revoked. That means a player who is invited into your team can join and leave it freely without further need to /invite him again. Players who were on the team when you /locked it are not automatically invited when they leave on their own account.\n0x88ff88/uninvite <player>0xffff88: reverses /invite. The invitation is revoked, the player can no longer join you, and if he currently is on your team, he will be thrown out.\n0x88ff88/unlock0xffff88: makes your team available for everyone to join again. + invite_no_team Can't use \1 if you're not on a team.\n invite_team_locked \1 locked, you'll need an invitation from a team leader via the /invite command to join from now on.\n invite_team_unlocked \1 unlocked, you can join it freely again.\n @@ -2383,9 +2449,11 @@ network_statistics3 Received: \5 bytes in \6 packets (\7 bytes/s)\n network_login_denial Got login denial...\n -network_server_login Received login from \1 via socket \2.\n +network_server_login Received login from \1 via socket \2, network version: \3 (ID: \4).\n +network_unknown_version unknown network_server_login_success New user: \1\n + network_toomanyservers \n\n\nWarning: too many servers open on this computer.\nLeaving the port range that is scanned by clients with default settings.\n\n\n network_browser_unidentified Reveived unidentifiable server information from \1 over socket \2.\n @@ -2527,11 +2595,14 @@ #******************************************** #******************************************** +# printed on loading a map +map_file_loading Loading map \1 ...\n + # title of map error message map_file_load_failure_title Map load failure # printed when a map can't be loaded, and the user can do something about it -map_file_load_failure_self The map \1 could not be loaded or parsed; please check your configuration and the log below.\n +map_file_load_failure_self The map \1 could not be loaded or parsed; please check your configuration and the log.\n # printed when a map can't be loaded, and the failure is the server admin's fault map_file_load_failure_server The map \1 could not be loaded.\nThe server you tried to connect to may have a broken configuration; you should inform the server administrator of this error.\n @@ -2543,6 +2614,8 @@ resource_file_wrong_place_title Incorrect File Path resource_file_wrong_place The resource file loaded from "\1" wants to be at "\2". Possible resolutions:\na) If you are not the author of the resource, you should move it to the right place given above and adapt the reference pointing to it.\nb) If you are the author and want the file to stay where it is, you can modify its <Resource> tag so it wants to be where you put it. Consult the documentation on how to do that.\n +map_file_reverting Reverting to last known working map \1.\n + #******************************************** #******************************************** # @@ -2683,6 +2756,7 @@ access_level_op_help Minimal access level for /op, /deop, /promote and /demote co-admin management commands commands. access_level_op_max_help Maximal access level attainable by /op and /promote commands. access_level_admin_help Minimal access level for /admin command. +access_level_rtfm_help Minimal access level for /teach or /rtfm command. access_level_chat_help Minimal access level for chatting. access_level_ips_help Minimal access level you need for seeing IPs of players in the /players command. access_level_spy_team_help Minimal access level you need for seeing /team messages as a spectator. @@ -2713,7 +2787,9 @@ access_level_promote \1 has been promoted to "\2" by order of \3.\n access_level_admin_denied 0xff7f7f/admin denied,0xffffff insufficient access level.\n -access_level_shuffle_up_denied You have an insufficient access level to shuffle up.\n +access_level_shuffle_up_denied Required access level to shuffle up is "\1", you only have "\2".\n +access_level_rtfm_denied Required access level to teach others is "\1", you only have "\2".\n +rtfm_denied You need to be logged in to teach others.\n chat_command_unknown Unknown chat command "\1".\n Modified: armagetronad/trunk/armagetronad/language/french.txt =================================================================== --- armagetronad/trunk/armagetronad/language/french.txt 2008-03-19 20:31:09 UTC (rev 8363) +++ armagetronad/trunk/armagetronad/language/french.txt 2008-03-19 23:47:02 UTC (rev 8364) @@ -219,6 +219,9 @@ game_timeout_help Donne approximativement le temps maximum entre les rounds +wait_for_external_script_help Let the server wait for an external script between two rounds until the script switches this setting back to 0. +wait_for_external_script_timeout_help If the server has been paused by WAIT_FOR_EXTERNAL_SCRIPT for more seconds than this, kickstart the game. + #******************************************** #******************************************** # @@ -323,6 +326,12 @@ #ORIGINAL TEXT: The spam level of getting your vote rejected. #voting_spam_reject_help UNTRANSLATED +voting_suspend_help Arr\xEAte les votes pour n minutes. +voting_suspend_default_help Valeur par d\xE9faut de VOTING_SUSPEND. +voting_unsuspend_help Autorise les votes \xE0 nouveau. +voting_suspended Les votes ont \xE9t\xE9 suspendus pour les prochaines \1 minutes.\n +voting_unsuspended Les votes sont \xE0 nouveau autoris\xE9s.\n +vote_rejected_voting_suspended Les votes ont \xE9t\xE9 suspendus par l'Administrateur.\n #******************************************** #******************************************** Modified: armagetronad/trunk/armagetronad/src/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/src/Makefile.am 2008-03-19 20:31:09 UTC (rev 8363) +++ armagetronad/trunk/armagetronad/src/Makefile.am 2008-03-19 23:47:02 UTC (rev 8364) @@ -52,7 +52,7 @@ # Note: tMemManager.cpp must be last to avoid false leak reports (sorry for # the fragile dependency on undefined behaviour of the linker...) -libtools_a_SOURCES= ${tools_extra} tools/tArray.cpp tools/tArray.h tools/tCallback.cpp tools/tCallback.h tools/tCallbackString.h tools/tColor.h\ +libtools_a_SOURCES= ${tools_extra} tools/tArray.cpp tools/tArray.h tools/tCallback.cpp tools/tCallback.h tools/tCallbackString.h tools/tColor.cpp tools/tColor.h\ tools/tConfiguration.cpp tools/tConfiguration.h tools/tConsole.cpp tools/tConsole.h tools/tCrypt.cpp tools/tCrypt.h\ tools/tDirectories.cpp tools/tDirectories.h tools/tError.cpp tools/tError.h tools/tEventQueue.cpp\ tools/tEventQueue.h tools/tHeap.cpp tools/tHeap.h tools/tInitExit.h tools/tLinkedList.cpp tools/tLinkedList.h\ Modified: armagetronad/trunk/armagetronad/src/engine/eDisplay.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eDisplay.cpp 2008-03-19 20:31:09 UTC (rev 8363) +++ armagetronad/trunk/armagetronad/src/engine/eDisplay.cpp 2008-03-19 23:47:02 UTC (rev 8364) @@ -59,7 +59,7 @@ #define view_h 2.7 #ifdef DEBUG -bool debug_grid=0; +bool debug_grid=1; #endif REAL upper_height=100; Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-03-19 20:31:09 UTC (rev 8363) +++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-03-19 23:47:02 UTC (rev 8364) @@ -106,7 +106,7 @@ static tSettingItem< bool > se_allowTeamChangesConf( "ALLOW_TEAM_CHANGE", se_allowTeamChanges ); static bool se_enableChat = true; //flag indicating whether chat should be allowed at all (logged in players can always chat) -static tSettingItem<bool> se_enaChat("ENABLE_CHAT", se_enableChat); +static tSettingItem< bool > se_enaChat("ENABLE_CHAT", se_enableChat); static tReferenceHolder< ePlayerNetID > se_PlayerReferences; @@ -127,7 +127,7 @@ a.username == b.username && a.methodCongested == b.methodCongested; } - + static tArray<PasswordStorage> S_passwords; // if set, user names of non-authenticated players are left as they are, @@ -141,7 +141,7 @@ // transform special characters in name to escape sequences static std::string se_EscapeName( tString const & original, bool keepAt = true ) { - std::ostringstream filter; + std::ostringstream filter; int lastC = 'x'; for( int i = 0; i < original.Len()-1; ++i ) @@ -177,11 +177,11 @@ { filter << "\\x"; break; - } + } default: if ( 0x20 < c && 0x7f >= c ) { - // normal ascii, print + // normal ascii, print filter.put(c); } else @@ -190,7 +190,7 @@ filter << '%' << std::hex << std::uppercase << std::setfill('0') << std::setw(2) << c; } } - + lastC = c; } @@ -202,7 +202,7 @@ // reverses se_EscapeName (left inverse only, UnEscape(Escape(x)) == x, but not Escape(UnEscape(y)) == y. ) static std::string se_UnEscapeName( tString const & original ) { - std::ostringstream filter; + std::ostringstream filter; int lastC = 'x'; for( int i = 0; i < original.Len()-1; ++i ) @@ -473,8 +473,8 @@ PasswordStorage *storage = NULL; for (i = S_passwords.Len()-1; i>=0; i--) { - PasswordStorage & candidate = S_passwords(i); - if (answer.username == candidate.username && + PasswordStorage & candidate = S_passwords(i); + if (answer.username == candidate.username && methodCongested == candidate.methodCongested ) storage = &candidate; @@ -597,7 +597,7 @@ static void se_AdminLogin_ReallyOnlyCallFromChatKTHNXBYE( ePlayerNetID * p ) { // elevate access rights. We are currently in the context of player chat, - // therefore in his security context, but we need to log the player on, + // therefore in his security context, but we need to log the player on, // and that requires superior rights. { tCurrentAccessLevel elevator( tAccessLevel_Owner, true ); @@ -644,7 +644,7 @@ // count players above and on the current access level int countAbove = 0, countOn = 0; - + for ( int i = se_PlayerNetIDs.Len()-1; i>=0; --i ) { ePlayerNetID* player = se_PlayerNetIDs(i); @@ -652,7 +652,7 @@ // don't count AIs and spectators if ( !player->IsHuman() || !player->NextTeam() ) continue; - + if ( player->GetAccessLevel() < newAccessLevel ) { countAbove++; @@ -778,7 +778,7 @@ { tString username = result.username; tString authority = result.authority; - bool success = result.success; + bool success = result.success; ePlayerNetID * player = dynamic_cast< ePlayerNetID * >( static_cast< nNetObject * >( result.user ) ); if ( !player || player->Owner() <= 0 ) @@ -805,7 +805,7 @@ player->Authenticate( authName, result.accessLevel ); // log blurb to ladderlog. This is not important for debug playback, - // so we just don't record it. Once more is done with the blurb, + // so we just don't record it. Once more is done with the blurb, // we need to change that. for ( std::deque< tString >::const_iterator i = result.blurb.begin(); i != result.blurb.end(); ++i ) { @@ -1078,7 +1078,7 @@ StoreConfitem(tNEW(tConfItemLine) (confname, "$player_user_confitem_help", globalID)); - + confname.Clear(); confname << "AUTO_LOGIN_"<< id+1; StoreConfitem(tNEW(tConfItem<bool>)(confname, @@ -1334,12 +1334,12 @@ { return; } - + nMessage *m = new nMessage( se_loginWanted ); // write player *m << p; - + // write flag and name *m << p->loginWanted; @@ -1378,10 +1378,10 @@ nKrawall::SplitUserName( p->GetRawAuthenticatedName(), userName, authority ); } - p->loginWanted = - !nAuthentication::RequestLogin( authority, - userName, - *p, + p->loginWanted = + !nAuthentication::RequestLogin( authority, + userName, + *p, authority.Len() > 1 ? tOutput( "$login_request", authority ) : tOutput( "$login_request_local" ) ); #endif } @@ -1406,7 +1406,7 @@ // mark all players as wanting to log in for(int i=MAX_PLAYERS-1;i>=0;i--) { - ePlayer * lp = ePlayer::PlayerConfig(i); + ePlayer * lp = ePlayer::PlayerConfig(i); if ( lp && lp->netPlayer ) { lp->netPlayer->loginWanted = true; @@ -1554,11 +1554,11 @@ // search for exact or partial matches in player names ePlayerNetID * CompareBufferToPlayerNames - ( const tString & nameRaw, - int & num_matches, - ePlayerNetID * requester, - SE_NameGetter GetName, // = &ePlayerNetID::GetName, - SE_NameFilter Filter, // = &se_NameFilterID, + ( const tString & nameRaw, + int & num_matches, + ePlayerNetID * requester, + SE_NameGetter GetName, // = &ePlayerNetID::GetName, + SE_NameFilter Filter, // = &se_NameFilterID, SE_NameHider Hider )// = &se_NonHide ) { num_matches = 0; @@ -1600,21 +1600,20 @@ { int num_matches = 0; - // look for matches in the exact player names first - ePlayerNetID * ret = CompareBufferToPlayerNames( name, num_matches, requester, &ePlayerNetID::GetName, &se_NameFilterID, &se_NonHide ); + // try filtering the names before comparing them, this makes the matching case-insensitive + SE_NameFilter Filter = &ePlayerNetID::FilterName; + + // look for matches in the filtered screen names + ePlayerNetID * ret = CompareBufferToPlayerNames( name, num_matches, requester, &ePlayerNetID::GetName, Filter, &se_NonHide ); if ( ret && num_matches == 1 ) { return ret; } - // ok, next round: try filtering the names before comparing them, this makes the matching case-insensitive - SE_NameFilter Filter = &ePlayerNetID::FilterName; - - // look for matches in the screen names again - if ( !ret ) - { - ret = CompareBufferToPlayerNames( name, num_matches, requester, &ePlayerNetID::GetName, Filter, &se_NonHide ); - } + // look for matches in the exact screen names. + // No check for prior matches here, because the previous + // search was less specific. + ret = CompareBufferToPlayerNames( name, num_matches, requester, &ePlayerNetID::GetName, &se_NameFilterID, &se_NonHide ); if ( ret && num_matches == 1 ) { return ret; @@ -1646,7 +1645,7 @@ else if (num_matches > 1) { tOutput toSender( "$msg_toomanymatches", name ); if ( requester ) - { + { sn_ConsoleOut(toSender,requester->Owner() ); } else @@ -1659,7 +1658,7 @@ else { tOutput toSender( "$msg_nomatch", name ); if ( requester ) - { + { sn_ConsoleOut(toSender,requester->Owner() ); } else @@ -1682,7 +1681,7 @@ sn_ConsoleOut( tOutput( "$chatcommand_requires_player", command ), sender->Owner() ); return 0; } - + return ePlayerNetID::FindPlayerByName( player, sender ); } @@ -2141,7 +2140,7 @@ { accessLevel = level; } - + se_OpBase( admin, victim, "/op", accessLevel ); } @@ -2180,7 +2179,7 @@ { victim->SetAccessLevel( accessLevel ); - se_SecretConsoleOut( tOutput( "$access_level_promote", + se_SecretConsoleOut( tOutput( "$access_level_promote", victim->GetLogName(), tCurrentAccessLevel::GetName( accessLevel ), admin->GetLogName() ), victim, admin ); @@ -2206,7 +2205,7 @@ if ( accessLevel <= tAccessLevel_Authenticated ) { - se_SecretConsoleOut( tOutput( "$access_level_demote", + se_SecretConsoleOut( tOutput( "$access_level_demote", victim->GetLogName(), tCurrentAccessLevel::GetName( accessLevel ), admin->GetLogName() ), victim, admin ); @@ -2229,7 +2228,7 @@ // the team to invite to is, of course, the team the admin is in. eTeam * team = admin->CurrentTeam(); ePlayerNetID::eTeamSet const & invitations = admin->GetInvitations(); - + // unless, of course, he is in no team, then let him relay the one invitation // he has. if ( !team && invitations.size() == 1 ) @@ -2243,7 +2242,7 @@ // checks static bool se_CanManageTeam( ePlayerNetID * admin, bool emergency ) { - // check regular access level + // check regular access level if ( admin->GetAccessLevel() <= se_teamAccessLevel ) { return true; @@ -2350,7 +2349,7 @@ if ( params == "" ) return; #endif - + // trim whitespace // for the trunk: @@ -2377,7 +2376,7 @@ if ( !tRecorder::Playback( section, accept ) ) accept = ( params == sg_adminPass && sg_adminPass != "NONE" ); tRecorder::Record( section, accept ); - + //change this later to read from a password file or something... //or integrate it with auth if we ever get that done... if ( accept ) { @@ -2401,7 +2400,7 @@ sn_ConsoleOut( "$login_request_redundant", p->Owner() ); return; } - + if ( p->GetRawAuthenticatedName().Len() <= 1 || params.StrPos("@") >= 0 ) { if ( params.StrPos( "@" ) >= 0 ) @@ -2413,15 +2412,15 @@ p->SetRawAuthenticatedName( p->GetUserName() + "@" + params ); } } - + // check for stupid bans if ( se_IsUserBanned( p, p->GetRawAuthenticatedName() ) ) { return; } - + p->loginWanted = true; - + se_RequestLogin( p ); } #endif @@ -2458,20 +2457,16 @@ str.ReadLine(s); con << "Remote admin command by " << *p << "0xRESETT: " << str << "\n"; std::istringstream stream(&str(0)); - + // install filter eAdminConsoleFilter consoleFilter( p->Owner() ); - - if ( tRecorder::IsPlayingBack() ) - { - tConfItemBase::LoadPlayback(); - } - else - { - tConfItemBase::LoadLine(stream); - } + tConfItemBase::LoadLine(stream); } +#ifdef DEDICATED +static void se_Rtfm( tString const &command, ePlayerNetID * p, std::istream & s ); +#endif + static void handle_chat_admin_commands( ePlayer... [truncated message content] |
From: <nem...@us...> - 2008-03-20 05:46:37
|
Revision: 8366 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8366&view=rev Author: nemostultae Date: 2008-03-19 22:46:38 -0700 (Wed, 19 Mar 2008) Log Message: ----------- * Added paste support for Mac OS X. I'd modify scrap but it's too much of a mess. * Added tColor.cpp here too. Modified Paths: -------------- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj armagetronad/trunk/armagetronad/src/ui/uMenu.cpp Added Paths: ----------- armagetronad/trunk/armagetronad/src/macosx/AAPaste.cpp armagetronad/trunk/armagetronad/src/macosx/AAPaste.h Modified: armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj =================================================================== --- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-03-20 00:26:15 UTC (rev 8365) +++ armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-03-20 05:46:38 UTC (rev 8366) @@ -306,6 +306,14 @@ 9BB7BA060D830473004FE8C3 /* uMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B9F90D830473004FE8C3 /* uMenu.cpp */; }; 9BB7BA120D8304FD004FE8C3 /* aa_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BB7B6570D830321004FE8C3 /* aa_config.h */; }; 9BB7BA240D830669004FE8C3 /* aa_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BB7B65A0D830321004FE8C3 /* aa_config.h */; }; + 9BCBDE120D91F6D90022855B /* tColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BCBDE110D91F6D90022855B /* tColor.cpp */; }; + 9BCBDE440D91F7F30022855B /* tColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BCBDE110D91F6D90022855B /* tColor.cpp */; }; + 9BCBDF890D9210E10022855B /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BCBDF880D9210E10022855B /* ApplicationServices.framework */; }; + 9BCBE1E30D9214420022855B /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BCBE1E20D9214420022855B /* CoreFoundation.framework */; }; + 9BCBE30D0D922EAE0022855B /* AAPaste.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BCBE30B0D922EAE0022855B /* AAPaste.h */; }; + 9BCBE30E0D922EAE0022855B /* AAPaste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BCBE30C0D922EAE0022855B /* AAPaste.cpp */; }; + 9BCBE30F0D922EAE0022855B /* AAPaste.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BCBE30B0D922EAE0022855B /* AAPaste.h */; }; + 9BCBE3100D922EAE0022855B /* AAPaste.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BCBE30C0D922EAE0022855B /* AAPaste.cpp */; }; 9BD7D9720A2C7CB400D7033C /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BD7D96B0A2C7CB400D7033C /* libfreetype.a */; }; 9BD7D9730A2C7CB400D7033C /* libftgl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BD7D96C0A2C7CB400D7033C /* libftgl.a */; }; 9BD7D9740A2C7CB400D7033C /* libpng.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BD7D96D0A2C7CB400D7033C /* libpng.framework */; }; @@ -720,6 +728,11 @@ 9BB7B9F90D830473004FE8C3 /* uMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uMenu.cpp; sourceTree = "<group>"; }; 9BB7B9FA0D830473004FE8C3 /* uMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uMenu.h; sourceTree = "<group>"; }; 9BB7BA0E0D8304E4004FE8C3 /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = defs.h; path = ../src/defs.h; sourceTree = SOURCE_ROOT; }; + 9BCBDE110D91F6D90022855B /* tColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tColor.cpp; sourceTree = "<group>"; }; + 9BCBDF880D9210E10022855B /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; }; + 9BCBE1E20D9214420022855B /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; + 9BCBE30B0D922EAE0022855B /* AAPaste.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AAPaste.h; sourceTree = "<group>"; }; + 9BCBE30C0D922EAE0022855B /* AAPaste.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AAPaste.cpp; sourceTree = "<group>"; }; 9BD7D96B0A2C7CB400D7033C /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = /Library/Frameworks/ArmagetronAdvanced/current/libfreetype.a; sourceTree = "<absolute>"; }; 9BD7D96C0A2C7CB400D7033C /* libftgl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libftgl.a; path = /Library/Frameworks/ArmagetronAdvanced/current/libftgl.a; sourceTree = "<absolute>"; }; 9BD7D96D0A2C7CB400D7033C /* libpng.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpng.framework; path = /Library/Frameworks/ArmagetronAdvanced/current/libpng.framework; sourceTree = "<absolute>"; }; @@ -748,6 +761,8 @@ 9BD7D9750A2C7CB400D7033C /* SDL_image.framework in Frameworks */, 9BD7D9770A2C7CB400D7033C /* SDL.framework in Frameworks */, 9B83FE950B12161600878E8A /* Growl-WithInstaller.framework in Frameworks */, + 9BCBDF890D9210E10022855B /* ApplicationServices.framework in Frameworks */, + 9BCBE1E30D9214420022855B /* CoreFoundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -778,9 +793,11 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 29B97324FDCFA39411CA2CEA /* AppKit.framework */, + 9BCBDF880D9210E10022855B /* ApplicationServices.framework */, 9BD7D9680A2C7C7800D7033C /* Armagetron Advanced */, - 29B97324FDCFA39411CA2CEA /* AppKit.framework */, 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, + 9BCBE1E20D9214420022855B /* CoreFoundation.framework */, 29B97325FDCFA39411CA2CEA /* Foundation.framework */, 8CBA60B0089F00F2007E21DC /* OpenGL.framework */, ); @@ -926,6 +943,8 @@ 9BB7B64E0D830321004FE8C3 /* AAGrowlBridge.mm */, 9BB7B64F0D830321004FE8C3 /* AAGrowlPlugin.h */, 9BB7B6500D830321004FE8C3 /* AAGrowlPlugin.mm */, + 9BCBE30C0D922EAE0022855B /* AAPaste.cpp */, + 9BCBE30B0D922EAE0022855B /* AAPaste.h */, 9BB7B6510D830321004FE8C3 /* AARuby.h */, 9BB7B6520D830321004FE8C3 /* AARuby.mm */, 9BB7B6530D830321004FE8C3 /* AAURLHandler.h */, @@ -1065,6 +1084,7 @@ 9BB7B7A50D830422004FE8C3 /* tCallback.cpp */, 9BB7B7A60D830422004FE8C3 /* tCallback.h */, 9BB7B7A70D830422004FE8C3 /* tCallbackString.h */, + 9BCBDE110D91F6D90022855B /* tColor.cpp */, 9BB7B7A80D830422004FE8C3 /* tColor.h */, 9BB7B7A90D830422004FE8C3 /* tCommandLine.cpp */, 9BB7B7AA0D830422004FE8C3 /* tCommandLine.h */, @@ -1336,6 +1356,7 @@ buildActionMask = 2147483647; files = ( 9BB7BA120D8304FD004FE8C3 /* aa_config.h in Headers */, + 9BCBE30D0D922EAE0022855B /* AAPaste.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1344,6 +1365,7 @@ buildActionMask = 2147483647; files = ( 9BB7BA240D830669004FE8C3 /* aa_config.h in Headers */, + 9BCBE30F0D922EAE0022855B /* AAPaste.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1638,6 +1660,8 @@ 9BB7BA020D830473004FE8C3 /* uInput.cpp in Sources */, 9BB7BA040D830473004FE8C3 /* uInputQueue.cpp in Sources */, 9BB7BA060D830473004FE8C3 /* uMenu.cpp in Sources */, + 9BCBDE440D91F7F30022855B /* tColor.cpp in Sources */, + 9BCBE3100D922EAE0022855B /* AAPaste.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1791,6 +1815,8 @@ 9BB7B9FC0D830473004FE8C3 /* uInput.cpp in Sources */, 9BB7B9FE0D830473004FE8C3 /* uInputQueue.cpp in Sources */, 9BB7BA000D830473004FE8C3 /* uMenu.cpp in Sources */, + 9BCBDE120D91F6D90022855B /* tColor.cpp in Sources */, + 9BCBE30E0D922EAE0022855B /* AAPaste.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Added: armagetronad/trunk/armagetronad/src/macosx/AAPaste.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/macosx/AAPaste.cpp (rev 0) +++ armagetronad/trunk/armagetronad/src/macosx/AAPaste.cpp 2008-03-20 05:46:38 UTC (rev 8366) @@ -0,0 +1,67 @@ +/* + + ************************************************************************* + + ArmageTron -- Just another Tron Lightcycle Game in 3D. + Copyright (C) 2005 by Daniel Harple + and the AA DevTeam (see the file AUTHORS(.txt) in the main source directory) + + ************************************************************************** + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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. + + *************************************************************************** + + */ + +#include <ApplicationServices/ApplicationServices.h> +#include "AAPaste.h" + +bool AAPastePasteboardData(CFDataRef &outData) { + static const CFStringRef plainTextFlavor = CFSTR("public.utf8-plain-text"); + + OSStatus status; + PasteboardRef pasteboard; + + status = PasteboardCreate(kPasteboardClipboard, &pasteboard); + require_noerr(status, CantCreatePasteboard); + + ItemCount outItemCount; + status = PasteboardGetItemCount(pasteboard, &outItemCount); + require_noerr(status, CantGetItemCount); + + // do we have any pastes on the pasteboard? + if (outItemCount < 1) + goto CantGetItemCount; + + PasteboardItemID itemID; + // Index starts out at 1 here. + status = PasteboardGetItemIdentifier(pasteboard, 1, &itemID); + require_noerr(status, CantGetItemID); + + CFDataRef data; + status = PasteboardCopyItemFlavorData(pasteboard, itemID, plainTextFlavor, &data); + require_noerr(status, CantGetDataFlavor); + + outData = data; + return true; + +CantGetDataFlavor: +CantGetItemID: +CantGetItemCount: + CFRelease(pasteboard); +CantCreatePasteboard: + return false; +} Added: armagetronad/trunk/armagetronad/src/macosx/AAPaste.h =================================================================== --- armagetronad/trunk/armagetronad/src/macosx/AAPaste.h (rev 0) +++ armagetronad/trunk/armagetronad/src/macosx/AAPaste.h 2008-03-20 05:46:38 UTC (rev 8366) @@ -0,0 +1,43 @@ +/* + + ************************************************************************* + + ArmageTron -- Just another Tron Lightcycle Game in 3D. + Copyright (C) 2005 by Daniel Harple + and the AA DevTeam (see the file AUTHORS(.txt) in the main source directory) + + ************************************************************************** + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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. + + *************************************************************************** + + */ + +#ifndef ArmageTron_AAPaste_H +#define ArmageTron_AAPaste_H + +#include <CoreFoundation/CoreFoundation.h> + +//! Get the pasteboard text for Mac OS X. +//! +//! @param outData the data from the pasteboard. Caller is responsible for +//! calling CFRelease() on param. Be sure to check the return +//! value of this function before doing so... +//! @return true if the pasteboard data was retrieved, otherwise false +//! +bool AAPastePasteboardData(CFDataRef &outData); + +#endif Modified: armagetronad/trunk/armagetronad/src/ui/uMenu.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/ui/uMenu.cpp 2008-03-20 00:26:15 UTC (rev 8365) +++ armagetronad/trunk/armagetronad/src/ui/uMenu.cpp 2008-03-20 05:46:38 UTC (rev 8366) @@ -26,7 +26,15 @@ */ -#include "scrap.h" +#include "aa_config.h" + +#ifdef MACOSX +# include "AAPaste.h" +# include <CoreFoundation/CoreFoundation.h> +#else +# include "scrap.h" +#endif + #include "tSysTime.h" #include "uMenu.h" #include "rSysdep.h" @@ -837,6 +845,24 @@ ret = false; // c.sym = SDLK_DOWN; } +#ifdef MACOSX + else if (c.sym == SDLK_v && mod & KMOD_META) { + CFDataRef data; + if (!AAPastePasteboardData(data)) + return false; + + const UInt8 *bytes = CFDataGetBytePtr(data); + CFIndex bytesLength = CFDataGetLength(data); + + for (int i = 0; i < bytesLength; i++) { + if (!InsertChar(bytes[i])) + break; + } + + CFRelease(data); + ret = true; + } +#else else if (c.sym == SDLK_v && mod & KMOD_CTRL) { char *scrap = 0; int scraplen; @@ -862,6 +888,7 @@ } } } +#endif else { ret = InsertChar(c.unicode); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-03-20 14:01:05
|
Revision: 8372 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8372&view=rev Author: bazaarmagetron Date: 2008-03-20 07:00:05 -0700 (Thu, 20 Mar 2008) Log Message: ----------- wrtlprnft: Reverted a failed vim command (presumably) that "we" introduced in r7216 (concerning the addition of motion blur) Modified Paths: -------------- armagetronad/trunk/armagetronad/language/english_base.txt Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-03-01 10:39:05.813999891 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad bugs: https://launchpad.net/bugs/193938 fixed + timestamp: 2008-03-20 14:05:46.002000093 +0100 committer: wrtlprnft <wrt...@us...> properties: branch-nick: trunk-armagetronad-work 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 + 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 Modified: armagetronad/trunk/armagetronad/language/english_base.txt =================================================================== --- armagetronad/trunk/armagetronad/language/english_base.txt 2008-03-20 13:54:25 UTC (rev 8371) +++ armagetronad/trunk/armagetronad/language/english_base.txt 2008-03-20 14:00:05 UTC (rev 8372) @@ -733,7 +733,7 @@ armagetron_screenmode_help Screen resolution armagetron_last_screenmode_help Last screen resolution armagetron_windowsize_help Window size -armagetron_last_windowsize_help Last Window sizea +armagetron_last_windowsize_help Last Window size motion_blur_time_help Time over which the last rendered frames are blended together armagetron_vsync_help What to do with the monitor's vertical sync rmagetron_vsync_last_help What to do with the monitor's vertical sync This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-03-24 20:32:12
|
Revision: 8388 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8388&view=rev Author: bazaarmagetron Date: 2008-03-24 13:32:10 -0700 (Mon, 24 Mar 2008) Log Message: ----------- Manuel Moos: Removed annoying instachat that never makes it through default chat spam settings on 0.2.8.3 and replaced it with official version of the SHIFT-ESC prank. Modified Paths: -------------- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-03-20 14:05:46.002000093 +0100 committer: wrtlprnft <wrt...@us...> properties: branch-nick: trunk-armagetronad-work + timestamp: 2008-03-24 21:20:56.821000099 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad 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 + 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 Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-03-24 20:26:22 UTC (rev 8387) +++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-03-24 20:32:10 UTC (rev 8388) @@ -980,7 +980,7 @@ "/me just installed this game and still doesn't know how to talk.", "/team You all suck, I want a new team.", "Are you the real \"Player 1\"?", - "0x5aff91Only idiots0xffa962 write in0xc560ff color all0x87dfff the time!", + "Shh, don't tell anyone: Press SHIFT-ESC for cheats!", NULL}; #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-03-26 11:20:17
|
Revision: 8391 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8391&view=rev Author: bazaarmagetron Date: 2008-03-26 04:20:15 -0700 (Wed, 26 Mar 2008) Log Message: ----------- Manuel Moos: Version 0 maps now also get zones v1 parsed. Modified Paths: -------------- armagetronad/trunk/armagetronad/src/tron/gParser.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-03-24 21:20:56.821000099 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2008-03-26 11:43:03.937999964 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad bugs: https://launchpad.net/bugs/205977 fixed 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 + 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 Modified: armagetronad/trunk/armagetronad/src/tron/gParser.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gParser.cpp 2008-03-26 09:17:49 UTC (rev 8390) +++ armagetronad/trunk/armagetronad/src/tron/gParser.cpp 2008-03-26 11:20:15 UTC (rev 8391) @@ -1571,8 +1571,9 @@ #ifdef ENABLE_ZONESV2 switch (mapVersion) { + case 0: case 1: - // was, technically, without zones IIRC. But let's parse it anyway + // were, technically, without zones IIRC. But let's parse it anyway case 2: // switch to v2 when some sort of emulation layer is ready // we should probably check for the DTD, too; v1 zones are only possible This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-03-27 21:41:21
|
Revision: 8392 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8392&view=rev Author: bazaarmagetron Date: 2008-03-27 14:40:47 -0700 (Thu, 27 Mar 2008) Log Message: ----------- epsy: how come we were missing ZONE_ALPHA_TOGGLE on trunk? :-) Modified Paths: -------------- armagetronad/trunk/armagetronad/src/tron/gWinZone.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-03-26 11:43:03.937999964 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad bugs: https://launchpad.net/bugs/205977 fixed + timestamp: 2008-03-27 22:33:46.244999886 +0100 committer: epsy properties: branch-nick: trunk 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 + 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 Modified: armagetronad/trunk/armagetronad/src/tron/gWinZone.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gWinZone.cpp 2008-03-26 11:20:15 UTC (rev 8391) +++ armagetronad/trunk/armagetronad/src/tron/gWinZone.cpp 2008-03-27 21:40:47 UTC (rev 8392) @@ -46,6 +46,9 @@ #include <functional> #include <deque> +static int sg_zoneAlphaToggle = 0; +static tSettingItem<int> sg_zoneAlphaToggleConf( "ZONE_ALPHA_TOGGLE", sg_zoneAlphaToggle ); + std::deque<gZone *> sg_Zones; static int sg_zoneDeath = 1; @@ -467,6 +470,7 @@ glDisable(GL_CULL_FACE); glDepthMask(GL_FALSE); glBlendFunc( GL_SRC_ALPHA, GL_ONE ); + //glDisable(GL_TEXTURE); glDisable(GL_TEXTURE_2D); @@ -476,7 +480,9 @@ glMultMatrixf(&m[0][0]); // glScalef(.5,.5,.5); - if ( sr_alphaBlend ) + bool useAlpha = sr_alphaBlend ? !sg_zoneAlphaToggle : sg_zoneAlphaToggle; + + if ( useAlpha ) BeginQuads(); else BeginLineStrip(); @@ -503,7 +509,7 @@ glVertex3f(sb, cb, top); glVertex3f(sb, cb, bot); - if ( !sr_alphaBlend ) + if ( !useAlpha ) { glVertex3f(sa, ca, bot); RenderEnd(); 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:59
|
Revision: 8396 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8396&view=rev Author: bazaarmagetron Date: 2008-04-02 05:34:57 -0700 (Wed, 02 Apr 2008) Log Message: ----------- wrtlprnft: meh, always pull before you ci Modified Paths: -------------- armagetronad/trunk/armagetronad/win32/code_blocks/ArmagetronAd.cbp Property Changed: ---------------- 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 + timestamp: 2008-04-02 06:28:04.809999943 -0600 committer: wrtlprnft <wrt...@us...> properties: branch-nick: trunk-armagetronad-work 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 + 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd Name: svk:merge - 02982148-85d2-4202-9ec6-589ac3039d34:/local/armagetronad:10 + 02982148-85d2-4202-9ec6-589ac3039d34:/local/armagetronad:107d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8394 Name: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 Modified: armagetronad/trunk/armagetronad/win32/code_blocks/ArmagetronAd.cbp =================================================================== --- armagetronad/trunk/armagetronad/win32/code_blocks/ArmagetronAd.cbp 2008-04-02 12:34:13 UTC (rev 8395) +++ armagetronad/trunk/armagetronad/win32/code_blocks/ArmagetronAd.cbp 2008-04-02 12:34:57 UTC (rev 8396) @@ -252,6 +252,7 @@ <Unit filename="..\..\src\tools\tCallback.cpp" /> <Unit filename="..\..\src\tools\tCallback.h" /> <Unit filename="..\..\src\tools\tCallbackString.h" /> + <Unit filename="..\..\src\tools\tColor.cpp" /> <Unit filename="..\..\src\tools\tColor.h" /> <Unit filename="..\..\src\tools\tCommandLine.cpp" /> <Unit filename="..\..\src\tools\tCommandLine.h" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-04-18 10:19:54
|
Revision: 8411 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8411&view=rev Author: bazaarmagetron Date: 2008-04-18 03:19:59 -0700 (Fri, 18 Apr 2008) Log Message: ----------- wrtlprnft: Fixed an include safeguard that probably caused voodoo quite a headache Modified Paths: -------------- armagetronad/trunk/armagetronad/src/tron/gRotation.h Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-02 06:28:04.809999943 -0600 committer: wrtlprnft <wrt...@us...> properties: branch-nick: trunk-armagetronad-work + timestamp: 2008-04-18 11:38:40.286000013 +0200 committer: wrtlprnft <wrt...@us...> properties: branch-nick: trunk-armagetronad-work 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd + 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn Modified: armagetronad/trunk/armagetronad/src/tron/gRotation.h =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gRotation.h 2008-04-17 23:43:48 UTC (rev 8410) +++ armagetronad/trunk/armagetronad/src/tron/gRotation.h 2008-04-18 10:19:59 UTC (rev 8411) @@ -25,8 +25,8 @@ */ -#ifndef ARMAGETRON_COCKPIT_H -#define ARMAGETRON_COCKPIT_H +#ifndef ARMAGETRON_G_ROTATION_H +#define ARMAGETRON_G_ROTATION_H #include "tCallback.h" #include "tLinkedList.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-04-18 18:15:08
|
Revision: 8412 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8412&view=rev Author: bazaarmagetron Date: 2008-04-18 11:14:03 -0700 (Fri, 18 Apr 2008) Log Message: ----------- epsy46: Fixed client always thinking he was right about it's name, it somehow didn't happen in 0.2.8, also, let's see if my name gets detected properly :P Modified Paths: -------------- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-18 11:38:40.286000013 +0200 committer: wrtlprnft <wrt...@us...> properties: branch-nick: trunk-armagetronad-work + timestamp: 2008-04-18 22:05:03.575999975 +0200 committer: epsy46 <ep...@fr...> properties: branch-nick: trunk 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn + 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-04-18 10:19:59 UTC (rev 8411) +++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-04-18 18:14:03 UTC (rev 8412) @@ -7177,25 +7177,23 @@ eNameMessenger messenger( *this ); // apply client change, stripping excess spaces - if ( sn_GetNetState() == nSTANDALONE || !IsHuman() && sn_GetNetState() != nCLIENT || IsHuman() && ( nameFromServer_ != nameFromClient_ && !messenger.adminRename_ ) ) + if ( sn_GetNetState() != nCLIENT ) { - // apply name filters only on remote players - if ( Owner() != 0 ) - se_OptionalNameFilters( nameFromClient_ ); + if ( sn_GetNetState() == nSTANDALONE || !IsHuman() || IsHuman() && ( nameFromServer_ != nameFromClient_ && !messenger.adminRename_ ) ) + { + // apply name filters only on remote players + if ( Owner() != 0 ) + se_OptionalNameFilters( nameFromClient_ ); - // nothing wrong ? proceed to renaming - nameFromAdmin_ = nameFromServer_ = nameFromClient_; + // nothing wrong ? proceed to renaming + nameFromAdmin_ = nameFromServer_ = nameFromClient_; + } + else + { + // revert name + nameFromClient_ = nameFromServer_ = nameFromAdmin_; + } } - else if ( sn_GetNetState() == nCLIENT ) - { - // If we are in client mode, just follow our leader the server :) - nameFromAdmin_ = nameFromClient_ = nameFromServer_; - } - else - { - // revert name - nameFromClient_ = nameFromServer_ = nameFromAdmin_; - } // remove colors from name tString newName = tColoredString::RemoveColors( nameFromServer_ ); tString newUserName = se_UnauthenticatedUserName( newName ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-04-18 22:54:26
|
Revision: 8414 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8414&view=rev Author: bazaarmagetron Date: 2008-04-18 15:54:32 -0700 (Fri, 18 Apr 2008) Log Message: ----------- epsy46: manual merge of 0.2.8:810, because i don't have a clue on how to do that and everyone is sleeping :) Modified Paths: -------------- armagetronad/trunk/armagetronad/src/tools/tString.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-18 22:05:03.575999975 +0200 committer: epsy46 <ep...@fr...> properties: branch-nick: trunk + timestamp: 2008-04-19 02:49:17.803999901 +0200 committer: epsy46 <ep...@fr...> properties: branch-nick: trunk 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a + 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 Modified: armagetronad/trunk/armagetronad/src/tools/tString.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-04-18 22:39:54 UTC (rev 8413) +++ armagetronad/trunk/armagetronad/src/tools/tString.cpp 2008-04-18 22:54:32 UTC (rev 8414) @@ -1537,7 +1537,7 @@ // skip color codes if (*c=='0' && len >= 2 && c[1]=='x') { - if( len >= 8 && darkonly ) + if( len >= 8 && darkonly && strncmp( c, "0xRESETT", 8 ) != 0 ) { tColor colorToFilter; colorToFilter = tColor( c ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-04-19 19:11:09
|
Revision: 8420 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8420&view=rev Author: bazaarmagetron Date: 2008-04-19 12:11:14 -0700 (Sat, 19 Apr 2008) Log Message: ----------- wrtlprnft: replaced strlen(<string>) >= 8 by strnlen(<string>, 8) >= 8 in three places Modified Paths: -------------- armagetronad/trunk/armagetronad/src/render/rFont.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-19 02:49:17.803999901 +0200 committer: epsy46 <ep...@fr...> properties: branch-nick: trunk + timestamp: 2008-04-19 20:58:50.467000008 +0200 committer: wrtlprnft <wrt...@us...> properties: branch-nick: trunk-armagetronad-work 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 + 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb Modified: armagetronad/trunk/armagetronad/src/render/rFont.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/render/rFont.cpp 2008-04-19 19:07:22 UTC (rev 8419) +++ armagetronad/trunk/armagetronad/src/render/rFont.cpp 2008-04-19 19:11:14 UTC (rev 8420) @@ -555,7 +555,7 @@ // run through string while (*c!='\0') { - if (trouble && !(*c=='0' && strlen(c)>=8 && c[1]=='x' && colorMode != COLOR_IGNORE)) { + if (trouble && !(*c=='0' && strnlen(c, 8)>=8 && c[1]=='x' && colorMode != COLOR_IGNORE)) { tString str; str << *c; currentWidth += sr_Font.GetWidth(str, cheight); @@ -582,7 +582,7 @@ int wordLen = 0; while ( *nextSpace != '\0' && *nextSpace != '\n' && !isblank(*nextSpace) ) { - if (*nextSpace=='0' && strlen(nextSpace)>=8 && nextSpace[1]=='x' && colorMode != COLOR_IGNORE ) + if (*nextSpace=='0' && strnlen(nextSpace, 8)>=8 && nextSpace[1]=='x' && colorMode != COLOR_IGNORE ) { // skip color code nextSpace += 8; @@ -636,7 +636,7 @@ //} // detect presence of color code - if (*c=='0' && strlen(c)>=8 && c[1]=='x' && colorMode != COLOR_IGNORE ) + if (*c=='0' && strnlen(c, 8)>=8 && c[1]=='x' && colorMode != COLOR_IGNORE ) { tColor color; bool use = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-04-23 17:26:34
|
Revision: 8438 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8438&view=rev Author: bazaarmagetron Date: 2008-04-23 10:25:57 -0700 (Wed, 23 Apr 2008) Log Message: ----------- wrtlprnft: replaced strnlen by our own implementation because it's nonstandard. If anyone knows how to use the (probably optimized) glibc version if it exists, please do it :-) Modified Paths: -------------- armagetronad/trunk/armagetronad/src/render/rFont.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-19 20:58:50.467000008 +0200 committer: wrtlprnft <wrt...@us...> properties: branch-nick: trunk-armagetronad-work + timestamp: 2008-04-23 19:07:38.540999889 +0200 committer: wrtlprnft <wrt...@us...> properties: branch-nick: trunk-armagetronad-work 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb + 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 Modified: armagetronad/trunk/armagetronad/src/render/rFont.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/render/rFont.cpp 2008-04-23 17:17:06 UTC (rev 8437) +++ armagetronad/trunk/armagetronad/src/render/rFont.cpp 2008-04-23 17:25:57 UTC (rev 8438) @@ -189,6 +189,14 @@ } #endif +//! like strnlen, but that's nonstandard :-( +static size_t my_strnlen(char const *c, size_t i) { + char const *begin = c; + char const *end = c + i; + for(; *c && c != end; ++c); + return c - begin; +} + static rFont sr_lowerPartFont("textures/font_extra.png"); rFont rFont::s_defaultFont("textures/font.png", &sr_lowerPartFont); rFont rFont::s_defaultFontSmall("textures/font_s.png",32,5/128.0,9/128.0,1/128.0); @@ -582,7 +590,7 @@ int wordLen = 0; while ( *nextSpace != '\0' && *nextSpace != '\n' && !isblank(*nextSpace) ) { - if (*nextSpace=='0' && strnlen(nextSpace, 8)>=8 && nextSpace[1]=='x' && colorMode != COLOR_IGNORE ) + if (*nextSpace=='0' && my_strnlen(nextSpace, 8)>=8 && nextSpace[1]=='x' && colorMode != COLOR_IGNORE ) { // skip color code nextSpace += 8; @@ -636,7 +644,7 @@ //} // detect presence of color code - if (*c=='0' && strnlen(c, 8)>=8 && c[1]=='x' && colorMode != COLOR_IGNORE ) + if (*c=='0' && my_strnlen(c, 8)>=8 && c[1]=='x' && colorMode != COLOR_IGNORE ) { tColor color; bool use = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wrt...@us...> - 2008-04-25 18:02:04
|
Revision: 8441 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8441&view=rev Author: wrtlprnft Date: 2008-04-25 11:00:53 -0700 (Fri, 25 Apr 2008) Log Message: ----------- Merging branch 0.2.8 from revision 8363 to 8438: ------------------------------------------------------------------------ r8003 | wrtlprnft | 2008-02-19 13:49:32 +0100 (Tue, 19 Feb 2008) | 2 lines got rid of the warnings that appeared when loading the default cockpit ------------------------------------------------------------------------ r8008 | wrtlprnft | 2008-02-19 16:32:57 +0100 (Tue, 19 Feb 2008) | 1 line Added tPolynomial* to windows project ------------------------------------------------------------------------ r8022 | wrtlprnft | 2008-02-20 22:29:35 +0100 (Wed, 20 Feb 2008) | 2 lines Updated the file with the stuff I found a bit hard to find out at first ------------------------------------------------------------------------ r8035 | wrtlprnft | 2008-02-21 18:11:33 +0100 (Thu, 21 Feb 2008) | 2 lines If alpha blending is disabled at least enable the alpha test for rendering rectangular cockpit widgets ------------------------------------------------------------------------ r8042 | wrtlprnft | 2008-02-22 10:22:32 +0100 (Fri, 22 Feb 2008) | 2 lines New setting to determine the color of the seperator line between the foregroud and background of bar gauges ------------------------------------------------------------------------ r8060 | philippeqc | 2008-02-22 20:06:12 +0100 (Fri, 22 Feb 2008) | 1 line do not change dtd that are in use ------------------------------------------------------------------------ r8076 | philippeqc | 2008-02-23 11:09:12 +0100 (Sat, 23 Feb 2008) | 1 line changed influenceSlide, influenceAdd and influenceSet to influence in the InfluenceMonitorchanged rotationSpeed and rotationAngle to rotation in the ZoneInfluenceItemRotation ------------------------------------------------------------------------ r8081 | philippeqc | 2008-02-23 16:19:25 +0100 (Sat, 23 Feb 2008) | 1 line Added a parser to tPolynomial, to enable better integration in gParser.Added substitute method to tPolynomial ------------------------------------------------------------------------ r8082 | philippeqc | 2008-02-23 17:53:34 +0100 (Sat, 23 Feb 2008) | 7 lines Separated tPolynomialMarshaler from tPolynomial.h Made tPolynomialMarshaler a template class, so removed the file tPolynomial.cpp tPolynomialMarshaler now relies on 2 tPolynomial internally rather than 2 arrays of numbers tPolynomial has a parsing constructor Updated relevant unit test ------------------------------------------------------------------------ r8094 | philippeqc | 2008-02-24 10:44:32 +0100 (Sun, 24 Feb 2008) | 1 line Applied change from tPolynomialMarshaler to a template class to the whole project ------------------------------------------------------------------------ r8095 | philippeqc | 2008-02-24 12:44:10 +0100 (Sun, 24 Feb 2008) | 4 lines Some backward compatibility in the parser to tolerate deprecated notation influenceSlide and influenceAdd for the MonitorInfluence element. Some backward compatibility in the parser to tolerate deprecated notation rotationAngle and rotationSpeed for the Rotation element. ------------------------------------------------------------------------ r8201 | bazaarmagetron | 2008-03-01 10:45:44 +0100 (Sat, 01 Mar 2008) | 2 lines Manuel Moos: Disabling title screen when entering the game. ------------------------------------------------------------------------ r8231 | z-man | 2008-03-03 23:08:03 +0100 (Mon, 03 Mar 2008) | 54 lines Merging branch 0.2.8 from revision 7995 to 8230: ------------------------------------------------------------------------ r8227 | z-man | 2008-03-03 13:51:03 +0100 (Mon, 03 Mar 2008) | 2 lines Repaired dedicated server. ------------------------------------------------------------------------ r8226 | z-man | 2008-03-03 13:48:06 +0100 (Mon, 03 Mar 2008) | 2 lines Added ESC button to server connection that aborts the connection attempt. ------------------------------------------------------------------------ r8225 | z-man | 2008-03-03 12:39:47 +0100 (Mon, 03 Mar 2008) | 8 lines Broke the unfortunate chain of events that leads to severe FPS drops on old clients on several links: - server no longer sends redundant cycle death sync messages. - client ignores redundant cycle death messages; they caused calls to eGameObject::Move on objects already removed from the activity list. - game objects removed from the active lists no longer have currentFace set - game objects removed from the list, when they move, just update their position and don't get a new currentFace. The root of the problem are inactive game objects that still have a currentFace set. That causes that face and all its replacement in the grid reordering code to be marked as "not to be simplified". ------------------------------------------------------------------------ r8224 | z-man | 2008-03-03 12:00:19 +0100 (Mon, 03 Mar 2008) | 2 lines Not contacting master servers when the hostnames don't resolve. ------------------------------------------------------------------------ r8200 | wrtlprnft | 2008-02-29 19:51:16 +0100 (Fri, 29 Feb 2008) | 2 lines Fixed a typo. Maybe this will be another test for the bzr merging thing. ------------------------------------------------------------------------ r8199 | bazaarmagetron | 2008-02-29 19:36:32 +0100 (Fri, 29 Feb 2008) | 2 lines Manuel Moos: Extended allowed letters in authority URLs. ------------------------------------------------------------------------ r8024 | bazaarmagetron | 2008-02-20 23:21:06 +0100 (Wed, 20 Feb 2008) | 2 lines Manuel Moos: Another workaround attempt for the "perfectly stable" OS ATI driver :) Same problem as last time, glColor() call at the end of a glBegin()/glEnd() block. ------------------------------------------------------------------------ r8020 | wrtlprnft | 2008-02-20 21:47:26 +0100 (Wed, 20 Feb 2008) | 2 lines No longer print successful calls to ACCESS_LEVEL and USER_LEVEL to the console when loading a config file at start ------------------------------------------------------------------------ r8019 | wrtlprnft | 2008-02-20 20:39:54 +0100 (Wed, 20 Feb 2008) | 2 lines Added logging of /admin commands ------------------------------------------------------------------------ ------------------------------------------------------------------------ r8270 | bazaarmagetron | 2008-03-07 01:07:37 +0100 (Fri, 07 Mar 2008) | 2 lines Removed incomplete sentence :) ------------------------------------------------------------------------ r8271 | z-man | 2008-03-07 01:09:25 +0100 (Fri, 07 Mar 2008) | 204 lines Merging branch 0.2.8 from revision 8230 to 8269: ------------------------------------------------------------------------ r8269 | bazaarmagetron | 2008-03-06 19:48:38 +0100 (Thu, 06 Mar 2008) | 2 lines Manuel Moos: added FORTRESS_COLLAPSE_SPEED to control the time between the conquest of a zone and the vanishing (and killing of the team members) ------------------------------------------------------------------------ r8268 | z-man | 2008-03-06 15:37:25 +0100 (Thu, 06 Mar 2008) | 2 lines Fixed screen name reservation. ------------------------------------------------------------------------ r8267 | z-man | 2008-03-06 15:37:02 +0100 (Thu, 06 Mar 2008) | 2 lines Strings get excess zeroes clamped away before they are written over the net. This fixes sporadic network message length discrepancies on playback. I hope the extra zeroes don't do harm elsewhere (string comparison is safe). ------------------------------------------------------------------------ r8266 | z-man | 2008-03-06 13:33:14 +0100 (Thu, 06 Mar 2008) | 2 lines Adding method suffix and prefix to recording. ------------------------------------------------------------------------ r8265 | z-man | 2008-03-06 13:28:06 +0100 (Thu, 06 Mar 2008) | 2 lines Fixed spurious rename message bug; it happened when you authenticated and changed your color during the same round. ------------------------------------------------------------------------ r8264 | z-man | 2008-03-06 13:15:37 +0100 (Thu, 06 Mar 2008) | 2 lines Added login failure reason to playback. ------------------------------------------------------------------------ r8263 | bazaarmagetron | 2008-03-06 01:28:01 +0100 (Thu, 06 Mar 2008) | 2 lines Manuel Moos: Restored behavior that kick votes over the chat interface don't get transformed to removal votes. ------------------------------------------------------------------------ r8262 | bazaarmagetron | 2008-03-06 01:27:22 +0100 (Thu, 06 Mar 2008) | 8 lines author: Manuel Moos All votes are now handled over the new server controlled system internally. For old clients (pre 0.2.8), the vote items disguise as kick votes (if they are kick or suspend votes) and are plainly invisible for include and command votes. The decision to transform a kick into a suspension is now made on vote creation time. ------------------------------------------------------------------------ r8261 | bazaarmagetron | 2008-03-05 22:42:41 +0100 (Wed, 05 Mar 2008) | 2 lines Manuel Moos: Implemented "include" and "command" votes. ------------------------------------------------------------------------ r8260 | bazaarmagetron | 2008-03-05 19:43:01 +0100 (Wed, 05 Mar 2008) | 2 lines Manuel Moos: If the team owning a zone is dead at round end, the zone does not collapse harmlessly; instead, it gets "touchy" and will collapse at the slightest contact with an enemy. ------------------------------------------------------------------------ r8259 | bazaarmagetron | 2008-03-05 15:49:01 +0100 (Wed, 05 Mar 2008) | 2 lines Manuel Moos: Default hiding level adapted to docs: no hiding for anyone. ------------------------------------------------------------------------ r8258 | bazaarmagetron | 2008-03-05 13:20:54 +0100 (Wed, 05 Mar 2008) | 4 lines author: Manuel Moos Added access levels and individual biases for kick and suspend votes. Also added texts and config items for include and direct command votes. ------------------------------------------------------------------------ r8257 | bazaarmagetron | 2008-03-05 12:28:57 +0100 (Wed, 05 Mar 2008) | 2 lines Manuel Moos: Shuffled around access levels. Authenticated now is all on the bottom, only barely above "Program". Default access level for remote users stays 15, only that it's now named "Remote User". ------------------------------------------------------------------------ r8256 | bazaarmagetron | 2008-03-05 11:59:41 +0100 (Wed, 05 Mar 2008) | 2 lines Manuel Moos: Updated config file with new access levels. ------------------------------------------------------------------------ r8255 | bazaarmagetron | 2008-03-05 11:58:43 +0100 (Wed, 05 Mar 2008) | 2 lines Manuel Moos: Added two access levels below authenticated that you can USER_LEVEL players to; intended to be used to take away rights authenticated players usually get (like, starting votes) for selected users. ------------------------------------------------------------------------ r8253 | z-man | 2008-03-05 01:44:40 +0100 (Wed, 05 Mar 2008) | 2 lines Fixed oversized hole bug. ------------------------------------------------------------------------ r8252 | z-man | 2008-03-05 01:09:13 +0100 (Wed, 05 Mar 2008) | 3 lines Disabled debug mode exception for chatbot settings on the server (for debug replays). ------------------------------------------------------------------------ r8251 | z-man | 2008-03-05 01:06:54 +0100 (Wed, 05 Mar 2008) | 2 lines Faster logins in recording mode. ------------------------------------------------------------------------ r8250 | z-man | 2008-03-05 01:06:20 +0100 (Wed, 05 Mar 2008) | 2 lines Ping improvements. I though I committed this yesterday. ------------------------------------------------------------------------ r8249 | bazaarmagetron | 2008-03-04 19:25:58 +0100 (Tue, 04 Mar 2008) | 2 lines Manuel Moos: Added VOTE_KICK_REASON. ------------------------------------------------------------------------ r8248 | bazaarmagetron | 2008-03-04 19:25:15 +0100 (Tue, 04 Mar 2008) | 2 lines Manuel Moos: Added new commands here, too. ------------------------------------------------------------------------ r8247 | bazaarmagetron | 2008-03-04 19:24:48 +0100 (Tue, 04 Mar 2008) | 2 lines Manuel Moos: Added new voting settings items. ------------------------------------------------------------------------ r8246 | z-man | 2008-03-04 18:28:18 +0100 (Tue, 04 Mar 2008) | 2 lines Fixed armathentication compilation. ------------------------------------------------------------------------ r8245 | bazaarmagetron | 2008-03-04 17:47:12 +0100 (Tue, 04 Mar 2008) | 2 lines Manuel Moos: Suspension count is now stored in the eVoter data structure and has limited reconnection resistance. ------------------------------------------------------------------------ r8244 | bazaarmagetron | 2008-03-04 17:29:31 +0100 (Tue, 04 Mar 2008) | 2 lines Manuel Moos: Err, actually letting players into the game again :) ------------------------------------------------------------------------ r8243 | bazaarmagetron | 2008-03-04 17:28:23 +0100 (Tue, 04 Mar 2008) | 2 lines Manuel Moos: Giving players better reasons why they can't join the game. ------------------------------------------------------------------------ r8242 | bazaarmagetron | 2008-03-04 17:16:12 +0100 (Tue, 04 Mar 2008) | 2 lines Manuel Moos: VOTING_KICK_MINHARM now only affects votes that came via the menu. ------------------------------------------------------------------------ r8241 | bazaarmagetron | 2008-03-04 16:39:35 +0100 (Tue, 04 Mar 2008) | 4 lines author: Manuel Moos Added VOTING_HARM_TIME to complement VOTING_KICK_TIME (applies to all harmful votes, currently kicks and suspensions). Added VOTING_KICK_MINHARM to transform the first kick votes against a poor newbie into suspensions automatically. ------------------------------------------------------------------------ r8240 | bazaarmagetron | 2008-03-04 16:15:16 +0100 (Tue, 04 Mar 2008) | 2 lines Manuel Moos: Added VOTING_SUSPEND_ROUNDS to control suspend vote duration. ------------------------------------------------------------------------ r8239 | bazaarmagetron | 2008-03-04 16:14:41 +0100 (Tue, 04 Mar 2008) | 2 lines Manuel Moos: Added "/vote suspend <player>". ------------------------------------------------------------------------ r8238 | bazaarmagetron | 2008-03-04 16:13:56 +0100 (Tue, 04 Mar 2008) | 2 lines Manuel Moos: added "/callvote" ------------------------------------------------------------------------ r8237 | bazaarmagetron | 2008-03-04 15:29:47 +0100 (Tue, 04 Mar 2008) | 2 lines Manuel Moos: finished "/vote kick" vote interface. ------------------------------------------------------------------------ r8236 | bazaarmagetron | 2008-03-04 15:29:00 +0100 (Tue, 04 Mar 2008) | 4 lines author: Manuel Moos Avoiding redundant wall coordinates during holing. This makes the holer information a bit inaccurate; if someone "enlarges" a reviously existing hole, it will belong entirely to him, and not just the new bits. Duplicating last wall coordinate on Update() if there was a hole up to the wall end; this avoids "dragging" the hole along. ------------------------------------------------------------------------ r8235 | bazaarmagetron | 2008-03-04 15:28:00 +0100 (Tue, 04 Mar 2008) | 2 lines Manuel Moos: Filled vote stub for kick votes. ------------------------------------------------------------------------ r8234 | bazaarmagetron | 2008-03-04 15:27:20 +0100 (Tue, 04 Mar 2008) | 2 lines Manuel Moos: Added chat interface stub for votes. ------------------------------------------------------------------------ r8233 | bazaarmagetron | 2008-03-03 23:20:59 +0100 (Mon, 03 Mar 2008) | 2 lines Manuel Moos: Fix ammendment: avoiding short flicker. ------------------------------------------------------------------------ r8232 | bazaarmagetron | 2008-03-03 23:20:29 +0100 (Mon, 03 Mar 2008) | 5 lines author: Manuel Moos Deactivation events no longer minimize the application from fullscreen mode in Linux. The only known source for deactivation events is the screensaver, and ignoring them appears to scare it off :) ------------------------------------------------------------------------ ------------------------------------------------------------------------ r8274 | nemostultae | 2008-03-07 20:21:14 +0100 (Fri, 07 Mar 2008) | 12 lines Fixed bug which caused first build to forever hang when sorting resources. We were using absolute paths--not relative. Thus: >>> os.path.split("/foo") ('/', 'foo') caused an infinite loop, and the expected result: >>> os.path.split("foo") ('', 'foo') would not cause an infinite loop... ------------------------------------------------------------------------ r8277 | nemostultae | 2008-03-08 05:27:36 +0100 (Sat, 08 Mar 2008) | 2 lines Only send a Growl update if not dedicated ------------------------------------------------------------------------ r8286 | nemostultae | 2008-03-08 16:27:37 +0100 (Sat, 08 Mar 2008) | 2 lines gServerInfoFavorite -> nServerInfoRedirect ------------------------------------------------------------------------ r8287 | z-man | 2008-03-08 17:55:06 +0100 (Sat, 08 Mar 2008) | 67 lines Merging branch 0.2.8 from revision 8269 to 8286: ------------------------------------------------------------------------ r8285 | z-man | 2008-03-08 15:24:06 +0100 (Sat, 08 Mar 2008) | 3 lines Experimenting with different visuals for slowly collapsing zones. Take 1: When conquered, the zone lights up in white, then slows down. When the rotation stops, it darkens. ------------------------------------------------------------------------ r8284 | z-man | 2008-03-08 15:06:41 +0100 (Sat, 08 Mar 2008) | 3 lines Voter datastructure (with a little more persistence than ePlayerNetID) is only used to store suspensions while the ePlayerNetID object does not exist. This avoids suspending everyone connecting from the same LAN all at once. ------------------------------------------------------------------------ r8283 | z-man | 2008-03-08 14:53:19 +0100 (Sat, 08 Mar 2008) | 2 lines Re-added VOTE_USE_SERVER_CONTROLLED_KICK config item on the client to avoid UPGRADE messages. ------------------------------------------------------------------------ r8282 | z-man | 2008-03-08 13:51:07 +0100 (Sat, 08 Mar 2008) | 2 lines Fixed clientside reception of server controlled vote items. ------------------------------------------------------------------------ r8281 | z-man | 2008-03-08 13:49:37 +0100 (Sat, 08 Mar 2008) | 2 lines Added -O0 to debug configuration, just in case. ------------------------------------------------------------------------ r8280 | z-man | 2008-03-08 13:48:27 +0100 (Sat, 08 Mar 2008) | 2 lines Recording fixes for the case when there are errors talking to the authority. ------------------------------------------------------------------------ r8279 | z-man | 2008-03-08 11:49:26 +0100 (Sat, 08 Mar 2008) | 2 lines Added full user name to recording. ------------------------------------------------------------------------ r8278 | z-man | 2008-03-08 11:48:51 +0100 (Sat, 08 Mar 2008) | 2 lines Fixed extra trailing \0 in playback strings. ------------------------------------------------------------------------ r8276 | bazaarmagetron | 2008-03-08 00:57:06 +0100 (Sat, 08 Mar 2008) | 2 lines Manuel Moos: Fixed one vote item delivery bug. There must be another one hiding somewhere, though. ------------------------------------------------------------------------ r8275 | bazaarmagetron | 2008-03-08 00:56:32 +0100 (Sat, 08 Mar 2008) | 2 lines Manuel Moos: Fixed blank screen bug; it was caused by bad tToDo recursion. ------------------------------------------------------------------------ r8273 | z-man | 2008-03-07 14:20:40 +0100 (Fri, 07 Mar 2008) | 2 lines Don't show "IP=<empty>" in /players output. ------------------------------------------------------------------------ r8272 | z-man | 2008-03-07 12:03:02 +0100 (Fri, 07 Mar 2008) | 4 lines Added eGameObject::OnRoundBegin(), called after game object creation. Used it in the zone code to fix the flickering empty zone glitch in sumo, and to avoid rare midgame zone ownership changes. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r8288 | nemostultae | 2008-03-08 19:11:48 +0100 (Sat, 08 Mar 2008) | 2 lines Typo, don't include gWinZone.cpp ------------------------------------------------------------------------ r8295 | wrtlprnft | 2008-03-09 16:57:55 +0100 (Sun, 09 Mar 2008) | 1 line re-added gWinZone.* to the codeblocks project, it got removed for some reason ------------------------------------------------------------------------ r8297 | nemostultae | 2008-03-09 19:02:20 +0100 (Sun, 09 Mar 2008) | 2 lines Restored building trunk on Mac OS X ------------------------------------------------------------------------ r8298 | nemostultae | 2008-03-09 19:15:53 +0100 (Sun, 09 Mar 2008) | 2 lines Don't copy Info.plist to the Resources/ directory ------------------------------------------------------------------------ r8307 | nemostultae | 2008-03-11 02:35:28 +0100 (Tue, 11 Mar 2008) | 3 lines Added rakefile.rb and xcode.rake to project. Moved shared.xcconfig to MacOS group. ------------------------------------------------------------------------ r8319 | nemostultae | 2008-03-15 00:44:37 +0100 (Sat, 15 Mar 2008) | 2 lines Possibly fixes baddog144's error? ------------------------------------------------------------------------ r8338 | wrtlprnft | 2008-03-18 20:30:26 +0100 (Tue, 18 Mar 2008) | 2 lines Make clientside completion aware of the new commands that accept player names ------------------------------------------------------------------------ r8353 | wrtlprnft | 2008-03-19 20:15:20 +0100 (Wed, 19 Mar 2008) | 4 lines Paste support: press ctrl-v in any place that expects text to paste the clipboard contents. Tested on linux and windows, it should work on macos, too, in theory. No clue if it really does, though, someone will need to test that. The code for getting the clipboard contents comes from http://www.libsdl.org/projects/scrap/ and is released in the public domain ------------------------------------------------------------------------ r8355 | wrtlprnft | 2008-03-19 20:21:30 +0100 (Wed, 19 Mar 2008) | 1 line Add new files for copy and paste support ------------------------------------------------------------------------ r8364 | z-man | 2008-03-20 00:47:02 +0100 (Thu, 20 Mar 2008) | 352 lines Merging branch 0.2.8 from revision 8286 to 8363: ------------------------------------------------------------------------ r8363 | z-man | 2008-03-19 21:31:09 +0100 (Wed, 19 Mar 2008) | 2 lines Undid test commits. ------------------------------------------------------------------------ r8362 | bazaarmagetron | 2008-03-19 21:24:54 +0100 (Wed, 19 Mar 2008) | 45 lines author: Manuel Moos Automatic merging of commits that would change history order: ------------------------------------------------------------ revno: 775.1.2 committer: Manuel Moos <z-...@us...> branch nick: armagetronad timestamp: Wed 2008-03-19 21:02:00 +0100 message: Test commit from bzr. ------------------------------------------------------------ revno: 775.1.1 committer: Manuel Moos <z-...@us...> branch nick: 0.2.8-armagetronad-work timestamp: Wed 2008-03-19 20:45:00 +0100 message: Empty merge to keep the peace between svn and bzr. ------------------------------------------------------------ revno: 770.1.4 committer: epsy branch nick: 0.2.8 timestamp: Wed 2008-03-19 20:21:23 +0100 message: redo ------------------------------------------------------------ revno: 770.1.3 committer: epsy branch nick: 0.2.8 timestamp: Wed 2008-03-19 20:19:36 +0100 message: undo ------------------------------------------------------------ revno: 770.1.2 committer: Manuel Moos <z-...@us...> branch nick: 0.2.8-armagetronad-work timestamp: Wed 2008-03-19 20:12:10 +0100 message: Empty merge to keep the peace between svn and bzr. ------------------------------------------------------------ revno: 770.1.1 committer: Manuel Moos <z-...@us...> branch nick: 0.2.8 timestamp: Wed 2008-03-19 19:56:58 +0100 message: Fixed AI player names in client and removed debug breakpoints from tColoredString:RemoveColors ------------------------------------------------------------------------ r8361 | z-man | 2008-03-19 21:03:11 +0100 (Wed, 19 Mar 2008) | 2 lines Test commit from svn. ------------------------------------------------------------------------ r8360 | bazaarmagetron | 2008-03-19 20:48:16 +0100 (Wed, 19 Mar 2008) | 2 lines Manuel Moos: redo ------------------------------------------------------------------------ r8359 | bazaarmagetron | 2008-03-19 20:47:38 +0100 (Wed, 19 Mar 2008) | 2 lines Manuel Moos: undo ------------------------------------------------------------------------ r8358 | bazaarmagetron | 2008-03-19 20:47:00 +0100 (Wed, 19 Mar 2008) | 1 line Manuel Moos: Empty merge to keep the peace between svn and bzr. ------------------------------------------------------------------------ r8357 | bazaarmagetron | 2008-03-19 20:46:37 +0100 (Wed, 19 Mar 2008) | 2 lines Manuel Moos: Fixed AI player names in client and removed debug breakpoints from tColoredString:RemoveColors ------------------------------------------------------------------------ r8352 | z-man | 2008-03-19 20:05:44 +0100 (Wed, 19 Mar 2008) | 2 lines Removing annoying debug breakpoints. ------------------------------------------------------------------------ r8351 | z-man | 2008-03-19 20:03:27 +0100 (Wed, 19 Mar 2008) | 3 lines Only clients really supporting the new votes get them now, and only they count for the totals. Undesired side effect so far: MIN_VOTERS is not taken into account properly, that still uses the total number of voters. ------------------------------------------------------------------------ r8350 | z-man | 2008-03-19 12:06:46 +0100 (Wed, 19 Mar 2008) | 2 lines Fixed one-off error with kick vote to suspend vote transmogrification, converted epsy's TABS to spaces. ------------------------------------------------------------------------ r8347 | nemostultae | 2008-03-19 01:06:06 +0100 (Wed, 19 Mar 2008) | 3 lines * Removed rDisplayList.h from Copy Headers task * Moved tColor.cpp to tools/ subgroup ------------------------------------------------------------------------ r8346 | bazaarmagetron | 2008-03-19 01:01:29 +0100 (Wed, 19 Mar 2008) | 1 line Manuel Moos: Empty merge to keep the peace between svn and bzr. ------------------------------------------------------------------------ r8345 | wrtlprnft | 2008-03-18 23:09:08 +0100 (Tue, 18 Mar 2008) | 6 lines - fixed a client compilation warning - /rtfm now prints the message to the invoker, too, to catch errors - some language file fixes - whitespace corrections ------------------------------------------------------------------------ r8344 | bazaarmagetron | 2008-03-18 21:43:49 +0100 (Tue, 18 Mar 2008) | 1 line Manuel Moos: Empty merge to keep the peace between svn and bzr. ------------------------------------------------------------------------ r8343 | wrtlprnft | 2008-03-18 21:32:00 +0100 (Tue, 18 Mar 2008) | 2 lines Fixed a bug with the display of authenticated names in the server browser. ------------------------------------------------------------------------ r8342 | bazaarmagetron | 2008-03-18 21:13:57 +0100 (Tue, 18 Mar 2008) | 1 line Manuel Moos: Empty merge to keep the peace between svn and bzr. ------------------------------------------------------------------------ r8341 | bazaarmagetron | 2008-03-18 21:13:30 +0100 (Tue, 18 Mar 2008) | 2 lines Manuel Moos: eek, forgot help texts ------------------------------------------------------------------------ r8340 | bazaarmagetron | 2008-03-18 21:11:35 +0100 (Tue, 18 Mar 2008) | 4 lines author: Manuel Moos * FILTER_COLOR_TEAM filters color in team messages * FILTER_DARK_COLOR_(STRINGS|SERVER_NAMES|NAMES|TEAM) ------------------------------------------------------------------------ r8339 | wrtlprnft | 2008-03-18 20:33:05 +0100 (Tue, 18 Mar 2008) | 2 lines Durka's xcode file that includes tColor.cpp ------------------------------------------------------------------------ r8337 | wrtlprnft | 2008-03-18 20:06:36 +0100 (Tue, 18 Mar 2008) | 2 lines new /rtfm command to send help messages to other players. ------------------------------------------------------------------------ r8336 | bazaarmagetron | 2008-03-18 17:58:29 +0100 (Tue, 18 Mar 2008) | 2 lines Manuel Moos: "we" forgot to initialize the alpha value :) ------------------------------------------------------------------------ r8335 | bazaarmagetron | 2008-03-18 17:48:19 +0100 (Tue, 18 Mar 2008) | 2 lines Manuel Moos: Fixed performance problems (string duplication) and bugs in color code interpretation. ------------------------------------------------------------------------ r8334 | bazaarmagetron | 2008-03-18 16:53:02 +0100 (Tue, 18 Mar 2008) | 2 lines Manuel Moos: Avoiding needless copies of default help topics in memory (and fixing array element count bug on the go). ------------------------------------------------------------------------ r8333 | wrtlprnft | 2008-03-18 15:21:36 +0100 (Tue, 18 Mar 2008) | 2 lines Primitive help system. See settings_dedicated.cfg:339 for a description of the new commands ------------------------------------------------------------------------ r8332 | bazaarmagetron | 2008-03-17 21:47:10 +0100 (Mon, 17 Mar 2008) | 4 lines author: epsy Ah, i shouldn't code on mornings, names on client will really, i promise, appear again. Also restructured tColor, changed it to a class, added tColor::IsDark() and construction of a tColor from a color code. Set rFont.cpp to use it. ------------------------------------------------------------------------ r8331 | bazaarmagetron | 2008-03-17 12:06:52 +0100 (Mon, 17 Mar 2008) | 2 lines Manuel Moos: numeric access level -> named access level in one server message. ------------------------------------------------------------------------ r8330 | bazaarmagetron | 2008-03-17 11:46:09 +0100 (Mon, 17 Mar 2008) | 2 lines Manuel Moos: Better feedback messages; the vote submitter is now always informed that his vote was accepted, and the new vote notification is back. ------------------------------------------------------------------------ r8329 | z-man | 2008-03-17 11:15:44 +0100 (Mon, 17 Mar 2008) | 2 lines Added missing output parameter. ------------------------------------------------------------------------ r8328 | bazaarmagetron | 2008-03-17 08:36:18 +0100 (Mon, 17 Mar 2008) | 2 lines epsy: Player names really appears again. :) ------------------------------------------------------------------------ r8326 | wrtlprnft | 2008-03-16 23:16:35 +0100 (Sun, 16 Mar 2008) | 2 lines Append (and parse) a list of authenticated names to the big server info messages (the ones that make up the details you see on the server browser) ------------------------------------------------------------------------ r8325 | bazaarmagetron | 2008-03-16 16:40:57 +0100 (Sun, 16 Mar 2008) | 2 lines epsy: The Players name appear again in standalone mode. Also added VOTING_SUSPEND and RENAME to NEWS. ------------------------------------------------------------------------ r8324 | bazaarmagetron | 2008-03-16 16:40:09 +0100 (Sun, 16 Mar 2008) | 4 lines author: Manuel Moos Full case insensitive matches now take precedence over partial case sensitive matches. "KILL Z", if players z and Z-Man are online, now kills z. ------------------------------------------------------------------------ r8323 | wrtlprnft | 2008-03-16 16:17:24 +0100 (Sun, 16 Mar 2008) | 2 lines Minor annoyance: the round end zone on freestyle game is now announced correctly ------------------------------------------------------------------------ r8322 | bazaarmagetron | 2008-03-16 00:56:03 +0100 (Sun, 16 Mar 2008) | 2 lines Manuel Moos: Map load failures (including missing spawn points) now let the map be reverted to the last known working map. ------------------------------------------------------------------------ r8321 | bazaarmagetron | 2008-03-15 01:56:28 +0100 (Sat, 15 Mar 2008) | 2 lines Manuel Moos: Voter always gets messages about the voting, no matter what privacy level is set. ------------------------------------------------------------------------ r8320 | bazaarmagetron | 2008-03-15 01:55:56 +0100 (Sat, 15 Mar 2008) | 2 lines Manuel Moos: Typo. ------------------------------------------------------------------------ r8318 | bazaarmagetron | 2008-03-14 13:35:44 +0100 (Fri, 14 Mar 2008) | 2 lines Manuel Moos: Added settings_authentication.cfg to list of configuration files to be distributed and installed. Whoops. ------------------------------------------------------------------------ r8317 | nemostultae | 2008-03-14 03:22:19 +0100 (Fri, 14 Mar 2008) | 2 lines Only use ZThread in dedicated build ------------------------------------------------------------------------ r8316 | wrtlprnft | 2008-03-13 23:54:34 +0100 (Thu, 13 Mar 2008) | 2 lines Have the server log the version of each connecting clients (I hope the max version the client sends is its current version) ------------------------------------------------------------------------ r8315 | wrtlprnft | 2008-03-12 21:56:31 +0100 (Wed, 12 Mar 2008) | 2 lines Don't look at this patch. Especially not z-man. ------------------------------------------------------------------------ r8313 | z-man | 2008-03-12 12:31:32 +0100 (Wed, 12 Mar 2008) | 2 lines Shuffling no longer uses tString::toInt so it can (and does) report input errors. ------------------------------------------------------------------------ r8312 | wrtlprnft | 2008-03-12 11:15:46 +0100 (Wed, 12 Mar 2008) | 2 lines Add new default settings to settings_authentication.cfg ------------------------------------------------------------------------ r8311 | bazaarmagetron | 2008-03-11 23:26:57 +0100 (Tue, 11 Mar 2008) | 4 lines author: Manuel Moos No more double "not allowed to rename" messages. Immediate response to admin player rename is "player will be renamed". ------------------------------------------------------------------------ r8310 | bazaarmagetron | 2008-03-11 23:25:06 +0100 (Tue, 11 Mar 2008) | 2 lines Manuel Moos: Applied epsy's name forcing patch with minor adaptions. ------------------------------------------------------------------------ r8309 | wrtlprnft | 2008-03-11 20:51:24 +0100 (Tue, 11 Mar 2008) | 2 lines more helpful "you can't shuffle up" message ------------------------------------------------------------------------ r8308 | wrtlprnft | 2008-03-11 20:36:35 +0100 (Tue, 11 Mar 2008) | 3 lines Actually make ACCESS_LEVEL_SHUFFLE_UP work... Don't look at the error, and if you do, please don't remember that I ever did such a stupid mistake. ------------------------------------------------------------------------ r8306 | nemostultae | 2008-03-11 02:20:36 +0100 (Tue, 11 Mar 2008) | 3 lines Xcode changed something. armagetronad-dedicated is now explicitly known as compiled.mach-o.executable filetype. Well done Xcode... ------------------------------------------------------------------------ r8305 | nemostultae | 2008-03-11 02:17:13 +0100 (Tue, 11 Mar 2008) | 2 lines Updated Mac OS X build instructions. ------------------------------------------------------------------------ r8304 | bazaarmagetron | 2008-03-10 22:14:59 +0100 (Mon, 10 Mar 2008) | 4 lines author: Manuel Moos QUIT now also works in the 'waiting for players, only spectators online' break. ------------------------------------------------------------------------ r8303 | bazaarmagetron | 2008-03-10 21:51:03 +0100 (Mon, 10 Mar 2008) | 2 lines Manuel Moos: Disabling silly displaylist stats for the dedicated server. ------------------------------------------------------------------------ r8302 | bazaarmagetron | 2008-03-10 17:12:58 +0100 (Mon, 10 Mar 2008) | 4 lines author: Manuel Moos Cleaned up a bit of the configuration recording and playback chaos. "Quit" console command is broken on playback currently in some situations. Silenced /msg chat no longer echoed to administrators and server console. ------------------------------------------------------------------------ r8301 | bazaarmagetron | 2008-03-09 21:52:55 +0100 (Sun, 09 Mar 2008) | 2 lines Manuel Moos: Removed unused variable. ------------------------------------------------------------------------ r8300 | bazaarmagetron | 2008-03-09 21:52:19 +0100 (Sun, 09 Mar 2008) | 2 lines Manuel Moos: Small fix: made non-krawall compilation of epsy's patch work. ------------------------------------------------------------------------ r8299 | bazaarmagetron | 2008-03-09 21:51:49 +0100 (Sun, 09 Mar 2008) | 2 lines Manuel Moos: Applied epsy's VOTING_SUSPEND patch. ------------------------------------------------------------------------ r8296 | wrtlprnft | 2008-03-09 18:10:34 +0100 (Sun, 09 Mar 2008) | 2 lines Added WAIT_FOR_EXTERNAL_SCRIPT, a feature found in armahacktron that facilitates stdio scripting. Thanks epsy for isolating it from the rest of armahacktron ------------------------------------------------------------------------ r8293 | z-man | 2008-03-09 16:07:30 +0100 (Sun, 09 Mar 2008) | 2 lines Typo. ------------------------------------------------------------------------ r8292 | z-man | 2008-03-09 16:05:28 +0100 (Sun, 09 Mar 2008) | 2 lines Added ROUND_SCORE_TEAM ladderlog message. ------------------------------------------------------------------------ r8291 | bazaarmagetron | 2008-03-08 21:25:28 +0100 (Sat, 08 Mar 2008) | 2 lines Manuel Moos: added bits. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r8365 | z-man | 2008-03-20 01:26:15 +0100 (Thu, 20 Mar 2008) | 2 lines Server compiles again. ------------------------------------------------------------------------ r8366 | nemostultae | 2008-03-20 06:46:38 +0100 (Thu, 20 Mar 2008) | 3 lines * Added paste support for Mac OS X. I'd modify scrap but it's too much of a mess. * Added tColor.cpp here too. ------------------------------------------------------------------------ r8367 | nemostultae | 2008-03-20 07:22:49 +0100 (Thu, 20 Mar 2008) | 2 lines Better handling of return value for paste on Mac OS X ------------------------------------------------------------------------ r8372 | bazaarmagetron | 2008-03-20 15:00:05 +0100 (Thu, 20 Mar 2008) | 2 lines wrtlprnft: Reverted a failed vim command (presumably) that "we" introduced in r7216 (concerning the addition of motion blur) ------------------------------------------------------------------------ r8388 | bazaarmagetron | 2008-03-24 21:32:10 +0100 (Mon, 24 Mar 2008) | 2 lines Manuel Moos: Removed annoying instachat that never makes it through default chat spam settings on 0.2.8.3 and replaced it with official version of the SHIFT-ESC prank. ------------------------------------------------------------------------ r8391 | bazaarmagetron | 2008-03-26 12:20:15 +0100 (Wed, 26 Mar 2008) | 2 lines Manuel Moos: Version 0 maps now also get zones v1 parsed. ------------------------------------------------------------------------ r8392 | bazaarmagetron | 2008-03-27 22:40:47 +0100 (Thu, 27 Mar 2008) | 2 lines epsy: how come we were missing ZONE_ALPHA_TOGGLE on trunk? :-) ------------------------------------------------------------------------ r8393 | wrtlprnft | 2008-03-30 22:19:04 +0200 (Sun, 30 Mar 2008) | 2 lines "fixed" a compiler warning ------------------------------------------------------------------------ r8395 | bazaarmagetron | 2008-04-02 14:34:13 +0200 (Wed, 02 Apr 2008) | 2 lines wrtlprnft: Fixed erroneous update of spawnDir that caused the minimap to rotate sometimes when it wasn't supposed to. ------------------------------------------------------------------------ r8396 | bazaarmagetron | 2008-04-02 14:34:57 +0200 (Wed, 02 Apr 2008) | 2 lines wrtlprnft: meh, always pull before you ci ------------------------------------------------------------------------ r8411 | bazaarmagetron | 2008-04-18 12:19:59 +0200 (Fri, 18 Apr 2008) | 2 lines wrtlprnft: Fixed an include safeguard that probably caused voodoo quite a headache ------------------------------------------------------------------------ r8412 | bazaarmagetron | 2008-04-18 20:14:03 +0200 (Fri, 18 Apr 2008) | 2 lines epsy46: Fixed client always thinking he was right about it's name, it somehow didn't happen in 0.2.8, also, let's see if my name gets detected properly :P ------------------------------------------------------------------------ r8414 | bazaarmagetron | 2008-04-19 00:54:32 +0200 (Sat, 19 Apr 2008) | 2 lines epsy46: manual merge of 0.2.8:810, because i don't have a clue on how to do that and everyone is sleeping :) ------------------------------------------------------------------------ r8420 | bazaarmagetron | 2008-04-19 21:11:14 +0200 (Sat, 19 Apr 2008) | 2 lines wrtlprnft: replaced strlen(<string>) >= 8 by strnlen(<string>, 8) >= 8 in three places ------------------------------------------------------------------------ r8438 | bazaarmagetron | 2008-04-23 19:25:57 +0200 (Wed, 23 Apr 2008) | 2 lines wrtlprnft: replaced strnlen by our own implementation because it's nonstandard. If anyone knows how to use the (probably optimized) glibc version if it exists, please do it :-) ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8363&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7995&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8230&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8269&view=rev http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8286&view=rev Modified Paths: -------------- armagetronad/trunk/armagetronad/NEWS armagetronad/trunk/armagetronad/config/default.cfg armagetronad/trunk/armagetronad/config/settings_authentication.cfg armagetronad/trunk/armagetronad/config/settings_dedicated.cfg armagetronad/trunk/armagetronad/language/english_base.txt 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/engine/eTeam.cpp armagetronad/trunk/armagetronad/src/engine/eVoter.cpp armagetronad/trunk/armagetronad/src/engine/eVoter.h armagetronad/trunk/armagetronad/src/network/nAuthentication.cpp armagetronad/trunk/armagetronad/src/network/nNetwork.cpp armagetronad/trunk/armagetronad/src/network/nNetwork.h armagetronad/trunk/armagetronad/src/network/nSpamProtection.cpp armagetronad/trunk/armagetronad/src/network/nSpamProtection.h armagetronad/trunk/armagetronad/src/render/rFont.cpp armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp armagetronad/trunk/armagetronad/src/tools/tString.cpp armagetronad/trunk/armagetronad/src/tron/gCycle.cpp armagetronad/trunk/armagetronad/src/tron/gCycleMovement.cpp armagetronad/trunk/armagetronad/src/tron/gGame.cpp armagetronad/trunk/armagetronad/src/tron/gTeam.cpp armagetronad/trunk/armagetronad/src/tron/gWall.cpp armagetronad/trunk/armagetronad/src/tron/gWinZone.cpp Modified: armagetronad/trunk/armagetronad/NEWS =================================================================== --- armagetronad/trunk/armagetronad/NEWS 2008-04-25 16:45:31 UTC (rev 8440) +++ armagetronad/trunk/armagetronad/NEWS 2008-04-25 18:00:53 UTC (rev 8441) @@ -89,6 +89,10 @@ ------------ New settings and commands: +- MIN_PLAY_TIME_*: minimal play time required before you are allowed to + play on this server. +- SPAM_AUTOKICK_COUNT: minimal number of spam warning messages you get in a + row before you get kicked. - FORTRESS_COLLAPSE_SPEED: tune the collapse speed of fortress zones. - VOTE_KICK_REASON: default reason given on kick votes. - "/vote" chat interface to votes; "/vote kick <player>" issues a kick vote. @@ -160,6 +164,14 @@ "[L] " - PLAYER_MESSAGE <user ID or name> <Message>: Like /msg, but from the console +- All ladderlog outputs can be enabled or disabled separately by using + LADDERLOG_WRITE_*. LADDERLOG_WRITE_ALL enables or disables all ladderlog + output alltogether. +- SLAP <player> [points] sends a message to everyone and subtracts a number + of points (default: 1) from <player>'s score. Negative points are + supported. +- AUTO_TEAM_SPEC_SPAM to disable the spectator join/leave messages you get + when AUTO_TEAM is enabled If --enable-armathentication was activated: - ACCESS_LEVEL_IPS to let admins see IPs of players in the list. @@ -179,11 +191,17 @@ - /lock, /unlock, /invite and /uninvite team management chat for players of access level ACCESS_LEVEL_TEAM or better. - /login chat command then uses the more secure hashed base logins +- new chat commands /op and /deop to change other players' access rights Featurelets ----------- - /teams chat command that rougly prints team layout. +- clientside play time tracking and server controlled minimal required experience + to be allowed to play. +- color codes in chat increase the spam level logarithmically. +- /team messages get a reduced spam level; reduction factor is given by + (team size)/(number of total players). - /team messages can be used by spectators to chat with other spectators only. - Performance optimizations. Using OpenGL display lists to cache geometry. - Removed ztrick, antialiasing and perspective correction settings. They all had only one right @@ -247,6 +265,7 @@ - /help command that supports multiple help topics. Use HELP_INTRODUCTORY_BLURB and ADD_HELP_TOPIC to control its contents - /rtfm command that allows moderators to send help messages to newbies +- /players now shows the players' color and allows searching Bugfixes -------- Modified: armagetronad/trunk/armagetronad/config/default.cfg =================================================================== --- armagetronad/trunk/armagetronad/config/default.cfg 2008-04-25 16:45:31 UTC (rev 8440) +++ armagetronad/trunk/armagetronad/config/default.cfg 2008-04-25 18:00:53 UTC (rev 8441) @@ -6,6 +6,12 @@ SERVER_NAME Unnamed Server CM_LOCY -0.5 +# no play time +PLAY_TIME_TOTAL 0 +PLAY_TIME_MULTIPLAYER 0 +PLAY_TIME_TEAM 0 + +# default keyboard layout 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/settings_authentication.cfg =================================================================== --- armagetronad/trunk/armagetronad/config/settings_authentication.cfg 2008-04-25 16:45:31 UTC (rev 8440) +++ armagetronad/trunk/armagetronad/config/settings_authentication.cfg 2008-04-25 18:00:53 UTC (rev 8441) @@ -181,12 +181,12 @@ ACCESS_LEVEL_RTFM 2 -# To use the /op, /dop, /promote and /demote ad-hoc access level modifying +# To use the /op and /deop ad-hoc access level modifying # commands, you need ot have at least ACCESS_LEVEL_OP 7 -# and these commands cannot raise the level of a user above +# and that command cannot directly raise the level of a user above ACCESS_LEVEL_OP_MAX 2 Modified: armagetronad/trunk/armagetronad/config/settings_dedicated.cfg =================================================================== --- armagetronad/trunk/armagetronad/config/settings_dedicated.cfg 2008-04-25 16:45:31 UTC (rev 8440) +++ armagetronad/trunk/armagetronad/config/settings_dedicated.cfg 2008-04-25 18:00:53 UTC (rev 8441) @@ -172,9 +172,10 @@ SPAM_PROTECTION 4.0 # minimum average time between chat messages in seconds so they are not considered spamming. Increase for more spam protection. SPAM_PROTECTION_VOTE 50.0 # Extra factor for SPAM_PROTECTION for votes. Increase for more spam protection. -SPAM_PROTECTION_CHAT 1.0 # Extra factor for SPAM_PROTECTION for chat messages. Increase for more spam protection. -SPAM_PENALTY 3.0 # spam penalty to add on spam detection +SPAM_PROTECTION_CHAT .3 # Extra factor for SPAM_PROTECTION for chat messages. Increase for more spam protection. +SPAM_PENALTY 0.0 # spam penalty to add on spam detection. This makes repeated spams extra painful. SPAM_AUTOKICK 14.0 # spam protection value that causes someone to get instantly kicked +SPAM_AUTOKICK_COUNT 3 # minimal number of spam warnings before someone is kicked for spam. SPAM_MAXLEN 80 # maximal length of chat message # voting @@ -229,6 +230,17 @@ DEFAULT_KICK_TO_SERVER # default server to kick/move to (IP or hostname) DEFAULT_KICK_TO_PORT 4534 # default port of the server to kick/move to +# Minimal play time requirements. Clients starting from 0.2.8.3 record the play time +# in three categories: total play time (all games count), online play time (games on +# a server count) and team play time (only online games with teammates count). +# With the following settings, you can keep players lacking experience in these +# categories out of the game. Players not meeting the requirements will be forced +# to spectate. + +MIN_PLAY_TIME_TOTAL 0.0 # required total play time in minutes +MIN_PLAY_TIME_ONLINE 0.0 # required online play time in minutes +MIN_PLAY_TIME_TEAM 0.0 # required team play time in minutes + ############################################################################################ # # Game settings Modified: armagetronad/trunk/armagetronad/language/english_base.txt =================================================================== --- armagetronad/trunk/armagetronad/language/english_base.txt 2008-04-25 16:45:31 UTC (rev 8440) +++ armagetronad/trunk/armagetronad/language/english_base.txt 2008-04-25 18:00:53 UTC (rev 8441) @@ -197,11 +197,22 @@ auto_team_help Flag indicating whether players should be put into teams automatically. no_spectators_allowed Sorry, does not work with automatic team assignment.\n +auto_team_spec_spam_help If set to 0, spectators won't be announced when joining or leaving, provided AUTO_TEAM is set to 0. allow_team_name_color_help Allow a team to be named after a color allow_team_name_player_help Allow a team to be named after the leading player allow_team_name_leader_help Set to 1 to allow team leader to set a team, 0 otherwise. +play_time_total_help Total time in minutes someone has played with this client +play_time_online_help Total time in minutes someone has played with this client online +play_time_team_help Total time in minutes someone has played with this client in a team +min_play_time_total_help Total play time in minutes required to play here +min_play_time_online_help Online play time in minutes required to play here +min_play_time_team_help Team play time in minutes required to play here +play_time_total_lacking You cannot play here; first, you need to get more general experience. Play somewhere else (local games count) for \1 minutes, then you can come back here and play.\n +play_time_online_lacking You cannot play here; first, you need to get more online experience. Play on other servers for \1 minutes, then you can come back here and play.\n +play_time_team_lacking You cannot play here; first, you need to get more team play experience. Play on other team servers for \1 minutes, then you can come back here and play.\n + team_name_1_help name of team 1 team_name_2_help name of team 2 team_name_3_help name of team 3 @@ -370,6 +381,7 @@ spam_penalty_help Number of seconds to silence a spammer. spam_maxlen_help Maximal length of chat message. spam_autokick_help Spam score that causes you to get kicked instantly. +spam_autokick_count_help Number of spam warnings before a player gets spamkicked. silence_all_help If set to 1, new players will be silenced enable_chat_help If set to 0, all chat will be surpressed (if reset on the server, messages from logged in players and private/team messages are still shown) allow_team_change_help If set to 1, all players can change teams. If set to 0, players can only change teams if they've been specifically allowed to by ALLOW_TEAM_CHANGE_PLAYER @@ -688,6 +700,10 @@ 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_write_all_help Set all the LADDER_LOG_WRITE_* settings to the same value +ladderlog_write_all_usage Usage: LADDER_LOG_WRITE_ALL 1|0 +ladderlog_write_all_enabled Enabled full ladderlog output. +ladderlog_write_all_disabled Disabled ladderlog output. ladderlog_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 @@ -845,6 +861,8 @@ ban_list_help Prints a list of currently banned IPs. unban_ip_help Revokes the ban of the specified IP address. +player_list_hidden_player_prefix_help The prefix that is shown on hidden players' Global ID and access level when we can see it. + # communication console_message_help Prints a message on the console of all connected clients. center_message_help Prints a big message on the screen of all connected clients. @@ -2218,6 +2236,9 @@ instant_death_activated Death zone activated! Avoid it!\n player_admin_kill \1 0xRESETTwas smitten by an administrator.\n +player_admin_slap_free \1 0xRESETThas been slapped by an administrator.\n +player_admin_slap_win \1 has been hugged by an administrator and got \2 points.\n +player_admin_slap_lose \1 has been slapped by an administrator and lost \2 points.\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 @@ -2314,8 +2335,7 @@ remove_help_topic_success Removed help topic "\1".\n remove_help_topic_notfound Help topic "\1" doesn't exist.\n -rtfm_announcement \1 wants you to know about the following help topic:\n -rtfm_success \1 got the following message:\n +rtfm_announcement \2 wants \3 to know about /help \1.\n help_introductory_blurb_help Message that is displayed before the list of help topics if someone uses /help without arguments @@ -2332,11 +2352,10 @@ help_commands_team_text 0x88ff88/teamshuffle0xffff88: Shuffle yourself to be at the outside of your team's wingmen formation\n0x88ff88/teamshuffle <position>0xffff88: Shuffle yourself to be at a specific position\n0x88ff88/teamshuffle [+|-]<offset>0xffff88: Shuffle yourself up/down by a certain number of ranks\n0x88ff88/teamleave0xffff88: Leave your current team. Only works on some servers\n0x88ff88/teams0xffff88: Get a list of all teams with a somewhat graphic representation of their formation help_commands_pp_shortdesc Player police commands -help_commands_pp_text 0x88ff88/players0xffff88: Get a list of all players, along with some other information\n0x88ff88/vote kick|suspend <player>0xffff88: Start a poll to kick or suspend a player +help_commands_pp_text 0x88ff88/players [<search>]0xffff88: Get a list of all players, along with some other information. You can also match specific users with the search argument.\n0x88ff88/vote kick|suspend <player>0xffff88: Start a poll to kick or suspend a player help_commands_auth_shortdesc Authentication related commands -help_commands_auth_text 0x88ff88/login [<user>]@<authority>0xffff88: Authenticate yourself using a given authority. Try @forums if you have an account at http://forums.armagetronad.net/\n0x88ff88/logout0xffff88: Log out so you can log back in as another player\n0x88ff88/vote include <file>0xffff88: Start a poll to include a given file\n0x88ff88/vote command <command>0xffff88: Start a poll to execute an admin command\n0x88ff88/admin <command>0xffff88: Execute a console command on the server if you have sufficient access rights\n0x88ff88/op <player> <optional access level>0xffff88: Gives another player a higher access level; the level defaults to the level one lower than you access level, which is also the maximal possible level\n0x88ff88/deop <player>0xffff88: Reverses /op; it takes away a player's access level, effectively making him unauthenticated again. Only works on players of lower access level than yours, of course.\n0x88ff88/promote <player> <optional steps>0xffff88: elevates a player's access level the given number of steps (default: one)\n0x88ff88/demote <player> <optional steps>0xffff88: lowers a player's access level the given number of steps (default: one) - +help_commands_auth_text 0x88ff88/login [<user>]@<authority>0xffff88: Authenticate yourself using a given authority. Try @forums if you have an account at http://forums.armagetronad.net/\n0x88ff88/logout0xffff88: Log out so you can log back in as another player\n0x88ff88/vote include <file>0xffff88: Start a poll to include a given file\n0x88ff88/vote command <command>0xffff88: Start a poll to execute an admin command\n0x88ff88/admin <command>0xffff88: Execute a console command on the server if you have sufficient access rights\n0x88ff88/op <player> [+|-]<optional access level>0xffff88: Gives another player a higher or a lower access level; the level defaults to the level one lower than you access level, which is also the maximal possible level\n0x88ff88/deop <player>0xffff88: Reverses /op; it takes away a player's access level, effectively making him unauthenticated again. Only works on players of lower access level than yours, of course.\n help_commands_auth_levels_shortdesc List of all access levels help_commands_auth_levels_text 0x88ff880 (Owner)0xffff88: The owner of the server. Commands entered on the server console are executed with these rights.\n0x88ff881 (Admin)0xffff88: A server administrator. By default, almost as powerful as the owner himself.\n0x88ff882 (Moderator)0xffff88: A server moderator. Is still allowed to use /admin, but is restricted to player management commands.\n0x88ff887 (Team Leader)0xffff88: Leader of a team. By default, no admin rights at all.\n0x88ff888 (Team Member)0xffff88: Member of a team. Local team accounts get this level.\n0x88ff8812 (Local User)0xffff88: Players with local accounts get this level.\n0x88ff8815 (Remote User)0xffff88: Players with remote accounts get this level by default.\n0x88ff8816 (Fallen from Grace)0xffff88: Authenticated players who ab... [truncated message content] |
From: <baz...@us...> - 2008-04-27 13:04:26
|
Revision: 8442 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8442&view=rev Author: bazaarmagetron Date: 2008-04-27 06:04:18 -0700 (Sun, 27 Apr 2008) Log Message: ----------- epsy46: colored team names in team menu Modified Paths: -------------- armagetronad/trunk/armagetronad/src/engine/eTeam.cpp armagetronad/trunk/armagetronad/src/engine/eTeam.h armagetronad/trunk/armagetronad/src/tron/gTeam.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-23 19:07:38.540999889 +0200 committer: wrtlprnft <wrt...@us...> properties: branch-nick: trunk-armagetronad-work + timestamp: 2008-04-27 16:58:18.187999964 +0200 committer: epsy46 <ep...@fr...> properties: branch-nick: trunk 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 + 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph Modified: armagetronad/trunk/armagetronad/src/engine/eTeam.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eTeam.cpp 2008-04-25 18:00:53 UTC (rev 8441) +++ armagetronad/trunk/armagetronad/src/engine/eTeam.cpp 2008-04-27 13:04:18 UTC (rev 8442) @@ -303,6 +303,14 @@ r = g = b = 7; } + if ( oldr != r || oldg != g || oldb != b || name != updateName) + { + tColoredString newColoredName; + newColoredName << tColoredString::ColorString(r,g,b) + << name; + coloredName = newColoredName; + } + // if the name has been changed then update it if (name!=updateName) { @@ -314,13 +322,13 @@ tOutput message; tColoredString name; name << *oldest; - name << tColoredString::ColorString(1,1,1); + name << tColoredString::ColorString(-1,-1,-1); message.SetTemplateParameter(1, name); tColoredString resetColor; resetColor << tColoredString::ColorString(r,g,b); resetColor << updateName; - resetColor << tColoredString::ColorString(1,1,1); + resetColor << tColoredString::ColorString(-1,-1,-1); message.SetTemplateParameter(2, resetColor); message << "$team_renamed"; sn_ConsoleOut(message); Modified: armagetronad/trunk/armagetronad/src/engine/eTeam.h =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eTeam.h 2008-04-25 18:00:53 UTC (rev 8441) +++ armagetronad/trunk/armagetronad/src/engine/eTeam.h 2008-04-27 13:04:18 UTC (rev 8442) @@ -54,6 +54,7 @@ unsigned short r,g,b; // team color tString name; // our name + tString coloredName; //!< our colored name bool locked_; //!< if set, only invited players may join @@ -174,6 +175,9 @@ const tString& Name() const { return name; } + const tString& ColoredName() const { + return coloredName; + } virtual void PrintName(tString &s) const; // print out an understandable name in to s Modified: armagetronad/trunk/armagetronad/src/tron/gTeam.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gTeam.cpp 2008-04-25 18:00:53 UTC (rev 8441) +++ armagetronad/trunk/armagetronad/src/tron/gTeam.cpp 2008-04-27 13:04:18 UTC (rev 8442) @@ -60,7 +60,7 @@ } // Handling the $team_join template ;) - text->SetTemplateParameter(1 , team->Name() ); + text->SetTemplateParameter(1 , team->ColoredName() ); text->SetTemplateParameter(2 , team->NumPlayers() ); if (team->PlayerMayJoin(player)) text->SetTemplateParameter(3, se_TeamMenu_Team_Ok); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-04-28 15:45:51
|
Revision: 8445 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8445&view=rev Author: bazaarmagetron Date: 2008-04-28 08:36:08 -0700 (Mon, 28 Apr 2008) Log Message: ----------- epsy46: Build the colored team name each time instead Modified Paths: -------------- armagetronad/trunk/armagetronad/src/engine/eTeam.cpp armagetronad/trunk/armagetronad/src/engine/eTeam.h armagetronad/trunk/armagetronad/src/tron/gTeam.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-27 16:58:18.187999964 +0200 committer: epsy46 <ep...@fr...> properties: branch-nick: trunk + timestamp: 2008-04-28 18:45:18.319999933 +0200 committer: epsy46 properties: branch-nick: trunk 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph + 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y Modified: armagetronad/trunk/armagetronad/src/engine/eTeam.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eTeam.cpp 2008-04-28 14:03:46 UTC (rev 8444) +++ armagetronad/trunk/armagetronad/src/engine/eTeam.cpp 2008-04-28 15:36:08 UTC (rev 8445) @@ -303,14 +303,6 @@ r = g = b = 7; } - if ( oldr != r || oldg != g || oldb != b || name != updateName) - { - tColoredString newColoredName; - newColoredName << tColoredString::ColorString(r,g,b) - << name; - coloredName = newColoredName; - } - // if the name has been changed then update it if (name!=updateName) { Modified: armagetronad/trunk/armagetronad/src/engine/eTeam.h =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eTeam.h 2008-04-28 14:03:46 UTC (rev 8444) +++ armagetronad/trunk/armagetronad/src/engine/eTeam.h 2008-04-28 15:36:08 UTC (rev 8445) @@ -54,7 +54,6 @@ unsigned short r,g,b; // team color tString name; // our name - tString coloredName; //!< our colored name bool locked_; //!< if set, only invited players may join @@ -175,9 +174,6 @@ const tString& Name() const { return name; } - const tString& ColoredName() const { - return coloredName; - } virtual void PrintName(tString &s) const; // print out an understandable name in to s Modified: armagetronad/trunk/armagetronad/src/tron/gTeam.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gTeam.cpp 2008-04-28 14:03:46 UTC (rev 8444) +++ armagetronad/trunk/armagetronad/src/tron/gTeam.cpp 2008-04-28 15:36:08 UTC (rev 8445) @@ -58,9 +58,13 @@ *text << textTemplate; return text; } + // Build a colored team name + tColoredString teamname; + teamname << tColoredString::ColorString( team->R() , team->G () , team->B() ) + << team->Name(); // Handling the $team_join template ;) - text->SetTemplateParameter(1 , team->ColoredName() ); + text->SetTemplateParameter(1 , teamname ); text->SetTemplateParameter(2 , team->NumPlayers() ); if (team->PlayerMayJoin(player)) text->SetTemplateParameter(3, se_TeamMenu_Team_Ok); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-04-29 17:50:08
|
Revision: 8447 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8447&view=rev Author: bazaarmagetron Date: 2008-04-29 10:50:06 -0700 (Tue, 29 Apr 2008) Log Message: ----------- epsy46: working team colors in team menu Modified Paths: -------------- armagetronad/trunk/armagetronad/src/tron/gTeam.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-28 18:45:18.319999933 +0200 committer: epsy46 properties: branch-nick: trunk + timestamp: 2008-04-29 21:44:30.609999895 +0200 committer: epsy46 properties: branch-nick: trunk 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y + 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz Modified: armagetronad/trunk/armagetronad/src/tron/gTeam.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gTeam.cpp 2008-04-28 15:49:35 UTC (rev 8446) +++ armagetronad/trunk/armagetronad/src/tron/gTeam.cpp 2008-04-29 17:50:06 UTC (rev 8447) @@ -60,7 +60,7 @@ } // Build a colored team name tColoredString teamname; - teamname << tColoredString::ColorString( team->R() , team->G () , team->B() ) + teamname << tColoredString::ColorString( team->R() / 15.0 , team->G() / 15.0 , team->B() / 15.0 ) << team->Name(); // Handling the $team_join template ;) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-05-18 13:24:27
|
Revision: 8467 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8467&view=rev Author: bazaarmagetron Date: 2008-05-18 06:24:31 -0700 (Sun, 18 May 2008) Log Message: ----------- epsy46: SILENCE/VOICE works on client too Modified Paths: -------------- armagetronad/trunk/armagetronad/language/english_base.txt armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-04-29 21:44:30.609999895 +0200 committer: epsy46 properties: branch-nick: trunk + timestamp: 2008-05-18 15:18:39.105000019 +0200 committer: epsy46 <ep...@fr...> properties: branch-nick: trunk 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz + 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m Modified: armagetronad/trunk/armagetronad/language/english_base.txt =================================================================== --- armagetronad/trunk/armagetronad/language/english_base.txt 2008-05-17 16:08:51 UTC (rev 8466) +++ armagetronad/trunk/armagetronad/language/english_base.txt 2008-05-18 13:24:31 UTC (rev 8467) @@ -2273,7 +2273,9 @@ spam_protection_silenced SPAM PROTECTION: you have been silenced by the server administrator.\n spam_protection_silenced_default SPAM PROTECTION: you have to be given voice in order to chat publically.\n player_silenced \10xff7777 has been silenced.\n +player_silenced_local \10xff7777 has been locally silenced.\n player_voiced \10x77ff77 has been given his voice back.\n +player_voiced_local \10x77ff77 has been locally voiced.\n player_allowed_teamchange \10x77ff77 has been allowed to change his team.\n player_disallowed_teamchange \10xff7777 cannot change teams anymore.\n vote_spam_protection VOTE SPAM PROTECTION: you are disallowed from issuing votes for the next \1 seconds.\n Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-05-17 16:08:51 UTC (rev 8466) +++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2008-05-18 13:24:31 UTC (rev 8467) @@ -1632,7 +1632,7 @@ ePlayerNetID * ePlayerNetID::FindPlayerByName( tString const & name, ePlayerNetID * requester ) { - int num_matches = 0; + int num_matches = 0; // try filtering the names before comparing them, this makes the matching case-insensitive SE_NameFilter Filter = &ePlayerNetID::FilterName; @@ -7225,21 +7225,26 @@ tString name; s >> name; - int num = name.ToInt(); - if ( num > 0 ) + try { - // look for a player from that client - for ( int i = se_PlayerNetIDs.Len()-1; i>=0; --i ) + int num = name.ToInt(); + + if ( num > 0 ) { - ePlayerNetID* p = se_PlayerNetIDs(i); + // look for a player from that client + for ( int i = se_PlayerNetIDs.Len()-1; i>=0; --i ) + { + ePlayerNetID* p = se_PlayerNetIDs(i); - // check whether it's p who should be returned - if ( p->Owner() == num ) - { - return p; + // check whether it's p who should be returned + if ( p->Owner() == num ) + { + return p; + } } } - } + // name.ToInt will throw a tGenericException when name doesn't look like an int, but it's not fatal, so we will just go on + } catch ( tGenericException ) {} return ePlayerNetID::FindPlayerByName( name ); } @@ -7333,17 +7338,17 @@ static void Silence_conf(std::istream &s) { - if ( se_NeedsServer( "SILENCE", s ) ) - { - return; - } - ePlayerNetID * p = ReadPlayer( s ); if ( p && !p->IsSilenced() ) { - sn_ConsoleOut( tOutput( "$player_silenced", p->GetColoredName() ) ); +#ifndef DEDICATED + if ( sn_GetNetState() == nCLIENT ) + sn_ConsoleOut( tOutput( "$player_silenced_local", p->GetColoredName() ) ); + else +#endif + sn_ConsoleOut( tOutput( "$player_silenced", p->GetColoredName() ) ); p->SetSilenced( true ); - } + } } static tConfItemFunc silence_conf("SILENCE",&Silence_conf); @@ -7351,15 +7356,15 @@ static void Voice_conf(std::istream &s) { - if ( se_NeedsServer( "VOICE", s ) ) - { - return; - } - ePlayerNetID * p = ReadPlayer( s ); if ( p && p->IsSilenced() ) { - sn_ConsoleOut( tOutput( "$player_voiced", p->GetColoredName() ) ); +#ifndef DEDICATED + if ( sn_GetNetState() == nCLIENT ) + sn_ConsoleOut( tOutput( "$player_voiced_local", p->GetColoredName() ) ); + else +#endif + sn_ConsoleOut( tOutput( "$player_voiced", p->GetColoredName() ) ); p->SetSilenced( false ); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-06-18 21:34:38
|
Revision: 8489 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8489&view=rev Author: bazaarmagetron Date: 2008-06-18 14:34:39 -0700 (Wed, 18 Jun 2008) Log Message: ----------- Manuel Moos: Don't do FTGL include path magic if it is not required because pkgconfig gives something that looks like a correct path. Modified Paths: -------------- armagetronad/trunk/armagetronad/configure.ac Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-05-18 15:18:39.105000019 +0200 committer: epsy46 <ep...@fr...> properties: branch-nick: trunk + timestamp: 2008-06-18 23:25:20.809999943 +0200 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m + 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 Modified: armagetronad/trunk/armagetronad/configure.ac =================================================================== --- armagetronad/trunk/armagetronad/configure.ac 2008-06-14 23:09:23 UTC (rev 8488) +++ armagetronad/trunk/armagetronad/configure.ac 2008-06-18 21:34:39 UTC (rev 8489) @@ -744,8 +744,10 @@ test -z "$FREETYPE_CONFIG" && FREETYPE_CONFIG=freetype-config +FTGL_CFLAGS="`pkg-config ftgl --cflags`" + AC_CHECK_LIB(ftgl,FT_Render_Glyph, -CPPFLAGS="$CPPFLAGS `pkg-config ftgl --cflags`" +CPPFLAGS="$CPPFLAGS $FTGL_CFLAGS" LIBS="$LIBS `pkg-config ftgl --libs`" , AC_MSG_ERROR([You need the library ftgl to compile Armagetron. Read the file doc/install_linux.html.]), @@ -754,7 +756,7 @@ USE_FTGL=yes -# `pkg-config ftgl --cflags` doesn't reliably give the include path to FTGL itself, we are on our own finding the includes +# `pkg-config ftgl --cflags` doesn't reliably give the include path to FTGL itself, we are on our own finding the includes in some cases. # look for FTGL headers in default system header locations and the prefixes of the libraries that do have a -config script FTGL_HEADERS="/usr/include/FTGL /usr/local/include/FTGL `$FREETYPE_CONFIG --prefix`/include/FTGL `$SDL_CONFIG --prefix`/include/FTGL `$XML2_CONFIG --prefix/`include/FTGL ${prefix}/include/FTGL " @@ -769,20 +771,22 @@ ) # candidates are collected, walk through them -found=false -AC_MSG_CHECKING(for location of FTGL includes) -for candidate in ${FTGL_HEADERS}; do - if test -r ${candidate}/FTGL.h; then - AC_MSG_RESULT(${candidate}) - CPPFLAGS="$CPPFLAGS -I${candidate}" - found=true - break +if test -z "`echo $FTGL_CFLAGS | grep FTGL`"; then + found=false + AC_MSG_CHECKING(for location of FTGL includes) + for candidate in ${FTGL_HEADERS}; do + if test -r ${candidate}/FTGL.h; then + AC_MSG_RESULT(${candidate}) + CPPFLAGS="$CPPFLAGS -I${candidate}" + found=true + break + fi + done + + if test ${found} = false; then + AC_MSG_RESULT(not found) + AC_MSG_ERROR([FTGL headers not found on your system. Please pass the correct location via --with-ftgl=<path to FTGL include directory>.]) fi -done - -if test ${found} = false; then - AC_MSG_RESULT(not found) - AC_MSG_ERROR([FTGL headers not found on your system. Please pass the correct location via --with-ftgl=<path to FTGL include directory>.]) fi dnl ************************************************* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-07-08 15:24:44
|
Revision: 8502 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8502&view=rev Author: bazaarmagetron Date: 2008-07-08 08:23:38 -0700 (Tue, 08 Jul 2008) Log Message: ----------- wrtlprnft: Explicitly stating that the latin-1 encoding should be used for rendered strings. Hopefully avoids the UTF-8 feature of newer FTGL versions until we actually use UTF-8 :-) Modified Paths: -------------- armagetronad/trunk/armagetronad/src/render/rFont.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-06-18 23:25:20.809999943 +0200 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2008-07-08 16:23:00.000000000 +0200 committer: wrtlprnft <wrt...@us...> properties: branch-nick: trunk-armagetronad-work bugs: https://launchpad.net/bugs/246159 fixed 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 + 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 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf Modified: armagetronad/trunk/armagetronad/src/render/rFont.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/render/rFont.cpp 2008-07-07 18:24:41 UTC (rev 8501) +++ armagetronad/trunk/armagetronad/src/render/rFont.cpp 2008-07-08 15:23:38 UTC (rev 8502) @@ -363,6 +363,7 @@ font = Load(tDirectories::Data().GetReadPath("textures/Armagetronad.ttf")); } + font->CharMap(ft_encoding_latin_1); font->FaceSize(size); (*this)[size] = font; return *font; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |