From 0f85bfb69e591530a2a51ae9d634bea1e0fcca8a Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Wed, 29 Oct 2003 14:18:49 +0000 Subject: [PATCH] fix stupid copy/paste error --- ChangeLog | 8 ++++++-- include/byteswap.h | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0555d49e..2c985e53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,19 @@ +2003-10-29 Martin Schaffner + + * include/byteswap.h: fix stupid copy/paste error + 2003-10-24 Bradley Bell * 2d/bitblt.c, 2d/ibitblt.c, include/gr.h, include/grdef.h: use gr_linear_rep_movsd_2x instead of almost identical gr_linear_movsd_double. Better since we have assembly versions. -2003-10-22 Martin Schaffner +2003-10-22 Martin Schaffner * main/gamemine.c, main/piggy.c: fix "psychedelic" walls in d1 prisons -2003-10-21 Martin Schaffner +2003-10-21 Martin Schaffner * main/gameseq.c, main/multi.c, main/multi.h: fix compilation error with --disable-network, move reset_network_objects() diff --git a/include/byteswap.h b/include/byteswap.h index 453199d9..55d17454 100644 --- a/include/byteswap.h +++ b/include/byteswap.h @@ -1,4 +1,4 @@ -/* $Id: byteswap.h,v 1.9 2003-10-03 07:58:14 btb Exp $ */ +/* $Id: byteswap.h,v 1.10 2003-10-29 14:18:49 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -67,9 +67,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. memcpy((void *)&tmp, (void *)(s), 4); \ (ushort)(d) = INTEL_SHORT(tmp); } #define PUT_INTEL_INT(d, s) { uint tmp = INTEL_INT(s); \ - memcpy((void *)d, (void *)&tmp, 4); } + memcpy((void *)d, (void *)&tmp, 2); } #define PUT_INTEL_SHORT(d, s) { ushort tmp = INTEL_SHORT(s); \ - memcpy((void *)d, (void *)&tmp, 4); } + memcpy((void *)d, (void *)&tmp, 2); } #endif // ! WORDS_NEED_ALIGNMENT #endif // ! _BYTESWAP_H -- 2.39.2