Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19099/src
Modified Files:
input.c makefile mswindow.c playerlist.c
Log Message:
Fix to playerlist refreshing problem with player then observer mode.
Makefile fixes.
Index: playerlist.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/playerlist.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- playerlist.c 6 May 2006 06:25:16 -0000 1.7
+++ playerlist.c 7 May 2006 21:10:52 -0000 1.8
@@ -193,7 +193,7 @@
sortMyTeamFirst = booleanDefault ("sortMyTeamFirst", sortMyTeamFirst);
- /* Do we show observers in playerlist? 0 = all, 1 = only players, 2 = only observers */
+ /* Do we show observers in playerlist? 0 = all, 1 = only players, 2 = only observers 3 = players then observers */
playerListObserver = intDefault ("playerListObserver", 0);
/* plistUpdate[MAXPLAYER] must always be TRUE because thats how we no when
@@ -422,8 +422,8 @@
int row, i, last;
struct player *current;
int teamPos[NUMTEAM + 1];
+ int obsPos = 0;
int *pos;
- int obscount = 0;
static int plistLastRow = -1;
static int blankLine = -1;
@@ -472,7 +472,7 @@
++teamPos[remap[current->p_team]];
if (!(current->p_mapchars[1] <= 'f'))
- obscount++;
+ ++obsPos;
}
}
else
@@ -487,7 +487,7 @@
++teamPos[remap[current->p_team]];
if (current->p_flags & PFOBSERV)
- obscount++;
+ ++obsPos;
}
}
}
@@ -541,6 +541,7 @@
last += teamPos[myTeam];
teamPos[myTeam] = last;
}
+
if (myTeam != NOBODY)
{
@@ -561,7 +562,11 @@
last += teamPos[NOBODY];
teamPos[NOBODY] = last;
}
-
+ if (playerListObserver == 3)
+ {
+ last += obsPos;
+ obsPos = last;
+ }
/* Clear some lines if people have left. */
@@ -572,9 +577,7 @@
}
plistLastRow = last;
- if (playerListObserver == 3)
- plistLastRow += obscount;
-
+
/* Write out each player that has either changed position or has
* new stats. */
@@ -591,7 +594,7 @@
if (playerListObserver == 0 || playerListObserver == 3)
{
if (playerListObserver == 3 && !(current->p_mapchars[1] <= 'f'))
- row = --plistLastRow;
+ row = --obsPos;
else
row = --(teamPos[remap[current->p_team]]);
if ((!updatePlayer[i]) && plistPos[i] == row)
@@ -638,7 +641,7 @@
(playerListObserver == 3))
{
if (playerListObserver == 3 && (current->p_flags & PFOBSERV))
- row = --plistLastRow;
+ row = --obsPos;
else
row = --(teamPos[remap[current->p_team]]);
if ((!updatePlayer[i]) && plistPos[i] == row)
Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- mswindow.c 7 May 2006 16:59:27 -0000 1.15
+++ mswindow.c 7 May 2006 21:10:52 -0000 1.16
@@ -3914,7 +3914,7 @@
xForm.eM22=cosine/SCALEY;
xForm.eDx = eDx;
xForm.eDy = eDy;
-
+
SetWorldTransform(hdc,&xForm);
BitBlt(hdc, 0, 0, width, height, GlobalMemDC2, 0, 0, SRCPAINT);
Index: makefile
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- makefile 7 May 2006 16:59:27 -0000 1.8
+++ makefile 7 May 2006 21:10:52 -0000 1.9
@@ -23,8 +23,8 @@
ldebug = -Gn -w-dup
!ENDIF
-# Borland Libs
-LIBOPTS = /LC:\Borland\bcc55\lib;c:\Borland\bcc55\lib\psdk;..\Win32\lib\BCC /Tpe
+# Libs
+#LIBOPTS = /L..\Win32\lib\BCC /Tpe
LIBS = SDL.LIB SDL_mixer.LIB SDLmain.LIB CW32mt.LIB IMPORT32.LIB user32.lib gdi32.lib wsock32.lib kernel32.lib shell32.lib winmm.lib mpr.lib $(GMPLIB)
Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- input.c 7 May 2006 16:59:27 -0000 1.9
+++ input.c 7 May 2006 21:10:51 -0000 1.10
@@ -1469,23 +1469,6 @@
return;
#endif
-
-#ifdef SHORT_PACKETS
- if (data->Window == reviewWin)
- {
- if (recv_mesg)
- {
- sendShortReq (SPK_MOFF);
- }
- else
- {
- sendShortReq (SPK_MON);
- }
- return;
- }
-#endif
-
-
if (data->Window != w && data->Window != mapw
&& data->Window != infow
&& data->Window != playerw)