Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18583/src
Modified Files:
hintwin.c local.c makefile
Log Message:
- fixed hightlightFriendlyPhaser option to work again: on for white phasers on hits,
off for flicker between team color and white
- added some more hints to the hint database
- fixed hint messages so they properly loop
- added Maximize button to title bar
- made BCC default compiler and disabled RSA mkkey check (-nt) until it can be fixed
Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- local.c 12 Apr 2006 04:20:03 -0000 1.2
+++ local.c 14 Apr 2006 12:24:00 -0000 1.3
@@ -971,19 +971,11 @@
php->ph_fuse, php->ph_maxfuse);
px = new_dx;
py = new_dy;
- W_CacheLine (w, px, py, tx, ty, col);
- //W_CacheLineDB (localSDB, px, py, tx, ty, col);
}
- else
- W_CacheLine (w, px, py, tx, ty, col);
- //W_CacheLineDB (localSDB, px, py, tx, ty, col);
-
+ W_CacheLine (w, px, py, tx, ty, col);
}
else
{
- /* I prefer them to just be solid white, I think most others will too
- So I take this line out and replace it */
- /* if ((php->ph_fuse % 2) == 1) */
if (php->ph_status != PHMISS)
{
if (phaserShrinkStyle == 1 && j == me)
@@ -993,18 +985,21 @@
php->ph_fuse, php->ph_maxfuse);
px = new_dx;
py = new_dy;
- W_CacheLine (w, px, py, tx, ty, foreColor);
- //W_CacheLineDB (localSDB, px, py, tx, ty, foreColor);
}
+ if (highlightFriendlyPhasers)
+ W_CacheLine (w, px, py, tx, ty, foreColor);
else
- W_CacheLine (w, px, py, tx, ty, foreColor);
- //W_CacheLineDB (localSDB, px, py, tx, ty, foreColor);
+ {
+ if ((php->ph_fuse % 2) == 1)
+ W_CacheLine (w, px, py, tx, ty, foreColor);
+ else
+ W_CacheLine (w, px, py, tx, ty,
+ shipCol[remap[j->p_team]]);
+ }
}
else
W_CacheLine (w, px, py, tx, ty,
shipCol[remap[j->p_team]]);
- /*W_CacheLineDB (localSDB, px, py, tx, ty,
- shipCol[remap[j->p_team]]);*/
}
#else
if (highlightFriendlyPhasers && (php->ph_status == PHHIT))
Index: makefile
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- makefile 12 Apr 2006 04:20:03 -0000 1.2
+++ makefile 14 Apr 2006 12:24:00 -0000 1.3
@@ -145,7 +145,7 @@
$(rc) bccnetrek.rc
rsa_box.c:
- ..\tools\mkkey -k $(RSAKEY)
+ ..\tools\mkkey -nt -k $(RSAKEY)
netrek.exe: $(OBJS) $(RESOURCES) main.ico
$(link) $(ldebug) $(LIBOPTS) $(OBJS) C0x32.OBJ, netrek.exe,, $(LIBS), , $(RESOURCES)
Index: hintwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/hintwin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hintwin.c 12 Apr 2006 04:20:05 -0000 1.1
+++ hintwin.c 14 Apr 2006 12:24:00 -0000 1.2
@@ -173,8 +173,8 @@
{
case W_LBUTTON:
curhint++;
- if (curhint >= numhints)
- curhint = numhints;
+ if (curhint > numhints)
+ curhint = 0;
showhint (curhint);
return;
case W_MBUTTON:
@@ -186,7 +186,7 @@
case W_RBUTTON:
curhint--;
if (curhint < 0)
- curhint = 0;
+ curhint = numhints;
showhint (curhint);
return;
}