Update of /cvsroot/netrek/client/cow
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24918
Modified Files:
cowmain.c data.c data.h defs.h getname.c input.c local.c
newwin.c playback.c short.c socket.c struct.h system.mk.in
x11window.c camera.c camera.h config.guess config.sub
configure
Log Message:
ut06 full screen, det circle, quit on motd, add icon, add desktop file
Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/local.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- local.c 22 Jun 2002 04:43:24 -0000 1.7
+++ local.c 19 Sep 2006 10:20:39 -0000 1.8
@@ -4,6 +4,9 @@
* Functions to maintain the local map.
*
* $Log$
+ * Revision 1.8 2006/09/19 10:20:39 quozl
+ * ut06 full screen, det circle, quit on motd, add icon, add desktop file
+ *
* Revision 1.7 2002/06/22 04:43:24 tanner
* Clean up of SDL code. #ifdef'd out functions not needed in SDL.
*
@@ -644,6 +647,23 @@
dy - (shield_height / 2), shield, color);
#endif
}
+ /* Det circle */
+ if (detCircle)
+ {
+ if (myPlayer(j) || isObsLockPlayer(j))
+ {
+ int dcr = DETDIST*2/SCALE;
+ int dcx = dx - (dcr/2);
+ int dcy = dy - (dcr/2);
+ W_WriteCircle(w, dcy, dcy, dcr, W_Red);
+ clearzone[0][clearcount] = dcx;
+ clearzone[1][clearcount] = dcy;
+ clearzone[2][clearcount] = dcr + dcr;
+ clearzone[3][clearcount] = dcr + dcr;
+ clearcount++;
+ detCircle--;
+ }
+ }
if (j->p_flags & PFCLOAK) /* when cloaked stop here */
continue;
@@ -652,7 +672,7 @@
idbuf[0] = *(shipnos + j->p_no);
- if (j == me)
+ if (myPlayer(j) || isObsLockPlayer(j))
{
switch (me->p_flags & (PFGREEN | PFYELLOW | PFRED))
{
Index: configure
===================================================================
RCS file: /cvsroot/netrek/client/cow/configure,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- configure 27 Jan 2006 09:57:27 -0000 1.18
+++ configure 19 Sep 2006 10:20:39 -0000 1.19
@@ -2519,14 +2519,12 @@
-if test "$code" = cow; then
- if test "$stable" = nope; then
- SAVELIBS="$LIBS"
- LIBS="$LIBS $XLIBSWDIR $XLIBSWLIB"
- SAVEINCS="$INCS"
- INCS="$INCS $XINCLUDES"
- echo $ac_n "checking for main in -lXpm""... $ac_c" 1>&6
-echo "configure:2530: checking for main in -lXpm" >&5
+SAVELIBS="$LIBS"
+LIBS="$LIBS $XLIBSWDIR $XLIBSWLIB"
+SAVEINCS="$INCS"
+INCS="$INCS $XINCLUDES"
+echo $ac_n "checking for main in -lXpm""... $ac_c" 1>&6
+echo "configure:2528: checking for main in -lXpm" >&5
ac_lib_var=`echo Xpm'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2534,14 +2532,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lXpm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2538 "configure"
+#line 2536 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2564,21 +2562,21 @@
echo "$ac_t""no" 1>&6
fi
- for ac_hdr in X11/xpm.h
+for ac_hdr in X11/xpm.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2572: checking for $ac_hdr" >&5
+echo "configure:2570: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2577 "configure"
+#line 2575 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2604,31 +2602,22 @@
fi
done
- LIBS="$SAVELIBS"
- INCS="$SAVEINCS"
- fi
-fi
+LIBS="$SAVELIBS"
+INCS="$SAVEINCS"
# Fix link order for Xpm
XLIBSW="$XLIBSWDIR $XPMLIBS $XLIBSWLIB"
-if test "$code" = server; then
-
-
- true # dummy line
-else
- INCS="$INCS $XINCLUDES"
-
- LIBS="$LIBS $XLIBSW"
-fi
+INCS="$INCS $XINCLUDES"
+LIBS="$LIBS $XLIBSW"
#--------------------------------------------------------------------
# Check for gmp and mp
#--------------------------------------------------------------------
echo $ac_n "checking for mp.h""... $ac_c" 1>&6
-echo "configure:2632: checking for mp.h" >&5
+echo "configure:2621: checking for mp.h" >&5
# Check whether --with-gmp-incdir or --without-gmp-incdir was given.
if test "${with_gmp_incdir+set}" = set; then
withval="$with_gmp_incdir"
@@ -2639,7 +2628,7 @@
if test "$MPINC" = nope; then
cat > conftest.$ac_ext <<EOF
-#line 2643 "configure"
+#line 2632 "configure"
#include "confdefs.h"
#include <mp.h>
@@ -2659,15 +2648,15 @@
fi
echo $ac_n "checking for gmp.h""... $ac_c" 1>&6
-echo "configure:2663: checking for gmp.h" >&5
+echo "configure:2652: checking for gmp.h" >&5
if test "$MPINC" = nope; then
cat > conftest.$ac_ext <<EOF
-#line 2666 "configure"
+#line 2655 "configure"
#include "confdefs.h"
#include <gmp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2698,12 +2687,12 @@
if test "$code" = cow; then
# mp not supported with new mkkey.
cat > conftest.$ac_ext <<EOF
-#line 2702 "configure"
+#line 2691 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2718,12 +2707,12 @@
rm -f conftest*
else
cat > conftest.$ac_ext <<EOF
-#line 2722 "configure"
+#line 2711 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2755,7 +2744,7 @@
SAVEINCS="$INCS"
INCS="$INCS $XINCLUDES"
cat > conftest.$ac_ext <<EOF
-#line 2759 "configure"
+#line 2748 "configure"
#include "confdefs.h"
#include <gmp.h>
@@ -2787,7 +2776,7 @@
MPLIB=nope
else
echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6
-echo "configure:2791: checking for main in -lmp" >&5
+echo "configure:2780: checking for main in -lmp" >&5
ac_lib_var=`echo mp'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2795,14 +2784,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2799 "configure"
+#line 2788 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2824,7 +2813,7 @@
fi
echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6
-echo "configure:2828: checking for main in -lgmp" >&5
+echo "configure:2817: checking for main in -lgmp" >&5
ac_lib_var=`echo gmp'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2832,14 +2821,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lgmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2836 "configure"
+#line 2825 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2878,7 +2867,7 @@
if test "$MPLIB" = nope; then
if test "$code" = cow; then
echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6
-echo "configure:2882: checking for main in -lmp" >&5
+echo "configure:2871: checking for main in -lmp" >&5
ac_lib_var=`echo mp'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2886,14 +2875,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2890 "configure"
+#line 2879 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2916,7 +2905,7 @@
else
echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6
-echo "configure:2920: checking for main in -lmp" >&5
+echo "configure:2909: checking for main in -lmp" >&5
ac_lib_var=`echo mp'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2924,14 +2913,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lmp $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2928 "configure"
+#line 2917 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2980,7 +2969,7 @@
fi
if test "$code" = server; then
echo $ac_n "checking res-rsa/configure""... $ac_c" 1>&6
-echo "configure:2984: checking res-rsa/configure" >&5
+echo "configure:2973: checking res-rsa/configure" >&5
if test -r "$srcdir/res-rsa/configure"; then
subdirs="$srcdir/res-rsa"
@@ -3006,7 +2995,7 @@
#--------------------------------------------------------------------
echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:3010: checking for main in -lXbsd" >&5
+echo "configure:2999: checking for main in -lXbsd" >&5
ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3014,14 +3003,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lXbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3018 "configure"
+#line 3007 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3044,7 +3033,7 @@
# AC _CHECK_LIB(V3, main, [LIBS="$LIBS -lV3"])
# AC _CHECK_LIB(PW, main, [LIBS="$LIBS -lPW"])
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:3048: checking for main in -lsocket" >&5
+echo "configure:3037: checking for main in -lsocket" >&5
ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3052,14 +3041,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3056 "configure"
+#line 3045 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3080,7 +3069,7 @@
fi
echo $ac_n "checking for main in -linet""... $ac_c" 1>&6
-echo "configure:3084: checking for main in -linet" >&5
+echo "configure:3073: checking for main in -linet" >&5
ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3088,14 +3077,14 @@
ac_save_LIBS="$LIBS"
LIBS="-linet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3092 "configure"
+#line 3081 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3116,7 +3105,7 @@
fi
echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:3120: checking for main in -lnsl" >&5
+echo "configure:3109: checking for main in -lnsl" >&5
ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3124,14 +3113,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3128 "configure"
+#line 3117 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3152,7 +3141,7 @@
fi
echo $ac_n "checking for main in -lseq""... $ac_c" 1>&6
-echo "configure:3156: checking for main in -lseq" >&5
+echo "configure:3145: checking for main in -lseq" >&5
ac_lib_var=`echo seq'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3160,14 +3149,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lseq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3164 "configure"
+#line 3153 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3188,7 +3177,7 @@
fi
echo $ac_n "checking for main in -lsun""... $ac_c" 1>&6
-echo "configure:3192: checking for main in -lsun" >&5
+echo "configure:3181: checking for main in -lsun" >&5
ac_lib_var=`echo sun'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3196,14 +3185,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lsun $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3200 "configure"
+#line 3189 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3226,7 +3215,7 @@
if test "$code" = server; then
echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6
-echo "configure:3230: checking for main in -lipc" >&5
+echo "configure:3219: checking for main in -lipc" >&5
ac_lib_var=`echo ipc'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3234,14 +3223,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3238 "configure"
+#line 3227 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3262,7 +3251,7 @@
fi
echo $ac_n "checking for main in -lshm""... $ac_c" 1>&6
-echo "configure:3266: checking for main in -lshm" >&5
+echo "configure:3255: checking for main in -lshm" >&5
ac_lib_var=`echo shm'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3270,14 +3259,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lshm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3274 "configure"
+#line 3263 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3298,7 +3287,7 @@
fi
echo $ac_n "checking for main in -lstuff""... $ac_c" 1>&6
-echo "configure:3302: checking for main in -lstuff" >&5
+echo "configure:3291: checking for main in -lstuff" >&5
ac_lib_var=`echo stuff'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3306,14 +3295,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lstuff $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3310 "configure"
+#line 3299 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3335,7 +3324,7 @@
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:3339: checking for crypt in -lcrypt" >&5
+echo "configure:3328: checking for crypt in -lcrypt" >&5
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3343,7 +3332,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3347 "configure"
+#line 3336 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3354,7 +3343,7 @@
crypt()
; return 0; }
EOF
-if { (eval echo configure:3358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3377,7 +3366,7 @@
echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6
-echo "configure:3381: checking for main in -ltermcap" >&5
+echo "configure:3370: checking for main in -ltermcap" >&5
ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3385,14 +3374,14 @@
ac_save_LIBS="$LIBS"
LIBS="-ltermcap $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3389 "configure"
+#line 3378 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3415,7 +3404,7 @@
echo $ac_n "checking for newwin in -lcurses""... $ac_c" 1>&6
-echo "configure:3419: checking for newwin in -lcurses" >&5
+echo "configure:3408: checking for newwin in -lcurses" >&5
ac_lib_var=`echo curses'_'newwin | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3423,7 +3412,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3427 "configure"
+#line 3416 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -3434,7 +3423,7 @@
newwin()
; return 0; }
EOF
-if { (eval echo configure:3438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3463,12 +3452,12 @@
#--------------------------------------------------------------------
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3467: checking return type of signal handlers" >&5
+echo "configure:3456: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3472 "configure"
+#line 3461 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -3485,7 +3474,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:3489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -3504,7 +3493,7 @@
echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6
-echo "configure:3508: checking for restartable system calls" >&5
+echo "configure:3497: checking for restartable system calls" >&5
if eval "test \"`echo '$''{'ac_cv_sys_restartable_syscalls'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3512,7 +3501,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3516 "configure"
+#line 3505 "configure"
#include "confdefs.h"
/* Exit 0 (true) if wait returns something other than -1,
i.e. the pid of the child, which means that wait was restarted
@@ -3530,7 +3519,7 @@
}
EOF
-if { (eval echo configure:3534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sys_restartable_syscalls=yes
else
@@ -3553,7 +3542,7 @@
fi
echo $ac_n "checking for signals style""... $ac_c" 1>&6
-echo "configure:3557: checking for signals style" >&5
+echo "configure:3546: checking for signals style" >&5
if eval "test \"`echo '$''{'cow_cv_signals_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3562,7 +3551,7 @@
else
cat > conftest.$ac_ext <<EOF
-#line 3566 "configure"
+#line 3555 "configure"
#include "confdefs.h"
#include <signal.h>
@@ -3582,7 +3571,7 @@
exit(0);}
EOF
-if { (eval echo configure:3586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cow_cv_signals_type=BSD
else
@@ -3606,12 +3595,12 @@
else
if test "x$cow_cv_signals_type" = xSYSV_or_POSIX; then
echo $ac_n "checking for sigset""... $ac_c" 1>&6
-echo "configure:3610: checking for sigset" >&5
+echo "configure:3599: checking for sigset" >&5
if eval "test \"`echo '$''{'ac_cv_func_sigset'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3615 "configure"
+#line 3604 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sigset(); below. */
@@ -3634,7 +3623,7 @@
; return 0; }
EOF
-if { (eval echo configure:3638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_sigset=yes"
else
@@ -3674,12 +3663,12 @@
for ac_func in usleep random setstate strftime ftime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3678: checking for $ac_func" >&5
+echo "configure:3667: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3683 "configure"
+#line 3672 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3702,7 +3691,7 @@
; return 0; }
EOF
-if { (eval echo configure:3706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3728,7 +3717,7 @@
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:3732: checking for main in -lm" >&5
+echo "configure:3721: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3736,14 +3725,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3740 "configure"
+#line 3729 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3766,12 +3755,12 @@
for ac_func in nint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3770: checking for $ac_func" >&5
+echo "configure:3759: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3775 "configure"
+#line 3764 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3794,7 +3783,7 @@
; return 0; }
EOF
-if { (eval echo configure:3798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3819,7 +3808,7 @@
done
cat > conftest.$ac_ext <<EOF
-#line 3823 "configure"
+#line 3812 "configure"
#include "confdefs.h"
#include <math.h>
EOF
@@ -3840,12 +3829,12 @@
for ac_func in usleep setstate strdup rint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3844: checking for $ac_func" >&5
+echo "configure:3833: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3849 "configure"
+#line 3838 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3868,7 +3857,7 @@
; return 0; }
EOF
-if { (eval echo configure:3872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3899,12 +3888,12 @@
for ac_func in random strdup rint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3903: checking for $ac_func" >&5
+echo "configure:3892: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3908 "configure"
+#line 3897 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3927,7 +3916,7 @@
; return 0; }
EOF
-if { (eval echo configure:3931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3962,7 +3951,7 @@
if test "$code" = server; then
echo $ac_n "checking for netstat""... $ac_c" 1>&6
-echo "configure:3966: checking for netstat" >&5
+echo "configure:3955: checking for netstat" >&5
dirs="/bsd /usr/bsd /etc /bin /usr/bin /usr/etc"
NETSTAT="nice -20 /usr/ucb/netstat -f inet"
for i in $dirs; do
@@ -3978,7 +3967,7 @@
done
echo $ac_n "checking for uptime""... $ac_c" 1>&6
-echo "configure:3982: checking for uptime" >&5
+echo "configure:3971: checking for uptime" >&5
dirs="/bsd /usr/bsd /etc /bin /usr/bin /usr/etc"
for i in $dirs; do
if test -x $i/uptime; then
@@ -4040,7 +4029,7 @@
# Extract the first word of "sdl-config", so it can be a program name with args.
set dummy sdl-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4044: checking for $ac_word" >&5
+echo "configure:4033: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4075,7 +4064,7 @@
min_sdl_version=1.2.4
echo $ac_n "checking for SDL - version >= $min_sdl_version""... $ac_c" 1>&6
-echo "configure:4079: checking for SDL - version >= $min_sdl_version" >&5
+echo "configure:4068: checking for SDL - version >= $min_sdl_version" >&5
no_sdl=""
if test "$SDL_CONFIG" = "no" ; then
no_sdl=yes
@@ -4101,7 +4090,7 @@
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 4105 "configure"
+#line 4094 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -4162,7 +4151,7 @@
EOF
-if { (eval echo configure:4166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -4201,7 +4190,7 @@
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4205 "configure"
+#line 4194 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -4216,7 +4205,7 @@
return 0;
; return 0; }
EOF
-if { (eval echo configure:4220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding SDL or finding the wrong"
@@ -4263,7 +4252,7 @@
if test x$no_sdl != xyes; then
have_SDLmixer=no
echo $ac_n "checking for Mix_OpenAudio in -lSDL_mixer""... $ac_c" 1>&6
-echo "configure:4267: checking for Mix_OpenAudio in -lSDL_mixer" >&5
+echo "configure:4256: checking for Mix_OpenAudio in -lSDL_mixer" >&5
ac_lib_var=`echo SDL_mixer'_'Mix_OpenAudio | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4271,7 +4260,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lSDL_mixer $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4275 "configure"
+#line 4264 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4282,7 +4271,7 @@
Mix_OpenAudio()
; return 0; }
EOF
-if { (eval echo configure:4286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4467,8 +4456,6 @@
s%@LN_S@%$LN_S%g
s%@NOX11@%$NOX11%g
s%@NOWIN32@%$NOWIN32%g
-s%@XINCLUDES@%$XINCLUDES%g
-s%@XLIBSW@%$XLIBSW%g
s%@INCS@%$INCS%g
s%@MPINC@%$MPINC%g
s%@MPLIB@%$MPLIB%g
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/cow/data.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- data.h 21 Jun 2002 00:29:02 -0000 1.8
+++ data.h 19 Sep 2006 10:20:39 -0000 1.9
@@ -2,6 +2,9 @@
/* data.h
*
* $Log$
+ * Revision 1.9 2006/09/19 10:20:39 quozl
+ * ut06 full screen, det circle, quit on motd, add icon, add desktop file
+ *
* Revision 1.8 2002/06/21 00:29:02 quozl
* describe playback states
*
@@ -219,6 +222,7 @@
extern int shrinkPhaserOnMiss;
extern int newDashboard, old_db;
extern int niftyNewMessages;
+extern int detCircle;
extern int fastQuit;
extern int babes;
extern int showlocal, showgalactic;
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/cow/defs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- defs.h 5 Aug 1999 16:46:32 -0000 1.2
+++ defs.h 19 Sep 2006 10:20:39 -0000 1.3
@@ -3,6 +3,9 @@
/* defs.h
*
* $Log$
+ * Revision 1.3 2006/09/19 10:20:39 quozl
+ * ut06 full screen, det circle, quit on motd, add icon, add desktop file
+ *
* Revision 1.2 1999/08/05 16:46:32 siegl
* remove several defines (BRMH, RABBITEARS, NEWDASHBOARD2)
*
@@ -21,17 +24,15 @@
#define ADDRLEN 10
#ifdef NBT
-#define MAX_MACRO 255
+#define MAX_MACRO 500
#endif
#ifndef MAXPLAYER
-#define MAXPLAYER 20
+#define MAXPLAYER 36 /* Defined in config.h as well */
#endif
-#define TESTERS 4 /* Priveledged slots for * *
- * robots and game 'testers'
- *
- */
+#define TESTERS 4 /* Priveledged slots for
+ * robots and game 'testers' */
#define MAXPLANETS 40
#define MAXTORP 8
#define MAXPLASMA 1
@@ -51,9 +52,9 @@
*
* * windows */
#define PSEUDOSIZE 16
-#define CLOAK_PHASES 7 /* number of drawing phases
- * * * in a cloak * *
- * engage/disengage */
+#define CLOAK_PHASES 7 /* number of drawing phases
+ * in a cloak
+ * engage/disengage */
#define NUMRANKS 9
/* These are configuration definitions */
@@ -67,7 +68,7 @@
* * * for 20 spaces */
#define EXPDIST 350 /* At this range a torp will
* * * explode */
-#define DETDIST 1600 /* At this range a player *
+#define DETDIST 1700 /* At this range a player *
* * can detonate a torp */
#define NUM_PLANET_BITMAPS 7
#define NUM_PLANET_BITMAPS2 8
@@ -88,31 +89,29 @@
/* 6 minutes is maximum for autoquit -- anything more causes problems in the
* server. (?) */
-#define AUTOQUIT 9*60 /* auto logout in 5 minutes */
+#define AUTOQUIT 9*60 /* auto logout in 5 minutes */
-#define VACANT -1 /* indicates vacant port on
- * * * a starbase */
+#define VACANT -1 /* indicates vacant port on
+ * a starbase */
#define DOCKDIST 600
-#define DOCKSPEED 2 /* If base is moving, there
- * * * will be some finesse
- * * * involved to dock */
+#define DOCKSPEED 2 /* If base is moving, there
+ * will be some finesse
+ * involved to dock */
#define NUMPORTS 4
-#define SBFUELMIN 10000 /* If starbase's fuel is * *
- * less than this, it will *
- *
- * * not refuel docked
- * vessels */
-#define TRACTDIST 6000 /* maximum effective tractor
- * * * beam range */
-#define TRACTEHEAT 5 /* ammount tractor beams * *
- * heat engines */
-#define TRACTCOST 20 /* fuel cost of activated *
- * * tractor beam */
+#define SBFUELMIN 10000 /* If starbase's fuel is
+ * less than this, it will
+ * not refuel docked vessels */
+#define TRACTDIST 6000 /* maximum effective tractor
+ * beam range */
+#define TRACTEHEAT 5 /* ammount tractor beams
+ * heat engines */
+#define TRACTCOST 20 /* fuel cost of activated
+ * tractor beam */
/* RSA stuff */
-#define RSA_VERSION "RSA v2.0 CLIENT" /* string must begin with *
- * * characters "RSA" */
+#define RSA_VERSION "RSA v2.0 CLIENT" /* string must begin with
+ * characters "RSA" */
#define KEY_SIZE 32
#define RESERVED_SIZE 16
#define NAME_LEN 16
@@ -144,37 +143,21 @@
#define MAXTEAM (ORI)
#define NUMTEAM 4
/* * These are random configuration variables */
-#define VICTORY 3 /* Number of systems needed
- * * * to conquer the galaxy
- */
-#define WARNTIME 30 /* Number of updates to have
- * * * a warning on the
- * screen */
-#define MESSTIME 30 /* Number of updates to have
- * * * a message on the
- * screen */
+#define VICTORY 3 /* Number of systems needed
+ * to conquer the galaxy */
+#define WARNTIME 30 /* Number of updates to have
+ * a warning on the screen */
+#define MESSTIME 30 /* Number of updates to have
+ * a message on the screen */
-#define TARG_PLAYER 0x1 /* Flags for gettarget */
+#define TARG_PLAYER 0x1 /* Flags for gettarget */
#define TARG_PLANET 0x2
-#define TARG_CLOAK 0x4 /* Include cloaked ships in
- * * * search */
+#define TARG_CLOAK 0x4 /* Include cloaked ships in
+ * search */
#define TARG_SELF 0x8
#define TARG_ENEMY 0x10
#define TARG_FRIEND 0x20
-/* Data files to make the game play across daemon restarts. */
-
-
-#define GLOBAL "/ch/ue/hadley/alternate/net/ntserv/.global"
-#define SCORES "/ch/ue/hadley/alternate/net/ntserv/.scores"
-#define PLFILE "/ch/ue/hadley/alternate/net/ntserv/.planets"
-#define MOTD "/ch/ue/hadley/alternate/net/ntserv/.motd"
-#define DAEMON "/ch/ue/hadley/alternate/net/ntserv/daemonII"
-#define ROBOT "/ch/ue/hadley/alternate/net/ntserv/robotII"
-#define LOGFILENAME "/ch/ue/hadley/alternate/net/ntserv/logfile"
-#define PLAYERFILE "/ch/ue/hadley/alternate/net/ntserv/.players"
-#define CONQFILE "/ch/ue/hadley/alternate/net/ntserv/.conquer"
-#define SYSDEF_FILE "/ch/ue/hadley/alternate/net/ntserv/.sysdef"
#define DEFAULT_PORT 2592
@@ -198,13 +181,14 @@
((p)->p_swar | (p)->p_hostile))) && \
(!((p)->p_team & \
(me->p_swar | me->p_hostile))))
-#define isAlive(p) (((p)->p_status == PALIVE) || ((p)->p_status == PFOBSERV))
+#define isAlive(p) (((p)->p_status == PALIVE) || ((p)->p_status == POBSERV))
#define friendlyPlanet(p) ((p)->pl_info & me->p_team && \
!((p)->pl_owner & (me->p_swar | me->p_hostile)))
#define isLockPlanet(p) ((me->p_flags & PFPLLOCK) && (me->p_planet == p->pl_no))
#define isLockPlayer(p) ((me->p_flags & PFPLOCK) && (me->p_playerl == p->p_no))
-
+#define isObsLockPlayer(p) ((me->p_flags & PFOBSERV) && (me->p_flags & PFPLOCK) && \
+ (me->p_playerl == p->p_no))
#define torpColor(t) \
(myTorp(t) ? myColor : shipCol[remap[players[(t)->t_owner].p_team]])
#define plasmatorpColor(t) \
@@ -217,20 +201,21 @@
(myPlayer(p) ? myColor : shipCol[remap[(p)->p_team]])
#ifdef RECORDGAME
-#define planetColor(p) \
- ((((p)->pl_info & me->p_team) || playback) \
- ? shipCol[remap[(p)->pl_owner]] : unColor)
+#define planetColor(p) \
+ ((((p)->pl_info & me->p_team) || playback) \
+ ? shipCol[remap[(p)->pl_owner]] : unColor)
#else
#define planetColor(p) \
(((p)->pl_info & me->p_team) ? shipCol[remap[(p)->pl_owner]] : unColor)
#endif
#define planetFont(p) \
- (myPlanet(p) ? W_BoldFont : friendlyPlanet(p) ? W_UnderlineFont \
+ (myPlanet(p) ? W_BoldFont : friendlyPlanet(p) ? W_HighlightFont \
: W_RegularFont)
+//SRS - changed this from UnderlineFont to HighlightFont
#define shipFont(p) \
- (myPlayer(p) ? W_BoldFont : friendlyPlayer(p) ? W_UnderlineFont \
+ (myPlayer(p) ? W_BoldFont : friendlyPlayer(p) ? W_HighlightFont \
: W_RegularFont)
#define bombingRating(p) \
((float) (p)->p_stats.st_tarmsbomb * status->timeprod / \
@@ -266,37 +251,37 @@
#endif
#ifndef ROTATERACE
-#define sendTorpReq(dir) sendShortPacket(CP_TORP, dir)
-#define sendPhaserReq(dir) sendShortPacket(CP_PHASER, dir)
-#define sendDirReq(dir) sendShortPacket(CP_DIRECTION, dir)
-#define sendPlasmaReq(dir) sendShortPacket(CP_PLASMA, dir)
+#define sendTorpReq(dir) sendShortPacket(CP_TORP, (char) dir)
+#define sendPhaserReq(dir) sendShortPacket(CP_PHASER, (char) dir)
+#define sendDirReq(dir) sendShortPacket(CP_DIRECTION, (char) dir)
+#define sendPlasmaReq(dir) sendShortPacket(CP_PLASMA, (char) dir)
#else
-#define sendTorpReq(dir) sendShortPacket(CP_TORP, RotateDirSend(dir))
-#define sendPhaserReq(dir) sendShortPacket(CP_PHASER, RotateDirSend(dir))
-#define sendDirReq(dir) sendShortPacket(CP_DIRECTION, RotateDirSend(dir))
-#define sendPlasmaReq(dir) sendShortPacket(CP_PLASMA, RotateDirSend(dir))
+#define sendTorpReq(dir) sendShortPacket(CP_TORP, (char) RotateDirSend(dir))
+#define sendPhaserReq(dir) sendShortPacket(CP_PHASER, (char) RotateDirSend(dir))
+#define sendDirReq(dir) sendShortPacket(CP_DIRECTION, (char) RotateDirSend(dir))
+#define sendPlasmaReq(dir) sendShortPacket(CP_PLASMA, (char) RotateDirSend(dir))
#endif /* ROTATERACE */
-#define sendSpeedReq(speed) sendShortPacket(CP_SPEED, speed)
-#define sendShieldReq(state) sendShortPacket(CP_SHIELD, state)
-#define sendOrbitReq(state) sendShortPacket(CP_ORBIT, state)
-#define sendRepairReq(state) sendShortPacket(CP_REPAIR, state)
-#define sendBeamReq(state) sendShortPacket(CP_BEAM, state)
-#define sendCopilotReq(state) sendShortPacket(CP_COPILOT, state)
+#define sendSpeedReq(speed) sendShortPacket(CP_SPEED, (char) speed)
+#define sendShieldReq(state) sendShortPacket(CP_SHIELD, (char) state)
+#define sendOrbitReq(state) sendShortPacket(CP_ORBIT, (char) state)
+#define sendRepairReq(state) sendShortPacket(CP_REPAIR, (char) state)
+#define sendBeamReq(state) sendShortPacket(CP_BEAM, (char) state)
+#define sendCopilotReq(state) sendShortPacket(CP_COPILOT, (char) state)
#define sendDetonateReq() sendShortPacket(CP_DET_TORPS, 0)
-#define sendCloakReq(state) sendShortPacket(CP_CLOAK, state)
-#define sendBombReq(state) sendShortPacket(CP_BOMB, state)
+#define sendCloakReq(state) sendShortPacket(CP_CLOAK, (char) state)
+#define sendBombReq(state) sendShortPacket(CP_BOMB, (char) state)
#define sendPractrReq() sendShortPacket(CP_PRACTR, 0)
-#define sendWarReq(mask) sendShortPacket(CP_WAR, mask)
-#define sendRefitReq(ship) {sendShortPacket(CP_REFIT, ship); shipchange(ship);}
-#define sendPlaylockReq(pnum) sendShortPacket(CP_PLAYLOCK, pnum)
-#define sendPlanlockReq(pnum) sendShortPacket(CP_PLANLOCK, pnum)
+#define sendWarReq(mask) sendShortPacket(CP_WAR, (char) mask)
+#define sendRefitReq(ship) {sendShortPacket(CP_REFIT, (char) ship); shipchange(ship);}
+#define sendPlaylockReq(pnum) sendShortPacket(CP_PLAYLOCK, (char) pnum)
+#define sendPlanlockReq(pnum) sendShortPacket(CP_PLANLOCK, (char) pnum)
#define sendCoupReq() sendShortPacket(CP_COUP, 0)
#define sendQuitReq() sendShortPacket(CP_QUIT, 0)
#define sendByeReq() sendShortPacket(CP_BYE, 0)
-#define sendDockingReq(state) sendShortPacket(CP_DOCKPERM, state)
-#define sendResetStatsReq(verify) sendShortPacket(CP_RESETSTATS, verify)
-#define sendScanReq(who) sendShortPacket(CP_SCAN, who) /* ATM */
+#define sendDockingReq(state) sendShortPacket(CP_DOCKPERM, (char) state)
+#define sendResetStatsReq(verify) sendShortPacket(CP_RESETSTATS, (char) verify)
+#define sendScanReq(who) sendShortPacket(CP_SCAN, (char) who) /* ATM */
#ifdef SHORT_PACKETS
/* #define sendShortReq(state) sendShortPacket(CP_S_REQ, state) */
@@ -401,18 +386,18 @@
#ifdef SHORT_PACKETS
-#define SPK_VOFF 0 /* variable packets off */
-#define SPK_VON 1 /* variable packets on */
-#define SPK_MOFF 2 /* message packets off */
-#define SPK_MON 3 /* message packets on */
-#define SPK_M_KILLS 4 /* send kill mesgs */
-#define SPK_M_NOKILLS 5 /* don't send kill mesgs */
-#define SPK_THRESHOLD 6 /* threshold */
-#define SPK_M_WARN 7 /* warnings */
-#define SPK_M_NOWARN 8 /* no warnings */
-#define SPK_SALL 9 /* only planets,kills and *
- * * weapons */
-#define SPK_ALL 10 /* Full Update - SP_STATS */
+#define SPK_VOFF 0 /* variable packets off */
+#define SPK_VON 1 /* variable packets on */
+#define SPK_MOFF 2 /* message packets off */
+#define SPK_MON 3 /* message packets on */
+#define SPK_M_KILLS 4 /* send kill mesgs */
+#define SPK_M_NOKILLS 5 /* don't send kill mesgs */
+#define SPK_THRESHOLD 6 /* threshold */
+#define SPK_M_WARN 7 /* warnings */
+#define SPK_M_NOWARN 8 /* no warnings */
+#define SPK_SALL 9 /* only planets,kills and
+ * weapons */
+#define SPK_ALL 10 /* Full Update - SP_STATS */
#define SPK_NUMFIELDS 6
Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/newwin.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- newwin.c 16 May 2006 06:16:35 -0000 1.5
+++ newwin.c 19 Sep 2006 10:20:39 -0000 1.6
@@ -2,6 +2,9 @@
/* newwin.c
*
* $Log$
+ * Revision 1.6 2006/09/19 10:20:39 quozl
+ * ut06 full screen, det circle, quit on motd, add icon, add desktop file
+ *
* Revision 1.5 2006/05/16 06:16:35 quozl
* add PLCORE
*
@@ -138,25 +141,32 @@
newwin(char *hostmon, char *progname)
{
int i;
+ int main_width = TWINSIDE + GWINSIDE + BORDER;
+ int main_height = GWINSIDE + 2 * BORDER + PLISTSIZE;
W_Initialize(hostmon);
- baseWin = W_MakeWindow("netrek", 0, YOFF, (TWINSIDE + GWINSIDE) + BORDER,
- GWINSIDE + 2 * BORDER + PLISTSIZE, NULL, BORDER, gColor);
+ if (booleanDefault("FullScreen", 1)) {
+ main_width = MAX(main_width, 1024);
+ main_height = MAX(main_height, 768);
+ }
+
+ baseWin = W_MakeWindow("netrek", 0, YOFF, main_width,
+ main_height, NULL, BORDER, gColor);
iconWin = W_MakeWindow("netrek_icon", 0, 0, icon_width, icon_height, NULL,
BORDER, gColor);
W_SetWindowExposeHandler(iconWin, drawIcon);
W_SetIconWindow(baseWin, iconWin);
- w = W_MakeWindow("local", -BORDER, -BORDER, TWINSIDE, TWINSIDE, baseWin,
+ w = W_MakeWindow("local", 0, 0, TWINSIDE, TWINSIDE, baseWin,
BORDER, foreColor);
- mapw = W_MakeWindow("map", TWINSIDE, -BORDER, GWINSIDE, GWINSIDE, baseWin,
+ mapw = W_MakeWindow("map", TWINSIDE+BORDER, 0, GWINSIDE, GWINSIDE, baseWin,
BORDER, foreColor);
- tstatw = W_MakeWindow("tstat", -BORDER, TWINSIDE, TWINSIDE, STATSIZE, baseWin,
- BORDER, foreColor);
+ tstatw = W_MakeWindow("tstat", 0, TWINSIDE+BORDER, TWINSIDE, STATSIZE,
+ baseWin, BORDER, foreColor);
#ifdef nodef /* 01/18/95 No messages for
* * * dashdord [007] */
@@ -165,11 +175,11 @@
W_SetWindowExposeHandler(tstatw, redrawTstats);
- warnw = W_MakeWindow("warn", TWINSIDE, GWINSIDE, GWINSIDE, MESSAGESIZE,
+ warnw = W_MakeWindow("warn", TWINSIDE+BORDER, GWINSIDE+BORDER, GWINSIDE, MESSAGESIZE,
baseWin, BORDER, foreColor);
W_SetWindowKeyDownHandler(warnw, handleMessageWindowKeyDown);
- messagew = W_MakeWindow("message", TWINSIDE, GWINSIDE + BORDER + MESSAGESIZE,
+ messagew = W_MakeWindow("message", TWINSIDE+BORDER, GWINSIDE+BORDER+MESSAGESIZE,
GWINSIDE, MESSAGESIZE, baseWin, BORDER, foreColor);
W_SetWindowKeyDownHandler(messagew, handleMessageWindowKeyDown);
W_SetWindowButtonHandler(messagew, handleMessageWindowButton);
@@ -186,7 +196,7 @@
PlistMaxWidth(), MAXPLAYER + 3, baseWin, 2);
#else
playerw = W_MakeTextWindow("player", 0,
- YOFF + TWINSIDE + BORDER + STATSIZE,
+ YOFF + TWINSIDE + BORDER + STATSIZE + BORDER,
PlistMaxWidth(), MAXPLAYER + 3, baseWin, 2);
#endif
@@ -224,22 +234,22 @@
reviewWin = W_MakeScrollingWindow("review", 0,
YOFF + TWINSIDE + BORDER + STATSIZE, 80, 2, baseWin, BORDER);
#else
- messwa = W_MakeScrollingWindow("review_all", TWINSIDE,
+ messwa = W_MakeScrollingWindow("review_all", TWINSIDE + BORDER,
YOFF + GWINSIDE + 3 * BORDER + 2 * MESSAGESIZE, 80, 10, baseWin, BORDER);
- messwt = W_MakeScrollingWindow("review_team", TWINSIDE,
+ messwt = W_MakeScrollingWindow("review_team", TWINSIDE + BORDER,
YOFF + GWINSIDE + 4 * BORDER + 2 * MESSAGESIZE + 10 * W_Textheight + 8,
80, 5, baseWin, BORDER);
- messwi = W_MakeScrollingWindow("review_your", TWINSIDE,
+ messwi = W_MakeScrollingWindow("review_your", TWINSIDE + BORDER,
YOFF + GWINSIDE + 5 * BORDER + 2 * MESSAGESIZE + 15 * W_Textheight + 16,
80, 4, baseWin, BORDER);
- messwk = W_MakeScrollingWindow("review_kill", TWINSIDE,
+ messwk = W_MakeScrollingWindow("review_kill", TWINSIDE + BORDER,
YOFF + GWINSIDE + 6 * BORDER + 2 * MESSAGESIZE + 19 * W_Textheight + 24,
80, 6, baseWin, BORDER);
- phaserwin = W_MakeScrollingWindow("review_phaser", TWINSIDE,
+ phaserwin = W_MakeScrollingWindow("review_phaser", TWINSIDE + BORDER,
YOFF + GWINSIDE + 3 * BORDER + 2 * MESSAGESIZE + 15 * W_Textheight + 16,
80, 4, baseWin, BORDER);
- reviewWin = W_MakeScrollingWindow("review", TWINSIDE,
- YOFF + GWINSIDE + BORDER + STATSIZE, 80, 20, baseWin, BORDER);
+ reviewWin = W_MakeScrollingWindow("review", TWINSIDE + BORDER + 1,
+ YOFF + GWINSIDE + BORDER + STATSIZE, 81, 21, baseWin, BORDER-1);
#endif
W_SetWindowKeyDownHandler(messwa, handleMessageWindowKeyDown);
@@ -300,12 +310,11 @@
foreColor);
#endif
- for (i = 0; i < 4; i++)
- {
- teamWin[i] = W_MakeWindow(teamshort[1 << i], i * BOXSIDE, TWINSIDE - BOXSIDE,
- BOXSIDE, BOXSIDE, w, 1, foreColor);
- }
- qwin = W_MakeWindow("quit", 4 * BOXSIDE, TWINSIDE - BOXSIDE, BOXSIDE, BOXSIDE, w, 1,
+ teamWin[0] = W_MakeWindow(teamshort[1 << 0], -1, 400, BOXSIDE, BOXSIDE, w, 1, foreColor);
+ teamWin[1] = W_MakeWindow(teamshort[1 << 1], -1, -1, BOXSIDE, BOXSIDE, w, 1, foreColor);
+ teamWin[2] = W_MakeWindow(teamshort[1 << 2], 400, -1, BOXSIDE, BOXSIDE, w, 1, foreColor);
+ teamWin[3] = W_MakeWindow(teamshort[1 << 3], 400, 400, BOXSIDE, BOXSIDE, w, 1, foreColor);
+ qwin = W_MakeWindow("quit", 200, 400, BOXSIDE, BOXSIDE, w, 1,
foreColor);
#ifdef ARMY_SLIDER
@@ -383,6 +392,7 @@
W_MapWindow(messagew);
W_MapWindow(w);
W_MapWindow(baseWin);
+ W_FullScreenBegin();
/* since we aren't mapping windows that have root as parent in x11window.c
* * * (since that messes up the TransientFor feature) we have to map them
* * * here. (If already mapped, W_MapWindow returns) */
@@ -750,7 +760,6 @@
/* as they are active */
fd_set mask;
-
/* fast quit? - jn */
if (fastQuit)
{
@@ -758,7 +767,6 @@
return;
}
-
/* The following allows quick choosing of teams */
lastOkayMask = okayMask = tournMask;
@@ -815,9 +823,8 @@
fd_set rfds;
struct timeval tv;
- me->p_ghostbuster = 0;
-
#ifndef HAVE_WIN32
+ W_FullScreen(baseWin);
tv.tv_sec = 1;
#else
/* Since we don't have a socket to check on Win32 for windowing *
@@ -909,6 +916,9 @@
case W_EV_KEY:
switch (event.key)
{
+ case 'q':
+ *team = -1;
+ return;
case 's':
*s_type = SCOUT;
break;
Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/input.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- input.c 22 May 2006 13:12:48 -0000 1.13
+++ input.c 19 Sep 2006 10:20:39 -0000 1.14
@@ -2,6 +2,9 @@
/* input.c
*
* $Log$
+ * Revision 1.14 2006/09/19 10:20:39 quozl
+ * ut06 full screen, det circle, quit on motd, add icon, add desktop file
+ *
* Revision 1.13 2006/05/22 13:12:48 quozl
* add camera frame counter
*
@@ -1729,7 +1732,7 @@
Key34(W_Event * data)
{
- emptyKey();
+ W_FullScreenToggle(baseWin);
}
Key35(void)
@@ -2301,6 +2304,7 @@
lastdet = curtime;
}
#endif /* AUTOKEY */
+ detCircle = 1;
}
Index: config.guess
===================================================================
RCS file: /cvsroot/netrek/client/cow/config.guess,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config.guess 1 Feb 2006 14:51:42 -0000 1.5
+++ config.guess 19 Sep 2006 10:20:39 -0000 1.6
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2005-08-03'
+timestamp='2006-07-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -106,7 +107,7 @@
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -206,8 +207,11 @@
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
macppc:MirBSD:*:*)
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -764,7 +768,14 @@
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -779,8 +790,11 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ x86:Interix*:[3456]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[3456]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -817,6 +831,9 @@
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit ;;
@@ -851,7 +868,11 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
@@ -870,7 +891,11 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
@@ -919,6 +944,9 @@
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
@@ -964,7 +992,7 @@
LIBC=gnulibc1
# endif
#else
- #ifdef __INTEL_COMPILER
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
LIBC=gnu
#else
LIBC=gnuaout
@@ -974,7 +1002,11 @@
LIBC=dietlibc
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^LIBC/{
+ s: ::g
+ p
+ }'`"
test x"${LIBC}" != x && {
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit
@@ -1185,7 +1217,6 @@
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
- *86) UNAME_PROCESSOR=i686 ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1264,6 +1295,9 @@
i*86:skyos:*:*)
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
exit ;;
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
Index: config.sub
===================================================================
RCS file: /cvsroot/netrek/client/cow/config.sub,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config.sub 1 Feb 2006 14:51:43 -0000 1.5
+++ config.sub 19 Sep 2006 10:20:39 -0000 1.6
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2005-07-08'
+timestamp='2006-07-02'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -119,8 +120,9 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -171,6 +173,10 @@
-hiux*)
os=-hiuxwe2
;;
+ -sco6)
+ os=-sco5v6
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +193,10 @@
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -231,7 +241,7 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
@@ -239,7 +249,8 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -257,18 +268,19 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
- | ms1 \
+ | mt \
| msp430 \
+ | nios | nios2 \
| ns16k | ns32k \
| or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b \
- | strongarm \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
@@ -276,9 +288,6 @@
| z8k)
basic_machine=$basic_machine-unknown
;;
- m32c)
- basic_machine=$basic_machine-unknown
- ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -286,6 +295,9 @@
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
+ ms1)
+ basic_machine=mt-unknown
+ ;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
@@ -305,7 +317,7 @@
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
+ | avr-* | avr32-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
@@ -316,7 +328,7 @@
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | m32r-* | m32rle-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -336,19 +348,20 @@
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
- | ms1-* \
+ | mt-* \
| msp430-* \
+ | nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
@@ -359,8 +372,6 @@
| ymp-* \
| z8k-*)
;;
- m32c-*)
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -696,6 +707,9 @@
basic_machine=i386-pc
os=-msdos
;;
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
@@ -803,6 +817,12 @@
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
+ pc98)
+ basic_machine=i386-pc
+ ;;
+ pc98-*)
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
@@ -859,6 +879,10 @@
basic_machine=i586-unknown
os=-pw32
;;
+ rdos)
+ basic_machine=i386-pc
+ os=-rdos
+ ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -1101,7 +1125,7 @@
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sparc | sparcv8 | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@@ -1174,21 +1198,23 @@
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku*)
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1340,6 +1366,9 @@
# system, and we'll never get to this point.
case $basic_machine in
+ spu-*)
+ os=-elf
+ ;;
*-acorn)
os=-riscix1.2
;;
@@ -1349,9 +1378,9 @@
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
Index: system.mk.in
===================================================================
RCS file: /cvsroot/netrek/client/cow/system.mk.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- system.mk.in 22 May 2006 13:11:21 -0000 1.10
+++ system.mk.in 19 Sep 2006 10:20:39 -0000 1.11
@@ -111,9 +111,9 @@
LFLAGS = -g $(EXTRALINKFLAGS)
LIBRARIES = $(LMP) $(LIBS) $(EXTRALIBS) $(SDL_LIBS) $(SDL_MIXER_LIBS)
-netrek: $(RSAOBJ) $(PMAKE) null $(ROBJ) $(MAINOBJ) $(INPUTOBJ) $(X11OBJ) $(WIN32OBJ) $(RANDOMOBJ) cflags.c randomize
- $(CC) $(LFLAGS) -o netrek `./randomize $(ROBJ) $(RSAOBJ) $(INPUTOBJ) \
- $(MAINOBJ) $(X11OBJ) $(WIN32OBJ) $(RANDOMOBJ)` $(LIBRARIES) -lXxf86vm -lImlib2
+netrek: $(RSAOBJ) $(PMAKE) null $(ROBJ) $(MAINOBJ) $(INPUTOBJ) $(X11OBJ) $(WIN32OBJ) $(RANDOMOBJ) cflags.c
+ $(CC) $(LFLAGS) -o netrek $(ROBJ) $(RSAOBJ) $(INPUTOBJ) \
+ $(MAINOBJ) $(X11OBJ) $(WIN32OBJ) $(RANDOMOBJ) $(LIBRARIES) -lXxf86vm -lImlib2
netrek.shared: done.libcow $(MAINOBJ) $(COWAPI)
$(CC) $(LFLAGS) $(MAINOBJ) -L. -lcow $(LIBS) -o netrek.shared
Index: short.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/short.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- short.c 22 May 2006 13:13:24 -0000 1.4
+++ short.c 19 Sep 2006 10:20:39 -0000 1.5
@@ -3,6 +3,9 @@
/* HW 19.07.93
*
* $Log$
+ * Revision 1.5 2006/09/19 10:20:39 quozl
+ * ut06 full screen, det circle, quit on motd, add icon, add desktop file
+ *
* Revision 1.4 2006/05/22 13:13:24 quozl
* initialise packet buffers
*
@@ -775,8 +778,8 @@
{ /* S_P2 */
struct player_s2_spacket *pa2 = (struct player_s2_spacket *) sbuf;
- x = SCALE * ntohs(pa2->x);
- y = SCALE * ntohs(pa2->y);
+ x = SCALE * (short) ntohs(pa2->x);
+ y = SCALE * (short) ntohs(pa2->y);
new_flags(ntohl(pa2->flags), 0);
}
else
Index: getname.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/getname.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- getname.c 28 Apr 2001 04:06:15 -0000 1.3
+++ getname.c 19 Sep 2006 10:20:39 -0000 1.4
@@ -4,6 +4,9 @@
* Kevin P. Smith 09/28/88
*
* $Log$
+ * Revision 1.4 2006/09/19 10:20:39 quozl
+ * ut06 full screen, det circle, quit on motd, add icon, add desktop file
+ *
* Revision 1.3 2001/04/28 04:06:15 quozl
* If server rejects guest login, allow the user to retry with a real name.
* Current INL servers are coded to reject guest login. Having to restart
@@ -145,6 +148,7 @@
{
#ifndef HAVE_WIN32
+ W_FullScreen(baseWin);
timeout.tv_sec = 1;
timeout.tv_usec = 0;
#else
@@ -212,8 +216,8 @@
if (!autolog)
{
sprintf(tempstr, "Seconds to go: %d ", secondsLeft);
- W_WriteText(w, 150, 400, textColor, tempstr, strlen(tempstr),
- W_BoldFont);
+ W_WriteText(w, 100, 400, textColor, tempstr, strlen(tempstr),
+ W_RegularFont);
}
if (secondsLeft == 0)
{
@@ -539,21 +543,23 @@
if (alf != NULL)
W_WriteText(w, 100, 130, textColor, alf, strlen(alf), W_BoldFont);
- sprintf(buf, "Connection established to Netrek server %s", serverName);
+ t = "Welcome to Netrek.";
+ W_WriteText(w, 100, 10, textColor, t, strlen(t), W_RegularFont);
+ sprintf(buf, "Connected to server %s", serverName);
t = buf;
- W_WriteText(w, 100, 150, textColor, t, strlen(t), W_BoldFont);
- t = "Enter your name. Use the name 'guest' for a temporary character.";
- W_WriteText(w, 100, 30, textColor, t, strlen(t), W_BoldFont);
- t = "Type ^D (Ctrl - D) in this window to quit.";
- W_WriteText(w, 100, 40, textColor, t, strlen(t), W_BoldFont);
- sprintf(s, "Your name (default = %s): %s ", defname, tempname)
+ W_WriteText(w, 100, 20, textColor, t, strlen(t), W_RegularFont);
+ t = "Keep your mouse in this window to type.";
+ W_WriteText(w, 100, 30, textColor, t, strlen(t), W_RegularFont);
+ t = "Press Control/D to quit at this point, but use Shift/Q later.";
+ W_WriteText(w, 100, 40, textColor, t, strlen(t), W_RegularFont);
+ sprintf(s, "What is your name? [default is %s]: %s ", defname, tempname)
;
- W_WriteText(w, 100, 50, textColor, s, strlen(s), W_BoldFont);
+ W_WriteText(w, 100, 50, textColor, s, strlen(s), W_RegularFont);
if (state == ST_GETPASS)
{
alf = NULL;
- t = "Enter password: ";
- W_WriteText(w, 100, 60, textColor, t, strlen(t), W_BoldFont);
+ t = "What is your password? : ";
+ W_WriteText(w, 100, 60, textColor, t, strlen(t), W_RegularFont);
}
if (state > ST_GETPASS)
{
@@ -561,9 +567,9 @@
t = "You need to make a password.";
W_WriteText(w, 100, 70, textColor, t, strlen(t), W_BoldFont);
t = "So think of a password you can remember, and enter it.";
- W_WriteText(w, 100, 80, textColor, t, strlen(t), W_BoldFont);
+ W_WriteText(w, 100, 80, textColor, t, strlen(t), W_RegularFont);
t = "What is your password? :";
- W_WriteText(w, 100, 90, textColor, t, strlen(t), W_BoldFont);
+ W_WriteText(w, 100, 90, textColor, t, strlen(t), W_RegularFont);
}
if (state == ST_MAKEPASS2)
{
@@ -571,7 +577,7 @@
t = "Enter it again to make sure you typed it right.";
W_WriteText(w, 100, 110, textColor, t, strlen(t), W_BoldFont);
t = "Your password? :";
- W_WriteText(w, 100, 120, textColor, t, strlen(t), W_BoldFont);
+ W_WriteText(w, 100, 120, textColor, t, strlen(t), W_RegularFont);
}
}
@@ -587,20 +593,6 @@
static char *README[] =
{
"",
- "The COW (former BRM) development group proudly presents:",
- "",
- " Client Of Win (COW) the best Netrek Client you ever had :)",
- "",
- "Note: This client is made by humans and errors are human.",
- " No one takes responsibility for lost INL games etc.",
- " Use at your own risk! If you don't like it, don't use it.",
- "",
- "Comments, suggestions, bug reports to: cow at netrek.org",
- "",
- "Include version and architecture info in bug reports",
- "",
- "Patches to: cow at netrek.org",
- "",
};
int i, length;
Index: camera.h
===================================================================
RCS file: /cvsroot/netrek/client/cow/camera.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- camera.h 22 May 2006 13:12:48 -0000 1.1
+++ camera.h 19 Sep 2006 10:20:39 -0000 1.2
@@ -1,5 +1,2 @@
/* camera.c */
-void camera_set_display(Display *arg_disp);
-void camera_set_window(Window *arg_window);
-void camera_init(void);
-void camera_snap(void);
+void camera_snap(Display *display, Window window);
Index: playback.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/playback.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- playback.c 22 May 2006 13:12:48 -0000 1.14
+++ playback.c 19 Sep 2006 10:20:39 -0000 1.15
@@ -5,6 +5,9 @@
* Routines neccessary to playback a game recording.
*
* $Log$
+ * Revision 1.15 2006/09/19 10:20:39 quozl
+ * ut06 full screen, det circle, quit on motd, add icon, add desktop file
+ *
* Revision 1.14 2006/05/22 13:12:48 quozl
* add camera frame counter
*
@@ -347,8 +350,6 @@
mapAll();
- (void) SIGNAL(SIGINT, SIG_IGN);
-
/* Instructions from getname() */
MZERO(mystats, sizeof(struct stats));
@@ -437,7 +438,6 @@
W_ClearWindow(w);
me->p_status = PALIVE; /* Put player in game */
- me->p_ghostbuster = 0;
PlistNoteUpdate(me->p_no);
if (showStats) /* Default showstats are on.
@@ -492,7 +492,7 @@
intrupt();
W_Flush();
if (!pb_stepping) usleep(pbdelay);
- if (pb_snapping) camera_snap();
+ if (pb_snapping) camera_snap(w);
}
}
Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/cow/struct.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- struct.h 16 May 2006 06:20:18 -0000 1.4
+++ struct.h 19 Sep 2006 10:20:39 -0000 1.5
@@ -6,6 +6,9 @@
* Most of the unneeded stuff in the structures has been thrown away.
*
* $Log$
+ * Revision 1.5 2006/09/19 10:20:39 quozl
+ * ut06 full screen, det circle, quit on motd, add icon, add desktop file
+ *
* Revision 1.4 2006/05/16 06:20:18 quozl
* add PLCORE
*
@@ -112,6 +115,7 @@
#define PALIVE 2
#define PEXPLODE 3
#define PDEAD 4
+#define POBSERV 5
#define PFSHIELD 0x0001
#define PFREPAIR 0x0002
@@ -287,7 +291,6 @@
* genocide */
short p_planets; /* planets taken this game */
short p_armsbomb; /* armies bombed this game */
- int p_ghostbuster;
int p_docked; /* If starbase, # docked to,
* else pno base host */
int p_port[4]; /* If starbase, pno of ship
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/data.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- data.c 22 May 2006 13:13:39 -0000 1.9
+++ data.c 19 Sep 2006 10:20:39 -0000 1.10
@@ -1,6 +1,9 @@
/* data.c
*
* $Log$
+ * Revision 1.10 2006/09/19 10:20:39 quozl
+ * ut06 full screen, det circle, quit on motd, add icon, add desktop file
+ *
* Revision 1.9 2006/05/22 13:13:39 quozl
* change defaults
*
@@ -82,6 +85,7 @@
*
* * newDashboard */
+int detCircle = 0; /* Show det circle on tactical */
int fastQuit = 0;
int gen_distress = 0; /* generic distress/macro *
Index: camera.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/camera.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- camera.c 22 May 2006 13:12:48 -0000 1.2
+++ camera.c 19 Sep 2006 10:20:39 -0000 1.3
@@ -20,21 +20,12 @@
/* maximum file name size */
#define MAXFRAMEFILENAMESIZE 80
-/* set the display used by the camera */
-void camera_set_display(Display *arg_disp)
-{
- disp = arg_disp;
-}
-
-/* set the window used by the camera */
-void camera_set_window(Window *arg_window)
-{
- tw = *arg_window;
-}
-
-void camera_init() {
+void camera_init(Display *arg_disp, Window arg_window) {
if (initialised) return;
int depth;
+ disp = arg_disp;
+ tw = arg_window;
+
scr = ScreenOfDisplay(disp, DefaultScreen(disp));
vis = DefaultVisual(disp, XScreenNumberOfScreen(scr));
depth = DefaultDepth(disp, XScreenNumberOfScreen(scr));
@@ -57,12 +48,12 @@
initialised++;
}
-void camera_snap()
+void camera_snap(Display *arg_disp, Window arg_window)
{
Imlib_Image image;
char *name;
- camera_init();
+ camera_init(arg_disp, arg_window);
image = imlib_create_image_from_drawable(rw, rx, ry, rdx, rdy, 0);
imlib_context_set_image(image);
imlib_image_attach_data_value("quality", NULL, 15, NULL);
Index: x11window.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/x11window.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- x11window.c 22 May 2006 13:11:21 -0000 1.9
+++ x11window.c 19 Sep 2006 10:20:39 -0000 1.10
@@ -4,6 +4,9 @@
* Kevin P. Smith 6/11/89 Much modified by Jerry Frain and Joe Young
*
* $Log$
+ * Revision 1.10 2006/09/19 10:20:39 quozl
+ * ut06 full screen, det circle, quit on motd, add icon, add desktop file
+ *
* Revision 1.9 2006/05/22 13:11:21 quozl
* add video mode change support
*
@@ -45,6 +48,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/cursorfont.h>
+#include <X11/Xatom.h>
#ifdef FUNCTION_KEYS
#include <X11/keysym.h>
@@ -375,6 +379,8 @@
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
};
+int full_screen_default, full_screen_enabled;
+
/* X debugging */
int
_myerror(Display * d, XErrorEvent * e)
@@ -446,7 +452,6 @@
W_Colormap = DefaultColormap(W_Display, W_Screen);
myroot.window = W_Root;
myroot.type = WIN_GRAPH;
- video_mode_begin();
GetFonts();
GetColors();
@@ -462,7 +467,7 @@
#ifdef BEEPLITE
init_tts();
#endif
- camera_set_display(W_Display);
+ W_FullScreenInitialise();
}
/* Make sure the font will work, ie: that it fits in the 6x10 character cell
@@ -973,6 +978,10 @@
#ifdef MOTION_MOUSE
attrs.event_mask |= ButtonMotionMask;
#endif
+ // if (!strcmp(name, "netrek")) {
+ // attrs.event_mask |= StructureNotifyMask;
+ // }
+
if (strcmp(name, "netrek_icon") == 0) /* icon should not select *
* for input */
@@ -986,9 +995,13 @@
CWBorderPixel,
&attrs),
WIN_GRAPH);
- if (strcmp(name, "netrek") == 0) {
- camera_set_window(&newwin->window);
+
+ if (!strcmp(name, "netrek")) {
+ if (full_screen_enabled) {
+ kde_fullscreen_on(newwin);
+ }
}
+
/* top window */
sz_hints = XAllocSizeHints();
if (strcmp(name, "netrek") == 0 || strcmp(name, "wait") == 0 ||
@@ -1764,6 +1777,20 @@
XDrawLine(W_Display, win, colortable[color].contexts[1], x0, y0, x1, y1);
}
+void W_WriteCircle (W_Window window,
+ int x,
+ int y,
+ int r,
+ W_Color color)
+{
+ struct window *win = W_Void2Window(window);
+
+ XSetForeground(W_Display, colortable[color].contexts[0],
+ colortable[color].pixelValue);
+ XDrawArc(W_Display, win->window, colortable[color].contexts[0],
+ x, y, r, r, 0, 23040);
+}
+
void
W_WriteTriangle(W_Window window, int x, int y, int s, int t, W_Color color)
{
@@ -3717,6 +3744,12 @@
}
#endif /* HAVE_XPM */
+void W_CameraSnap(W_Window window)
+{
+ struct window *win = W_Void2Window(window);
+ camera_snap(W_Display, win->window);
+}
+
/* XFree86 VidMode X extension handling */
#include <X11/extensions/xf86vmode.h>
@@ -3726,31 +3759,28 @@
int video_mode_dotclock, video_mode_list_size;
/* restore video mode to known previous mode */
-void video_mode_end()
+void video_mode_off()
{
if (video_mode_current != NULL) {
XF86VidModeSwitchToMode(W_Display, W_Screen, video_mode_current);
- fprintf(stderr, "video_mode_begin: restored previous video mode\n");
}
}
-/* set video mode to that preferred for game */
-void video_mode_begin()
-{
- int major, minor, line;
- XF86VidModeModeLine current;
-
- /* do not change mode if configuration setting requests no change */
- if (!booleanDefault("VideoModeChange", 1)) {
- return;
- }
-
- /* do not change if X server has no support for change */
+/* check if X server has support for changing modes */
+int video_mode_initialise() {
+ int major, minor;
if (!XF86VidModeQueryVersion(W_Display, &major, &minor)) {
fprintf(stderr, "XFree86-VidMode X extension absent\n");
- return;
+ return 0;
}
+ static int done = 0;
+ if (done) return 1;
+ done++;
+
+ int line;
+ XF86VidModeModeLine current;
+
/* obtain the current mode line and list of known mode lines */
XF86VidModeGetModeLine(W_Display, W_Screen, &video_mode_dotclock, ¤t);
XF86VidModeGetAllModeLines(W_Display, W_Screen,
@@ -3774,22 +3804,142 @@
if (video_mode_current == NULL) {
fprintf(stderr, "video_mode_begin: this mode not found, "
"cannot switch back, so not switching\n");
- return;
+ return 0;
}
/* schedule a change-back at program end */
- atexit(video_mode_end);
+ atexit(video_mode_off);
+
+ return 1;
+}
+
+void video_mode_on()
+{
+ int line;
/* if there is a mode line for 1024x768 then use it */
for (line=0; line < video_mode_list_size; line++) {
XF86VidModeModeInfo *mode = video_mode_list[line];
if (mode->hdisplay == 1024 && mode->vdisplay == 768) {
XF86VidModeSwitchToMode(W_Display, W_Screen, mode);
- fprintf(stderr, "video_mode_begin: changed to 1024x768\n");
return;
}
}
+}
- /* mode was not changed, discard the scheduled change-back */
- video_mode_current = NULL;
+void view_port_warp(W_Window window)
+{
+ struct window *win = W_Void2Window(window);
+
+ /* force the video view port to cover the window */
+ int tx = 0, ty = 0;
+ Window child;
+ XTranslateCoordinates(W_Display, win->window, W_Root, 0, 0, &tx, &ty, &child);
+ XF86VidModeSetViewPort(W_Display, W_Screen, tx, ty);
+ XMoveResizeWindow(W_Display, win->window, 0, 0, 1024, 768);
+ XMapRaised(W_Display, win->window);
+ // XEvent event;
+ // do {
+ // XMaskEvent(W_Display, StructureNotifyMask, &event);
+ // } while ( (event.type != MapNotify) || (event.xmap.event != win) );
+ XRaiseWindow(W_Display, win->window);
+}
+
+/* force the cursor to stay within the window */
+void pointer_grab_on(W_Window window)
+{
+ struct window *win = W_Void2Window(window);
+
+ XGrabPointer(W_Display, win->window, True, ButtonPressMask |
+ ButtonReleaseMask | EnterWindowMask | LeaveWindowMask |
+ PointerMotionMask | PointerMotionHintMask |
+ Button1MotionMask | Button2MotionMask |
+ Button3MotionMask | Button4MotionMask |
+ Button5MotionMask | ButtonMotionMask |
+ KeymapStateMask, GrabModeAsync, GrabModeAsync,
+ win->window, None, CurrentTime);
+ XGrabKeyboard(W_Display, win->window, True, GrabModeAsync,
+ GrabModeAsync, CurrentTime);
+}
+
+void pointer_grab_off(W_Window window)
+{
+ struct window *win = W_Void2Window(window);
+ XUngrabPointer(W_Display, CurrentTime);
+ XUngrabKeyboard(W_Display, CurrentTime);
+}
+
+void kde_fullscreen_on(W_Window window) {
+ struct window *win = W_Void2Window(window);
+ Atom WM_HINTS;
+ WM_HINTS = XInternAtom(W_Display, "_NET_WM_STATE", True);
+ if (WM_HINTS != None) {
+ Atom p[1];
+ p[0] = XInternAtom(W_Display, "_NET_WM_STATE_FULLSCREEN", True);
+ XChangeProperty(W_Display, win->window, WM_HINTS, XA_ATOM, 32,
+ PropModeReplace, (unsigned char *)p, 1);
+ }
+}
+
+void kde_fullscreen_off(W_Window window) {
+ struct window *win = W_Void2Window(window);
+ Atom WM_HINTS;
+ WM_HINTS = XInternAtom(W_Display, "_NET_WM_STATE", True);
+ if (WM_HINTS != None) {
+ XDeleteProperty(W_Display, win->window, WM_HINTS);
+ }
+}
+
+void W_FullScreenOn(W_Window window)
+{
+ video_mode_on();
+ view_port_warp(window);
+ pointer_grab_on(window);
+ kde_fullscreen_on(window);
+}
+
+void W_FullScreenOff(W_Window window)
+{
+ pointer_grab_off(window);
+ kde_fullscreen_off(window);
+ video_mode_off();
+}
+
+int W_FullScreenInitialise() {
+ full_screen_enabled = 0;
+ full_screen_default = 0;
+ if (booleanDefault("FullScreen", 1)) {
+ full_screen_default++;
+ if (video_mode_initialise())
+ full_screen_enabled++;
+ }
+}
+
+void W_FullScreenToggle(W_Window window) {
+ if (full_screen_enabled) {
+ full_screen_enabled = 0;
+ W_FullScreenOff(window);
+ } else {
+ if (!full_screen_default) {
+ if (!video_mode_initialise()) {
+ return;
+ }
+ }
+ full_screen_enabled++;
+ W_FullScreenOn(window);
+ }
+}
+
+void W_FullScreenBegin(W_Window window) {
+ if (full_screen_enabled) {
+ W_FullScreenOn(window);
+ }
+}
+
+/* regularly enforce */
+void W_FullScreen(W_Window window) {
+ if (full_screen_enabled) {
+ view_port_warp(window);
+ pointer_grab_on(window);
+ }
}
Index: cowmain.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/cowmain.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cowmain.c 20 May 2006 08:48:16 -0000 1.14
+++ cowmain.c 19 Sep 2006 10:20:39 -0000 1.15
@@ -2,6 +2,9 @@
/* main.c
*
* $Log$
+ * Revision 1.15 2006/09/19 10:20:39 quozl
+ * ut06 full screen, det circle, quit on motd, add icon, add desktop file
+ *
* Revision 1.14 2006/05/20 08:48:16 quozl
* fix some valgrind use of uninitialised data reports
*
@@ -903,8 +906,6 @@
mapAll();
- (void) SIGNAL(SIGINT, SIG_IGN);
-
#ifndef RWATCH
getname(pseudo, defpasswd);
#else
@@ -1027,7 +1028,8 @@
if (team == -1)
{
- W_DestroyWindow(w);
+ W_DestroyWindow(baseWin);
+ video_mode_off();
#ifdef AUTOKEY
if (autoKey)
@@ -1038,9 +1040,9 @@
#if defined(SOUND) && !defined(HAVE_SDL)
Exit_Sound();
+ sleep(1);
#endif
- sleep(1);
if (logFile != NULL)
fclose(logFile);
printf("OK, bye!\n");
@@ -1068,7 +1070,6 @@
/* for (i = 0; i < NSIG; i++) { (void) SIGNAL(i, SIG_IGN); } */
me->p_status = PALIVE; /* Put player in game */
- me->p_ghostbuster = 0;
PlistNoteUpdate(me->p_no);
if (showStats) /* Default showstats are on.
Index: socket.c
===================================================================
RCS file: /cvsroot/netrek/client/cow/socket.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- socket.c 22 May 2006 13:13:24 -0000 1.11
+++ socket.c 19 Sep 2006 10:20:39 -0000 1.12
@@ -8,6 +8,9 @@
* Routines to allow connection to the xtrek server.
*
* $Log$
+ * Revision 1.12 2006/09/19 10:20:39 quozl
+ * ut06 full screen, det circle, quit on motd, add icon, add desktop file
+ *
* Revision 1.11 2006/05/22 13:13:24 quozl
* initialise packet buffers
*
@@ -1027,7 +1030,11 @@
chan = sock;
if (commMode == COMM_TCP)
drop_flag = 0; /* just in case */
- retval += doRead(sock);
+ /* Bug fix for unnecessary redraws with UDP on - reported by TP */
+ // if (commMode == COMM_UDP)
+ // doRead (sock);
+ // else
+ retval += doRead (sock);
}
dotimers();
@@ -3985,7 +3992,7 @@
case SP_S_STATS : /* see SP_STATS */
fprintf(stderr, "\nS->C SP_S_STATS\t");
if (log_packets > 1)
- fprintf(stderr, " pnum=%d, tplanets-%d, tkills=%d, tlosses=%d, kills=%d, losses=%d, tticks=%d, tarmies=%d, sbkills=%d, sblosses=%d, armies=%d, planets=%d, maxkills=%d, sbmaxkills=%d,",
+ fprintf(stderr, " pnum=%d, tplanets=%d, tkills=%d, tlosses=%d, kills=%d, losses=%d, tticks=%d, tarmies=%d, sbkills=%d, sblosses=%d, armies=%d, planets=%d, maxkills=%d, sbmaxkills=%d,",
((struct stats_spacket *) packet)->pnum,
ntohs(((struct stats_spacket *) packet)->tplanets),
ntohs(((struct stats_spacket *) packet)->tkills),