--- wad/wadstruct.h	Tue Nov  4 11:16:32 1997
+++ /home/josh/ceph/dumb/wad/wadstruct.h	Tue Nov 25 10:16:54 1997
@@ -3,11 +3,16 @@
 #define WADSTRUCT_H
 
 #include "lib/endian.h"
 
 /* wad structures don't get aligned: old GCCs might need a #pragma instead */
-#define PACKED __attribute__((packed))
+/*#define PACKED __attribute__((packed))*/
+
+/* Annoyingly, the above doesn't seem to do anything on systems which need 
+   it, AND it breaks C++ compilation.  If anyone can explain this to me,
+   please do. */
+#define PACKED
 
 #ifdef __cplusplus
 #define UMEMB(n) n()
 #else
 #define UMEMB(n) n
--- dumb/thinghit.c	Mon Nov 24 14:15:00 1997
+++ /home/josh/ceph/dumb/dumb/thinghit.c	Tue Nov 25 10:18:29 1997
@@ -132,11 +132,11 @@
       for(i=0;i<2;i++) {
 	 /* deal with speed */
 	 me->delta[i]=lta->speed[i];
 	 /* deal with term (sectors only) */
 	 if(lta->lumptype==ML_SECTOR) {
-	    me->term[i]=get_term_type(ld,lta->term_type[i],ttfrom);
+	    me->term[i]=get_term_type(ld,(int)(lta->term_type[i]),ttfrom);
 	    me->term[i]+=stairiter*(fixed)(lta->term_offset[i])<<12;
 	 };
       };
 
       /* deal with targ */