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

warning fixes for gcc 4.0

Browse source
This commit is contained in:
kreatordxx 2006-12-24 09:15:37 +00:00
parent 21ec5934ce
commit d698e87960
6 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dxx-changelog.txt
View file

@ -11,8 +11,9 @@ arch/carbon/conf.h: allow universal binaries to be built using Xcode 2.1 or late
arch/sdl/digi.c: add MIDI stubs for Mac, it doesn't have the 'real' functions yet
arch/sdl/joy.c: use d_strdup instead of strdup to avoid errors when compiling on Mac OS 9, free the joystick button texts when closing
main/inferno.c: use strncpy instead of snprintf, MPW on Mac OS 9 doesn't have snprintf
main/automap.c, main/gamefont.c, main/newmenu.c, main/state.c, main/titles.c: warning fixes for gcc 4.0
20061219
20061223
--------
main/game.c, main/gamerend.c: small brace tidy up to allow a source code editor to list all the functions (from D2X CVS)

4
main/automap.c
View file

@ -401,6 +401,8 @@ void draw_player( object * obj )
automap_draw_line(&sphere_point, &arrow_point);
}
void create_name_canv(void);
void draw_automap()
{
int i;
@ -625,7 +627,9 @@ void do_automap( int key_code ) {
int pause_game=1; // Set to 1 if everything is paused during automap...No pause during net.
fix t1, t2;
control_info saved_control_info;
#ifdef OGL
grs_bitmap Automap_background;
#endif
int Max_segments_away = 0;
int SegmentLimit = 1;
ubyte pal[256*3];

1
main/gamefont.c
View file

@ -31,6 +31,7 @@ static char rcsid[] = "$Id: gamefont.c,v 1.1.1.1 2006/03/17 19:56:39 zicodxx Exp
#include "inferno.h"
#include "gr.h"
#include "gamefont.h"
#include "args.h"
// if 1, use high-res versions of fonts
int FontHires = 0;

1
main/newmenu.c
View file

@ -37,6 +37,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "error.h"
#include "pstypes.h"
#include "gr.h"
#include "grdef.h"
#include "mono.h"
#include "songs.h"
#include "key.h"

1
main/state.c
View file

@ -49,6 +49,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#else
#include <GL/gl.h>
#endif
#include "ogl_init.h"
#endif
#include "pstypes.h"

4
main/titles.c
View file

@ -30,6 +30,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include <stdio.h>
#include <string.h>
#ifdef OGL
#include "ogl_init.h"
#endif
#ifdef MACINTOSH
#include <Events.h>
#endif