Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15093/src
Modified Files:
data.c defaults.c local.c newwin.c option.c sound.c
Log Message:
Some formating spacing fixes.
Fixed up changes list to be more accurate.
Detcircle done the right way (for clearing).
Addition of toggle angular sound on/off to SDL sound window.
Index: sound.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sound.c 1 May 2006 00:55:11 -0000 1.11
+++ sound.c 24 May 2006 01:14:39 -0000 1.12
@@ -357,7 +357,8 @@
#define SOUND_INIT MESSAGE_SOUND + 2
#define SOUND_DONE MESSAGE_SOUND + 3
-#define SDL_SOUND_DONE 1
+#define SDL_SOUND_ANGLE 1
+#define SDL_SOUND_DONE 2
static void soundrefresh (int i);
static void sdlsoundrefresh (int i);
@@ -389,6 +390,11 @@
sprintf (buf, "Sound is turned %s",
(sound_toggle == 1) ? "ON" : "OFF");
}
+ else if (i == SDL_SOUND_ANGLE)
+ {
+ sprintf (buf, "Angular sound is turned %s",
+ (newSoundAngles) ? "ON" : "OFF");
+ }
else if (i == SDL_SOUND_DONE)
{
strcpy (buf, "Done");
@@ -514,7 +520,12 @@
{
if (sound_init)
sound_toggle = (sound_toggle == 1) ? 0 : 1;
- soundrefresh (SOUND_TOGGLE);
+ sdlsoundrefresh (SOUND_TOGGLE);
+ }
+ else if (i == SDL_SOUND_ANGLE)
+ {
+ newSoundAngles = (newSoundAngles) ? 0 : 1;
+ sdlsoundrefresh (SDL_SOUND_ANGLE);
}
else
{
Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- newwin.c 23 May 2006 07:14:08 -0000 1.29
+++ newwin.c 24 May 2006 01:14:39 -0000 1.30
@@ -998,7 +998,7 @@
if (newSound)
{
soundWin = W_MakeMenu("sound", WINSIDE + 20, -BORDER + 10, 30,
- 2, NULL, 2);
+ 3, NULL, 2);
W_SetWindowKeyDownHandler(soundWin, sdlsoundaction);
W_SetWindowButtonHandler(soundWin, sdlsoundaction);
W_DefineArrowCursor(soundWin);
Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- local.c 23 May 2006 07:14:08 -0000 1.28
+++ local.c 24 May 2006 01:14:39 -0000 1.29
@@ -1110,14 +1110,13 @@
{
if (myPlayer(j) || isObsLockPlayer(j))
{
- W_WriteCircle(w, WINSIDE/2, WINSIDE/2, DETDIST/SCALE, W_Red);
- olddetcircle = 1;
+ W_WriteCircle(w, WINSIDE/2, WINSIDE/2, DETDIST/SCALE, W_Red);
+ clearzone[0][clearcount] = WINSIDE/2 - (DETDIST/SCALE);
+ clearzone[1][clearcount] = WINSIDE/2 - (DETDIST/SCALE);
+ clearzone[2][clearcount] = 2*DETDIST/SCALE;
+ clearzone[3][clearcount] = 2*DETDIST/SCALE;
+ clearcount++;
}
- else if (olddetcircle && (me->p_flags & PFOBSERV) && !(me->p_flags & PFPLOCK))
- {
- W_WriteCircle(w, WINSIDE/2, WINSIDE/2, DETDIST/SCALE, backColor);
- olddetcircle = 0;
- }
}
if (j->p_flags & PFCLOAK) /* when cloaked stop here */
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- defaults.c 22 May 2006 08:27:53 -0000 1.19
+++ defaults.c 24 May 2006 01:14:39 -0000 1.20
@@ -776,7 +776,7 @@
int notdone;
unsigned char c;
char *str;
- struct stringlist *sl;
+ struct stringlist *sl;
#ifdef MULTILINE_MACROS
unsigned char keysused[256];
@@ -1373,14 +1373,14 @@
if (findfile (NETREKRC, file))
return 1;
- if (findfile (NETREKRCTXT, file))
- return 1;
+ if (findfile (NETREKRCTXT, file))
+ return 1;
if (findfile (XTREKRC, file))
return 1;
- if (findfile (XTREKRCTXT, file))
- return 1;
+ if (findfile (XTREKRCTXT, file))
+ return 1;
#ifdef SYSTEM_DEFAULTFILE
/* now try for a system default defaults file */
@@ -1401,8 +1401,8 @@
char tmp[100];
int i;
- if (strlen (pigcall) == 0)
- sprintf (pigcall, "Netrek XP Mod (%s) - the smarter netrek eXPerience!", mvers);
+ if (strlen (pigcall) == 0)
+ sprintf (pigcall, "Netrek XP 2006 (%s) - the smarter netrek eXPerience!", mvers);
timerType = intDefault ("timerType", timerType);
if (timerType < T_NONE || timerType >= T_TOTAL)
@@ -1415,7 +1415,7 @@
newSoundAngles = booleanDefault ("newSoundAngles", newSoundAngles);
tpDotDist = intDefault ("tpDotDist", tpDotDist);
omitTeamLetter = booleanDefault ("omitTeamLetter", omitTeamLetter);
- beepOnPrivateMessage = booleanDefault ("beepOnPrivateMessage", beepOnPrivateMessage);
+ beepOnPrivateMessage = booleanDefault ("beepOnPrivateMessage", beepOnPrivateMessage);
viewBox = booleanDefault ("viewBox", viewBox);
warpStreaks = booleanDefault ("warpStreaks", warpStreaks);
showStars = booleanDefault ("showStars", showStars);
@@ -1538,7 +1538,7 @@
agriCAPS = booleanDefault ("agriCAPS", agriCAPS);
agriColor = intDefault ("agriColor", agriColor);
- playerListMessaging = booleanDefault ("playerListMessaging", playerListMessaging);
+ playerListMessaging = booleanDefault ("playerListMessaging", playerListMessaging);
highlightFriendlyPhasers = booleanDefault ("highlightFriendlyPhasers",
highlightFriendlyPhasers);
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- data.c 23 May 2006 07:14:08 -0000 1.26
+++ data.c 24 May 2006 01:14:39 -0000 1.27
@@ -61,7 +61,6 @@
* system support */
int niftyNewMessages = 1;
unsigned int oldalert = 0;
-int olddetcircle = 0;
int remap[16] = { 0, 1, 2, 0, 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0 };
int messpend = 0;
#ifdef XTRA_MESSAGE_UI
Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- option.c 23 May 2006 07:14:08 -0000 1.18
+++ option.c 24 May 2006 01:14:39 -0000 1.19
@@ -901,12 +901,6 @@
redrawall = 1;
oldalert = 0; /* Force a border refresh */
}
- /* Let's see if this is we need to clear the det circle */
- else if (op->op_option == &detCircle && detCircle == 0)
- {
- W_WriteCircle(w, WINSIDE/2, WINSIDE/2, DETDIST/SCALE, backColor);
- olddetcircle = 0;
- }
else if (op->op_option == &partitionPlist)
RedrawPlayerList ();
else if (op->op_option == &sortPlayers)