head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.130 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.128 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.126 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.124 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.122 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.120 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.118 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.116 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.114 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.112 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.110 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.108 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.106 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.104 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.102 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.100 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.98 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.96 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.94 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.92 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.90 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.88 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.86 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.82 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.62 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.84 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.80 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.78 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.76 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.74 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.72 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.70 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.68 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.66 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.64 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.60 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.58 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.56 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.54 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.52 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.50 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.48 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.46 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.44 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.42 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.40 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.38 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.36 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.34 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.32 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.30 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.28 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.26 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.24 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.22 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.20 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.18 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.16 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.14 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.12 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.10 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.8 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.6 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.4 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.2 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.3.0.62 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.60 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.58 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.56 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.54 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.52 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.50 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.48 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.46 pkgsrc-2008Q1:1.3.0.44 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.42 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.40 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.38 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.36 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.34 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.32 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.30 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.28 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.26 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.24 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.22 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.20 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.18 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.16 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.14 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.12 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.10 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2; locks; strict; comment @# @; 1.5 date 2010.02.22.21.58.47; author wiz; state Exp; branches; next 1.4; 1.4 date 2010.02.21.16.17.12; author wiz; state dead; branches; next 1.3; 1.3 date 2000.02.03.16.01.15; author abs; state Exp; branches; next 1.2; 1.2 date 98.09.06.16.37.44; author hubertf; state Exp; branches; next 1.1; 1.1 date 98.08.28.12.53.05; author garbled; state Exp; branches; next ; desc @@ 1.5 log @Re-add xdoom, requested by drochner. Address PR 24024 by marking it as not-for-lp64platforms. @ text @$NetBSD: patch-ab,v 1.3 2000/02/03 16:01:15 abs Exp $ --- linuxdoom-1.10/am_map.c.orig Mon Dec 22 19:58:32 1997 +++ linuxdoom-1.10/am_map.c Thu Feb 3 01:33:44 2000 @@@@ -783,7 +783,7 @@@@ // void AM_updateLightLev(void) { - static nexttic = 0; + static int nexttic = 0; //static int litelevels[] = { 0, 3, 5, 6, 6, 7, 7, 7 }; static int litelevels[] = { 0, 4, 7, 10, 12, 14, 15, 15 }; static int litelevelscnt = 0; @@@@ -856,9 +856,9 @@@@ TOP =8 }; - register outcode1 = 0; - register outcode2 = 0; - register outside; + register int outcode1 = 0; + register int outcode2 = 0; + register int outside; fpoint_t tmp; int dx; @@@@ -989,7 +989,7 @@@@ register int ay; register int d; - static fuck = 0; + static int fuck = 0; // For debugging only if ( fl->a.x < 0 || fl->a.x >= f_w @ 1.4 log @Remove xdoom, use prboom instead, which also works on 64bit machines (see PR 24024). @ text @@ 1.3 log @Update to 1.10nb1 Actually work with the supplied WAD file One file-to-patch per patchfile Remove strange 'post-patch' substitute X11_BASE phase Fix numerous coredumps Add a '-h' usage Handle the sndserver dying Make it work on little endian systems Add a '-volume X' flag, and skip all sound code if 0 Other cleanup in some of the more repellant code areas. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Boom - make da noise! (add soundserver) @ text @d1 35 a35 461 $NetBSD: patch-ab,v 1.1 1998/08/28 12:53:05 garbled Exp $ *** 1.1.1.1 1998/07/03 16:32:29 --- linuxdoom-1.10/d_net.h 1998/07/03 16:33:37 *************** *** 80,84 **** { // Supposed to be DOOMCOM_ID? ! long id; // DOOM executes an int to execute commands. --- 80,84 ---- { // Supposed to be DOOMCOM_ID? ! int id; // DOOM executes an int to execute commands. Index: linuxdoom-1.10/doomtype.h =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/doomtype.h,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 doomtype.h *** 1.1.1.1 1998/07/03 16:32:16 --- linuxdoom-1.10/doomtype.h 1998/07/15 21:12:05 *************** *** 47,51 **** // Max pos 32-bit int. #define MAXINT ((int)0x7fffffff) - #define MAXLONG ((long)0x7fffffff) #define MINCHAR ((char)0x80) #define MINSHORT ((short)0x8000) --- 47,50 ---- *************** *** 53,57 **** // Max negative 32-bit integer. #define MININT ((int)0x80000000) - #define MINLONG ((long)0x80000000) #endif --- 52,55 ---- Index: linuxdoom-1.10/info.h =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/info.h,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 info.h *** 1.1.1.1 1998/07/03 16:32:20 --- linuxdoom-1.10/info.h 1998/07/03 16:33:41 *************** *** 1148,1157 **** { spritenum_t sprite; ! long frame; ! long tics; // void (*action) (); actionf_t action; statenum_t nextstate; ! long misc1, misc2; } state_t; --- 1148,1157 ---- { spritenum_t sprite; ! int frame; ! int tics; // void (*action) (); actionf_t action; statenum_t nextstate; ! int misc1, misc2; } state_t; Index: linuxdoom-1.10/m_bbox.h =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/m_bbox.h,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 m_bbox.h *** 1.1.1.1 1998/07/03 16:32:20 --- linuxdoom-1.10/m_bbox.h 1998/07/03 16:33:42 *************** *** 24,28 **** #define __M_BBOX__ ! #include #include "m_fixed.h" --- 24,28 ---- #define __M_BBOX__ ! #include "doomtype.h" #include "m_fixed.h" Index: linuxdoom-1.10/m_swap.h =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/m_swap.h,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 m_swap.h *** 1.1.1.1 1998/07/03 16:32:29 --- linuxdoom-1.10/m_swap.h 1998/07/15 21:08:17 *************** *** 34,40 **** #ifdef __BIG_ENDIAN__ short SwapSHORT(short); ! long SwapLONG(long); #define SHORT(x) ((short)SwapSHORT((unsigned short) (x))) ! #define LONG(x) ((long)SwapLONG((unsigned long) (x))) #else #define SHORT(x) (x) --- 34,40 ---- #ifdef __BIG_ENDIAN__ short SwapSHORT(short); ! int SwapLONG(int); #define SHORT(x) ((short)SwapSHORT((unsigned short) (x))) ! #define LONG(x) ((int)SwapLONG((unsigned int) (x))) #else #define SHORT(x) (x) Index: linuxdoom-1.10/i_net.c =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/i_net.c,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 i_net.c *** 1.1.1.1 1998/07/03 16:32:18 --- linuxdoom-1.10/i_net.c 1998/07/15 21:11:38 *************** *** 51,69 **** - - // For some odd reason... - #define ntohl(x) \ - ((unsigned long int)((((unsigned long int)(x) & 0x000000ffU) << 24) | \ - (((unsigned long int)(x) & 0x0000ff00U) << 8) | \ - (((unsigned long int)(x) & 0x00ff0000U) >> 8) | \ - (((unsigned long int)(x) & 0xff000000U) >> 24))) - - #define ntohs(x) \ - ((unsigned short int)((((unsigned short int)(x) & 0x00ff) << 8) | \ - (((unsigned short int)(x) & 0xff00) >> 8))) \ - - #define htonl(x) ntohl(x) - #define htons(x) ntohs(x) - void NetSend (void); boolean NetListen (void); --- 51,54 ---- *************** *** 74,78 **** // ! int DOOMPORT = (IPPORT_USERRESERVED +0x1d ); int sendsocket; --- 59,63 ---- // ! int DOOMPORT = (IPPORT_RESERVED +0x1d ); int sendsocket; Index: linuxdoom-1.10/i_sound.c =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/i_sound.c,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 i_sound.c *** 1.1.1.1 1998/07/03 16:32:18 --- linuxdoom-1.10/i_sound.c 1998/07/15 20:05:49 *************** *** 42,47 **** --- 42,49 ---- #include + #ifdef LINUX // Linux voxware output. #include + #endif // Timer stuff. Experimental. Index: linuxdoom-1.10/i_video.c =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/i_video.c,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 i_video.c *** 1.1.1.1 1998/07/03 16:32:18 --- linuxdoom-1.10/i_video.c 1998/07/15 20:40:59 *************** *** 37,41 **** // Had to dig up XShm.c for this one. // It is in the libXext, but not in the XFree86 headers. ! #ifdef LINUX int XShmGetEventBase( Display* dpy ); // problems with g++? #endif --- 37,41 ---- // Had to dig up XShm.c for this one. // It is in the libXext, but not in the XFree86 headers. ! #if defined(LINUX) || defined (__NetBSD__) int XShmGetEventBase( Display* dpy ); // problems with g++? #endif *************** *** 47,51 **** #include ! #include #include --- 47,51 ---- #include ! #include #include Index: linuxdoom-1.10/m_menu.c =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/m_menu.c,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 m_menu.c *** 1.1.1.1 1998/07/03 16:32:21 --- linuxdoom-1.10/m_menu.c 1998/07/03 16:33:58 *************** *** 530,534 **** continue; } ! count = read (handle, &savegamestrings[i], SAVESTRINGSIZE); close (handle); LoadMenu[i].status = 1; --- 530,534 ---- continue; } ! count = read (handle, savegamestrings[i], SAVESTRINGSIZE); close (handle); LoadMenu[i].status = 1; Index: linuxdoom-1.10/m_misc.c =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/m_misc.c,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 m_misc.c *** 1.1.1.1 1998/07/03 16:32:21 --- linuxdoom-1.10/m_misc.c 1998/07/03 16:33:58 *************** *** 227,231 **** char* name; int* location; ! int defaultvalue; int scantranslate; // PC scan code hack int untranslated; // lousy hack --- 227,231 ---- char* name; int* location; ! long defaultvalue; int scantranslate; // PC scan code hack int untranslated; // lousy hack *************** *** 255,260 **** // UNIX hack, to be removed. #ifdef SNDSERV ! {"sndserver", (int *) &sndserver_filename, (int) "sndserver"}, ! {"mb_used", &mb_used, 2}, #endif --- 255,260 ---- // UNIX hack, to be removed. #ifdef SNDSERV ! {"sndserver", (int *) &sndserver_filename, (long) "sndserver"}, ! {"mb_used", &mb_used, 12}, #endif *************** *** 286,299 **** {"usegamma",&usegamma, 0}, ! {"chatmacro0", (int *) &chat_macros[0], (int) HUSTR_CHATMACRO0 }, ! {"chatmacro1", (int *) &chat_macros[1], (int) HUSTR_CHATMACRO1 }, ! {"chatmacro2", (int *) &chat_macros[2], (int) HUSTR_CHATMACRO2 }, ! {"chatmacro3", (int *) &chat_macros[3], (int) HUSTR_CHATMACRO3 }, ! {"chatmacro4", (int *) &chat_macros[4], (int) HUSTR_CHATMACRO4 }, ! {"chatmacro5", (int *) &chat_macros[5], (int) HUSTR_CHATMACRO5 }, ! {"chatmacro6", (int *) &chat_macros[6], (int) HUSTR_CHATMACRO6 }, ! {"chatmacro7", (int *) &chat_macros[7], (int) HUSTR_CHATMACRO7 }, ! {"chatmacro8", (int *) &chat_macros[8], (int) HUSTR_CHATMACRO8 }, ! {"chatmacro9", (int *) &chat_macros[9], (int) HUSTR_CHATMACRO9 } }; --- 286,299 ---- {"usegamma",&usegamma, 0}, ! {"chatmacro0", (int *) &chat_macros[0], (long) HUSTR_CHATMACRO0 }, ! {"chatmacro1", (int *) &chat_macros[1], (long) HUSTR_CHATMACRO1 }, ! {"chatmacro2", (int *) &chat_macros[2], (long) HUSTR_CHATMACRO2 }, ! {"chatmacro3", (int *) &chat_macros[3], (long) HUSTR_CHATMACRO3 }, ! {"chatmacro4", (int *) &chat_macros[4], (long) HUSTR_CHATMACRO4 }, ! {"chatmacro5", (int *) &chat_macros[5], (long) HUSTR_CHATMACRO5 }, ! {"chatmacro6", (int *) &chat_macros[6], (long) HUSTR_CHATMACRO6 }, ! {"chatmacro7", (int *) &chat_macros[7], (long) HUSTR_CHATMACRO7 }, ! {"chatmacro8", (int *) &chat_macros[8], (long) HUSTR_CHATMACRO8 }, ! {"chatmacro9", (int *) &chat_macros[9], (long) HUSTR_CHATMACRO9 } }; Index: linuxdoom-1.10/m_swap.c =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/m_swap.c,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 m_swap.c *** 1.1.1.1 1998/07/03 16:32:31 --- linuxdoom-1.10/m_swap.c 1998/07/15 20:56:48 *************** *** 43,47 **** // Swapping 32bit. ! unsigned long SwapLONG( unsigned long x) { return --- 43,47 ---- // Swapping 32bit. ! unsigned int SwapLONG( unsigned int x) { return Index: linuxdoom-1.10/p_setup.c =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/p_setup.c,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 p_setup.c *** 1.1.1.1 1998/07/03 16:32:23 --- linuxdoom-1.10/p_setup.c 1998/07/03 16:34:02 *************** *** 534,538 **** // build line tables for each sector ! linebuffer = Z_Malloc (total*4, PU_LEVEL, 0); sector = sectors; for (i=0 ; i #endif --- 42,49 ---- #include "r_sky.h" ! #if 0 #include + #else + #include #endif *************** *** 479,490 **** } numtextures = numtextures1 + numtextures2; ! ! textures = Z_Malloc (numtextures*4, PU_STATIC, 0); ! texturecolumnlump = Z_Malloc (numtextures*4, PU_STATIC, 0); ! texturecolumnofs = Z_Malloc (numtextures*4, PU_STATIC, 0); ! texturecomposite = Z_Malloc (numtextures*4, PU_STATIC, 0); ! texturecompositesize = Z_Malloc (numtextures*4, PU_STATIC, 0); ! texturewidthmask = Z_Malloc (numtextures*4, PU_STATIC, 0); ! textureheight = Z_Malloc (numtextures*4, PU_STATIC, 0); totalwidth = 0; --- 481,492 ---- } numtextures = numtextures1 + numtextures2; ! textures = Z_Malloc (numtextures*sizeof(texture_t*), PU_STATIC, 0); ! texturecolumnlump = Z_Malloc (numtextures*sizeof(short*), PU_STATIC, 0); ! texturecolumnofs = Z_Malloc (numtextures*sizeof(unsigned short*), ! PU_STATIC, 0); ! texturecomposite = Z_Malloc (numtextures*sizeof(byte*), PU_STATIC, 0); ! texturecompositesize = Z_Malloc (numtextures*sizeof(int), PU_STATIC, 0); ! texturewidthmask = Z_Malloc (numtextures*sizeof(int), PU_STATIC, 0); ! textureheight = Z_Malloc (numtextures*sizeof(fixed_t), PU_STATIC, 0); totalwidth = 0; *************** *** 640,644 **** length = W_LumpLength (lump) + 255; colormaps = Z_Malloc (length, PU_STATIC, 0); ! colormaps = (byte *)( ((int)colormaps + 255)&~0xff); W_ReadLump (lump,colormaps); } --- 642,646 ---- length = W_LumpLength (lump) + 255; colormaps = Z_Malloc (length, PU_STATIC, 0); ! colormaps = (byte *)( ((long)colormaps + 255)&~0xffL); W_ReadLump (lump,colormaps); } Index: linuxdoom-1.10/r_draw.c =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/r_draw.c,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 r_draw.c *** 1.1.1.1 1998/07/03 16:32:24 --- linuxdoom-1.10/r_draw.c 1998/07/03 16:34:04 *************** *** 462,466 **** translationtables = Z_Malloc (256*3+255, PU_STATIC, 0); ! translationtables = (byte *)(( (int)translationtables + 255 )& ~255); // translate just the 16 green colors --- 462,466 ---- translationtables = Z_Malloc (256*3+255, PU_STATIC, 0); ! translationtables = (byte *)(( (long)translationtables + 255 )& ~255L); // translate just the 16 green colors Index: linuxdoom-1.10/w_wad.c =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/w_wad.c,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 w_wad.c *** 1.1.1.1 1998/07/03 16:32:27 --- linuxdoom-1.10/w_wad.c 1998/07/15 20:22:25 *************** *** 35,39 **** --- 35,43 ---- #include #include + #if 0 #include + #else + #include + #endif #define O_BINARY 0 #endif Index: linuxdoom-1.10/z_zone.c =================================================================== RCS file: /ca1/div/cvsroot/extern/doom/z_zone.c,v retrieving revision 1.1.1.1 diff -c -2 -r1.1.1.1 z_zone.c *** 1.1.1.1 1998/07/03 16:32:29 --- linuxdoom-1.10/z_zone.c 1998/07/15 20:44:56 *************** *** 193,198 **** memblock_t* base; size = (size + 3) & ~3; ! // scan through the block list, // looking for the first free block --- 193,202 ---- memblock_t* base; + #ifdef __alpha + size = (size + 7) & ~7; + #else size = (size + 3) & ~3; ! #endif ! // scan through the block list, // looking for the first free block @ 1.1 log @xdoom-1.10: a 3D shoot-em-up for 8-bit X11 displays. Many thanks to Matthias Drochner for giving me his framework on the pkg as a starting point. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- d_net.h 1998/07/03 16:33:37 d17 1 a17 1 Index: doomtype.h d23 1 a23 1 --- doomtype.h 1998/07/15 21:12:05 d40 1 a40 1 Index: info.h d46 1 a46 1 --- info.h 1998/07/03 16:33:41 d70 1 a70 1 Index: m_bbox.h d76 1 a76 1 --- m_bbox.h 1998/07/03 16:33:42 d90 1 a90 1 Index: m_swap.h d96 1 a96 1 --- m_swap.h 1998/07/15 21:08:17 d114 1 a114 1 Index: i_net.c d120 1 a120 1 --- i_net.c 1998/07/15 21:11:38 d156 1 a156 1 Index: i_sound.c d162 1 a162 1 --- i_sound.c 1998/07/15 20:05:49 d174 1 a174 1 Index: i_video.c d180 1 a180 1 --- i_video.c 1998/07/15 20:40:59 d207 1 a207 1 Index: m_menu.c d213 1 a213 1 --- m_menu.c 1998/07/03 16:33:58 d227 1 a227 1 Index: m_misc.c d233 1 a233 1 --- m_misc.c 1998/07/03 16:33:58 d293 1 a293 1 Index: m_swap.c d299 1 a299 1 --- m_swap.c 1998/07/15 20:56:48 d313 1 a313 1 Index: p_setup.c d319 1 a319 1 --- p_setup.c 1998/07/03 16:34:02 d333 1 a333 1 Index: r_data.c d339 1 a339 1 --- r_data.c 1998/07/15 20:54:12 d397 1 a397 1 Index: r_draw.c d403 1 a403 1 --- r_draw.c 1998/07/03 16:34:04 d417 1 a417 1 Index: w_wad.c d423 1 a423 1 --- w_wad.c 1998/07/15 20:22:25 d436 1 a436 1 Index: z_zone.c d442 1 a442 1 --- z_zone.c 1998/07/15 20:44:56 @