Add DL_LIBS to the -x11 targets.

Something is funny with Ubuntu such that -ldl needs to be specifically
added even though QFutil's .la specifies it. I don't know if it's a libtool
issue or not, but this does work.

More will probably be necessary, but this was sufficient to get prover to
the point where qfcc segged building qwaq (0.7.2).

nq/source/Makefile.am

@@ -138,7 +138,7 @@ nq_x11_libs=  \
 nq_x11_SOURCES= 	sys_unix.c
 nq_x11_LDADD=		$(nq_x11_libs) \
 			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
-			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS)
+			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(DL_LIBS)
 nq_x11_LDFLAGS= 	$(common_ldflags)
 nq_x11_DEPENDENCIES=	$(nq_x11_libs)
 

qw/source/Makefile.am

@@ -168,7 +168,7 @@ qw_client_x11_libs= \
 qw_client_x11_SOURCES=	cl_sys_unix.c
 qw_client_x11_LDADD= $(qw_client_x11_libs) \
 			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
-			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL_LIBS)
+			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL_LIBS) $(DL_LIBS)
 qw_client_x11_LDFLAGS=	$(common_ldflags)
 qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs)
 

qw/source/cl_ents.c

@@ -302,7 +302,8 @@ CL_LinkPacketEntities (void)
 			old->colormap = new->colormap;
 			if (new->colormap && (new->colormap <= MAX_CLIENTS)
 				&& cl.players[new->colormap - 1].name
-				&& cl.players[new->colormap - 1].name->value[0]) {
+				&& cl.players[new->colormap - 1].name->value[0]
+				&& new->modelindex == cl_playerindex) {
 				player_info_t *player = &cl.players[new->colormap - 1];
 				ent->skin = mod_funcs->Skin_SetSkin (ent->skin, new->colormap,
 													 player->skinname->value);

tools/qwaq/Makefile.am

@@ -38,7 +38,7 @@ qwaq_x11_libs= \
 qwaq_x11_SOURCES=qwaq.c qwaq-bi.c
 qwaq_x11_LDADD= $(qwaq_x11_libs) $(QWAQ_LIBS) \
 				$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
-				$(X_EXTRA_LIBS) $(X_SHM_LIB)
+				$(X_EXTRA_LIBS) $(X_SHM_LIB) $(DL_LIBS)
 qwaq_x11_LDFLAGS=
 qwaq_x11_DEPENDENCIES= $(qwaq_x11_libs) $(QWAQ_DEPS)