Remove the last traces of NORMALUNIX
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 60
This commit is contained in:
parent
457bca3961
commit
862f45407c
3 changed files with 15 additions and 7 deletions
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
bindir = $(prefix)/bin
|
||||
|
||||
CFLAGS = @CFLAGS@ @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ -DNORMALUNIX -Wall
|
||||
CFLAGS = @CFLAGS@ @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ -Wall
|
||||
chocolate_doom_LDADD = @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@
|
||||
|
||||
chocolate_doom_SOURCES=\
|
||||
|
|
|
|||
11
src/d_main.c
11
src/d_main.c
|
|
@ -1,7 +1,7 @@
|
|||
// Emacs style mode select -*- C++ -*-
|
||||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Id: d_main.c 59 2005-08-31 21:21:18Z fraggle $
|
||||
// $Id: d_main.c 60 2005-08-31 21:24:24Z fraggle $
|
||||
//
|
||||
// Copyright(C) 1993-1996 Id Software, Inc.
|
||||
// Copyright(C) 2005 Simon Howard
|
||||
|
|
@ -22,6 +22,9 @@
|
|||
// 02111-1307, USA.
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.8 2005/08/31 21:24:24 fraggle
|
||||
// Remove the last traces of NORMALUNIX
|
||||
//
|
||||
// Revision 1.7 2005/08/31 21:21:18 fraggle
|
||||
// Better IWAD detection and identification. Support '-iwad' to specify
|
||||
// the IWAD to use.
|
||||
|
|
@ -57,7 +60,7 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
static const char rcsid[] = "$Id: d_main.c 59 2005-08-31 21:21:18Z fraggle $";
|
||||
static const char rcsid[] = "$Id: d_main.c 60 2005-08-31 21:24:24Z fraggle $";
|
||||
|
||||
#define BGCOLOR 7
|
||||
#define FGCOLOR 8
|
||||
|
|
@ -67,6 +70,10 @@ static const char rcsid[] = "$Id: d_main.c 59 2005-08-31 21:21:18Z fraggle $";
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <io.h>
|
||||
#endif
|
||||
|
||||
|
||||
#include "config.h"
|
||||
#include "doomdef.h"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Emacs style mode select -*- C++ -*-
|
||||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Id: d_net.c 41 2005-08-04 22:55:08Z fraggle $
|
||||
// $Id: d_net.c 60 2005-08-31 21:24:24Z fraggle $
|
||||
//
|
||||
// Copyright(C) 1993-1996 Id Software, Inc.
|
||||
// Copyright(C) 2005 Simon Howard
|
||||
|
|
@ -22,6 +22,9 @@
|
|||
// 02111-1307, USA.
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.5 2005/08/31 21:24:24 fraggle
|
||||
// Remove the last traces of NORMALUNIX
|
||||
//
|
||||
// Revision 1.4 2005/08/04 22:55:07 fraggle
|
||||
// Use DOOM_VERSION to define the Doom version (don't conflict with
|
||||
// automake's config.h). Display GPL message instead of anti-piracy
|
||||
|
|
@ -44,7 +47,7 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
static const char rcsid[] = "$Id: d_net.c 41 2005-08-04 22:55:08Z fraggle $";
|
||||
static const char rcsid[] = "$Id: d_net.c 60 2005-08-31 21:24:24Z fraggle $";
|
||||
|
||||
|
||||
#include "m_menu.h"
|
||||
|
|
@ -124,9 +127,7 @@ unsigned NetbufferChecksum (void)
|
|||
c = 0x1234567;
|
||||
|
||||
// FIXME -endianess?
|
||||
#ifdef NORMALUNIX
|
||||
return 0; // byte order problems
|
||||
#endif
|
||||
|
||||
l = (NetbufferSize () - (int)&(((doomdata_t *)0)->retransmitfrom))/4;
|
||||
for (i=0 ; i<l ; i++)
|
||||
|
|
|
|||
Loading…
Reference in a new issue