From f51fa9af948a581e291274867439214e5ae3e04f Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 30 Aug 2005 22:15:11 +0000
Subject: More Windows fixes

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 58
---
 src/i_net.c | 11 +++++++++--
 src/w_wad.c | 16 ++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/i_net.c b/src/i_net.c
index 0fd21727..a79ec445 100644
--- a/src/i_net.c
+++ b/src/i_net.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: i_net.c 57 2005-08-30 22:11:10Z fraggle $
+// $Id: i_net.c 58 2005-08-30 22:15:11Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.7  2005/08/30 22:15:11  fraggle
+// More Windows fixes
+//
 // Revision 1.6  2005/08/30 22:11:10  fraggle
 // Windows fixes
 //
@@ -46,7 +49,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: i_net.c 57 2005-08-30 22:11:10Z fraggle $";
+rcsid[] = "$Id: i_net.c 58 2005-08-30 22:15:11Z fraggle $";
 
 #include <stdlib.h>
 #include <string.h>
@@ -341,6 +344,10 @@ void I_InitNetwork (void)
 {
     doomcom = malloc (sizeof (*doomcom) );
     memset (doomcom, 0, sizeof(*doomcom) );
+
+    doomcom->ticdup = 1;
+    doomcom->extratics = 0;
+
     
     // single player game
     netgame = false;
diff --git a/src/w_wad.c b/src/w_wad.c
index 2d3303cc..1d169f6c 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: w_wad.c 57 2005-08-30 22:11:10Z fraggle $
+// $Id: w_wad.c 58 2005-08-30 22:15:11Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.7  2005/08/30 22:15:11  fraggle
+// More Windows fixes
+//
 // Revision 1.6  2005/08/30 22:11:10  fraggle
 // Windows fixes
 //
@@ -48,7 +51,7 @@
 
 
 static const char
-rcsid[] = "$Id: w_wad.c 57 2005-08-30 22:11:10Z fraggle $";
+rcsid[] = "$Id: w_wad.c 58 2005-08-30 22:15:11Z fraggle $";
 
 
 #include <ctype.h>
@@ -170,6 +173,7 @@ void W_AddFile (char *filename)
     int			length;
     int			startlump;
     filelump_t*		fileinfo;
+    filelump_t*         filerover;
     FILE               *storehandle;
     
     // open the file and add to directory
@@ -235,12 +239,12 @@ void W_AddFile (char *filename)
 	
     storehandle = reloadname ? NULL : handle;
 	
-    for (i=startlump ; i<numlumps ; i++,lump_p++, fileinfo++)
+    for (i=startlump,filerover=fileinfo ; i<numlumps ; i++,lump_p++, filerover++)
     {
 	lump_p->handle = storehandle;
-	lump_p->position = LONG(fileinfo->filepos);
-	lump_p->size = LONG(fileinfo->size);
-	strncpy (lump_p->name, fileinfo->name, 8);
+	lump_p->position = LONG(filerover->filepos);
+	lump_p->size = LONG(filerover->size);
+	strncpy (lump_p->name, filerover->name, 8);
     }
 	
     if (reloadname)
-- 
cgit v1.2.3