Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs16:/tmp/cvs-serv3182/src
Modified Files:
data.c defaults.c mswindow.c
Log Message:
Add checks against localSDB and mapSDB existing before trying to free them.
Make windowsMove on by default.
Change default save file to be netrekrc not netrekrc.sav.
Two compiler warning fixes for casting int as char.
Detailed the exact bandwidth increase for the 2 full resolution options.
Cleaned up todo list.
Changes to compile.txt and rsa.txt based on user feedback to difficulties
compiling.
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- data.c 25 Apr 2007 07:21:49 -0000 1.88
+++ data.c 27 Apr 2007 07:15:28 -0000 1.89
@@ -765,7 +765,7 @@
int agriCAPS = 1;
int agriColor = 2;
-int windowMove = 0;
+int windowMove = 1;
int mainResizeable = 1;
int mainMaximized = 1;
int maxScrollLines = 300;
Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- mswindow.c 25 Apr 2007 07:21:50 -0000 1.80
+++ mswindow.c 27 Apr 2007 07:15:28 -0000 1.81
@@ -607,17 +607,23 @@
p = tmp;
}
- SelectObject (localSDB->mem_dc, localSDB->old_bmp);
- DeleteObject (localSDB->mem_bmp);
- ReleaseDC (((Window *)localSDB->window)->hwnd, localSDB->win_dc);
- DeleteDC (localSDB->mem_dc);
- free (localSDB);
+ if (localSDB)
+ {
+ SelectObject (localSDB->mem_dc, localSDB->old_bmp);
+ DeleteObject (localSDB->mem_bmp);
+ ReleaseDC (((Window *)localSDB->window)->hwnd, localSDB->win_dc);
+ DeleteDC (localSDB->mem_dc);
+ free (localSDB);
+ }
- SelectObject (mapSDB->mem_dc, mapSDB->old_bmp);
- DeleteObject (mapSDB->mem_bmp);
- ReleaseDC (((Window *)mapSDB->window)->hwnd, mapSDB->win_dc);
- DeleteDC (mapSDB->mem_dc);
- free (mapSDB);
+ if (mapSDB)
+ {
+ SelectObject (mapSDB->mem_dc, mapSDB->old_bmp);
+ DeleteObject (mapSDB->mem_bmp);
+ ReleaseDC (((Window *)mapSDB->window)->hwnd, mapSDB->win_dc);
+ DeleteDC (mapSDB->mem_dc);
+ free (mapSDB);
+ }
//WinKey Kill Library Stop
if (pfnFastCallKill != NULL)
@@ -822,8 +828,8 @@
VKMap[VK_TAB] = (char) 201; //'i'+96; // Make it look like '^i' so macroKey: TAB will work
VKMap[VK_UP] = '>'; // accelerate
VKMap[VK_DOWN] = '<'; // decelerate
- VKMap[VK_LEFT] = 187; // turn left ^[
- VKMap[VK_RIGHT] = 189; // turn right ^]
+ VKMap[VK_LEFT] = (char) 187; // turn left ^[
+ VKMap[VK_RIGHT] = (char) 189; // turn right ^]
VKMap[VK_NUMPAD0] = '0'; // I want to use Numeric Keypad!
VKMap[VK_NUMPAD1] = '1'; // Added these mappings SRS 4/10/98
VKMap[VK_NUMPAD2] = '2';
@@ -1860,7 +1866,7 @@
win->ClipRect.right = LOWORD (lParam) - win->border;
win->ClipRect.bottom = HIWORD (lParam) - win->border;
// Reinitialize SDB as size/borders of window have changed
- if ((Window *) w != NULL && win->hwnd == ((Window *) w)->hwnd)
+ if ((Window *) w != NULL && win->hwnd == ((Window *) w)->hwnd && localSDB)
{
SelectObject (localSDB->mem_dc, localSDB->old_bmp);
DeleteObject (localSDB->mem_bmp);
@@ -1869,7 +1875,7 @@
free (localSDB);
localSDB = W_InitSDB (w);
}
- else if ((Window *) mapw != NULL && win->hwnd == ((Window *) mapw)->hwnd)
+ else if ((Window *) mapw != NULL && win->hwnd == ((Window *) mapw)->hwnd && mapSDB)
{
SelectObject (mapSDB->mem_dc, mapSDB->old_bmp);
DeleteObject (mapSDB->mem_bmp);
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- defaults.c 25 Apr 2007 07:21:49 -0000 1.82
+++ defaults.c 27 Apr 2007 07:15:28 -0000 1.83
@@ -931,7 +931,7 @@
{
"Display other ships to 256 directions instead of 16",
"by using long ship packets instead of short ship packets,",
- "increases bandwidth usage by several kb/second.",
+ "increases bandwidth usage by 1-2 kb/second.",
NULL
}
},
@@ -939,7 +939,7 @@
{
"Allows observers to see all weapons fire on galaxy map",
"by using long torp packets instead of short torp packets,",
- "can increase bandwidth usage on the order of 10 kb/second.",
+ "can increase bandwidth usage by 1 kb/second.",
"Also allows self torps to be seen beyond tactical range,",
"again via the galaxy map.",
NULL
@@ -2170,7 +2170,7 @@
if (!saveFile)
{
saveFile = (char *) malloc (sizeof (char) * 13);
- sprintf (saveFile, "%s", "netrekrc.sav");
+ sprintf (saveFile, "%s", "netrekrc");
}
exe_dir = GetExeDir ();