Menu
▾
▴
bzflag-commits — CVS commits get mailed here
This list is closed, nobody may subscribe to it.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(19) |
Aug
(4) |
Sep
(20) |
Oct
(42) |
Nov
(80) |
Dec
(19) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(29) |
Feb
(100) |
Mar
(297) |
Apr
(115) |
May
(66) |
Jun
(145) |
Jul
(139) |
Aug
(19) |
Sep
(45) |
Oct
(53) |
Nov
(46) |
Dec
(148) |
| 2003 |
Jan
(277) |
Feb
(91) |
Mar
(17) |
Apr
(20) |
May
(63) |
Jun
(786) |
Jul
(1737) |
Aug
(740) |
Sep
(635) |
Oct
(538) |
Nov
(345) |
Dec
(652) |
| 2004 |
Jan
(1101) |
Feb
(557) |
Mar
(460) |
Apr
(154) |
May
(366) |
Jun
(296) |
Jul
(457) |
Aug
(582) |
Sep
(682) |
Oct
(515) |
Nov
(482) |
Dec
(711) |
| 2005 |
Jan
(819) |
Feb
(215) |
Mar
(398) |
Apr
(183) |
May
(459) |
Jun
(226) |
Jul
(303) |
Aug
(509) |
Sep
(566) |
Oct
(766) |
Nov
(294) |
Dec
(149) |
| 2006 |
Jan
(330) |
Feb
(192) |
Mar
(155) |
Apr
(633) |
May
(207) |
Jun
(51) |
Jul
(197) |
Aug
(121) |
Sep
(18) |
Oct
(54) |
Nov
(159) |
Dec
(134) |
| 2007 |
Jan
(341) |
Feb
(179) |
Mar
(220) |
Apr
(221) |
May
(71) |
Jun
(194) |
Jul
(283) |
Aug
(872) |
Sep
(406) |
Oct
(154) |
Nov
(103) |
Dec
(118) |
| 2008 |
Jan
(82) |
Feb
(192) |
Mar
(232) |
Apr
(215) |
May
(248) |
Jun
(604) |
Jul
(305) |
Aug
(228) |
Sep
(188) |
Oct
(195) |
Nov
(129) |
Dec
(110) |
| 2009 |
Jan
(182) |
Feb
(120) |
Mar
(150) |
Apr
(195) |
May
(74) |
Jun
(190) |
Jul
(339) |
Aug
(212) |
Sep
(101) |
Oct
(6) |
Nov
(7) |
Dec
(15) |
| 2010 |
Jan
(49) |
Feb
(127) |
Mar
(100) |
Apr
(60) |
May
(165) |
Jun
(41) |
Jul
(9) |
Aug
(32) |
Sep
(40) |
Oct
|
Nov
(7) |
Dec
(9) |
| 2011 |
Jan
(8) |
Feb
(8) |
Mar
(1) |
Apr
(6) |
May
(389) |
Jun
(278) |
Jul
(65) |
Aug
(10) |
Sep
(23) |
Oct
(67) |
Nov
(22) |
Dec
(96) |
| 2012 |
Jan
(30) |
Feb
(33) |
Mar
(54) |
Apr
(32) |
May
(3) |
Jun
(16) |
Jul
(44) |
Aug
(8) |
Sep
(4) |
Oct
(3) |
Nov
(4) |
Dec
(25) |
| 2013 |
Jan
(72) |
Feb
(23) |
Mar
(53) |
Apr
(16) |
May
(51) |
Jun
(37) |
Jul
(2) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(5) |
Dec
|
|
From: <bul...@us...> - 2013-05-30 18:14:10
|
Revision: 22785
http://sourceforge.net/p/bzflag/code/22785
Author: bullet_catcher
Date: 2013-05-30 18:14:07 +0000 (Thu, 30 May 2013)
Log Message:
-----------
Initialize SolarisMedia private variables in the same order that they are declared.
Modified Paths:
--------------
trunk/bzflag/src/platform/SolarisMedia.cxx
Modified: trunk/bzflag/src/platform/SolarisMedia.cxx
===================================================================
--- trunk/bzflag/src/platform/SolarisMedia.cxx 2013-05-30 16:46:16 UTC (rev 22784)
+++ trunk/bzflag/src/platform/SolarisMedia.cxx 2013-05-30 18:14:07 UTC (rev 22785)
@@ -33,11 +33,9 @@
// SolarisMedia
//
-SolarisMedia::SolarisMedia() : BzfMedia(), audio_fd(-1),
- queueIn(-1), queueOut(-1),
- childProcID(0),
- written(0), eof_written(0),
- eof_counter(0),audio_ready(0)
+SolarisMedia::SolarisMedia() : BzfMedia(), audio_fd(-1), audio_ready(0),
+ queueIn(-1), queueOut(-1), written(0),
+ eof_written(0), eof_counter(0), childProcID(0)
{
// do nothing
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-30 16:46:18
|
Revision: 22784
http://sourceforge.net/p/bzflag/code/22784
Author: bullet_catcher
Date: 2013-05-30 16:46:16 +0000 (Thu, 30 May 2013)
Log Message:
-----------
Use AM_CXXFLAGS, which has compiler flags from configure.
Use unused variables in a useless way to silence warnings.
Modified Paths:
--------------
trunk/bzflag/plugins/serverSidePlayerSample/Makefile.am
trunk/bzflag/plugins/serverSidePlayerSample/playerHandler.cpp
Modified: trunk/bzflag/plugins/serverSidePlayerSample/Makefile.am
===================================================================
--- trunk/bzflag/plugins/serverSidePlayerSample/Makefile.am 2013-05-29 18:19:55 UTC (rev 22783)
+++ trunk/bzflag/plugins/serverSidePlayerSample/Makefile.am 2013-05-30 16:46:16 UTC (rev 22784)
@@ -4,7 +4,7 @@
playerHandler.cpp \
playerHandler.h \
serverSidePlayerSample.cpp
-serverSidePlayerSample_la_CXXFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/plugins/plugin_utils
+serverSidePlayerSample_la_CXXFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/plugins/plugin_utils $(AM_CXXFLAGS)
serverSidePlayerSample_la_LDFLAGS = -module -avoid-version -shared
serverSidePlayerSample_la_LIBADD = $(top_builddir)/plugins/plugin_utils/libplugin_utils.la
Modified: trunk/bzflag/plugins/serverSidePlayerSample/playerHandler.cpp
===================================================================
--- trunk/bzflag/plugins/serverSidePlayerSample/playerHandler.cpp 2013-05-29 18:19:55 UTC (rev 22783)
+++ trunk/bzflag/plugins/serverSidePlayerSample/playerHandler.cpp 2013-05-30 16:46:16 UTC (rev 22784)
@@ -34,6 +34,7 @@
std::string playerName = bz_getPlayerCallsign(player);
std::string msg = "Oh look, " + playerName + " decided to join us!";
sendChatMessage(msg.c_str());
+ rot += pos[0]; // use these variables in a useless way to silence warning
}
void PlayerHandler::shotFired(int player, unsigned short shotID)
@@ -41,6 +42,7 @@
std::string playerName = bz_getPlayerCallsign(player);
std::string msg = "Hey, " + playerName + " I bet you think you are special now!";
sendChatMessage(msg.c_str());
+ ++shotID; // use this variable in a useless way to silence warning
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-29 18:19:59
|
Revision: 22783
http://sourceforge.net/p/bzflag/code/22783
Author: bullet_catcher
Date: 2013-05-29 18:19:55 +0000 (Wed, 29 May 2013)
Log Message:
-----------
Add a GNU extension for autoconf to test for C++0x support, and use it to select the required compiler option.
Abort the configure script if no c++ compiler is found or if we don't know how to get C++0x support from it.
Modified Paths:
--------------
trunk/bzflag/configure.ac
trunk/bzflag/m4/Makefile.am
Added Paths:
-----------
trunk/bzflag/m4/ax_cxx_compile_stdcxx_0x.m4
Modified: trunk/bzflag/configure.ac
===================================================================
--- trunk/bzflag/configure.ac 2013-05-29 16:46:11 UTC (rev 22782)
+++ trunk/bzflag/configure.ac 2013-05-29 18:19:55 UTC (rev 22783)
@@ -208,6 +208,19 @@
AC_PROG_MAKE_SET
AM_PROG_MKDIR_P
AC_PROG_CXX
+if test -z "$CXX"; then
+ AC_MSG_ERROR([A c++ compiler is required to build BZFlag])
+fi
+AX_CXX_COMPILE_STDCXX_0X
+if test "x$ax_cv_cxx_compile_cxx0x_native" != xyes; then
+ if test "x$ax_cv_cxx_compile_cxx0x_cxx" = xyes; then
+ CXXFLAGS="$CXXFLAGS -std=c++0x"
+ elif test "x$ax_cv_cxx_compile_cxx0x_gxx" = xyes; then
+ CXXFLAGS="$CXXFLAGS -std=gnu++0x"
+ else
+ AC_MSG_ERROR([A c++ compiler with C++0x support is required to build BZFlag])
+ fi
+fi
AC_PROG_CC
AC_PROG_LN_S
AC_CHECK_PROG(AR, ar, ar)
@@ -744,7 +757,7 @@
if test x$enable_debug = xyes ; then
CONF_CFLAGS="$CONF_CFLAGS -Werror -g -O0"
- CONF_CXXFLAGS="-std=c++0x $CONF_CXXFLAGS -Werror -g -O0"
+ CONF_CXXFLAGS="$CONF_CXXFLAGS -Werror -g -O0"
# revert automatic setting of CFLAGS and CXXFLAGS to prevent
# override of "-g -O0" put into CONF_CFLAGS and CONF_CXXFLAGS above
CFLAGS="$user_CFLAGS"
@@ -754,7 +767,7 @@
if test "$GCC" = yes ; then
OPTIMIZE="-fexpensive-optimizations"
CONF_CFLAGS="$CONF_CFLAGS $OPTIMIZE"
- CONF_CXXFLAGS="-std=c++0x $CONF_CXXFLAGS $OPTIMIZE"
+ CONF_CXXFLAGS="$CONF_CXXFLAGS $OPTIMIZE"
fi
AC_DEFINE(NDEBUG, 1, [Debugging disabled])
fi
Modified: trunk/bzflag/m4/Makefile.am
===================================================================
--- trunk/bzflag/m4/Makefile.am 2013-05-29 16:46:11 UTC (rev 22782)
+++ trunk/bzflag/m4/Makefile.am 2013-05-29 18:19:55 UTC (rev 22783)
@@ -1,4 +1,5 @@
EXTRA_DIST = \
+ ax_cxx_compile_stdcxx_0x.m4 \
cache.m4 \
curses.m4 \
isnan.m4 \
Added: trunk/bzflag/m4/ax_cxx_compile_stdcxx_0x.m4
===================================================================
--- trunk/bzflag/m4/ax_cxx_compile_stdcxx_0x.m4 (rev 0)
+++ trunk/bzflag/m4/ax_cxx_compile_stdcxx_0x.m4 2013-05-29 18:19:55 UTC (rev 22783)
@@ -0,0 +1,107 @@
+# ============================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_0x.html
+# ============================================================================
+#
+# SYNOPSIS
+#
+# AX_CXX_COMPILE_STDCXX_0X
+#
+# DESCRIPTION
+#
+# Check for baseline language coverage in the compiler for the C++0x
+# standard.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Benjamin Kosnik <bk...@re...>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 7
+
+AU_ALIAS([AC_CXX_COMPILE_STDCXX_0X], [AX_CXX_COMPILE_STDCXX_0X])
+AC_DEFUN([AX_CXX_COMPILE_STDCXX_0X], [
+ AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
+ ax_cv_cxx_compile_cxx0x_native,
+ [AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([
+ template <typename T>
+ struct check
+ {
+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
+ };
+
+ typedef check<check<bool>> right_angle_brackets;
+
+ int a;
+ decltype(a) b;
+
+ typedef check<int> check_type;
+ check_type c;
+ check_type&& cr = static_cast<check_type&&>(c);],,
+ ax_cv_cxx_compile_cxx0x_native=yes, ax_cv_cxx_compile_cxx0x_native=no)
+ AC_LANG_RESTORE
+ ])
+
+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
+ ax_cv_cxx_compile_cxx0x_cxx,
+ [AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -std=c++0x"
+ AC_TRY_COMPILE([
+ template <typename T>
+ struct check
+ {
+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
+ };
+
+ typedef check<check<bool>> right_angle_brackets;
+
+ int a;
+ decltype(a) b;
+
+ typedef check<int> check_type;
+ check_type c;
+ check_type&& cr = static_cast<check_type&&>(c);],,
+ ax_cv_cxx_compile_cxx0x_cxx=yes, ax_cv_cxx_compile_cxx0x_cxx=no)
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ AC_LANG_RESTORE
+ ])
+
+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
+ ax_cv_cxx_compile_cxx0x_gxx,
+ [AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -std=gnu++0x"
+ AC_TRY_COMPILE([
+ template <typename T>
+ struct check
+ {
+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
+ };
+
+ typedef check<check<bool>> right_angle_brackets;
+
+ int a;
+ decltype(a) b;
+
+ typedef check<int> check_type;
+ check_type c;
+ check_type&& cr = static_cast<check_type&&>(c);],,
+ ax_cv_cxx_compile_cxx0x_gxx=yes, ax_cv_cxx_compile_cxx0x_gxx=no)
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ AC_LANG_RESTORE
+ ])
+
+ if test "$ax_cv_cxx_compile_cxx0x_native" = yes ||
+ test "$ax_cv_cxx_compile_cxx0x_cxx" = yes ||
+ test "$ax_cv_cxx_compile_cxx0x_gxx" = yes; then
+ AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
+ fi
+])
Property changes on: trunk/bzflag/m4/ax_cxx_compile_stdcxx_0x.m4
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-29 16:46:13
|
Revision: 22782
http://sourceforge.net/p/bzflag/code/22782
Author: bullet_catcher
Date: 2013-05-29 16:46:11 +0000 (Wed, 29 May 2013)
Log Message:
-----------
Fix spelling.
Modified Paths:
--------------
trunk/bzflag/man/bzfs.6.in
trunk/bzflag/man/bzw.5.in
Modified: trunk/bzflag/man/bzfs.6.in
===================================================================
--- trunk/bzflag/man/bzfs.6.in 2013-05-29 16:33:17 UTC (rev 22781)
+++ trunk/bzflag/man/bzfs.6.in 2013-05-29 16:46:11 UTC (rev 22782)
@@ -1147,7 +1147,7 @@
USERADMIN: *COPS +BAN +UNBAN
Probably you want to define customized permissions for the default
-group "VERIFIED" instead of those automatically asigned by the server:
+group "VERIFIED" instead of those automatically assigned by the server:
VERIFIED: \-ALL +perm1 +perm2 ...
Modified: trunk/bzflag/man/bzw.5.in
===================================================================
--- trunk/bzflag/man/bzw.5.in 2013-05-29 16:33:17 UTC (rev 22781)
+++ trunk/bzflag/man/bzw.5.in 2013-05-29 16:46:11 UTC (rev 22782)
@@ -1244,7 +1244,7 @@
.br
<integer>
.br
- | <teleporter_name_with_wilcards> (":f" | ":b")?
+ | <teleporter_name_with_wildcards> (":f" | ":b")?
.br
.TP
link :=
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2013-05-29 16:33:20
|
Revision: 22781
http://sourceforge.net/p/bzflag/code/22781
Author: jeffm2501
Date: 2013-05-29 16:33:17 +0000 (Wed, 29 May 2013)
Log Message:
-----------
Apply patch 599 by Bjarnig Ingi Gislason to fix bug 1069537 from ubuntu. Fixes some formating in the bzfs man page.
Modified Paths:
--------------
trunk/bzflag/man/bzfs.6.in
Modified: trunk/bzflag/man/bzfs.6.in
===================================================================
--- trunk/bzflag/man/bzfs.6.in 2013-05-29 08:56:53 UTC (rev 22780)
+++ trunk/bzflag/man/bzfs.6.in 2013-05-29 16:33:17 UTC (rev 22781)
@@ -31,8 +31,8 @@
[\fB\-d\fR]
[\fB\-density \fR\fInum\fR]
[\fB\-disableBots\fR]
-[\fB\+f \fR{\fIgood\fR|\fIbad\fR|\fIteam|\fR|\fIflag\-id\fR}[\fI{count}\fR]]
-[\fB\-f \fR{\fIgood\fR|\fIbad\fR|\fIflag\-id\fR}]
+[\fB+f \fR{\fIgood\fR | \fIbad\fR | \fIteam | \fR | \fIflag\-id\fR}[\fI{count}\fR]]
+[\fB\-f \fR{\fIgood\fR | \fIbad\fR | \fIflag\-id\fR}]
[\fB\-fb\fR]
[\fB\-filterCallsigns\fR]
[\fB\-filterChat\fR]
@@ -53,7 +53,7 @@
[\fB\-masterBanURL \fIURL\fR]
[\fB\-maxidle \fR\fIseconds\fR]
[\fB\-mp
-\fR{\fIcount\fR\~|\~[\fIrogue-count\fR]\fB,\~\fR[\fIred-count\fR]\fB,\~\fR[\fIgreen-count\fR]\fB,\~\fR[\fIblue-count\fR]\fB,\~\fR[\fIpurple-count\fR]\fB,\~\fR[\fIobserver-count\fR]}]
+\fR{\fIcount\fR\~ | \~[\fIrogue-count\fR]\fB,\~\fR[\fIred-count\fR]\fB,\~\fR[\fIgreen-count\fR]\fB,\~\fR[\fIblue-count\fR]\fB,\~\fR[\fIpurple-count\fR]\fB,\~\fR[\fIobserver-count\fR]}]
[\fB\-mps \fR\fImax\-score\fR]
[\fB\-ms \fIshots\fR]
[\fB\-mts \fR\fImax\-score\fR]
@@ -73,15 +73,15 @@
[\fB\-publiclist \fIurl\fR]
[\fB\-publickey \fIkey\fR]
[\fB\-q\fR]
-[\fB\+r\fR]
-[\fB\-rabbit \fR[\fBscore\fR|\fBkiller\fR|\fBrandom\fR]]
+[\fB+r\fR]
+[\fB\-rabbit \fR[\fBscore\fR | \fBkiller\fR | \fBrandom\fR]]
[\fB\-recbuf \fIsize\fR]
[\fB\-recbufonly\fR]
[\fB\-recdir \fIdirectory\fR]
[\fB\-replay\fR]
[\fB\-reportfile \fIfilename\fR]
[\fB\-reportpipe \fIcommand\fR]
-[\fB\+s \fIflag\-count\fR]
+[\fB+s \fIflag\-count\fR]
[\fB\-s \fIflag\-count\fR]
[\fB\-sa\fR]
[\fB\-sb\fR]
@@ -96,7 +96,7 @@
[\fB\-synctime\fR]
[\fB\-t\fR]
[\fB\-tftimeout \fItime\-limit\fR]
-[\fB\-time \fR{\fItime\-limit\fR|\fIending-time\fR}]
+[\fB\-time \fR{\fItime\-limit\fR | \fIending-time\fR}]
[\fB\-timemanual\fR]
[\fB\-tk\fR]
[\fB\-tkkr \fIpercent\fR]
@@ -188,13 +188,13 @@
Increase debugging level. If more \-d is given, more debugging info is obtained.
.TP
\fB\-density \fR\fInum\fR
-Specify density for buildings, i.e. the higher the integer number, the more
+Specify density for buildings, i.e.\& the higher the integer number, the more
buildings you will get. This applies to automatically generated maps only.
.TP
.B \-disableBots
Disallow clients from using the ROGER autopilot or from using robots.
.TP
-\fB+f\fR {\fIgood\fR|\fIbad\fR|\fIteam\fR\fIflag\-id\fR}[\fI{count}\fR]
+\fB+f\fR {\fIgood\fR | \fIbad\fR | \fIteam\fR\fIflag\-id\fR}[\fI{count}\fR]
Forces the existence of the given flag. If specified multiple times
for the same \fIflag\-id\fR, then that many flags will appear. The
\fIgood\fR argument is equivalent to specifying \fB+f\fR once for
@@ -204,7 +204,7 @@
\fI{count}\fR parameter allows the specification of multiple flags of the
same type. Note that the curly braces are required.
.TP
-\fB\-f\fR {\fIgood\fR|\fIbad\fR|\fIflag\-id\fR}
+\fB\-f\fR {\fIgood\fR | \fIbad\fR | \fIflag\-id\fR}
Disallows random flags of the given type. Required flags given by the
\fB+f\fR option are still provided. The \fIbad\fR argument is equivalent
to specifying \fB\-f\fR once for each kind of bad flag. Same goes for
@@ -285,7 +285,7 @@
not kicked. If a player uttered a word recently, he will be kicked after
thrice the given time.
.TP
-\fB\-mp\fR {\fIcount\fR|[\fIrogue\fR]\fB,\fR[\fIred\fR]\fB,\fR[\fIgreen\fR]\fB,\fR[\fIblue\fR]\fB,\fR[\fIpurple\fR]\fB,\fR[\fIobserver\fR]}
+\fB\-mp\fR {\fIcount\fR | [\fIrogue\fR]\fB,\fR[\fIred\fR]\fB,\fR[\fIgreen\fR]\fB,\fR[\fIblue\fR]\fB,\fR[\fIpurple\fR]\fB,\fR[\fIobserver\fR]}
Sets the maximum number of players, total or per team. A single value sets
the total number of players allowed. Five comma separated values set the
maximum for each team. If a count is left blank then no limit is set for
@@ -330,7 +330,7 @@
.TP
\fB\-passwd \fIpassword\fR
Specify a server administrator password for use in remote administration
-such as /kick, /ban, /mute, etc messages.
+such as /kick, /ban, /mute, etc.\& messages.
.TP
\fB\-pidfile \fIfilename\fR
Specify a file where the server will write its process ID so it may be used for
@@ -386,7 +386,7 @@
same built\-in url so, by default, clients will see public servers
automatically. This argument may be provided multiple times to
publicize a server to multiple list servers.
-.TP
+.TP
\fB\-publickey \fIkey\fR
Advertise this server on the list server(s) using the specified key.
Only has an effect when used with \fB\-publictitle\fR and/or \fB\-publicaddr\fR.
@@ -401,7 +401,7 @@
Makes most shots ricochet.
Super bullets, shock waves, and guided missiles do not.
.TP
-\fB\-rabbit\fR [\fIscore\fR|\fIkiller\fR|\fIrandom\fR]
+\fB\-rabbit\fR [\fIscore\fR | \fIkiller\fR | \fIrandom\fR]
Enables the rabbit\-hunt style game. By default, the free\-for\-all
style is used. You must specify the algorithm used to pick a new
rabbit when the old one dies. The \fIscore\fR algorithm uses a modified
@@ -491,7 +491,7 @@
of seconds that the flag should be left alone before it is reset. The
default value is 30.
.TP
-\fB\-time \fR{\fItime\-limit\fR|\fIending-time\fR}
+\fB\-time \fR{\fItime\-limit\fR | \fIending-time\fR}
Sets a time limit on the game to \fItime\-limit\fR or \fIending-time\fR. The game will be
stopped \fItime\-limit\fR seconds after the first player connects, or at \fIending-time\fR,
whichever is given. The \fIending-time\fR should be given in hh:mm:ss format, but does not
@@ -513,8 +513,8 @@
\fIpercent\fR [1\-100]. A start up grace period is given to players.
.TP
.B \-trackplayhistory
-Has the server track players with good runs of kills and anounces them.
-Also anounces those players that stop the runs of good players.
+Has the server track players with good runs of kills and announces them.
+Also announces those players that stop the runs of good players.
.TP
\fB\-ts \fR[\fImicros\fR]
Include timestamp information in DEBUG output \(em useful for logging.
@@ -575,7 +575,7 @@
advantage. Single shot, non-Jump games will teach valuable lessons in dodging,
however, and are excellent starting points for the beginner.
.SS Networking
-Communication between the server and clients (i.e. between \fBbzfs\fR and
+Communication between the server and clients (i.e.\& between \fBbzfs\fR and
\fBbzflag\fR) during a game is via TCP and UDP. Use the \fB\-help\fR option
to get
the server's default port. If there's a firewall between the server and
@@ -695,7 +695,7 @@
.ft R
.TP
-.B /poll \fR{{\fIban\fR|\fIkick\fR} \fIcallsign\fR|vote {\fIyes\fR|\fIno\fR}|veto}
+.B /poll \fR{{\fIban\fR | \fIkick\fR} \fIcallsign\fR | vote {\fIyes\fR | \fIno\fR} | veto}
Interact and make requests of the bzflag voting system via the /poll command.
The ban and kick subcommands request a vote to respectively ban or kick some
player. The playername is expected as the next argument. The vote and veto
@@ -726,7 +726,7 @@
Prints server's current running time in days, hours, mins and secs.
.TP
-.B /vote \fR{\fIyes\fR|\fIno\fR}
+.B /vote \fR{\fIyes\fR | \fIno\fR}
If there is a poll active, this command will place a vote in favor or in
opposition to the poll. Multiple languages are supported as a vote argument
in addition to "yes" and "no". By default, you must be registered to vote on
@@ -736,7 +736,7 @@
.SH "SERVER ADMINISTRATIVE COMMANDS"
.BR
.TP
-.B /ban \fR{\fIip\fR|\fIipList\fR|\fI#slot\fR|\fI"Player Name"\fR|\fIplayerName\fR} \fIduration\fR \fIreason\fR
+.B /ban \fR{\fIip\fR | \fIipList\fR | \fI#slot\fR | \fI"Player Name"\fR | \fIplayerName\fR} \fIduration\fR \fIreason\fR
Ban players using the specified IPs for certain length of time
from using this server.
@@ -874,7 +874,7 @@
.ft R
.TP
-.B /kick \fR{\fI"Player Name"\fR|\fIplayerName\fR|\fI#slot\fR} \fIreason\fR
+.B /kick \fR{\fI"Player Name"\fR | \fIplayerName\fR | \fI#slot\fR} \fIreason\fR
Kick a player off the server. Example:
.ft CW
.nf
@@ -890,7 +890,7 @@
.ft R
.TP
-.B /kill \fR{\fI"Player Name"\fR|\fIplayerName\fR|\fI#slot\fR} [\fIreason\fR]
+.B /kill \fR{\fI"Player Name"\fR | \fIplayerName\fR | \fI#slot\fR} [\fIreason\fR]
Kill a player just like when shooting. Example:
.ft CW
.nf
@@ -930,7 +930,7 @@
.ft R
.TP
-.B /mute \fR{\fI#slot\fR|\fIcallsign\fR}
+.B /mute \fR{\fI#slot\fR | \fIcallsign\fR}
Allows a server admin to remove the ability for a player to communicate with
other players. Once muted the player may only talk to admins on the server.
This command removes the TALK permission that is enabled by default for all
@@ -1006,7 +1006,7 @@
List all files in the recordings directory
.TP
-.B /replay load \fR{\fIfilename\fR|\fI#index\fR}
+.B /replay load \fR{\fIfilename\fR | \fI#index\fR}
Load the specified recording file by name, or by index
(same indices as produced by the 'replay list' command)
@@ -1021,7 +1021,7 @@
to the server rejoin (to reload the map, etc...)
.TP
-.B /replay skip \fR[{\fI+\fR|\fI\-\fR} \fIseconds\fR]
+.B /replay skip \fR[{\fI+\fR | \fI\-\fR} \fIseconds\fR]
If seconds is specified, then skip that amount of time in the recording.
Otherwise, skip forwards until there is activity.
@@ -1040,7 +1040,7 @@
.ft R
.TP
-.B /sendhelp \fR{\fI"Player name"\fR|\fIplayerName\fR|\fI#slot\fR} \fIhelp page\fR
+.B /sendhelp \fR{\fI"Player name"\fR | \fIplayerName\fR | \fI#slot\fR} \fIhelp page\fR
Send the specified help page to a user
.ft CW
.nf
@@ -1058,7 +1058,7 @@
Kick all players off the server
.TP
-.B /unmute \fR{\fI#slot\fR|\fIcallsign\fR}
+.B /unmute \fR{\fI#slot\fR | \fIcallsign\fR}
Allows a server admin to restore the TALK permission to a previously muted
player.
@@ -1080,7 +1080,7 @@
generally customized to perhaps allow administrative control to
trusted users.
-There are both local and global groups, i.e. groups that are available
+There are both local and global groups, i.e.\& groups that are available
across the entire BZFlag network. In setting up a server, you may
want to specify global groups that will allow already well known and
trusted users to police your server and help maintain control against
@@ -1113,10 +1113,10 @@
and exactly which permissions are granted by each. These files are laid out
with one line per group, using the following format:
-GROUP_NAME: [*Group] [+|\-|!]perm1 [+|\-|!]perm2 ... permN
+GROUP_NAME: [*Group] [ +| \-| !]perm1 [ +| \-| !]perm2 ... permN
-*Group: inhert permissions from existing group "Group"
+*Group: inherit permissions from existing group "Group"
.br
+perm: add perm to this group
@@ -1125,7 +1125,7 @@
\-perm: remove perm from this group
.br
-!perm: forbid perm for this group. makes perm inaccessable whether it's granted
+!perm: forbid perm for this group. makes perm inaccessible whether it's granted
from another group or not
If no operator is given with a permission it is handled like +perm. A group
@@ -1295,10 +1295,10 @@
Lists the permissions for each group
.TP
-.B /masterban \fR{\fIflush\fR|\fIreload\fR}
+.B /masterban \fR{\fIflush\fR | \fIreload\fR}
Forces the server to flush any bans from the master server. If reload is specified
instead of flush, also reloads bans from the the internet. Local bans are unaffected.
-This command requires the UNBAN permision.
+This command requires the UNBAN permission.
.TP
.B /reload
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kon...@us...> - 2013-05-29 08:56:55
|
Revision: 22780
http://sourceforge.net/p/bzflag/code/22780
Author: kongr45gpen
Date: 2013-05-29 08:56:53 +0000 (Wed, 29 May 2013)
Log Message:
-----------
Apply patch #571 by allejo (typo fix on README.WINDOWS)
Modified Paths:
--------------
trunk/bzflag/README.WINDOWS
Modified: trunk/bzflag/README.WINDOWS
===================================================================
--- trunk/bzflag/README.WINDOWS 2013-05-29 06:46:26 UTC (rev 22779)
+++ trunk/bzflag/README.WINDOWS 2013-05-29 08:56:53 UTC (rev 22780)
@@ -35,7 +35,7 @@
**Required Libraries**
You will need the windows DirectX SDK
- (download at hhttp://www.microsoft.com/download/en/details.aspx?displaylang=en&id=6812)
+ (download at http://www.microsoft.com/download/en/details.aspx?displaylang=en&id=6812)
You may also need to install curses and NSIS to do a full
distribution build. Public Domain Curses is at
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-29 06:46:29
|
Revision: 22779
http://sourceforge.net/p/bzflag/code/22779
Author: bullet_catcher
Date: 2013-05-29 06:46:26 +0000 (Wed, 29 May 2013)
Log Message:
-----------
Add limits.h, which was removed in r22733, back to AC_CHECK_HEADERS() for Solaris.
Revision Links:
--------------
http://sourceforge.net/p/bzflag/code/22733
Modified Paths:
--------------
trunk/bzflag/configure.ac
Modified: trunk/bzflag/configure.ac
===================================================================
--- trunk/bzflag/configure.ac 2013-05-29 06:43:55 UTC (rev 22778)
+++ trunk/bzflag/configure.ac 2013-05-29 06:46:26 UTC (rev 22779)
@@ -350,6 +350,7 @@
dsound.h \
fcntl.h \
inttypes.h \
+ limits.h \
linux/input.h \
process.h \
sched.h \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-29 06:43:58
|
Revision: 22778
http://sourceforge.net/p/bzflag/code/22778
Author: bullet_catcher
Date: 2013-05-29 06:43:55 +0000 (Wed, 29 May 2013)
Log Message:
-----------
On Linux systems, replace -W with -Wextra now that GCC 4.3 and higher is required for -std=c++0x, and add -Wcast-qual.
Modified Paths:
--------------
trunk/bzflag/configure.ac
Modified: trunk/bzflag/configure.ac
===================================================================
--- trunk/bzflag/configure.ac 2013-05-28 17:43:39 UTC (rev 22777)
+++ trunk/bzflag/configure.ac 2013-05-29 06:43:55 UTC (rev 22778)
@@ -670,9 +670,7 @@
case $host_os in
linux*)
AC_DEFINE(HALF_RATE_AUDIO, 1, [Half rate Audio])
- #FLAGS="$FLAGS -Wall -W -Wfloat-equal -Wundef -Wshadow -Wpointer-arith -Wcast-qual -Wwrite-strings -Wconversion -Wredundant-decls"
- # time to use -Wextra instead of -W ? (gcc 3.4+)
- FLAGS="-Wall -W -Wundef -Wshadow"
+ FLAGS="-Wall -Wextra -Wcast-qual -Wshadow -Wundef" # -Wconversion -Wfloat-equal -Wpointer-arith -Wredundant-decls -Wwrite-strings
CONF_CFLAGS="$CONF_CFLAGS $FLAGS"
CONF_CXXFLAGS="$CONF_CXXFLAGS $FLAGS -pedantic"
case $host_vendor in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2013-05-28 17:43:42
|
Revision: 22777
http://sourceforge.net/p/bzflag/code/22777
Author: jeffm2501
Date: 2013-05-28 17:43:39 +0000 (Tue, 28 May 2013)
Log Message:
-----------
cast to remove warning.
Modified Paths:
--------------
trunk/bzflag/src/bzflag/playing.cxx
Modified: trunk/bzflag/src/bzflag/playing.cxx
===================================================================
--- trunk/bzflag/src/bzflag/playing.cxx 2013-05-28 16:35:21 UTC (rev 22776)
+++ trunk/bzflag/src/bzflag/playing.cxx 2013-05-28 17:43:39 UTC (rev 22777)
@@ -1565,7 +1565,7 @@
// get the world size
cachedWorld->seekg(0, std::ios::end);
std::streampos size = cachedWorld->tellg();
- unsigned long charSize = std::streamoff(size);
+ unsigned long charSize = (unsigned long)std::streamoff(size);
// load the cached world
cachedWorld->seekg(0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-28 16:35:24
|
Revision: 22776
http://sourceforge.net/p/bzflag/code/22776
Author: bullet_catcher
Date: 2013-05-28 16:35:21 +0000 (Tue, 28 May 2013)
Log Message:
-----------
Use const_cast to suppress the last few "casts away qualifiers" warnings from g++ -Wcast-qual.
Modified Paths:
--------------
trunk/bzflag/src/bzflag/ServerStartMenu.cxx
trunk/bzflag/src/bzfs/CustomMesh.cxx
trunk/bzflag/src/obstacle/ArcObstacle.cxx
trunk/bzflag/src/obstacle/ConeObstacle.cxx
trunk/bzflag/src/obstacle/SphereObstacle.cxx
trunk/bzflag/src/obstacle/TetraBuilding.cxx
trunk/bzflag/src/platform/SDLDisplay.cxx
Modified: trunk/bzflag/src/bzflag/ServerStartMenu.cxx
===================================================================
--- trunk/bzflag/src/bzflag/ServerStartMenu.cxx 2013-05-28 06:16:49 UTC (rev 22775)
+++ trunk/bzflag/src/bzflag/ServerStartMenu.cxx 2013-05-28 16:35:21 UTC (rev 22776)
@@ -489,7 +489,7 @@
#if defined(_WIN32)
// Windows
- int result = _spawnvp(_P_DETACH, serverCmd, (char* const*) args);
+ int result = _spawnvp(_P_DETACH, serverCmd, const_cast<char* const*>(args));
if (result < 0) {
if (errno == ENOENT)
setStatus("Failed... can't find server program.");
@@ -541,10 +541,10 @@
close(2);
// exec server
- execvp(serverCmd, (char* const*)args);
+ execvp(serverCmd, const_cast<char* const*>(args));
// If execvp returns, bzfs wasnt at the anticipated location.
// Let execvp try to find it in $PATH by feeding it the "bzfs" name by it self
- execvp(serverApp, (char* const*)args);
+ execvp(serverApp, const_cast<char* const*>(args));
// If that returns too, something bad has happened. Exit.
exit(2);
}
Modified: trunk/bzflag/src/bzfs/CustomMesh.cxx
===================================================================
--- trunk/bzflag/src/bzfs/CustomMesh.cxx 2013-05-28 06:16:49 UTC (rev 22775)
+++ trunk/bzflag/src/bzfs/CustomMesh.cxx 2013-05-28 16:35:21 UTC (rev 22776)
@@ -207,7 +207,7 @@
} else {
vert[0] = vert[1] = vert[2] = 0.0f;
}
- ((std::vector<cfvec3>*)&vertices)->push_back(vert);
+ const_cast<std::vector<cfvec3>*>(&vertices)->push_back(vert);
}
MeshObstacle* mesh =
Modified: trunk/bzflag/src/obstacle/ArcObstacle.cxx
===================================================================
--- trunk/bzflag/src/obstacle/ArcObstacle.cxx 2013-05-28 06:16:49 UTC (rev 22775)
+++ trunk/bzflag/src/obstacle/ArcObstacle.cxx 2013-05-28 16:35:21 UTC (rev 22776)
@@ -79,7 +79,7 @@
ArcObstacle* copy =
new ArcObstacle(tmpXform, pos, size, angle, sweepAngle, ratio,
texsize, useNormals, divisions,
- (const BzMaterial**)materials, phydrv,
+ const_cast<const BzMaterial**>(materials), phydrv,
smoothBounce, driveThrough, shootThrough, ricochet);
return copy;
}
Modified: trunk/bzflag/src/obstacle/ConeObstacle.cxx
===================================================================
--- trunk/bzflag/src/obstacle/ConeObstacle.cxx 2013-05-28 06:16:49 UTC (rev 22775)
+++ trunk/bzflag/src/obstacle/ConeObstacle.cxx 2013-05-28 16:35:21 UTC (rev 22776)
@@ -78,7 +78,7 @@
ConeObstacle* copy =
new ConeObstacle(tmpXform, pos, size, angle, sweepAngle,
texsize, useNormals, divisions,
- (const BzMaterial**)materials, phydrv,
+ const_cast<const BzMaterial**>(materials), phydrv,
smoothBounce, driveThrough, shootThrough, ricochet);
return copy;
}
Modified: trunk/bzflag/src/obstacle/SphereObstacle.cxx
===================================================================
--- trunk/bzflag/src/obstacle/SphereObstacle.cxx 2013-05-28 06:16:49 UTC (rev 22775)
+++ trunk/bzflag/src/obstacle/SphereObstacle.cxx 2013-05-28 16:35:21 UTC (rev 22776)
@@ -77,7 +77,7 @@
SphereObstacle* copy =
new SphereObstacle(tmpXform, pos, size, angle, texsize, useNormals,
- hemisphere, divisions, (const BzMaterial**)materials,
+ hemisphere, divisions, const_cast<const BzMaterial**>(materials),
phydrv, smoothBounce, driveThrough, shootThrough, ricochet);
return copy;
}
Modified: trunk/bzflag/src/obstacle/TetraBuilding.cxx
===================================================================
--- trunk/bzflag/src/obstacle/TetraBuilding.cxx 2013-05-28 06:16:49 UTC (rev 22775)
+++ trunk/bzflag/src/obstacle/TetraBuilding.cxx 2013-05-28 16:35:21 UTC (rev 22776)
@@ -79,7 +79,7 @@
TetraBuilding* copy =
new TetraBuilding(tmpXform, vertices, normals, texcoords,
- useNormals, useTexcoords, (const BzMaterial**)materials,
+ useNormals, useTexcoords, const_cast<const BzMaterial**>(materials),
driveThrough, shootThrough, ricochet);
return copy;
}
Modified: trunk/bzflag/src/platform/SDLDisplay.cxx
===================================================================
--- trunk/bzflag/src/platform/SDLDisplay.cxx 2013-05-28 06:16:49 UTC (rev 22775)
+++ trunk/bzflag/src/platform/SDLDisplay.cxx 2013-05-28 16:35:21 UTC (rev 22776)
@@ -610,7 +610,7 @@
}
void SDLWindow::setFullscreen(bool on) {
- ((SDLDisplay *)getDisplay())->setFullscreen(on);
+ const_cast<SDLDisplay *>((const SDLDisplay *)getDisplay())->setFullscreen(on);
}
void SDLWindow::iconify(void) {
@@ -627,11 +627,11 @@
}
void SDLWindow::setSize(int width, int height) {
- ((SDLDisplay *)getDisplay())->setWindowSize(width, height);
+ const_cast<SDLDisplay *>((const SDLDisplay *)getDisplay())->setWindowSize(width, height);
}
void SDLWindow::getSize(int& width, int& height) const {
- ((SDLDisplay *)getDisplay())->getWindowSize(width, height);
+ const_cast<SDLDisplay *>((const SDLDisplay *)getDisplay())->getWindowSize(width, height);
}
void SDLWindow::setGamma(float gamma) {
@@ -691,14 +691,14 @@
}
bool SDLWindow::create(void) {
- if (!((SDLDisplay *)getDisplay())->createWindow()) {
+ if (!const_cast<SDLDisplay *>((const SDLDisplay *)getDisplay())->createWindow()) {
return false;
}
return true;
}
void SDLWindow::enableGrabMouse(bool on) {
- ((SDLDisplay *)getDisplay())->enableGrabMouse(on);
+ const_cast<SDLDisplay *>((const SDLDisplay *)getDisplay())->enableGrabMouse(on);
}
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-28 06:16:51
|
Revision: 22775
http://sourceforge.net/p/bzflag/code/22775
Author: bullet_catcher
Date: 2013-05-28 06:16:49 +0000 (Tue, 28 May 2013)
Log Message:
-----------
Remove "const" from some mesh objects that are modifiable.
Modified Paths:
--------------
trunk/bzflag/include/MeshObstacle.h
trunk/bzflag/src/bzflag/World.cxx
Modified: trunk/bzflag/include/MeshObstacle.h
===================================================================
--- trunk/bzflag/include/MeshObstacle.h 2013-05-28 03:35:53 UTC (rev 22774)
+++ trunk/bzflag/include/MeshObstacle.h 2013-05-28 06:16:49 UTC (rev 22775)
@@ -107,7 +107,7 @@
bool useSmoothBounce() const;
bool noClusters() const;
- const MeshDrawInfo* getDrawInfo() const;
+ MeshDrawInfo* getDrawInfo() const;
void setDrawInfo(MeshDrawInfo*);
int packSize() const;
@@ -223,7 +223,7 @@
return noclusters;
}
-inline const MeshDrawInfo* MeshObstacle::getDrawInfo() const
+inline MeshDrawInfo* MeshObstacle::getDrawInfo() const
{
return drawInfo;
}
Modified: trunk/bzflag/src/bzflag/World.cxx
===================================================================
--- trunk/bzflag/src/bzflag/World.cxx 2013-05-28 03:35:53 UTC (rev 22774)
+++ trunk/bzflag/src/bzflag/World.cxx 2013-05-28 06:16:49 UTC (rev 22775)
@@ -401,7 +401,7 @@
// check mesh faces
for (/* do nothing */; i < olist->count; i++) {
- const Obstacle* obs = olist->list[i];
+ Obstacle* obs = olist->list[i];
const char* type = obs->getType();
if (type == MeshObstacle::getClassName()) {
break;
@@ -419,7 +419,7 @@
}
else {
// add the face to the hitlist
- olist->list[hitCount] = (Obstacle*) obs;
+ olist->list[hitCount] = obs;
hitCount++;
// compute its dot product and stick it in the scratchPad
const float* p = face->getPlane();
@@ -542,7 +542,7 @@
drawInfoArray = new MeshDrawInfo*[count];
drawInfoCount = 0;
for (unsigned int i = 0; i < count; i++) {
- MeshDrawInfo* di = (MeshDrawInfo*) sourceMeshes[i]->getDrawInfo();
+ MeshDrawInfo* di = sourceMeshes[i]->getDrawInfo();
if ((di != NULL) && !di->isCopy()) {
MeshDrawMgr* dm = new MeshDrawMgr(di);
di->setDrawMgr(dm);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-28 03:35:56
|
Revision: 22774
http://sourceforge.net/p/bzflag/code/22774
Author: bullet_catcher
Date: 2013-05-28 03:35:53 +0000 (Tue, 28 May 2013)
Log Message:
-----------
Preserve const quality in record/replay packets.
Modified Paths:
--------------
trunk/bzflag/src/bzfs/RecordReplay.cxx
Modified: trunk/bzflag/src/bzfs/RecordReplay.cxx
===================================================================
--- trunk/bzflag/src/bzfs/RecordReplay.cxx 2013-05-27 19:07:54 UTC (rev 22773)
+++ trunk/bzflag/src/bzfs/RecordReplay.cxx 2013-05-28 03:35:53 UTC (rev 22774)
@@ -86,7 +86,7 @@
u32 nextFilePos;
u32 prevFilePos;
RRtime timestamp;
- char *data;
+ const char *data;
} RRpacket;
//static const unsigned int RRpacketHdrSize =
// sizeof(RRpacket) - (2 * sizeof(RRpacket*) - sizeof(char*));
@@ -1896,12 +1896,13 @@
p->data = NULL;
}
else {
- p->data = new char [p->len];
- if (fread(p->data, p->len, 1, f) != 1) {
- delete[] p->data;
+ char *d = new char [p->len];
+ if (fread(d, p->len, 1, f) != 1) {
+ delete[] d;
delete p;
return NULL;
}
+ p->data = d;
}
logDebugMessage(4,"loadRRpacket(): mode = %i, len = %4i, code = %s, data = %p\n",
@@ -2378,7 +2379,7 @@
p->mode = mode;
p->code = code;
p->len = len;
- p->data = (char*) data; // dirty little trick
+ p->data = (const char *)data;
}
@@ -2389,10 +2390,11 @@
p->next = NULL;
p->prev = NULL;
- p->data = new char [len];
- if (data != NULL) {
- memcpy(p->data, data, len);
+ char *d = new char [len];
+ if (d != NULL) {
+ memcpy(d, data, len);
}
+ p->data = d;
initPacket(mode, code, len, p->data, p);
return p;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-27 19:07:57
|
Revision: 22773
http://sourceforge.net/p/bzflag/code/22773
Author: bullet_catcher
Date: 2013-05-27 19:07:54 +0000 (Mon, 27 May 2013)
Log Message:
-----------
Remove const from message data that will be modified.
Use const_cast where it is, in fact, safe to modify const message data for rebroadcast.
Modified Paths:
--------------
trunk/bzflag/src/bzfs/bzfs.cxx
trunk/bzflag/src/bzfs/bzfs.h
Modified: trunk/bzflag/src/bzfs/bzfs.cxx
===================================================================
--- trunk/bzflag/src/bzfs/bzfs.cxx 2013-05-27 19:00:01 UTC (rev 22772)
+++ trunk/bzflag/src/bzfs/bzfs.cxx 2013-05-27 19:07:54 UTC (rev 22773)
@@ -258,7 +258,7 @@
// usually, the caller gets a buffer via getDirectMessageBuffer(), but for example
// for MsgShotBegin the receiving buffer gets used directly
static int directMessage(GameKeeper::Player &playerData,
- uint16_t code, int len, const void *msg)
+ uint16_t code, int len, void *msg)
{
if (playerData.isParting)
return -1;
@@ -271,7 +271,7 @@
return pwrite(playerData, bufStart, len + 4);
}
-void directMessage(int playerIndex, uint16_t code, int len, const void *msg)
+void directMessage(int playerIndex, uint16_t code, int len, void *msg)
{
GameKeeper::Player *playerData
= GameKeeper::Player::getPlayerByIndex(playerIndex);
@@ -281,7 +281,7 @@
directMessage(*playerData, code, len, msg);
}
-void broadcastMessage(uint16_t code, int len, const void *msg)
+void broadcastMessage(uint16_t code, int len, void *msg)
{
// send message to everyone
for (int i = 0; i < curMaxPlayers; i++) {
@@ -3542,7 +3542,7 @@
}
}
-static void shotUpdate(int playerIndex, const void *buf, int len)
+static void shotUpdate(int playerIndex, void *buf, int len)
{
GameKeeper::Player *playerData
= GameKeeper::Player::getPlayerByIndex(playerIndex);
@@ -3574,7 +3574,7 @@
broadcastMessage(MsgGMUpdate, len, buf);
}
-static void shotFired(int playerIndex, const void *buf, int len)
+static void shotFired(int playerIndex, void *buf, int len)
{
GameKeeper::Player *playerData
= GameKeeper::Player::getPlayerByIndex(playerIndex);
@@ -4383,7 +4383,7 @@
// Sanity check
if (len == FiringInfoPLen)
- shotFired(t, buf, int(len));
+ shotFired(t, const_cast<void *>(buf), int(len));
break;
// shot ended prematurely
@@ -4903,7 +4903,7 @@
}
case MsgGMUpdate:
- shotUpdate(t, buf, int(len));
+ shotUpdate(t, const_cast<void *>(buf), int(len));
break;
// FIXME handled inside uread, but not discarded
Modified: trunk/bzflag/src/bzfs/bzfs.h
===================================================================
--- trunk/bzflag/src/bzfs/bzfs.h 2013-05-27 19:00:01 UTC (rev 22772)
+++ trunk/bzflag/src/bzfs/bzfs.h 2013-05-27 19:07:54 UTC (rev 22773)
@@ -103,7 +103,7 @@
PlayerId dstPlayer,
const char *message);
extern char *getDirectMessageBuffer();
-extern void broadcastMessage(uint16_t code, int len, const void *msg);
+extern void broadcastMessage(uint16_t code, int len, void *msg);
extern void sendTeamUpdate(int playerIndex = -1,
int teamIndex1 = -1,
int teamIndex2 = -1);
@@ -112,7 +112,7 @@
extern void sendIPUpdate(int targetPlayer = -1, int playerIndex = -1);
extern void sendPlayerInfo(void);
extern void directMessage(int playerIndex, uint16_t code,
- int len, const void *msg);
+ int len, void *msg);
extern int getCurMaxPlayers();
extern bool areFoes(TeamColor team1, TeamColor team2);
extern PingPacket getTeamCounts();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-27 19:00:03
|
Revision: 22772
http://sourceforge.net/p/bzflag/code/22772
Author: bullet_catcher
Date: 2013-05-27 19:00:01 +0000 (Mon, 27 May 2013)
Log Message:
-----------
Make a disposable copy of a FlagType object to preserve the const original when firing a world weapon.
Modified Paths:
--------------
trunk/bzflag/src/bzfs/WorldWeapons.cxx
Modified: trunk/bzflag/src/bzfs/WorldWeapons.cxx
===================================================================
--- trunk/bzflag/src/bzfs/WorldWeapons.cxx 2013-05-27 02:04:17 UTC (rev 22771)
+++ trunk/bzflag/src/bzfs/WorldWeapons.cxx 2013-05-27 19:00:01 UTC (rev 22772)
@@ -158,8 +158,9 @@
it != weapons.end(); ++it) {
Weapon *w = *it;
if (w->nextTime <= nowTime) {
+ FlagType type = *(w->type); // non-const copy
- fireWorldWepReal((FlagType*)w->type, BZDB.eval(StateDatabase::BZDB_RELOADTIME),
+ fireWorldWepReal(&type, BZDB.eval(StateDatabase::BZDB_RELOADTIME),
ServerPlayer, w->teamColor, w->origin, w->tilt, w->direction,
getNewWorldShotID(), 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-27 02:04:19
|
Revision: 22771
http://sourceforge.net/p/bzflag/code/22771
Author: bullet_catcher
Date: 2013-05-27 02:04:17 +0000 (Mon, 27 May 2013)
Log Message:
-----------
Remove "const" from the modifiable array of bzfs options.
Modified Paths:
--------------
trunk/bzflag/src/bzfs/CmdLineOptions.cxx
Modified: trunk/bzflag/src/bzfs/CmdLineOptions.cxx
===================================================================
--- trunk/bzflag/src/bzfs/CmdLineOptions.cxx 2013-05-26 23:35:00 UTC (rev 22770)
+++ trunk/bzflag/src/bzfs/CmdLineOptions.cxx 2013-05-27 02:04:17 UTC (rev 22771)
@@ -497,12 +497,12 @@
exit(1);
}
- const char **av = new const char*[tokens.size()+1];
+ char **av = new char*[tokens.size()+1];
av[0] = strdup("bzfs");
ac = 1;
for (std::vector<std::string>::iterator it = tokens.begin(); it != tokens.end(); ++it)
av[ac++] = strdup((*it).c_str());
- return (char **)av;
+ return av;
}
static char **parseWorldOptions (const char *file, int &ac)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-26 23:35:03
|
Revision: 22770
http://sourceforge.net/p/bzflag/code/22770
Author: bullet_catcher
Date: 2013-05-26 23:35:00 +0000 (Sun, 26 May 2013)
Log Message:
-----------
Remove "const" from an object that may be modified.
Modified Paths:
--------------
trunk/bzflag/src/obstacle/ObstacleMgr.cxx
Modified: trunk/bzflag/src/obstacle/ObstacleMgr.cxx
===================================================================
--- trunk/bzflag/src/obstacle/ObstacleMgr.cxx 2013-05-26 23:10:11 UTC (rev 22769)
+++ trunk/bzflag/src/obstacle/ObstacleMgr.cxx 2013-05-26 23:35:00 UTC (rev 22770)
@@ -548,7 +548,7 @@
}
-static MeshObstacle* makeContainedMesh(int type, const Obstacle* obs)
+static MeshObstacle* makeContainedMesh(int type, Obstacle* obs)
{
MeshObstacle* mesh = NULL;
switch (type) {
@@ -887,7 +887,7 @@
for (int type = 0; type < ObstacleTypeCount; type++) {
const ObstacleList& list = getList(type);
for (unsigned int i = 0; i < list.size(); i++) {
- const Obstacle* obs = list[i];
+ Obstacle* obs = list[i];
if (!obs->isFromGroupDef() && !obs->isFromContainer()) {
if (!saveAsMeshes) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jef...@us...> - 2013-05-26 23:10:14
|
Revision: 22769
http://sourceforge.net/p/bzflag/code/22769
Author: jeffm2501
Date: 2013-05-26 23:10:11 +0000 (Sun, 26 May 2013)
Log Message:
-----------
call the game end message when a game is ended from the API, other plugins may depend on it to be notified.
Modified Paths:
--------------
trunk/bzflag/src/bzfs/bzfsAPI.cxx
Modified: trunk/bzflag/src/bzfs/bzfsAPI.cxx
===================================================================
--- trunk/bzflag/src/bzfs/bzfsAPI.cxx 2013-05-25 06:40:52 UTC (rev 22768)
+++ trunk/bzflag/src/bzfs/bzfsAPI.cxx 2013-05-26 23:10:11 UTC (rev 22769)
@@ -3564,6 +3564,12 @@
countdownPauseStart = TimeKeeper::getNullTime();
clOptions->countdownPaused = false;
}
+
+ // fire off a game end event
+ bz_GameStartEndEventData_V1 gameData;
+ gameData.eventType = bz_eGameEndEvent;
+ gameData.duration = clOptions->timeLimit;
+ worldEventManager.callEvents(bz_eGameEndEvent,&gameData);
}
BZF_API bz_eTeamType bz_checkBaseAtPoint ( float pos[3] )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-25 06:40:55
|
Revision: 22768
http://sourceforge.net/p/bzflag/code/22768
Author: bullet_catcher
Date: 2013-05-25 06:40:52 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Preserve const quality in server network handling.
Modified Paths:
--------------
trunk/bzflag/include/AresHandler.h
trunk/bzflag/src/game/NetHandler.cxx
trunk/bzflag/src/net/AresHandler.cxx
Modified: trunk/bzflag/include/AresHandler.h
===================================================================
--- trunk/bzflag/include/AresHandler.h 2013-05-23 07:55:08 UTC (rev 22767)
+++ trunk/bzflag/include/AresHandler.h 2013-05-25 06:40:52 UTC (rev 22768)
@@ -42,7 +42,7 @@
};
void setIndex ( int i ) {index = i;}
- void queryHostname(struct sockaddr *clientAddr);
+ void queryHostname(const struct sockaddr *clientAddr);
void queryHost(char *hostName);
const char *getHostname();
ResolutionStatus getHostAddress(struct in_addr *clientAddr);
Modified: trunk/bzflag/src/game/NetHandler.cxx
===================================================================
--- trunk/bzflag/src/game/NetHandler.cxx 2013-05-23 07:55:08 UTC (rev 22767)
+++ trunk/bzflag/src/game/NetHandler.cxx 2013-05-25 06:40:52 UTC (rev 22768)
@@ -278,7 +278,7 @@
#endif
if (!netPlayer[playerIndex])
netPlayer[playerIndex] = this;
- ares->queryHostname((struct sockaddr *) &clientAddr);
+ ares->queryHostname((const struct sockaddr *) &clientAddr);
}
NetHandler::NetHandler(const struct sockaddr_in &_clientAddr, int _fd)
@@ -402,7 +402,7 @@
return -1;
}
if (n > 0) {
- buffer = (void*)(((const char*)buffer) + n);
+ buffer = (const void*)(((const char*)buffer) + n);
length -= n;
}
}
Modified: trunk/bzflag/src/net/AresHandler.cxx
===================================================================
--- trunk/bzflag/src/net/AresHandler.cxx 2013-05-23 07:55:08 UTC (rev 22767)
+++ trunk/bzflag/src/net/AresHandler.cxx 2013-05-25 06:40:52 UTC (rev 22768)
@@ -80,13 +80,13 @@
}
-void AresHandler::queryHostname(struct sockaddr *clientAddr)
+void AresHandler::queryHostname(const struct sockaddr *clientAddr)
{
if (aresFailed)
return;
status = HbAPending;
// launch the asynchronous query to look up this hostname
- ares_gethostbyaddr(aresChannel, &((sockaddr_in *)clientAddr)->sin_addr,
+ ares_gethostbyaddr(aresChannel, &((const sockaddr_in *)clientAddr)->sin_addr,
sizeof(in_addr), AF_INET, staticCallback, (void *)this);
logDebugMessage(2,"Player [%d] submitted reverse resolve query\n", index);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-23 07:55:12
|
Revision: 22767
http://sourceforge.net/p/bzflag/code/22767
Author: bullet_catcher
Date: 2013-05-23 07:55:08 +0000 (Thu, 23 May 2013)
Log Message:
-----------
Revert r22761 changes to CacheManager::addFile() and
CachedTexture::finalization() interfaces that prevent
the completion of a texture download.
Preserve const quality in a call to MD5::update().
Revision Links:
--------------
http://sourceforge.net/p/bzflag/code/22761
Modified Paths:
--------------
trunk/bzflag/include/CacheManager.h
trunk/bzflag/src/bzflag/Downloads.cxx
trunk/bzflag/src/game/CacheManager.cxx
Modified: trunk/bzflag/include/CacheManager.h
===================================================================
--- trunk/bzflag/include/CacheManager.h 2013-05-23 06:23:54 UTC (rev 22766)
+++ trunk/bzflag/include/CacheManager.h 2013-05-23 07:55:08 UTC (rev 22767)
@@ -38,7 +38,7 @@
bool saveIndex();
bool findURL(const std::string& url, CacheRecord& record);
- bool addFile(CacheRecord& rec, const unsigned char* data);
+ bool addFile(CacheRecord& rec, const void* data);
std::vector<CacheRecord> getCacheList() const;
Modified: trunk/bzflag/src/bzflag/Downloads.cxx
===================================================================
--- trunk/bzflag/src/bzflag/Downloads.cxx 2013-05-23 06:23:54 UTC (rev 22766)
+++ trunk/bzflag/src/bzflag/Downloads.cxx 2013-05-23 07:55:08 UTC (rev 22767)
@@ -72,7 +72,7 @@
public:
CachedTexture(const std::string &texUrl);
- virtual void finalization(unsigned char *data, unsigned int length, bool good);
+ virtual void finalization(char *data, unsigned int length, bool good);
static void setParams(bool check, long timeout);
static int activeTransfer();
@@ -130,7 +130,7 @@
byteTransferred = 0;
}
-void CachedTexture::finalization(unsigned char *data, unsigned int length, bool good)
+void CachedTexture::finalization(char *data, unsigned int length, bool good)
{
time_t filetime;
Modified: trunk/bzflag/src/game/CacheManager.cxx
===================================================================
--- trunk/bzflag/src/game/CacheManager.cxx 2013-05-23 06:23:54 UTC (rev 22766)
+++ trunk/bzflag/src/game/CacheManager.cxx 2013-05-23 07:55:08 UTC (rev 22767)
@@ -108,7 +108,7 @@
}
-bool CacheManager::addFile(CacheRecord& record, const unsigned char* data)
+bool CacheManager::addFile(CacheRecord& record, const void* data)
{
if (((data == NULL) && (record.size != 0)) || (record.url.size() <= 0)) {
return false;
@@ -135,7 +135,7 @@
rec->usedDate = time(NULL); // update the timestamp
MD5 md5;
- md5.update(data, rec->size);
+ md5.update((const unsigned char *)data, rec->size);
md5.finalize();
rec->key = md5.hexdigest();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-23 06:23:57
|
Revision: 22766
http://sourceforge.net/p/bzflag/code/22766
Author: bullet_catcher
Date: 2013-05-23 06:23:54 +0000 (Thu, 23 May 2013)
Log Message:
-----------
Revert GuidedMissileStrategy::sendUpdate() to const on the object to match
the way it is called, preventing fallback to the base class's sendUpdate().
Also make "needUpdate" mutable to avoid ugly const casting.
This fixes the remote client GM tracking bug introduced in r22751.
Revision Links:
--------------
http://sourceforge.net/p/bzflag/code/22751
Modified Paths:
--------------
trunk/bzflag/src/bzflag/GuidedMissleStrategy.cxx
trunk/bzflag/src/bzflag/GuidedMissleStrategy.h
Modified: trunk/bzflag/src/bzflag/GuidedMissleStrategy.cxx
===================================================================
--- trunk/bzflag/src/bzflag/GuidedMissleStrategy.cxx 2013-05-18 22:11:53 UTC (rev 22765)
+++ trunk/bzflag/src/bzflag/GuidedMissleStrategy.cxx 2013-05-23 06:23:54 UTC (rev 22766)
@@ -377,11 +377,11 @@
return minTime;
}
-void GuidedMissileStrategy::sendUpdate(const FiringInfo& firingInfo)
+void GuidedMissileStrategy::sendUpdate(const FiringInfo& firingInfo) const
{
// only send an update when needed
if (!needUpdate) return;
- this->needUpdate = false;
+ needUpdate = false;
// construct and send packet
char packet[ShotUpdatePLen + PlayerIdPLen];
Modified: trunk/bzflag/src/bzflag/GuidedMissleStrategy.h
===================================================================
--- trunk/bzflag/src/bzflag/GuidedMissleStrategy.h 2013-05-18 22:11:53 UTC (rev 22765)
+++ trunk/bzflag/src/bzflag/GuidedMissleStrategy.h 2013-05-23 06:23:54 UTC (rev 22766)
@@ -36,7 +36,7 @@
void update(float dt);
float checkHit(const BaseLocalPlayer*, float[3]) const;
- void sendUpdate(const FiringInfo&);
+ void sendUpdate(const FiringInfo&) const;
void readUpdate(uint16_t, const void*);
void addShot(SceneDatabase*, bool colorblind);
void expire();
@@ -57,7 +57,7 @@
float puffTime,rootPuff;
TimeKeeper lastPuff;
- bool needUpdate;
+ mutable bool needUpdate;
PlayerId lastTarget;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-18 22:11:55
|
Revision: 22765
http://sourceforge.net/p/bzflag/code/22765
Author: bullet_catcher
Date: 2013-05-18 22:11:53 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Simplify experimental quality laser bolt coloring to preserve const quality.
Remove no-longer-needed vector rgb() methods.
Modified Paths:
--------------
trunk/bzflag/include/vectors.h
trunk/bzflag/src/geometry/LaserSceneNode.cxx
Modified: trunk/bzflag/include/vectors.h
===================================================================
--- trunk/bzflag/include/vectors.h 2013-05-18 20:19:54 UTC (rev 22764)
+++ trunk/bzflag/include/vectors.h 2013-05-18 22:11:53 UTC (rev 22765)
@@ -377,8 +377,6 @@
inline const vec3<T>& xyz() const { return *(new((void*)&x) vec3<T>(false)); }
inline vec3<T>& yzw() { return *(new((void*)&y) vec3<T>(false)); }
inline const vec3<T>& yzw() const { return *(new((void*)&y) vec3<T>(false)); }
- inline vec3<T>& rgb() { return xyz(); }
- inline const vec3<T>& rgb() const { return xyz(); }
vec4& operator+=(const vec4& v) { x += v.x; y += v.y; z += v.z; w += v.w; return *this; }
vec4& operator-=(const vec4& v) { x -= v.x; y -= v.y; z -= v.z; w -= v.w; return *this; }
Modified: trunk/bzflag/src/geometry/LaserSceneNode.cxx
===================================================================
--- trunk/bzflag/src/geometry/LaserSceneNode.cxx 2013-05-18 20:19:54 UTC (rev 22764)
+++ trunk/bzflag/src/geometry/LaserSceneNode.cxx 2013-05-18 22:11:53 UTC (rev 22765)
@@ -163,26 +163,28 @@
GLUquadric *q = gluNewQuadric();
- const fvec4& centerColor = sceneNode->centerColor;
- const fvec4& color = sceneNode->color;
+ fvec4 centerColor = sceneNode->centerColor;
+ centerColor.a = 0.85f;
+ fvec4 color = sceneNode->color;
+ color.a = 0.125f;
- myColor4fv(fvec4(centerColor.rgb(), 0.85f));
+ myColor4fv(centerColor);
gluCylinder(q, 0.0625f, 0.0625f, length, 10, 1);
addTriangleCount(20);
- myColor4fv(fvec4(color.rgb(), 0.125f));
+ myColor4fv(color);
gluCylinder(q, 0.1f, 0.1f, length, 16, 1);
addTriangleCount(32);
- myColor4fv(fvec4(color.rgb(), 0.125f));
+ myColor4fv(color);
gluCylinder(q, 0.2f, 0.2f, length, 24, 1);
addTriangleCount(48);
- myColor4fv(fvec4(color.rgb(), 0.125f));
+ myColor4fv(color);
gluCylinder(q, 0.4f, 0.4f, length, 32, 1);
addTriangleCount(64);
- myColor4fv(fvec4(color.rgb(), 0.125f));
+ myColor4fv(color);
if (sceneNode->first) {
gluSphere(q, 0.5f, 32, 32);
addTriangleCount(32 * 32 * 2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-18 20:19:56
|
Revision: 22764
http://sourceforge.net/p/bzflag/code/22764
Author: bullet_catcher
Date: 2013-05-18 20:19:54 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Preserve const quality in collision manager.
Add "Local Variables: ***" comment for Emacs.
Modified Paths:
--------------
trunk/bzflag/include/CollisionManager.h
trunk/bzflag/src/game/CollisionManager.cxx
Modified: trunk/bzflag/include/CollisionManager.h
===================================================================
--- trunk/bzflag/include/CollisionManager.h 2013-05-18 19:54:06 UTC (rev 22763)
+++ trunk/bzflag/include/CollisionManager.h 2013-05-18 20:19:54 UTC (rev 22764)
@@ -49,7 +49,7 @@
typedef struct {
int count;
- class ColDetNode** list;
+ const class ColDetNode** list;
} ColDetNodeList;
Modified: trunk/bzflag/src/game/CollisionManager.cxx
===================================================================
--- trunk/bzflag/src/game/CollisionManager.cxx 2013-05-18 19:54:06 UTC (rev 22763)
+++ trunk/bzflag/src/game/CollisionManager.cxx 2013-05-18 20:19:54 UTC (rev 22764)
@@ -74,7 +74,7 @@
return;
}
-inline static void addToRayList (ColDetNode* node)
+inline static void addToRayList (const ColDetNode* node)
{
RayList.list[RayList.count] = node;
RayList.count++;
@@ -481,7 +481,7 @@
root->tallyStats();
// setup the ray list
- RayList.list = new ColDetNode*[leafNodes];
+ RayList.list = new const ColDetNode*[leafNodes];
RayList.count = 0;
// print some statistics
@@ -868,7 +868,7 @@
}
if (childCount == 0) {
- addToRayList((ColDetNode*)this);
+ addToRayList(this);
}
else {
for (int i = 0; i < childCount; i++) {
@@ -960,6 +960,7 @@
}
+// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
// c-basic-offset: 2 ***
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-18 19:54:08
|
Revision: 22763
http://sourceforge.net/p/bzflag/code/22763
Author: bullet_catcher
Date: 2013-05-18 19:54:06 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Preserve const quality in API.
Modified Paths:
--------------
trunk/bzflag/include/bzfsAPI.h
trunk/bzflag/src/bzfs/bzfsAPI.cxx
trunk/bzflag/src/bzfs/bzfsHTTPAPI.cxx
Modified: trunk/bzflag/include/bzfsAPI.h
===================================================================
--- trunk/bzflag/include/bzfsAPI.h 2013-05-17 20:26:04 UTC (rev 22762)
+++ trunk/bzflag/include/bzfsAPI.h 2013-05-18 19:54:06 UTC (rev 22763)
@@ -1621,7 +1621,7 @@
public:
bz_BaseURLHandler() { version = 1; }
virtual ~bz_BaseURLHandler(){};
- virtual void URLDone ( const char* URL, void * data, unsigned int size, bool complete ) = 0;
+ virtual void URLDone ( const char* URL, const void * data, unsigned int size, bool complete ) = 0;
virtual void URLTimeout ( const char* /*URL*/, int /*errorCode*/ ){};
virtual void URLError ( const char* /*URL*/, int /*errorCode*/, const char * /*errorString*/ ){};
Modified: trunk/bzflag/src/bzfs/bzfsAPI.cxx
===================================================================
--- trunk/bzflag/src/bzfs/bzfsAPI.cxx 2013-05-17 20:26:04 UTC (rev 22762)
+++ trunk/bzflag/src/bzfs/bzfsAPI.cxx 2013-05-18 19:54:06 UTC (rev 22763)
@@ -69,7 +69,7 @@
doNext();
}
- virtual void URLDone ( const char*, void * data, unsigned int size, bool complete )
+ virtual void URLDone ( const char*, const void * data, unsigned int size, bool complete )
{
if (!busy)
return;
@@ -821,7 +821,7 @@
chunkSize = (left < maxNonPlayerDataChunk) ? left : maxNonPlayerDataChunk;
- peer->sendChunks.push_back(std::string((char*)data + pos, chunkSize));
+ peer->sendChunks.push_back(std::string((const char*)data + pos, chunkSize));
}
// send off at least one now if it was empty
@@ -3024,7 +3024,7 @@
((bz_URLHandler_V2*)Tasks[0].handler)->token = Tasks[0].token;
}
if (bufferedJobData.size())
- Tasks[0].handler->URLDone(Tasks[0].url.c_str(),(void*)bufferedJobData.c_str(),bufferedJobData.size(),true);
+ Tasks[0].handler->URLDone(Tasks[0].url.c_str(),bufferedJobData.c_str(),bufferedJobData.size(),true);
else
Tasks[0].handler->URLError(Tasks[0].url.c_str(),1,"Error");
Modified: trunk/bzflag/src/bzfs/bzfsHTTPAPI.cxx
===================================================================
--- trunk/bzflag/src/bzfs/bzfsHTTPAPI.cxx 2013-05-17 20:26:04 UTC (rev 22762)
+++ trunk/bzflag/src/bzfs/bzfsHTTPAPI.cxx 2013-05-18 19:54:06 UTC (rev 22763)
@@ -758,7 +758,7 @@
list[n] = std::string(d);
}
- virtual void URLDone (const char*, void *data, unsigned int size, bool complete)
+ virtual void URLDone (const char*, const void *data, unsigned int size, bool complete)
{
if (data && size)
bzAuthReturnData += std::string((const char*)data,size);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-17 20:26:07
|
Revision: 22762
http://sourceforge.net/p/bzflag/code/22762
Author: bullet_catcher
Date: 2013-05-17 20:26:04 +0000 (Fri, 17 May 2013)
Log Message:
-----------
Preserve const quality in some miscellaneous easy cases.
Modified Paths:
--------------
trunk/bzflag/src/bzfs/EntryZones.cxx
trunk/bzflag/src/bzfs/bzfs.cxx
trunk/bzflag/src/bzfs/bzfsHTTPAPI.cxx
trunk/bzflag/src/game/MsgStrings.cxx
Modified: trunk/bzflag/src/bzfs/EntryZones.cxx
===================================================================
--- trunk/bzflag/src/bzfs/EntryZones.cxx 2013-05-17 16:24:26 UTC (rev 22761)
+++ trunk/bzflag/src/bzfs/EntryZones.cxx 2013-05-17 20:26:04 UTC (rev 22762)
@@ -201,7 +201,7 @@
return false;
}
- CustomZone *zone = ((CustomZone *) &zones[closest]);
+ const CustomZone *zone = &zones[closest];
zone->getRandomPoint(pt);
return true;
Modified: trunk/bzflag/src/bzfs/bzfs.cxx
===================================================================
--- trunk/bzflag/src/bzfs/bzfs.cxx 2013-05-17 16:24:26 UTC (rev 22761)
+++ trunk/bzflag/src/bzfs/bzfs.cxx 2013-05-17 20:26:04 UTC (rev 22762)
@@ -949,7 +949,7 @@
static void relayPlayerPacket(int index, uint16_t len, const void *rawbuf, uint16_t code)
{
if (Record::enabled()) {
- Record::addPacket(code, len, (char*)rawbuf + 4);
+ Record::addPacket(code, len, (const char*)rawbuf + 4);
}
// relay packet to all players except origin
Modified: trunk/bzflag/src/bzfs/bzfsHTTPAPI.cxx
===================================================================
--- trunk/bzflag/src/bzfs/bzfsHTTPAPI.cxx 2013-05-17 16:24:26 UTC (rev 22761)
+++ trunk/bzflag/src/bzfs/bzfsHTTPAPI.cxx 2013-05-17 20:26:04 UTC (rev 22762)
@@ -492,7 +492,7 @@
RESPONSE_DATA(data);
if (v && size)
- data->Body += std::string((char*)v,size);
+ data->Body += std::string((const char*)v,size);
}
//---- Request----
Modified: trunk/bzflag/src/game/MsgStrings.cxx
===================================================================
--- trunk/bzflag/src/game/MsgStrings.cxx 2013-05-17 16:24:26 UTC (rev 22761)
+++ trunk/bzflag/src/game/MsgStrings.cxx 2013-05-17 20:26:04 UTC (rev 22762)
@@ -62,7 +62,7 @@
static std::string strFlagStatus (FlagStatus status);
static std::string strTeam (u16 id);
static std::string strPlayer (u16 id);
-static std::string strVector (float *vector);
+static std::string strVector (const float *vector);
static std::string strKillReason (int16_t reason);
static std::string strAddress (Address& address);
@@ -417,7 +417,7 @@
}
-static std::string strVector (float *vector)
+static std::string strVector (const float *vector)
{
std::string str = TextUtils::format ("(%8.3f, %8.3f, %8.3f)",
vector[0], vector[1], vector[2]);
@@ -893,8 +893,8 @@
listPush (list, 1, "type: %.2s", finfo.flagType->flagAbbv.c_str()); // FIXME ?
listPush (list, 2, "id: %i", shot.id);
listPush (list, 2, "team: %s", strTeam(shot.team).c_str());
- listPush (list, 2, "pos: %s", strVector((float*)shot.pos).c_str());
- listPush (list, 2, "vel: %s", strVector((float*)shot.vel).c_str());
+ listPush (list, 2, "pos: %s", strVector(shot.pos).c_str());
+ listPush (list, 2, "vel: %s", strVector(shot.vel).c_str());
listPush (list, 2, "lifetime: %-8.3f", finfo.lifetime);
return list;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bul...@us...> - 2013-05-17 16:24:28
|
Revision: 22761
http://sourceforge.net/p/bzflag/code/22761
Author: bullet_catcher
Date: 2013-05-17 16:24:26 +0000 (Fri, 17 May 2013)
Log Message:
-----------
Preserve const quality in cache management.
Modified Paths:
--------------
trunk/bzflag/include/CacheManager.h
trunk/bzflag/src/bzflag/Downloads.cxx
trunk/bzflag/src/game/CacheManager.cxx
Modified: trunk/bzflag/include/CacheManager.h
===================================================================
--- trunk/bzflag/include/CacheManager.h 2013-05-17 15:42:40 UTC (rev 22760)
+++ trunk/bzflag/include/CacheManager.h 2013-05-17 16:24:26 UTC (rev 22761)
@@ -38,7 +38,7 @@
bool saveIndex();
bool findURL(const std::string& url, CacheRecord& record);
- bool addFile(CacheRecord& rec, const void* data);
+ bool addFile(CacheRecord& rec, const unsigned char* data);
std::vector<CacheRecord> getCacheList() const;
Modified: trunk/bzflag/src/bzflag/Downloads.cxx
===================================================================
--- trunk/bzflag/src/bzflag/Downloads.cxx 2013-05-17 15:42:40 UTC (rev 22760)
+++ trunk/bzflag/src/bzflag/Downloads.cxx 2013-05-17 16:24:26 UTC (rev 22761)
@@ -72,7 +72,7 @@
public:
CachedTexture(const std::string &texUrl);
- virtual void finalization(char *data, unsigned int length, bool good);
+ virtual void finalization(unsigned char *data, unsigned int length, bool good);
static void setParams(bool check, long timeout);
static int activeTransfer();
@@ -130,7 +130,7 @@
byteTransferred = 0;
}
-void CachedTexture::finalization(char *data, unsigned int length, bool good)
+void CachedTexture::finalization(unsigned char *data, unsigned int length, bool good)
{
time_t filetime;
Modified: trunk/bzflag/src/game/CacheManager.cxx
===================================================================
--- trunk/bzflag/src/game/CacheManager.cxx 2013-05-17 15:42:40 UTC (rev 22760)
+++ trunk/bzflag/src/game/CacheManager.cxx 2013-05-17 16:24:26 UTC (rev 22761)
@@ -108,7 +108,7 @@
}
-bool CacheManager::addFile(CacheRecord& record, const void* data)
+bool CacheManager::addFile(CacheRecord& record, const unsigned char* data)
{
if (((data == NULL) && (record.size != 0)) || (record.url.size() <= 0)) {
return false;
@@ -130,12 +130,12 @@
replacement = true;
}
- out->write((char*)data, rec->size);
+ out->write((const char *)data, rec->size);
rec->usedDate = time(NULL); // update the timestamp
MD5 md5;
- md5.update((unsigned char *)data, rec->size);
+ md5.update(data, rec->size);
md5.finalize();
rec->key = md5.hexdigest();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
27 messages has been excluded from this view by a project administrator.
