diff --git a/include/bothdefs.h b/include/bothdefs.h
index 50dc7ea..e9b4117 100644
--- a/include/bothdefs.h
+++ b/include/bothdefs.h
@@ -25,16 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define LINUX_VERSION 0.98
 
 
-#if (defined(_M_IX86) || defined(__i386__)) && !defined(id386)
-#define id386	1
-#else
-#define id386	0
-#endif
-
-#ifdef SERVERONLY		// no asm in dedicated server
-#undef id386
-#endif
-
 #if id386
 #define UNALIGNED_OK	1	// set to 0 if unaligned accesses are not supported
 #else
diff --git a/include/quakeasm.h b/include/quakeasm.h
index 1ceadda..a243d62 100644
--- a/include/quakeasm.h
+++ b/include/quakeasm.h
@@ -25,12 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define __i386__	1
 #endif
 
-#ifdef	__i386__
-#define id386	1
-#else
-#define id386	0
-#endif
-
 // !!! must be kept the same as in d_iface.h !!!
 #define TRANSPARENT_COLOR	255
 
diff --git a/source/.gitignore b/source/.gitignore
new file mode 100644
index 0000000..808f457
--- /dev/null
+++ b/source/.gitignore
@@ -0,0 +1,3 @@
+*.d
+*.o
+qw-server
diff --git a/source/Makefile b/source/Makefile
index 8790672..7d762d5 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -6,7 +6,7 @@ EXE_libs=
 DIRECTORIES=
 vpath %.a $(patsubst @%,%,$(DIRECTORIES)) /usr/lib
 
-CPPFLAGS=-I . -I ../include -MMD
+CPPFLAGS=-I . -I ../include -Did386 -Dstricmp=strcasecmp -MMD -DSERVERONLY
 CFLAGS=-Wall #-Werror
 CXXFLAGS=-Wall #-Werror
 LDFLAGS=
@@ -36,6 +36,7 @@ EXE_sources=\
   sv_user.c \
   sv_ccmds.c \
   world.c \
+  worlda.S \
   sys_unix.c \
   model.c \
   cmd.c \
diff --git a/source/worlda.S b/source/worlda.S
new file mode 100644
index 0000000..786923f
--- /dev/null
+++ b/source/worlda.S
@@ -0,0 +1,124 @@
+//
+// worlda.s
+// x86 assembly-language server testing stuff
+//
+
+#include "asm_i386.h"
+#include "quakeasm.h"
+//include "d_ifacea.h"
+
+#if id386
+
+	.data
+
+Ltemp:	.long	0
+
+	.text
+
+//----------------------------------------------------------------------
+// hull-point test
+//----------------------------------------------------------------------
+
+#define hull	4+8				// because only partially pushed
+#define	num		8+4				// because only partially pushed
+#define p		12+12			// because only partially pushed
+
+	.align 4
+.globl C(SV_HullPointContents)
+C(SV_HullPointContents):
+	pushl	%edi				// preserve register variables
+	movl	num(%esp),%eax
+	testl	%eax,%eax
+	js		Lhquickout
+
+//	float		d;
+//	dclipnode_t	*node;
+//	mplane_t	*plane;
+
+	pushl	%ebx
+	movl	hull(%esp),%ebx
+
+	pushl	%ebp
+	movl	p(%esp),%edx
+
+	movl	hu_clipnodes(%ebx),%edi
+	movl	hu_planes(%ebx),%ebp
+
+	subl	%ebx,%ebx
+	pushl	%esi
+
+// %ebx: 0
+// %eax: num
+// %edx: p
+// %edi: hull->clipnodes
+// %ebp: hull->planes
+
+//	while (num >= 0)
+//	{
+
+Lhloop:
+
+//		node = hull->clipnodes + num;
+//		plane = hull->planes + node->planenum;
+// !!! if the size of dclipnode_t changes, the scaling of %eax needs to be
+//     changed !!!
+	movl	nd_planenum(%edi,%eax,8),%ecx
+	movl	nd_children(%edi,%eax,8),%eax
+	movl	%eax,%esi
+	rorl	$16,%eax
+	leal	(%ecx,%ecx,4),%ecx
+
+//		if (plane->type < 3)
+//			d = p[plane->type] - plane->dist;
+	movb	pl_type(%ebp,%ecx,4),%bl
+	cmpb	$3,%bl
+	jb		Lnodot
+
+//		else
+//			d = DotProduct (plane->normal, p) - plane->dist;
+	flds	pl_normal(%ebp,%ecx,4)
+	fmuls	0(%edx)
+	flds	pl_normal+4(%ebp,%ecx,4)
+	fmuls	4(%edx)
+	flds	pl_normal+8(%ebp,%ecx,4)
+	fmuls	8(%edx)
+	fxch	%st(1)
+	faddp	%st(0),%st(2)
+	faddp	%st(0),%st(1)
+	fsubs	pl_dist(%ebp,%ecx,4)
+	jmp		Lsub
+
+Lnodot:
+	flds	pl_dist(%ebp,%ecx,4)
+	fsubrs	(%edx,%ebx,4)
+
+Lsub:
+	sarl	$16,%eax
+	sarl	$16,%esi
+
+//		if (d < 0)
+//			num = node->children[1];
+//		else
+//			num = node->children[0];
+	fstps	Ltemp
+	movl	Ltemp,%ecx
+	sarl	$31,%ecx
+	andl	%ecx,%esi
+	xorl	$0xFFFFFFFF,%ecx
+	andl	%ecx,%eax
+	orl		%esi,%eax
+	jns		Lhloop
+
+//	return num;
+Lhdone:
+	popl	%esi
+	popl	%ebp
+	popl	%ebx				// restore register variables
+
+Lhquickout:
+	popl	%edi
+
+	ret
+
+#endif	// id386
+