head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.52 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.50 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.48 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.46 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.44 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.42 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.40 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.38 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.36 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.34 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.32 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.30 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.28 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.26 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.24 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.22 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.20 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.18 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.16 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.14 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.12 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.10 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.8 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.6 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.4 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.1.1.1.0.4 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.2 netbsd-1-6-1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2004.03.02.23.14.31; author snj; state dead; branches; next 1.2; 1.2 date 2003.12.13.10.32.53; author xtraeme; state Exp; branches; next 1.1; 1.1 date 2002.09.24.12.49.12; author blymn; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.09.24.12.49.12; author blymn; state Exp; branches; next ; desc @@ 1.3 log @Update to bzflag-1.10.4. Changes: * Allow variable number of team flags per team with +f bzfs option * bots now fully handle collision check * Notify players when reassigned to a different team on join * Allow multiple bases per team * Alt-Tab & resolution changes do not mess up the screen * No shooting allowed if OO flag is lost in a building * Unclean client disconnects are recognized earlier * Color carried team flags according to their team * Start of better spawn positions based on tanks * Various texture improvements * Add experimental quality setting for enhanced effects * Increase moon segments for exp. quality * Stop infinite spawn loop with complex worlds containing big pyramids * Don't spawn in multiple locations based on multiple r-clicks * Fix Respawning after non-shot kills * Relax kick tolerances and soften kick messages * Remove bad lite effects with Thief steal * Protect against crashes due to bad shot ids * Relax flag drop time for speed checking * Better unresponsive player removal messages * Let genocided players spawn again * Many other bugfixes @ text @$NetBSD: patch-ac,v 1.2 2003/12/13 10:32:53 xtraeme Exp $ --- src/bzadmin/Makefile.in.orig 2003-12-13 11:01:09.000000000 +0100 +++ src/bzadmin/Makefile.in 2003-12-13 11:01:28.000000000 +0100 @@@@ -128,7 +128,7 @@@@ PROGRAMS = $(bin_PROGRAMS) -DEFS = @@DEFS@@ -I. -I$(srcdir) -I../../include +DEFS = @@DEFS@@ -I. -I$(srcdir) -I../../include -I${BUILDLINK_DIR}/include CPPFLAGS = @@CPPFLAGS@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ @ 1.2 log @Updated to 1.10.0. The ChangeLog is huge. Selected new features include: * vote based kicking * tunable game parameters like gravity and world size * smarter bots * world weapons * bzadmin text client * autopilot * rabbit game style * single port networking And more... please review Changelog for a detailed list of changes. pkgsrc changes: o USE_X11BASE not needed anymore. I'm sorry, only tested on NetBSD/FreeBSD x86, I need more hardware... @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 11 a13 217 --- src/platform/NetBSDDisplay.cxx.orig Sun Sep 22 22:29:02 2002 +++ src/platform/NetBSDDisplay.cxx @@@@ -0,0 +1,214 @@@@ +/* bzflag + * Copyright (c) 1993 - 2002 Tim Riker + * + * This package is free software; you can redistribute it and/or + * modify it under the terms of the license found in the file + * named LICENSE that should have accompanied this file. + * + * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + */ + +#include "NetBSDDisplay.h" +#include "XWindow.h" + +#if defined(USE_XF86VIDMODE_EXT) +#include + +// evaluates to the (approximate) vertical retrace speed of modeinfo _r +#define getRetrace(_r) ((int)(0.5f + (1000.0f * (_r)->dotclock) / \ + ((_r)->htotal * (_r)->vtotal))) + +static int resolutionCompare(const void* _a, const void* _b) +{ + const XF86VidModeModeInfo* a = *((const XF86VidModeModeInfo**)_a); + const XF86VidModeModeInfo* b = *((const XF86VidModeModeInfo**)_b); + + // test the stuff we actually care about + if (a->hdisplay < b->hdisplay) return -1; + if (a->hdisplay > b->hdisplay) return 1; + if (a->vdisplay < b->vdisplay) return -1; + if (a->vdisplay > b->vdisplay) return 1; + if (getRetrace(a) < getRetrace(b)) return -1; + if (getRetrace(a) > getRetrace(b)) return 1; + + // other info can be ordered arbitrarily + return 0; +} + +// +// NetBSDDisplayMode +// + +NetBSDDisplayMode::NetBSDDisplayMode() : display(NULL), + numResolutions(0), + lastResolution(-1), + resolutions(NULL), + origNumResolutions(0), + origResolutions(NULL) +{ + // do nothing +} + +NetBSDDisplayMode::~NetBSDDisplayMode() +{ + delete[] resolutions; + if (origResolutions) + XFree(origResolutions); +} + +XDisplayMode::ResInfo** NetBSDDisplayMode::init(XDisplay* _display, + int& numModes, int& currentMode) +{ + int i, eventbase, errorbase; + + // save display for later + display = _display; + + // Check if we have the XF86 vidmode extension + if (!XF86VidModeQueryExtension(display->getRep()->getDisplay(), + &eventbase, &errorbase)) + return NULL; + + // get available resolutions + if (!XF86VidModeGetAllModeLines(display->getRep()->getDisplay(), + display->getRep()->getScreen(), + &numResolutions, &origResolutions)) + return NULL; + + // get current resolution + int dotclock; + XF86VidModeModeLine mode; + XF86VidModeGetModeLine(display->getRep()->getDisplay(), + display->getRep()->getScreen(), + &dotclock, &mode); + + // make a copy of the original data + origNumResolutions = numResolutions; + resolutions = new XF86VidModeModeInfo*[numResolutions]; + for (i = 0; i < numResolutions; i++) + resolutions[i] = origResolutions[i]; + + // sort resolutions + qsort(resolutions, numResolutions, sizeof(resolutions[0]), resolutionCompare); + + // find current resolution in the available resolution list + int current; + for (current = 0; current < numResolutions; current++) { + const XF86VidModeModeInfo* r = resolutions[current]; + if (dotclock == (int)r->dotclock && + mode.hdisplay == r->hdisplay && + mode.hsyncstart == r->hsyncstart && + mode.hsyncend == r->hsyncend && + mode.htotal == r->htotal && + mode.vdisplay == r->vdisplay && + mode.vsyncstart == r->vsyncstart && + mode.vsyncend == r->vsyncend && + mode.vtotal == r->vtotal && + mode.flags == r->flags) + break; + } + + // no switching if current mode not found + if (current == numResolutions) + return NULL; + + // compress out modes that are (effectively) duplicates. never + // remove the current mode. + for (i = 0; i < numResolutions - 1; ) { + if (resolutionCompare(resolutions + i, resolutions + i + 1) == 0) { + // is next resolution the current mode? if so then move it down + // so we don't blow it away. + if (current == i + 1) + resolutions[i] = resolutions[i + 1]; + + // move remaining resolutions down (overwriting the one after i) + for (int j = i + 2; j < numResolutions; j++) + resolutions[j - 1] = resolutions[j]; + + // do we move the current resolution down too? + if (current > i) + current--; + + // now one less resolution + numResolutions--; + } + else { + i++; + } + } + + // make ResInfo list + char name[80]; + ResInfo** resInfo = new ResInfo*[numResolutions]; + for (i = 0; i < numResolutions; i++) { + const XF86VidModeModeInfo* r = resolutions[i]; + sprintf(name, "%dx%d @@%d", r->hdisplay, r->vdisplay, getRetrace(r)); + resInfo[i] = new ResInfo(name, r->hdisplay, r->vdisplay, getRetrace(r)); + } + + // return modes + numModes = numResolutions; + currentMode = current; + lastResolution = current; + return resInfo; +} + +boolean NetBSDDisplayMode::set(int index) +{ + return doSet(index, True); +} + +boolean NetBSDDisplayMode::setDefault(int index) +{ + return doSet(index, False); +} + +boolean NetBSDDisplayMode::doSet(int index, boolean position) +{ + // ignore attempts to set video format to current format. + // normally this only happens when restoring the default + // format, when BzfDisplay deliberately forces the change. + // that's useful for win32 where the OS knows the right + // format and will ignore calls to switch the current + // format. however, irix isn't so clever and may cause + // the display to flicker even when the format isn't + // really changing. + if (index == lastResolution || numResolutions <= 1) + return True; + + // deactivate windows before resolution change. if we don't do this + // then the app will almost certainly crash in the OpenGL driver. + XWindow::deactivateAll(); + + // change resolution + if (XF86VidModeSwitchToMode(display->getRep()->getDisplay(), + display->getRep()->getScreen(), + resolutions[index])) { + if (position) { + // kludge for accelerated GLX. when we set the view port after + // changing the resolution just before quiting, GLX does not + // release the display to X server control. or something like + // that. the effect is that you see the game window still on + // the screen but maybe shifted around and you can't see any of + // the other windows. without this code, a workaround for the + // problem is ctrl_alt_+ or ctrl_alt_- to force a resize. + XF86VidModeSetViewPort(display->getRep()->getDisplay(), + display->getRep()->getScreen(), 0, 0); + } + XSync(display->getRep()->getDisplay(), False); + lastResolution = index; + + // reactivate previously deactivated window after change + XWindow::reactivateAll(); + return True; + } + + // reactivate previously deactivated window after change + XWindow::reactivateAll(); + return False; +} + +#endif +// ex: shiftwidth=2 tabstop=8 @ 1.1.1.1 log @bzflag is an OpenGL based multiplayer tank game. @ text @@