Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22426/src
Modified Files:
beeplite.c input.c mswindow.c newwin.c playerlist.c
Added Files:
vccnetrek.rc
Log Message:
Spacing fixes, updated build and compile files, added new resource file that works with Visual Studio, new clock bmp.
Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mswindow.c 29 Apr 2006 19:22:38 -0000 1.8
+++ mswindow.c 30 Apr 2006 15:59:40 -0000 1.9
@@ -2605,29 +2605,28 @@
// If we're not in message windows then we'll map wheel up and
// wheel down events as regular mouse events
if (win->type == WIN_GRAPH || win->type == WIN_TEXT || win->type == WIN_MENU)
- {
+ {
//BringWindowToTop (hwnd);
//GET_STRUCT_PTR;
/* Let's see whether we should process wheel messages */
if (!allowWheelActions)
return (1);
+ STORE_EVENT_MOUSE;
+ LastPressHwnd = hwnd;
- STORE_EVENT_MOUSE;
- LastPressHwnd = hwnd;
-
- if (wheel > 0)
- {
- EventQueue[EventTail].key = W_WHEELUP;
- EventQueue[EventTail].type = W_EV_BUTTON;
- }
- else if (wheel < 0)
- {
- EventQueue[EventTail].key = W_WHEELDOWN;
- EventQueue[EventTail].type = W_EV_BUTTON;
- }
+ if (wheel > 0)
+ {
+ EventQueue[EventTail].key = W_WHEELUP;
+ EventQueue[EventTail].type = W_EV_BUTTON;
+ }
+ else if (wheel < 0)
+ {
+ EventQueue[EventTail].key = W_WHEELDOWN;
+ EventQueue[EventTail].type = W_EV_BUTTON;
+ }
return (0);
- }
+ }
else if (win->type == WIN_SCROLL)
{
i = GetScrollPos (hwnd, SB_VERT);
@@ -3728,6 +3727,7 @@
border = bitmap->ClipRectAddr->top;
x += border;
y += border;
+
if (x < border)
{
width = bitmap->width - (border - x);
@@ -5792,12 +5792,12 @@
int border)
{
Window *newwin;
- int orig_x, orig_y, orig_width, orig_height;
+ int orig_x, orig_y, orig_width, orig_height;
orig_x = x;
- orig_y = y;
- orig_width = width;
- orig_height = height;
+ orig_y = y;
+ orig_width = width;
+ orig_height = height;
//Get the default position, etc.
checkGeometry (name, &x, &y, &width, &height);
@@ -5824,11 +5824,11 @@
newwin->TextHeight = height;
newwin->TextWidth = width;
- /* Set original coordinates, so we will be able to restore to them */
- newwin->orig_x = orig_x;
- newwin->orig_y = orig_y;
- newwin->orig_width = orig_width;
- newwin->orig_height = orig_height;
+ /* Set original coordinates, so we will be able to restore to them */
+ newwin->orig_x = orig_x;
+ newwin->orig_y = orig_y;
+ newwin->orig_width = orig_width;
+ newwin->orig_height = orig_height;
//Map (show) the window if the user spec'd it
if (checkMapped (name))
Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- newwin.c 29 Apr 2006 22:48:07 -0000 1.14
+++ newwin.c 30 Apr 2006 15:59:40 -0000 1.15
@@ -1740,7 +1740,7 @@
/******************************************************************************/
redrawQuit (void)
{
- W_WriteText (qwin, 5, 5, textColor, "Quit COW ", 10, W_RegularFont);
+ W_WriteText (qwin, 5, 5, textColor, "Quit NetrekXP", 13, W_RegularFont);
}
Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- input.c 24 Apr 2006 15:30:38 -0000 1.6
+++ input.c 30 Apr 2006 15:59:40 -0000 1.7
@@ -1490,72 +1490,71 @@
&& data->Window != infow
&& data->Window != playerw)
return;
-
- if (data->Window == playerw)
- {
- int x, y;
-
- if (findMouseInWin (&x, &y, playerw))
- {
- data->Window = playerw;
- data->x = x;
- data->y = y;
- }
- if (data->key == W_LBUTTON)
- {
- target = gettarget (data->Window, data->x, data->y, TARG_PLAYER);
- if (target->o_num == -1 || messageon || !playerListMessaging)
- return;
-
- /* Here we will have to enter message_on () followed by
- smessage to player */
+
+ if (data->Window == playerw)
+ {
+ int x, y;
+
+ if (findMouseInWin (&x, &y, playerw))
+ {
+ data->Window = playerw;
+ data->x = x;
+ data->y = y;
+ }
+ if (data->key == W_LBUTTON)
+ {
+ target = gettarget (data->Window, data->x, data->y, TARG_PLAYER);
+ if (target->o_num == -1 || messageon || !playerListMessaging)
+ return;
+ /* Here we will have to enter message_on () followed by
+ smessage to player */
#ifdef SOUND
- if (newSound)
- Play_Sound(MESSAGE_WAV);
- else
- Play_Sound(MESSAGE_SOUND);
+ if (newSound)
+ Play_Sound(MESSAGE_WAV);
+ else
+ Play_Sound(MESSAGE_SOUND);
#endif
- message_on ();
- data->key = players[target->o_num].p_mapchars[1];
- smessage (data->key);
- return;
- }
- else if (data->key == W_RBUTTON)
- {
- if (messageon || !playerListMessaging)
- return;
- /* Here we will have to enter message_on () followed by
- smessage to player */
+ message_on ();
+ data->key = players[target->o_num].p_mapchars[1];
+ smessage (data->key);
+ return;
+ }
+ else if (data->key == W_RBUTTON)
+ {
+ if (messageon || !playerListMessaging)
+ return;
+ /* Here we will have to enter message_on () followed by
+ smessage to player */
#ifdef SOUND
- if (newSound)
- Play_Sound(MESSAGE_WAV);
- else
- Play_Sound(MESSAGE_SOUND);
+ if (newSound)
+ Play_Sound(MESSAGE_WAV);
+ else
+ Play_Sound(MESSAGE_SOUND);
#endif
- message_on ();
- data->key = 'T';
- smessage (data->key);
- return;
- }
- else if (data->key == W_MBUTTON)
- {
- if (messageon || !playerListMessaging)
- return;
- /* Here we will have to enter message_on () followed by
- smessage to player */
+ message_on ();
+ data->key = 'T';
+ smessage (data->key);
+ return;
+ }
+ else if (data->key == W_MBUTTON)
+ {
+ if (messageon || !playerListMessaging)
+ return;
+ /* Here we will have to enter message_on () followed by
+ smessage to player */
#ifdef SOUND
- if (newSound)
- Play_Sound(MESSAGE_WAV);
- else
- Play_Sound(MESSAGE_SOUND);
+ if (newSound)
+ Play_Sound(MESSAGE_WAV);
+ else
+ Play_Sound(MESSAGE_SOUND);
#endif
- message_on ();
- data->key = 'A';
- smessage (data->key);
- return;
- }
- return;
+ message_on ();
+ data->key = 'A';
+ smessage (data->key);
+ return;
}
+ return;
+ }
if (messageon)
message_off (); /* ATM */
--- NEW FILE: vccnetrek.rc ---
#include "resource.h"
MAIN ICON DISCARDABLE "main.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,1
PRODUCTVERSION 1,0,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x3L
#else
FILEFLAGS 0x2L
#endif
FILEOS 0x10004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Netrek\0"
VALUE "FileDescription", "Netrek XP Mod (Colorized) Client\0"
VALUE "FileVersion", "1, 0, 0, 1\0"
VALUE "InternalName", "Netrek XP Mod\0"
VALUE "LegalCopyright", "Copyright © 1986-2004\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "netrek.rc\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Netrek XP Mod Client\0"
VALUE "ProductVersion", "1, 0, 0, 1\0"
VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
Index: playerlist.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/playerlist.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- playerlist.c 21 Apr 2006 12:00:07 -0000 1.3
+++ playerlist.c 30 Apr 2006 15:59:40 -0000 1.4
@@ -5,7 +5,7 @@
* rewrite for demand driven updates -> huge speedup: Oct. 94 [007] Major
* rewrite to fix some bugs and speed things up : Jan. 95 [Zork]
*
- * Sort observers separatly: opserver if (pl->p_flags & PFOBSERV) is true. : Jul 01 [SRS]
+ * Sort observers separately: observer if (pl->p_flags & PFOBSERV) is true. : Jul 01 [SRS]
*
*/
Index: beeplite.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- beeplite.c 26 Apr 2006 23:18:14 -0000 1.7
+++ beeplite.c 30 Apr 2006 15:59:39 -0000 1.8
@@ -26,10 +26,9 @@
void rcdlite(struct distress *dist)
/* the info */
{
- char message[100];
- int len = 0;
-
-
+ char message[100];
+ int len = 0;
+
if ((dist == NULL) ||
/* (dist->sender == me->p_no) || */
(distlite[dist->distype] == NULL))