TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix some gcc 3.0 warnings, courtesy of paoloulivi@tin.it

Browse source
This commit is contained in:
Bradley Bell 2001-10-12 06:40:49 +00:00
parent f5b970b755
commit 091220944b
6 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aclocal.m4 vendored
View file

@ -1,4 +1,4 @@
dnl aclocal.m4 generated automatically by aclocal 1.4
dnl aclocal.m4 generated automatically by aclocal 1.4-p4
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation

2
conf.h.in
View file

@ -1,4 +1,4 @@
/* conf.h.in. Generated automatically from configure.in by autoheader. */
/* conf.h.in. Generated automatically from configure.in by autoheader 2.13. */
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS

39
include/vecmat.h
View file

@ -13,13 +13,16 @@
*/
/*
* $Source: /cvs/cvsroot/d2x/include/vecmat.h,v $
* $Revision: 1.1.1.1 $
* $Revision: 1.2 $
* $Author: bradleyb $
* $Date: 2001-01-19 03:30:16 $
* $Date: 2001-10-12 06:40:49 $
*
* Header file for vector/matrix library
*
* $Log: not supported by cvs2svn $
* Revision 1.1.1.1 2001/01/19 03:30:16 bradleyb
* Import of d2x-0.0.8
*
* Revision 1.1.1.1 1999/06/14 22:02:28 donut
* Import of d1x 1.37 source.
*
@ -247,8 +250,8 @@ vms_vector * vm_vec_make (vms_vector * v, fix x, fix y, fix z);
#ifdef __WATCOMC__
#pragma aux vm_vec_make "*_" parm [eax] [edx] [ebx] [ecx] value [eax] modify exact [] = \
"mov 0[eax],edx" \
"mov 4[eax],ebx" \
"mov 0[eax],edx" \
"mov 4[eax],ebx" \
"mov 8[eax],ecx";
#endif
@ -258,8 +261,8 @@ vms_angvec * vm_angvec_make (vms_angvec * v, fixang p, fixang b, fixang h);
#ifdef __WATCOMC__
#pragma aux vm_angvec_make "*_" parm [eax] [dx] [bx] [cx] value [eax] modify exact [] = \
"mov 0[eax],dx" \
"mov 2[eax],bx" \
"mov 0[eax],dx" \
"mov 2[eax],bx" \
"mov 4[eax],cx";
#endif
@ -470,20 +473,20 @@ fix vm_vec_dotprod (vms_vector * v0, vms_vector * v1);
#ifdef INLINE
#ifdef __WATCOMC__
#pragma aux vm_vec_dotprod parm [esi] [edi] value [eax] modify exact [eax ebx ecx edx] = \
"mov eax,[esi]" \
"imul dword ptr [edi]" \
"mov ebx,eax" \
"mov ecx,edx" \
"mov eax,[esi]" \
"imul dword ptr [edi]" \
"mov ebx,eax" \
"mov ecx,edx" \
\
"mov eax,4[esi]" \
"imul dword ptr 4[edi]" \
"add ebx,eax" \
"adc ecx,edx" \
"mov eax,4[esi]" \
"imul dword ptr 4[edi]" \
"add ebx,eax" \
"adc ecx,edx" \
\
"mov eax,8[esi]" \
"imul dword ptr 8[edi]" \
"add eax,ebx" \
"adc edx,ecx" \
"mov eax,8[esi]" \
"imul dword ptr 8[edi]" \
"add eax,ebx" \
"adc edx,ecx" \
\
"shrd eax,edx,16";

4
main/collide.c
View file

@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#endif
#ifdef RCS
static char rcsid[] = "$Id: collide.c,v 1.4 2001-01-31 15:17:49 bradleyb Exp $";
static char rcsid[] = "$Id: collide.c,v 1.5 2001-10-12 06:40:49 bradleyb Exp $";
#endif
#include <string.h> // for memset
@ -559,7 +559,7 @@ int check_effect_blowup(segment *seg,int side,vms_vector *pnt, object *blower, i
if ((((ec=TmapInfo[tm].eclip_num)!=-1) && ((db=Effects[ec].dest_bm_num)!=-1 && !(Effects[ec].flags&EF_ONE_SHOT))) || (ec==-1 && (TmapInfo[tm].destroyed!=-1))) {
fix u,v;
grs_bitmap *bm = &GameBitmaps[Textures[tm].index];
int x,y,t;
int x=0,y=0,t;
PIGGY_PAGE_IN(Textures[tm]);

1
main/kludge.c
View file

@ -2,6 +2,7 @@
#include <conf.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "gr.h"
#include "pstypes.h"
#include "maths.h"

2
main/piggy.h
View file

@ -75,7 +75,7 @@ static inline void _piggy_page_in(bitmap_index bmp) {
#define PIGGY_PAGE_IN(bmp) \
do { \
if ( GameBitmaps[(bmp).index].bm_flags & BM_FLAG_PAGED_OUT ) {\
piggy_bitmap_page_in( bmp ); \
piggy_bitmap_page_in( bmp ); \
} \
} while(0)
/* mprintf(( 0, "Paging in '%s' from file '%s', line %d\n", #bmp, __FILE__,__LINE__ )); \ */