ref: f51fa9af948a581e291274867439214e5ae3e04f
parent: a77ebf56c612924bdc3da30ae5f26e41372cac9c
author: Simon Howard <[email protected]>
date: Tue Aug 30 18:15:11 EDT 2005
More Windows fixes Subversion-branch: /trunk/chocolate-doom Subversion-revision: 58
--- 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 @@
{doomcom = malloc (sizeof (*doomcom) );
memset (doomcom, 0, sizeof(*doomcom) );
+
+ doomcom->ticdup = 1;
+ doomcom->extratics = 0;
+
// single player game
netgame = false;
--- 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 @@
int length;
int startlump;
filelump_t* fileinfo;
+ filelump_t* filerover;
FILE *storehandle;
// open the file and add to directory
@@ -235,12 +239,12 @@
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)