From c9d00eb06392397d326d3fc63e2e7bc075174b6a Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Tue, 20 Feb 2018 02:08:52 -0800 Subject: [PATCH] make function declarations into prototypes --- 3d/draw.c | 2 +- arch/include/event.h | 4 +- arch/include/joy.h | 20 +- arch/include/key.h | 16 +- arch/include/mouse.h | 6 +- arch/linux/init.c | 10 +- arch/linux/ipx_mcast4.c | 2 +- arch/sdl/digi.c | 2 +- arch/sdl/event.c | 2 +- arch/sdl/init.c | 2 +- include/3d.h | 4 +- include/func.h | 4 +- include/gr.h | 4 +- include/grdef.h | 2 +- include/ipx.h | 6 +- include/libmve.h | 6 +- include/maths.h | 2 +- include/palette.h | 4 +- include/rbaudio.h | 10 +- include/rle.h | 2 +- include/timer.h | 8 +- include/u_mem.h | 4 +- include/ui.h | 38 ++-- libmve/decoder16.c | 2 +- main/ai.h | 2 +- main/automap.h | 2 +- main/bm.h | 8 +- main/cntrlcen.c | 2 +- main/collide.c | 4 +- main/collide.h | 2 +- main/controls.h | 2 +- main/digi.h | 34 ++-- main/digiobj.c | 8 +- main/editor/centers.h | 4 +- main/editor/editor.h | 10 +- main/editor/ehostage.h | 6 +- main/editor/eobject.h | 14 +- main/editor/eswitch.h | 8 +- main/editor/kdefs.h | 416 ++++++++++++++++++++-------------------- main/editor/kfuncs.c | 16 +- main/editor/med.c | 6 +- main/editor/medmisc.h | 6 +- main/editor/medrobot.c | 6 +- main/editor/medrobot.h | 8 +- main/editor/medwall.h | 26 ++- main/editor/mine.c | 2 +- main/editor/objpage.h | 6 +- main/editor/texpage.h | 6 +- main/effects.h | 8 +- main/endlevel.c | 6 +- main/endlevel.h | 12 +- main/escort.c | 2 +- main/fuelcen.h | 6 +- main/game.c | 22 +-- main/game.h | 10 +- main/gamecntl.c | 32 ++-- main/gamefont.h | 4 +- main/gamemine.c | 2 +- main/gamepal.c | 2 +- main/gameseq.c | 4 +- main/gameseq.h | 18 +- main/gauges.c | 2 +- main/gauges.h | 18 +- main/hudmsg.h | 4 +- main/inferno.h | 2 +- main/joydefs.h | 4 +- main/kconfig.h | 4 +- main/kmatrix.c | 4 +- main/kmatrix.h | 2 +- main/laser.c | 4 +- main/menu.c | 6 +- main/menu.h | 6 +- main/mission.c | 2 +- main/morph.h | 2 +- main/movie.h | 6 +- main/multi.c | 26 +-- main/multi.h | 8 +- main/multibot.c | 2 +- main/network.c | 30 +-- main/network.h | 22 +-- main/newdemo.c | 2 +- main/newdemo.h | 22 +-- main/object.c | 10 +- main/object.h | 16 +- main/paging.h | 2 +- main/piggy.h | 14 +- main/polyobj.c | 2 +- main/polyobj.h | 2 +- main/render.h | 2 +- main/reorder.h | 4 +- main/screens.h | 2 +- main/segment.h | 2 +- main/slew.h | 6 +- main/songs.c | 4 +- main/state.c | 4 +- main/switch.h | 4 +- main/texmerge.c | 2 +- main/texmerge.h | 4 +- main/titles.c | 2 +- main/wall.h | 6 +- main/weapon.h | 2 +- mem/mem.c | 2 +- texmap/scanline.h | 12 +- 103 files changed, 587 insertions(+), 589 deletions(-) diff --git a/3d/draw.c b/3d/draw.c index be51b788..22400d6a 100644 --- a/3d/draw.c +++ b/3d/draw.c @@ -33,7 +33,7 @@ int (*line_drawer_ptr)(fix x0,fix y0,fix x1,fix y1) = gr_line; //specifies 2d drawing routines to use instead of defaults. Passing //NULL for either or both restores defaults -void g3_set_special_render(void (*tmap_drawer)(),void (*flat_drawer)(),int (*line_drawer)(fix, fix, fix, fix)) +void g3_set_special_render(void (*tmap_drawer)(void), void (*flat_drawer)(void), int (*line_drawer)(fix, fix, fix, fix)) { tmap_drawer_ptr = (tmap_drawer)?tmap_drawer:draw_tmap; flat_drawer_ptr = (flat_drawer)?flat_drawer:gr_upoly_tmap; diff --git a/arch/include/event.h b/arch/include/event.h index af67460f..5a54511e 100644 --- a/arch/include/event.h +++ b/arch/include/event.h @@ -8,7 +8,7 @@ #ifndef _EVENT_H #define _EVENT_H -int event_init(); -void event_poll(); +int event_init(void); +void event_poll(void); #endif diff --git a/arch/include/joy.h b/arch/include/joy.h index 144ee691..d2e8ebac 100644 --- a/arch/include/joy.h +++ b/arch/include/joy.h @@ -85,8 +85,8 @@ extern cvar_t joy_invert[]; // joystick was detected, 1 if everything is ok. // joy_init() is called. -extern int joy_init(); -extern void joy_close(); +extern int joy_init(void); +extern void joy_close(void); extern char joy_installed; extern char joy_present; @@ -109,9 +109,9 @@ extern int joy_num_axes; // left position is usually always 0,0 on most joys. But, the safest // bet is to do all three, or let the user choose which ones to set. -extern void joy_set_ul(); -extern void joy_set_lr(); -extern void joy_set_cen(); +extern void joy_set_ul(void); +extern void joy_set_lr(void); +extern void joy_set_cen(void); //========================================================================== @@ -125,7 +125,7 @@ extern void joy_get_pos(int *x, int *y); //========================================================================== // This just reads the buttons and returns their status. When bit 0 // is 1, button 1 is pressed, when bit 1 is 1, button 2 is pressed. -extern int joy_get_btns(); +extern int joy_get_btns(void); //========================================================================== // This returns the number of times a button went either down or up since @@ -140,12 +140,12 @@ extern int joy_get_btns(); // it, and held it down for 6 more ticks. The time returned would be 9. #define joy_get_button_down_time(btn) key_down_time(KEY_JB1 + (btn)) -extern ubyte joy_read_raw_buttons(); +extern ubyte joy_read_raw_buttons(void); extern ubyte joystick_read_raw_axis(ubyte mask, int *axis); -extern void joy_flush(); -extern ubyte joy_get_present_mask(); +extern void joy_flush(void); +extern ubyte joy_get_present_mask(void); extern void joy_set_timer_rate(int max_value); -extern int joy_get_timer_rate(); +extern int joy_get_timer_rate(void); extern int joy_get_button_state(int btn); extern void joy_set_cen_fake(int channel); diff --git a/arch/include/key.h b/arch/include/key.h index 2b83262f..05499241 100644 --- a/arch/include/key.h +++ b/arch/include/key.h @@ -29,8 +29,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. //========================================================================== // This installs the int9 vector and initializes the keyboard in buffered // ASCII mode. key_close simply undoes that. -extern void key_init(); -extern void key_close(); +extern void key_init(void); +extern void key_close(void); //========================================================================== // These are configuration parameters to setup how the buffer works. @@ -51,16 +51,16 @@ extern volatile int keyd_time_when_last_pressed; // "keyd_buffer_type" variable. extern void key_putkey (unsigned short); // simulates a keystroke -extern void key_flush(); // Clears the 256 char buffer -extern int key_checkch(); // Returns 1 if a char is waiting -extern int key_getch(); // Gets key if one waiting other waits for one. -extern int key_inkey(); // Gets key if one, other returns 0. +extern void key_flush(void); // Clears the 256 char buffer +extern int key_checkch(void); // Returns 1 if a char is waiting +extern int key_getch(void); // Gets key if one waiting other waits for one. +extern int key_inkey(void); // Gets key if one, other returns 0. extern int key_inkey_time(fix *time); // Same as inkey, but returns the time the key was pressed down. -extern int key_peekkey(); // Same as inkey, but doesn't remove key from buffer. +extern int key_peekkey(void); // Same as inkey, but doesn't remove key from buffer. extern unsigned char key_to_ascii(int keycode ); -extern void key_debug(); // Does an INT3 +extern void key_debug(void); // Does an INT3 //========================================================================== // These are the unbuffered routines. Index by the keyboard scancode. diff --git a/arch/include/mouse.h b/arch/include/mouse.h index 34e5da5d..478b8cb9 100644 --- a/arch/include/mouse.h +++ b/arch/include/mouse.h @@ -69,20 +69,20 @@ extern void d_mouse_init(void); /* changed from int to void */ extern void mouse_set_limits( int x1, int y1, int x2, int y2 ); -extern void mouse_flush(); // clears all mice events... +extern void mouse_flush(void); // clears all mice events... //======================================================================== // Shutdowns mouse system. #ifdef SVGALIB_INPUT extern void d_mouse_close(); /* conflict with */ #else -extern void mouse_close(); +extern void mouse_close(void); #endif //======================================================================== extern void mouse_get_pos( int *x, int *y ); extern void mouse_get_delta( int *dx, int *dy, int *dz ); -extern int mouse_get_btns(); +extern int mouse_get_btns(void); extern void mouse_set_pos( int x, int y); // Returns how long this button has been down since last call. diff --git a/arch/linux/init.c b/arch/linux/init.c index 63600ee6..7bcf6dad 100644 --- a/arch/linux/init.c +++ b/arch/linux/init.c @@ -17,11 +17,11 @@ #include "joy.h" #include "args.h" -extern void arch_sdl_init(); -extern void arch_svgalib_init(); -extern void key_init(); -extern int com_init(); -extern void timer_init(); +extern void arch_sdl_init(void); +extern void arch_svgalib_init(void); +extern void key_init(void); +extern int com_init(void); +extern void timer_init(void); void arch_init_start() { diff --git a/arch/linux/ipx_mcast4.c b/arch/linux/ipx_mcast4.c index b9d218d1..015a926e 100644 --- a/arch/linux/ipx_mcast4.c +++ b/arch/linux/ipx_mcast4.c @@ -324,7 +324,7 @@ static int ipx_mcast4_SendGamePacket(ipx_socket_t *sk, ubyte *data, int dataLen) } // Pull this in from ipx_udp.c since it's the same for us. -extern int ipx_udp_GetMyAddress(); +extern int ipx_udp_GetMyAddress(void); struct ipx_driver ipx_mcast4 = { ipx_udp_GetMyAddress, diff --git a/arch/sdl/digi.c b/arch/sdl/digi.c index d715a9b6..e11a353c 100644 --- a/arch/sdl/digi.c +++ b/arch/sdl/digi.c @@ -235,7 +235,7 @@ void digi_stop_all_channels() extern void digi_end_soundobj(int channel); extern int SoundQ_channel; -extern void SoundQ_end(); +extern void SoundQ_end(void); int verify_sound_channel_free(int channel); // Volume 0-F1_0 diff --git a/arch/sdl/event.c b/arch/sdl/event.c index a4cc45ab..8e60a677 100644 --- a/arch/sdl/event.c +++ b/arch/sdl/event.c @@ -57,7 +57,7 @@ void event_poll() break; #endif case SDL_QUIT: { - void quit_request(); + void quit_request(void); quit_request(); } break; } diff --git a/arch/sdl/init.c b/arch/sdl/init.c index 25e7e729..a083eff3 100644 --- a/arch/sdl/init.c +++ b/arch/sdl/init.c @@ -20,7 +20,7 @@ #include "args.h" #include "digi.h" -extern void d_mouse_init(); +extern void d_mouse_init(void); void sdl_close() { diff --git a/include/3d.h b/include/3d.h index 5c25e43e..567d4fe5 100644 --- a/include/3d.h +++ b/include/3d.h @@ -128,7 +128,7 @@ void g3_start_instance_matrix(vms_vector *pos,vms_matrix *orient); void g3_start_instance_angles(vms_vector *pos,vms_angvec *angles); //pops the old context -void g3_done_instance(); +void g3_done_instance(void); //Misc utility functions: @@ -222,6 +222,6 @@ bool g3_draw_bitmap(vms_vector *pos,fix width,fix height,grs_bitmap *bm, int ori //specifies 2d drawing routines to use instead of defaults. Passing //NULL for either or both restores defaults -void g3_set_special_render(void (*tmap_drawer)(),void (*flat_drawer)(),int (*line_drawer)(fix, fix, fix, fix)); +void g3_set_special_render(void (*tmap_drawer)(void), void (*flat_drawer)(void), int (*line_drawer)(fix, fix, fix, fix)); #endif diff --git a/include/func.h b/include/func.h index b9d447e7..9befbdf2 100644 --- a/include/func.h +++ b/include/func.h @@ -23,9 +23,9 @@ typedef struct { } FUNCTION; void func_init( FUNCTION * funtable, int size ); -void func_close(); +void func_close(void); int (*func_get( char * name, int * numparams ))(void); -int func_howmany(); +int func_howmany(void); int (*func_nget( int func_number, int * numparams, char **name ))(void); void func_set_param( int n, int value ); int func_get_param( int n ); diff --git a/include/gr.h b/include/gr.h index ac7d8279..2647884a 100644 --- a/include/gr.h +++ b/include/gr.h @@ -356,8 +356,8 @@ void gr_close_font( grs_font * font ); void gr_remap_font( grs_font *font, char * fontname, char *font_data ); //remap (by re-reading) all the color fonts -void gr_remap_color_fonts(); -void gr_remap_mono_fonts(); +void gr_remap_color_fonts(void); +void gr_remap_mono_fonts(void); // Writes a string using current font. Returns the next column after last char. void gr_set_fontcolor( int fg, int bg ); diff --git a/include/grdef.h b/include/grdef.h index 8b882a74..4157b11d 100644 --- a/include/grdef.h +++ b/include/grdef.h @@ -21,7 +21,7 @@ void gr_init_bitmap_alloc( grs_bitmap *bm, int mode, int x, int y, int w, int h, void gr_init_sub_bitmap (grs_bitmap *bm, grs_bitmap *bmParent, int x, int y, int w, int h ); void gr_init_bitmap( grs_bitmap *bm, int mode, int x, int y, int w, int h, int bytesperline, unsigned char * data ); -extern void gr_set_buffer(int w, int h, int r, int (*buffer_func)()); +extern void gr_set_buffer(int w, int h, int r, int (*buffer_func)(void)); extern void gr_pal_setblock( int start, int n, unsigned char * palette ); extern void gr_pal_getblock( int start, int n, unsigned char * palette ); diff --git a/include/ipx.h b/include/ipx.h index 0392a8ea..b28a7c6a 100644 --- a/include/ipx.h +++ b/include/ipx.h @@ -53,9 +53,9 @@ extern void ipx_close(void); extern int ipx_change_default_socket( ushort socket_number ); // Returns a pointer to 6-byte address -extern ubyte * ipx_get_my_local_address(); +extern ubyte * ipx_get_my_local_address(void); // Returns a pointer to 4-byte server -extern ubyte * ipx_get_my_server_address(); +extern ubyte * ipx_get_my_server_address(void); // Determines the local address equivalent of an internetwork address. void ipx_get_local_target( ubyte * server, ubyte * node, ubyte * local_target ); @@ -78,7 +78,7 @@ extern int ipx_send_game_packet(ubyte *data, int datasize); extern void ipx_init_netgame_aux_data(ubyte data[]); extern int ipx_handle_netgame_aux_data(const ubyte data[]); // Handle disconnecting from the game -extern void ipx_handle_leave_game(); +extern void ipx_handle_leave_game(void); #define IPX_MAX_DATA_SIZE (542) //(546-4) diff --git a/include/libmve.h b/include/libmve.h index f0f7a063..15895e9e 100644 --- a/include/libmve.h +++ b/include/libmve.h @@ -12,9 +12,9 @@ typedef struct{ } MVE_videoSpec; int MVE_rmPrepMovie(void *stream, int x, int y, int track); -int MVE_rmStepMovie(); -void MVE_rmHoldMovie(); -void MVE_rmEndMovie(); +int MVE_rmStepMovie(void); +void MVE_rmHoldMovie(void); +void MVE_rmEndMovie(void); void MVE_getVideoSpec(MVE_videoSpec *vSpec); diff --git a/include/maths.h b/include/maths.h index d1903b0d..ab2f34da 100644 --- a/include/maths.h +++ b/include/maths.h @@ -10,7 +10,7 @@ #define D_RAND_MAX 32767 void d_srand (unsigned int seed); -int d_rand (); // Random number function which returns in the range 0-0x7FFF +int d_rand (void); // Random number function which returns in the range 0-0x7FFF #endif diff --git a/include/palette.h b/include/palette.h index e5885dee..945874f1 100644 --- a/include/palette.h +++ b/include/palette.h @@ -27,10 +27,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define DEFAULT_LEVEL_PALETTE "groupa.256" //don't confuse with D2_DEFAULT_PALETTE extern void gr_palette_set_gamma( int gamma ); -extern int gr_palette_get_gamma(); +extern int gr_palette_get_gamma(void); extern ubyte gr_palette_faded_out; extern int grd_fades_disabled; -extern void gr_palette_clear(); +extern void gr_palette_clear(void); extern int gr_palette_fade_out(ubyte *pal, int nsteps, int allow_keys ); extern int gr_palette_fade_in(ubyte *pal,int nsteps, int allow_keys ); extern void gr_palette_load( ubyte * pal ); diff --git a/include/rbaudio.h b/include/rbaudio.h index 65468629..d7416fa7 100644 --- a/include/rbaudio.h +++ b/include/rbaudio.h @@ -34,7 +34,7 @@ extern void RBARegisterCD(void); extern long RBAGetDeviceStatus(void); extern int RBAPlayTrack(int track); extern int RBAPlayTracks(int first, int last); //plays tracks first through last, inclusive -extern int RBACheckMediaChange(); +extern int RBACheckMediaChange(void); extern long RBAGetHeadLoc(int *min, int *sec, int *frame); extern int RBAPeekPlayStatus(void); extern void RBAStop(void); @@ -47,14 +47,14 @@ extern int RBAEnabled(void); extern void RBADisable(void); extern void RBAEnable(void); extern int RBAGetNumberOfTracks(void); -extern void RBAPause(); -extern int RBAResume(); +extern void RBAPause(void); +extern int RBAResume(void); //return the track number currently playing. Useful if RBAPlayTracks() //is called. Returns 0 if no track playing, else track number -int RBAGetTrackNum(); +int RBAGetTrackNum(void); // get the cddb discid for the current cd. -uint32_t RBAGetDiscID(); +uint32_t RBAGetDiscID(void); #endif diff --git a/include/rle.h b/include/rle.h index de7aa2a1..4764468d 100644 --- a/include/rle.h +++ b/include/rle.h @@ -36,7 +36,7 @@ void gr_rle_expand_scanline( ubyte *dest, ubyte *src, int x1, int x2 ); grs_bitmap * rle_expand_texture( grs_bitmap * bmp ); -void rle_cache_flush(); +void rle_cache_flush(void); void rle_swap_0_255(grs_bitmap *bmp); diff --git a/include/timer.h b/include/timer.h index abe9a6c0..ace88aac 100644 --- a/include/timer.h +++ b/include/timer.h @@ -38,8 +38,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define __far #define __interrupt -extern void timer_init(); -extern void timer_close(); +extern void timer_init(void); +extern void timer_close(void); extern void timer_set_rate(int count_val); extern void timer_set_function( void _far * function ); @@ -51,7 +51,7 @@ extern void timer_set_function( void _far * function ); // and microseconds. They time out after 1000 hrs, 100 hrs, 10 hrs, and // 1 hr, respectively. -extern fix timer_get_fixed_seconds(); // Rolls about every 9 hours... +extern fix timer_get_fixed_seconds(void); // Rolls about every 9 hours... #ifdef __DJGPP__ extern fix timer_get_fixed_secondsX(); // Assume interrupts already disabled extern fix timer_get_approx_seconds(); // Returns time since program started... accurate to 1/120th of a second @@ -59,7 +59,7 @@ extern void timer_set_joyhandler( void (*joy_handler)() ); #else #define timer_get_fixed_secondsX timer_get_fixed_seconds //#define timer_get_approx_seconds timer_get_fixed_seconds -extern fix timer_get_approx_seconds(); +extern fix timer_get_approx_seconds(void); #endif //NOT_USED extern unsigned int timer_get_microseconds(); diff --git a/include/u_mem.h b/include/u_mem.h index f5e58a8d..78eb99ae 100644 --- a/include/u_mem.h +++ b/include/u_mem.h @@ -21,7 +21,7 @@ extern ubyte virtual_memory_on; extern int show_mem_info; -void mem_display_blocks(); +void mem_display_blocks(void); extern void * mem_malloc( unsigned int size, char * var, char * file, int line, int fill_zero ); extern void * mem_realloc( void * buffer, unsigned int size, char * var, char * file, int line ); extern void mem_free( void * buffer ); @@ -37,7 +37,7 @@ extern char * mem_strdup(char * str, char * var, char * file, int line ); #define MALLOC( var, type, count ) (var=(type *)mem_malloc((count)*sizeof(type),#var, __FILE__,__LINE__,0 )) // Checks to see if any blocks are overwritten -void mem_validate_heap(); +void mem_validate_heap(void); #else diff --git a/include/ui.h b/include/ui.h index 0a3cc32b..34eae39a 100644 --- a/include/ui.h +++ b/include/ui.h @@ -241,18 +241,18 @@ extern void ui_draw_box_in( short x1, short y1, short x2, short y2 ); extern void ui_draw_line_in( short x1, short y1, short x2, short y2 ); -void ui_init(); -void ui_close(); +void ui_init(void); +void ui_close(void); int ui_messagebox( short x, short y, int NumButtons, char * text, ... ); void ui_string_centered( short x, short y, char * s ); int PopupMenu( int NumItems, char * text[] ); -extern void ui_mouse_init(); +extern void ui_mouse_init(void); extern grs_bitmap * ui_mouse_set_pointer( grs_bitmap * new ); -extern void ui_mouse_process(); -extern void ui_mouse_hide(); -extern void ui_mouse_show(); +extern void ui_mouse_process(void); +extern void ui_mouse_hide(void); +extern void ui_mouse_show(void); #define WIN_BORDER 1 #define WIN_FILLED 2 @@ -276,7 +276,7 @@ extern void ui_listbox_do( UI_GADGET_LISTBOX * listbox, int keypress ); extern void ui_draw_listbox( UI_GADGET_LISTBOX * listbox ); extern UI_GADGET_LISTBOX *ui_add_gadget_listbox(UI_WINDOW *wnd, short x, short y, short w, short h, short numitems, char **list); -extern void ui_mega_process(); +extern void ui_mega_process(void); extern void ui_get_button_size( char * text, int * width, int * height ); @@ -329,7 +329,7 @@ void ui_free( void * buffer ); UI_GADGET_KEYTRAP * ui_add_gadget_keytrap( UI_WINDOW * wnd, int key_to_trap, int (*function_to_call)(void) ); void ui_keytrap_do( UI_GADGET_KEYTRAP * keytrap, int keypress ); -void ui_mouse_close(); +void ui_mouse_close(void); #define UI_RECORD_MOUSE 1 #define UI_RECORD_KEYS 2 @@ -341,7 +341,7 @@ void ui_mouse_close(); int ui_record_events( int NumberOfEvents, UI_EVENT * buffer, int Flags ); int ui_play_events_realtime( int NumberOfEvents, UI_EVENT * buffer ); int ui_play_events_fast( int NumberOfEvents, UI_EVENT * buffer ); -int ui_recorder_status(); +int ui_recorder_status(void); void ui_set_playback_speed( int speed ); extern unsigned int ui_number_of_events; @@ -362,23 +362,23 @@ void GetKeyDescription( char * text, int keypress ); extern void menubar_init(char * filename ); extern void menubar_do( int keypress ); -extern void menubar_close(); -extern void menubar_hide(); -extern void menubar_show(); +extern void menubar_close(void); +extern void menubar_hide(void); +extern void menubar_show(void); -void ui_pad_init(); -void ui_pad_close(); +void ui_pad_init(void); +void ui_pad_close(void); void ui_pad_activate( UI_WINDOW * wnd, int x, int y ); -void ui_pad_deactivate(); +void ui_pad_deactivate(void); void ui_pad_goto(int n); -void ui_pad_goto_next(); -void ui_pad_goto_prev(); +void ui_pad_goto_next(void); +void ui_pad_goto_prev(void); void ui_pad_read( int n, char * filename ); -int ui_pad_get_current(); +int ui_pad_get_current(void); void ui_barbox_open( char * text, int length ); void ui_barbox_update( int position ); -void ui_barbox_close(); +void ui_barbox_close(void); void ui_reset_idle_seconds(void); int ui_get_idle_seconds(void); diff --git a/libmve/decoder16.c b/libmve/decoder16.c index c1963c3d..26ecb83d 100644 --- a/libmve/decoder16.c +++ b/libmve/decoder16.c @@ -10,7 +10,7 @@ static unsigned short *backBuf1, *backBuf2; static int lookup_initialized; static void dispatchDecoder16(unsigned short **pFrame, unsigned char codeType, unsigned char **pData, unsigned char **pOffData, int *pDataRemain, int *curXb, int *curYb); -static void genLoopkupTable(); +static void genLoopkupTable(void); void decodeFrame16(unsigned char *pFrame, unsigned char *pMap, int mapRemain, unsigned char *pData, int dataRemain) { diff --git a/main/ai.h b/main/ai.h index e012a8d3..ba3a87f7 100644 --- a/main/ai.h +++ b/main/ai.h @@ -312,7 +312,7 @@ extern void move_towards_vector(object *objp, vms_vector *vec_goal, int dot_base extern void init_ai_frame(void); extern void create_bfs_list(int start_seg, short bfs_list[], int *length, int max_segs); -extern void init_thief_for_level(); +extern void init_thief_for_level(void); extern int Escort_goal_object; diff --git a/main/automap.h b/main/automap.h index fb56ef92..a511f84d 100644 --- a/main/automap.h +++ b/main/automap.h @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "player.h" extern void do_automap(int key_code); -extern void automap_clear_visited(); +extern void automap_clear_visited(void); extern ubyte Automap_visited[MAX_SEGMENTS]; void DropBuddyMarker(object *objp); diff --git a/main/bm.h b/main/bm.h index c9722f86..e948f51f 100644 --- a/main/bm.h +++ b/main/bm.h @@ -70,11 +70,11 @@ extern int Dead_modelnums[]; extern int Marker_model_num; // Initializes the palette, bitmap system... -int bm_init(); -void bm_close(); +int bm_init(void); +void bm_close(void); // Initializes the Texture[] array of bmd_bitmap structures. -void init_textures(); +void init_textures(void); extern int Num_object_subtypes; // Number of possible IDs for the current type of object to be placed @@ -89,6 +89,6 @@ int bm_init_use_tbl(void); extern void bm_read_all(CFILE * fp); -int load_exit_models(); +int load_exit_models(void); #endif /* _BM_H */ diff --git a/main/cntrlcen.c b/main/cntrlcen.c index c5b47b20..300f2f3c 100644 --- a/main/cntrlcen.c +++ b/main/cntrlcen.c @@ -48,7 +48,7 @@ int Control_center_present; vms_vector Gun_pos[MAX_CONTROLCEN_GUNS], Gun_dir[MAX_CONTROLCEN_GUNS]; -void do_countdown_frame(); +void do_countdown_frame(void); // ----------------------------------------------------------------------------- //return the position & orientation of a gun on the control center object diff --git a/main/collide.c b/main/collide.c index 10c68c7c..d7ee8fad 100644 --- a/main/collide.c +++ b/main/collide.c @@ -1301,8 +1301,8 @@ void do_final_boss_hacks(void) Final_boss_is_dead = 1; } -extern int multi_all_players_alive(); -void multi_send_finish_game (); +extern int multi_all_players_alive(void); +void multi_send_finish_game(void); // ------------------------------------------------------------------------------------------------------ // Return 1 if robot died, else return 0 diff --git a/main/collide.h b/main/collide.h index e26198cb..3e5f70c0 100644 --- a/main/collide.h +++ b/main/collide.h @@ -21,7 +21,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifndef _COLLIDE_H #define _COLLIDE_H -void collide_init(); +void collide_init(void); void collide_two_objects(object * A, object * B, vms_vector *collision_point); void collide_object_with_wall(object * A, fix hitspeed, short hitseg, short hitwall, vms_vector * hitpt); extern void apply_damage_to_player(object *player, object *killer, fix damage); diff --git a/main/controls.h b/main/controls.h index 9396adda..1cbfc6ef 100644 --- a/main/controls.h +++ b/main/controls.h @@ -71,7 +71,7 @@ typedef struct _control_info { extern control_info Controls; -extern void controls_read_all(); +extern void controls_read_all(void); extern void controls_init(void); //set the cruise speed to zero diff --git a/main/digi.h b/main/digi.h index 7788a763..ae808984 100644 --- a/main/digi.h +++ b/main/digi.h @@ -57,10 +57,10 @@ extern cvar_t digi_midi_port; extern int digi_sample_rate; -extern int digi_get_settings(); -extern int digi_init(); -extern void digi_reset(); -extern void digi_close(); +extern int digi_get_settings(void); +extern int digi_init(void); +extern void digi_reset(void); +extern void digi_close(void); // Volume is max at F1_0. extern void digi_play_sample( int sndnum, fix max_volume ); @@ -77,8 +77,8 @@ extern void digi_play_midi_song( char * filename, char * melodic_bank, char * dr extern void digi_play_sample_3d( int soundno, int angle, int volume, int no_dups ); // Volume from 0-0x7fff -extern void digi_init_sounds(); -extern void digi_sync_sounds(); +extern void digi_init_sounds(void); +extern void digi_sync_sounds(void); extern void digi_kill_sound_linked_to_segment( int segnum, int sidenum, int soundnum ); extern void digi_kill_sound_linked_to_object( int objnum ); @@ -88,14 +88,14 @@ extern void digi_set_volume( int dvolume, int mvolume ); extern int digi_is_sound_playing(int soundno); -extern void digi_pause_all(); -extern void digi_resume_all(); -extern void digi_pause_digi_sounds(); -extern void digi_resume_digi_sounds(); -extern void digi_stop_all(); +extern void digi_pause_all(void); +extern void digi_resume_all(void); +extern void digi_pause_digi_sounds(void); +extern void digi_resume_digi_sounds(void); +extern void digi_stop_all(void); extern void digi_set_max_channels(int n); -extern int digi_get_max_channels(); +extern int digi_get_max_channels(void); extern int digi_lomem; @@ -111,19 +111,19 @@ extern int digi_find_channel(int soundno); extern int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_start, int loop_end, int soundobj); // Stops all sounds that are playing -void digi_stop_all_channels(); +void digi_stop_all_channels(void); extern void digi_end_sound( int channel ); extern void digi_set_channel_pan( int channel, int pan ); extern void digi_set_channel_volume( int channel, int volume ); extern int digi_is_channel_playing(int channel); -extern void digi_pause_midi(); -extern void digi_debug(); -extern void digi_stop_current_song(); +extern void digi_pause_midi(void); +extern void digi_debug(void); +extern void digi_stop_current_song(void); extern void digi_play_sample_looping( int soundno, fix max_volume,int loop_start, int loop_end ); extern void digi_change_looping_volume( fix volume ); -extern void digi_stop_looping_sound(); +extern void digi_stop_looping_sound(void); // Plays a queued voice sound. extern void digi_start_sound_queued( short soundnum, fix volume ); diff --git a/main/digiobj.c b/main/digiobj.c index 00684871..4e5c9d46 100644 --- a/main/digiobj.c +++ b/main/digiobj.c @@ -216,9 +216,9 @@ void digi_play_sample_3d( int soundno, int angle, int volume, int no_dups ) } -void SoundQ_init(); -void SoundQ_process(); -void SoundQ_pause(); +void SoundQ_init(void); +void SoundQ_process(void); +void SoundQ_pause(void); void digi_init_sounds() { @@ -739,7 +739,7 @@ void digi_resume_digi_sounds() digi_unpause_looping_sound(); } -extern void digi_resume_midi(); +extern void digi_resume_midi(void); void digi_resume_all() { diff --git a/main/editor/centers.h b/main/editor/centers.h index 08bf7d02..2ee5b93a 100644 --- a/main/editor/centers.h +++ b/main/editor/centers.h @@ -26,7 +26,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. extern char Center_names[MAX_CENTER_TYPES][CENTER_STRING_LENGTH]; -void close_centers_window(); -void do_centers_window(); +void close_centers_window(void); +void do_centers_window(void); #endif diff --git a/main/editor/editor.h b/main/editor/editor.h index 79bd5d94..36ae1928 100644 --- a/main/editor/editor.h +++ b/main/editor/editor.h @@ -323,7 +323,7 @@ extern int med_load_group( char *filename, short *vertex_ids, short *segment_ids extern int med_save_group( char *filename, short *vertex_ids, short *segment_ids, int num_vertices, int num_segments); // Updates the screen... (I put the prototype here for curves.c) -extern int medlisp_update_screen(); +extern int medlisp_update_screen(void); // Returns 0 if no error, 1 if error, whatever that might be. // Sets globals: @@ -424,7 +424,7 @@ extern void plot_parametric(vms_equation *coeffs, fix min_t, fix max_t, fix del_ extern int generate_curve( fix r1scale, fix r4scale ); // Deletes existing curve generated in generate_curve(). -extern void delete_curve(); +extern void delete_curve(void); // --- // -- Temporary function, identical to med_rotate_segment, but it takes a vector instead of an angvec // --- extern int med_rotate_segment_vec(segment *seg, vms_vector *vec); @@ -571,7 +571,7 @@ extern editor_view FrontView; extern editor_view RightView; extern void set_view_target_from_segment(segment *sp); -extern int SafetyCheck(); +extern int SafetyCheck(void); extern void editor_status( const char *format, ...); @@ -605,7 +605,7 @@ extern void autosave_mine(char *name); // Timed autosave extern void TimedAutosave(char *name); -extern void set_editor_time_of_day(); +extern void set_editor_time_of_day(void); // Undo function extern int undo(void); @@ -618,7 +618,7 @@ int RotateSegmentNew(vms_angvec *pbh); int rotate_segment_new(vms_angvec *pbh); //get & free vertices -int alloc_vert(); +int alloc_vert(void); void free_vert(int vert_num); // The current object type and id declared in eglobal.c diff --git a/main/editor/ehostage.h b/main/editor/ehostage.h index 313ca19a..c7bc25f8 100644 --- a/main/editor/ehostage.h +++ b/main/editor/ehostage.h @@ -20,8 +20,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifndef _EHOSTAGE_H #define _EHOSTAGE_H -extern int do_hostage_dialog(); -extern void hostage_close_window(); -extern void do_hostage_window(); +extern int do_hostage_dialog(void); +extern void hostage_close_window(void); +extern void do_hostage_window(void); #endif diff --git a/main/editor/eobject.h b/main/editor/eobject.h index e4be8f2a..c8c1cf34 100644 --- a/main/editor/eobject.h +++ b/main/editor/eobject.h @@ -23,12 +23,12 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. int ObjectSelectNextInMine(void); int ObjectSelectPrevInMine(void); -int ObjectDecreaseBankBig(); -int ObjectIncreaseBankBig(); -int ObjectDecreasePitchBig(); -int ObjectIncreasePitchBig(); -int ObjectDecreaseHeadingBig(); -int ObjectIncreaseHeadingBig(); -int ObjectFlipObject(); +int ObjectDecreaseBankBig(void); +int ObjectIncreaseBankBig(void); +int ObjectDecreasePitchBig(void); +int ObjectIncreasePitchBig(void); +int ObjectDecreaseHeadingBig(void); +int ObjectIncreaseHeadingBig(void); +int ObjectFlipObject(void); #endif diff --git a/main/editor/eswitch.h b/main/editor/eswitch.h index d737d4e5..1a62ae6e 100644 --- a/main/editor/eswitch.h +++ b/main/editor/eswitch.h @@ -23,15 +23,15 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" -extern int bind_wall_to_trigger(); +extern int bind_wall_to_trigger(void); -extern int trigger_remove(); +extern int trigger_remove(void); extern int remove_trigger(segment *seg, short side); -extern void close_trigger_window(); +extern void close_trigger_window(void); -extern void do_trigger_window(); +extern void do_trigger_window(void); #endif diff --git a/main/editor/kdefs.h b/main/editor/kdefs.h index 61980343..6ff57035 100644 --- a/main/editor/kdefs.h +++ b/main/editor/kdefs.h @@ -12,132 +12,132 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ // In khelp.c -int DoHelp(); +int DoHelp(void); // In kcurve.c -int InitCurve(); -int GenerateCurve(); -int DecreaseR4(); -int IncreaseR4(); -int DecreaseR1(); -int IncreaseR1(); -int DeleteCurve(); -int SetCurve(); +int InitCurve(void); +int GenerateCurve(void); +int DecreaseR4(void); +int IncreaseR4(void); +int DecreaseR1(void); +int IncreaseR1(void); +int DeleteCurve(void); +int SetCurve(void); // In kmine.c -int SaveMine(); -int LoadMine(); -int MineMenu(); -int CreateNewMine(); -int LoadOldMine(); +int SaveMine(void); +int LoadMine(void); +int MineMenu(void); +int CreateNewMine(void); +int LoadOldMine(void); -int SaveSituation(); -int LoadSituation(); +int SaveSituation(void); +int LoadSituation(void); // In kgame.c int SetPlayerPosition(void); -int SaveGameData(); -int LoadGameData(); -int LoadMineOnly(); -void ResetFilename(); +int SaveGameData(void); +int LoadGameData(void); +int LoadMineOnly(void); +void ResetFilename(void); // In group.c -int LoadGroup(); -int SaveGroup(); +int LoadGroup(void); +int SaveGroup(void); int PrevGroup(void); int NextGroup(void); -int CreateGroup(); -int SubtractFromGroup(); -int DeleteGroup(); -int MarkGroupSegment(); +int CreateGroup(void); +int SubtractFromGroup(void); +int DeleteGroup(void); +int MarkGroupSegment(void); int MoveGroup(void); int CopyGroup(void); -int AttachSegmentNew(); -int UngroupSegment(); -int GroupSegment(); -int Degroup(); -int RotateGroup(); +int AttachSegmentNew(void); +int UngroupSegment(void); +int GroupSegment(void); +int Degroup(void); +int RotateGroup(void); // In segment.c -int ToggleBottom(); -void make_curside_bottom_side(); -int select_segment_by_number(); -int select_segment_with_powerup(); +int ToggleBottom(void); +void make_curside_bottom_side(void); +int select_segment_by_number(void); +int select_segment_with_powerup(void); // In editor.c -int UndoCommand(); +int UndoCommand(void); // In kview.c -int ZoomOut(); -int ZoomIn(); -int MoveAway(); -int MoveCloser(); -int ToggleChaseMode(); +int ZoomOut(void); +int ZoomIn(void); +int MoveAway(void); +int MoveCloser(void); +int ToggleChaseMode(void); // In kbuild.c -int CreateBridge(); -int FormJoint(); -int CreateAdjacentJoint(); -int CreateAdjacentJointsSegment(); -int CreateAdjacentJointsAll(); -int CreateSloppyAdjacentJoint(); -int CreateSloppyAdjacentJointsGroup(); +int CreateBridge(void); +int FormJoint(void); +int CreateAdjacentJoint(void); +int CreateAdjacentJointsSegment(void); +int CreateAdjacentJointsAll(void); +int CreateSloppyAdjacentJoint(void); +int CreateSloppyAdjacentJointsGroup(void); // In ksegmove.c -int DecreaseHeading(); -int IncreaseHeading(); -int DecreasePitch(); -int IncreasePitch(); -int DecreaseBank(); -int IncreaseBank(); +int DecreaseHeading(void); +int IncreaseHeading(void); +int DecreasePitch(void); +int IncreasePitch(void); +int DecreaseBank(void); +int IncreaseBank(void); // In ksegsel.c -int SelectCurrentSegForward(); -int SelectCurrentSegBackward(); -int SelectNextSide(); -int SelectPrevSide(); -int CopySegToMarked(); -int SelectBottom(); -int SelectFront(); -int SelectTop(); -int SelectBack(); -int SelectLeft(); -int SelectRight(); +int SelectCurrentSegForward(void); +int SelectCurrentSegBackward(void); +int SelectNextSide(void); +int SelectPrevSide(void); +int CopySegToMarked(void); +int SelectBottom(void); +int SelectFront(void); +int SelectTop(void); +int SelectBack(void); +int SelectLeft(void); +int SelectRight(void); // In ksegsize.c -int IncreaseSegLength(); -int DecreaseSegLength(); -int DecreaseSegWidth(); -int IncreaseSegWidth(); -int IncreaseSegHeight(); -int DecreaseSegHeight(); -int ToggleSegSizeMode(); -int PerturbCurside(); -int PerturbCursideBig(); - -int IncreaseSegLengthBig(); -int DecreaseSegLengthBig(); -int DecreaseSegWidthBig(); -int IncreaseSegWidthBig(); -int IncreaseSegHeightBig(); -int DecreaseSegHeightBig(); - -int IncreaseSegLengthDefault(); -int DecreaseSegLengthDefault(); -int IncreaseSegWidthDefault(); -int DecreaseSegWidthDefault(); -int IncreaseSegHeightDefault(); -int DecreaseSegHeightDefault(); +int IncreaseSegLength(void); +int DecreaseSegLength(void); +int DecreaseSegWidth(void); +int IncreaseSegWidth(void); +int IncreaseSegHeight(void); +int DecreaseSegHeight(void); +int ToggleSegSizeMode(void); +int PerturbCurside(void); +int PerturbCursideBig(void); + +int IncreaseSegLengthBig(void); +int DecreaseSegLengthBig(void); +int DecreaseSegWidthBig(void); +int IncreaseSegWidthBig(void); +int IncreaseSegHeightBig(void); +int DecreaseSegHeightBig(void); + +int IncreaseSegLengthDefault(void); +int DecreaseSegLengthDefault(void); +int IncreaseSegWidthDefault(void); +int DecreaseSegWidthDefault(void); +int IncreaseSegHeightDefault(void); +int DecreaseSegHeightDefault(void); // In ktmap.c -int AssignTexture(); -int AssignTexture2(); -int ClearTexture2(); -int PropagateTextures(); -int PropagateTexturesMove(); -int PropagateTexturesMoveUVs(); -int PropagateTexturesUVs(); -int PropagateTexturesSelected(); +int AssignTexture(void); +int AssignTexture2(void); +int ClearTexture2(void); +int PropagateTextures(void); +int PropagateTexturesMove(void); +int PropagateTexturesMoveUVs(void); +int PropagateTexturesUVs(void); +int PropagateTexturesSelected(void); //--//// In macro.c //--//int MacroMenu(); @@ -149,128 +149,128 @@ int PropagateTexturesSelected(); //--//int MacroLoad(); // In editor.c -int medlisp_update_screen(); +int medlisp_update_screen(void); int medlisp_delete_segment(void); int medlisp_scale_segment(void); int medlisp_rotate_segment(void); -int medlisp_add_segment(); -int AttachSegment(); -int DeleteSegment(); -int DosShell(); -int CallLisp(); -int ExitEditor(); -int ShowAbout(); -int ExchangeMarkandCurseg(); -int CopySegtoMarked(); -int med_keypad_goto_prev(); -int med_keypad_goto_next(); -int med_keypad_goto(); -int med_increase_tilings(); -int med_decrease_tilings(); -int ToggleAutosave(); -int MarkStart(); -int MarkEnd(); +int medlisp_add_segment(void); +int AttachSegment(void); +int DeleteSegment(void); +int DosShell(void); +int CallLisp(void); +int ExitEditor(void); +int ShowAbout(void); +int ExchangeMarkandCurseg(void); +int CopySegtoMarked(void); +int med_keypad_goto_prev(void); +int med_keypad_goto_next(void); +int med_keypad_goto(void); +int med_increase_tilings(void); +int med_decrease_tilings(void); +int ToggleAutosave(void); +int MarkStart(void); +int MarkEnd(void); // Texture.c -int TexFlipX(); -int TexFlipY(); -int TexSlideUp(); -int TexSlideLeft(); -int TexSetDefault(); -int TexSetDefaultSelected(); -int TexSlideRight(); -int TexRotateLeft(); -int TexSlideDown(); -int TexRotateRight(); -int TexSelectActiveEdge(); -int TexRotate90Degrees(); -int TexIncreaseTiling(); -int TexDecreaseTiling(); -int TexSlideUpBig(); -int TexSlideLeftBig(); -int TexSlideRightBig(); -int TexRotateLeftBig(); -int TexSlideDownBig(); -int TexRotateRightBig(); -int TexStretchDown(); -int TexStretchUp(); -int TexChangeAll(); -int TexChangeAll2(); +int TexFlipX(void); +int TexFlipY(void); +int TexSlideUp(void); +int TexSlideLeft(void); +int TexSetDefault(void); +int TexSetDefaultSelected(void); +int TexSlideRight(void); +int TexRotateLeft(void); +int TexSlideDown(void); +int TexRotateRight(void); +int TexSelectActiveEdge(void); +int TexRotate90Degrees(void); +int TexIncreaseTiling(void); +int TexDecreaseTiling(void); +int TexSlideUpBig(void); +int TexSlideLeftBig(void); +int TexSlideRightBig(void); +int TexRotateLeftBig(void); +int TexSlideDownBig(void); +int TexRotateRightBig(void); +int TexStretchDown(void); +int TexStretchUp(void); +int TexChangeAll(void); +int TexChangeAll2(void); // object.c -int ObjectPlaceObject(); -int ObjectMakeCoop(); -int ObjectPlaceObjectTmap(); -int ObjectDelete(); -int ObjectMoveForward(); -int ObjectMoveLeft(); -int ObjectSetDefault(); -int ObjectMoveRight(); -int ObjectMoveBack(); -int ObjectMoveDown(); -int ObjectMoveUp(); -int ObjectMoveNearer(); -int ObjectMoveFurther(); -int ObjectSelectNextinSegment(); -int ObjectSelectNextType(); -int ObjectDecreaseBank(); -int ObjectIncreaseBank(); -int ObjectDecreasePitch(); -int ObjectIncreasePitch(); -int ObjectDecreaseHeading(); -int ObjectIncreaseHeading(); -int ObjectResetObject(); +int ObjectPlaceObject(void); +int ObjectMakeCoop(void); +int ObjectPlaceObjectTmap(void); +int ObjectDelete(void); +int ObjectMoveForward(void); +int ObjectMoveLeft(void); +int ObjectSetDefault(void); +int ObjectMoveRight(void); +int ObjectMoveBack(void); +int ObjectMoveDown(void); +int ObjectMoveUp(void); +int ObjectMoveNearer(void); +int ObjectMoveFurther(void); +int ObjectSelectNextinSegment(void); +int ObjectSelectNextType(void); +int ObjectDecreaseBank(void); +int ObjectIncreaseBank(void); +int ObjectDecreasePitch(void); +int ObjectIncreasePitch(void); +int ObjectDecreaseHeading(void); +int ObjectIncreaseHeading(void); +int ObjectResetObject(void); // elight.c -int LightSelectNextVertex(); -int LightSelectNextEdge(); -int LightCopyIntensity(); -int LightCopyIntensitySegment(); -int LightDecreaseLightVertex(); -int LightIncreaseLightVertex(); -int LightDecreaseLightSide(); -int LightIncreaseLightSide(); -int LightDecreaseLightSegment(); -int LightIncreaseLightSegment(); -int LightSetMaximum(); -int LightSetDefault(); -int LightSetDefaultAll(); -int LightAmbientLighting(); +int LightSelectNextVertex(void); +int LightSelectNextEdge(void); +int LightCopyIntensity(void); +int LightCopyIntensitySegment(void); +int LightDecreaseLightVertex(void); +int LightIncreaseLightVertex(void); +int LightDecreaseLightSide(void); +int LightIncreaseLightSide(void); +int LightDecreaseLightSegment(void); +int LightIncreaseLightSegment(void); +int LightSetMaximum(void); +int LightSetDefault(void); +int LightSetDefaultAll(void); +int LightAmbientLighting(void); // seguvs.c -int fix_bogus_uvs_on_side(); -int fix_bogus_uvs_all(); +int fix_bogus_uvs_on_side(void); +int fix_bogus_uvs_all(void); int set_average_light_on_curside(void); int set_average_light_on_all(void); int set_average_light_on_all_quick(void); // Miscellaneous, please put in correct file if you have time -int IncreaseDrawDepth(); -int DecreaseDrawDepth(); -int GotoMainMenu(); -int GotoGameScreen(); -int DropIntoDebugger(); -int CreateDefaultNewSegment(); -int CreateDefaultNewSegmentandAttach(); -int ClearSelectedList(); -int ClearFoundList(); -int SortSelectedList(); -int SetPlayerFromCurseg(); -int SetPlayerFromCursegAndRotate(); -int SetPlayerFromCursegMinusOne(); -int FindConcaveSegs(); -int SelectNextFoundSeg(); +int IncreaseDrawDepth(void); +int DecreaseDrawDepth(void); +int GotoMainMenu(void); +int GotoGameScreen(void); +int DropIntoDebugger(void); +int CreateDefaultNewSegment(void); +int CreateDefaultNewSegmentandAttach(void); +int ClearSelectedList(void); +int ClearFoundList(void); +int SortSelectedList(void); +int SetPlayerFromCurseg(void); +int SetPlayerFromCursegAndRotate(void); +int SetPlayerFromCursegMinusOne(void); +int FindConcaveSegs(void); +int SelectNextFoundSeg(void); int SelectPreviousFoundSeg(void); -int do_reset_orient(); -int GameZoomOut(); -int GameZoomIn(); +int do_reset_orient(void); +int GameZoomOut(void); +int GameZoomIn(void); // John's temp page stuff -int medtmp_set_page(); +int medtmp_set_page(void); // In objpage.c -int objpage_goto_next_object(); +int objpage_goto_next_object(void); // In medsel.c extern int SortSelectedList(void); @@ -317,20 +317,20 @@ extern int do_centers_dialog(void); extern int bind_wall_to_control_trigger(void); // In med.c -extern int fuelcen_create_from_curseg(); -extern int repaircen_create_from_curseg(); -extern int controlcen_create_from_curseg(); -extern int robotmaker_create_from_curseg(); -extern int fuelcen_reset_all(); -extern int RestoreGameState(); -extern int fuelcen_delete_from_curseg(); -extern int goal_blue_create_from_curseg(); -extern int goal_red_create_from_curseg(); +extern int fuelcen_create_from_curseg(void); +extern int repaircen_create_from_curseg(void); +extern int controlcen_create_from_curseg(void); +extern int robotmaker_create_from_curseg(void); +extern int fuelcen_reset_all(void); +extern int RestoreGameState(void); +extern int fuelcen_delete_from_curseg(void); +extern int goal_blue_create_from_curseg(void); +extern int goal_red_create_from_curseg(void); // In editor\robot.c -extern int do_robot_dialog(); -extern int do_object_dialog(); +extern int do_robot_dialog(void); +extern int do_object_dialog(void); // In editor\hostage.c -extern int do_hostage_dialog(); +extern int do_hostage_dialog(void); diff --git a/main/editor/kfuncs.c b/main/editor/kfuncs.c index cb3d3721..2295f5e4 100644 --- a/main/editor/kfuncs.c +++ b/main/editor/kfuncs.c @@ -32,19 +32,19 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. // Test function prototypes (replace Test1, 2 and 3 with whatever function // you wish to test.) -extern void test_create_path(); -extern void test_create_all_paths(); -extern void test_create_path_many(); -extern void create_all_paths(); -extern void test_create_all_anchors(); +extern void test_create_path(void); +extern void test_create_all_paths(void); +extern void test_create_path_many(void); +extern void create_all_paths(void); +extern void test_create_all_anchors(void); // extern void make_curside_bottom_side(); -extern void move_object_to_mouse_click(); -extern void test_create_n_segment_path(); +extern void move_object_to_mouse_click(void); +extern void test_create_n_segment_path(void); extern void set_all_modes_to_hover(void); extern void check_for_overlapping_segments(void); -extern void init_replacements(); +extern void init_replacements(void); extern void do_replacements(void); extern void do_replacements_all(void); diff --git a/main/editor/med.c b/main/editor/med.c index 2079a449..ed6bcebe 100644 --- a/main/editor/med.c +++ b/main/editor/med.c @@ -301,7 +301,7 @@ void ReadLispMacro( FILE * file, char * buffer ) } #endif -static int (*KeyFunction[8192])(); +static int (*KeyFunction[8192])(void); void medkey_init() { @@ -573,7 +573,7 @@ int ToggleLighting(void) return Lighting_on; } -void find_concave_segs(); +void find_concave_segs(void); int FindConcaveSegs() { @@ -651,7 +651,7 @@ int ToggleOutlineMode() //@@int do_reset_orient() //@@{ -//@@ slew_reset_orient(SlewObj); +//@@ slew_reset_orient(); //@@ //@@ Update_flags |= UF_GAME_VIEW_CHANGED; //@@ diff --git a/main/editor/medmisc.h b/main/editor/medmisc.h index 40ca9f58..f703f898 100644 --- a/main/editor/medmisc.h +++ b/main/editor/medmisc.h @@ -22,15 +22,15 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. void GetMouseRotation( int idx, int idy, vms_matrix * RotMat ); extern int Gameview_lockstep; //In medmisc.c -int ToggleLockstep(); +int ToggleLockstep(void); int medlisp_delete_segment(void); int medlisp_scale_segment(void); int medlisp_rotate_segment(void); int ToggleLockViewToCursegp(void); -int ToggleDrawAllSegments(); +int ToggleDrawAllSegments(void); int IncreaseDrawDepth(void); int DecreaseDrawDepth(void); -int ToggleCoordAxes(); +int ToggleCoordAxes(void); extern int Big_depth; void set_chase_matrix(segment *sp); void set_view_target_from_segment(segment *sp); diff --git a/main/editor/medrobot.c b/main/editor/medrobot.c index 06b29a25..106f2f78 100644 --- a/main/editor/medrobot.c +++ b/main/editor/medrobot.c @@ -42,9 +42,9 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define NUM_BOXES 6 // Number of boxes, AI modes -int GoodyNextID(); -int GoodyPrevID(); -void robot_close_window(); +int GoodyNextID(void); +int GoodyPrevID(void); +void robot_close_window(void); //------------------------------------------------------------------------- // Variables for this module... //------------------------------------------------------------------------- diff --git a/main/editor/medrobot.h b/main/editor/medrobot.h index e5f40f6b..a9cc74a8 100644 --- a/main/editor/medrobot.h +++ b/main/editor/medrobot.h @@ -20,10 +20,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifndef _MED_ROBOT_H #define _MED_ROBOT_H -extern void robot_close_window(); -extern void do_robot_window(); +extern void robot_close_window(void); +extern void do_robot_window(void); -extern void object_close_window(); -extern void do_object_window(); +extern void object_close_window(void); +extern void do_object_window(void); #endif diff --git a/main/editor/medwall.h b/main/editor/medwall.h index e8b93577..53c04e6b 100644 --- a/main/editor/medwall.h +++ b/main/editor/medwall.h @@ -23,44 +23,42 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" -extern int wall_add_removable(); - // Restores all the walls to original status -extern int wall_restore_all(); +extern int wall_restore_all(void); // Reset a wall. extern void wall_reset(segment *seg, int side); // Adds a removable wall (medwall.c) -extern int wall_add_removable(); +extern int wall_add_removable(void); // Adds a door (medwall.c) -extern int wall_add_door(); +extern int wall_add_door(void); // Adds an illusory wall (medwall.c) -extern int wall_add_illusion(); +extern int wall_add_illusion(void); // Removes a removable wall (medwall.c) -extern int wall_remove_blastable(); +extern int wall_remove_blastable(void); // Adds a wall. (visually) -extern int wall_add_to_curside(); +extern int wall_add_to_curside(void); extern int wall_add_to_markedside(sbyte type); // Removes a wall. (visually) -extern int wall_remove(); +extern int wall_remove(void); // Removes a specific side. int wall_remove_side(segment *seg, short side); -extern int bind_wall_to_control_center(); +extern int bind_wall_to_control_center(void); -extern void close_wall_window(); +extern void close_wall_window(void); -extern void do_wall_window(); +extern void do_wall_window(void); -extern int wall_link_doors(); -extern int wall_unlink_door(); +extern int wall_link_doors(void); +extern int wall_unlink_door(void); extern void copy_group_walls(int old_group, int new_group); #endif diff --git a/main/editor/mine.c b/main/editor/mine.c index c556e54e..e4a4d2f0 100644 --- a/main/editor/mine.c +++ b/main/editor/mine.c @@ -39,7 +39,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define REMOVE_EXT(s) (*(strchr( (s), '.' ))='\0') -int CreateDefaultNewSegment(); +int CreateDefaultNewSegment(void); int save_mine_data(CFILE * SaveFile); static char current_tmap_list[MAX_TEXTURES][13]; diff --git a/main/editor/objpage.h b/main/editor/objpage.h index f13eeab3..73852686 100644 --- a/main/editor/objpage.h +++ b/main/editor/objpage.h @@ -23,11 +23,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "ui.h" int objpage_grab_current(int n); -int objpage_goto_first(); +int objpage_goto_first(void); void objpage_init( UI_WINDOW *win ); -void objpage_close(); -void objpage_do(); +void objpage_close(void); +void objpage_do(void); extern void draw_object_picture(int id, vms_angvec *orient_angles, int type); diff --git a/main/editor/texpage.h b/main/editor/texpage.h index 36af97b1..ae6b3c60 100644 --- a/main/editor/texpage.h +++ b/main/editor/texpage.h @@ -21,9 +21,9 @@ extern int TextureEffects; extern int TextureMetals; int texpage_grab_current(int n); -int texpage_goto_first(); +int texpage_goto_first(void); void texpage_init( UI_WINDOW * win ); -void texpage_close(); -void texpage_do(); +void texpage_close(void); +void texpage_do(void); #endif diff --git a/main/effects.h b/main/effects.h index 2a07e6e2..f501e092 100644 --- a/main/effects.h +++ b/main/effects.h @@ -51,16 +51,16 @@ extern int Num_effects; extern eclip Effects[MAX_EFFECTS]; // Set up special effects. -extern void init_special_effects(); +extern void init_special_effects(void); // Clear any active one-shots -void reset_special_effects(); +void reset_special_effects(void); // Function called in game loop to do effects. -extern void do_special_effects(); +extern void do_special_effects(void); // Restore bitmap -extern void restore_effect_bitmap_icons(); +extern void restore_effect_bitmap_icons(void); //stop an effect from animating. Show first frame. void stop_effect(int effect_num); diff --git a/main/endlevel.c b/main/endlevel.c index 978ef2f2..e6ca6dd8 100644 --- a/main/endlevel.c +++ b/main/endlevel.c @@ -78,11 +78,11 @@ object *endlevel_camera; #define FLY_SPEED i2f(50) void do_endlevel_flythrough(int n); -void draw_stars(); +void draw_stars(void); int find_exit_side(object *obj); -void generate_starfield(); +void generate_starfield(void); void start_endlevel_flythrough(int n,object *obj,fix speed); -void start_rendered_endlevel_sequence(); +void start_rendered_endlevel_sequence(void); #ifdef D2_OEM static const char movie_table[] = { 'a','a','a','a','d','d','d','d' }; diff --git a/main/endlevel.h b/main/endlevel.h index 6d37927a..9f186cd6 100644 --- a/main/endlevel.h +++ b/main/endlevel.h @@ -23,14 +23,14 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "object.h" extern int Endlevel_sequence; -void do_endlevel_frame(); -void stop_endlevel_sequence(); -void start_endlevel_sequence(); +void do_endlevel_frame(void); +void stop_endlevel_sequence(void); +void start_endlevel_sequence(void); void render_endlevel_frame(fix eye_offset); -void render_external_scene(); -void draw_exit_model(); -void init_endlevel(); +void render_external_scene(fix eye_offset); +void draw_exit_model(void); +void init_endlevel(void); extern grs_bitmap *terrain_bitmap; //*satellite_bitmap,*station_bitmap, extern int exit_segnum; diff --git a/main/escort.c b/main/escort.c index 4dbbec8e..ff457c7a 100644 --- a/main/escort.c +++ b/main/escort.c @@ -38,7 +38,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif -extern void multi_send_stolen_items(); +extern void multi_send_stolen_items(void); void say_escort_goal(int goal_num); void show_escort_menu(char *msg); diff --git a/main/fuelcen.h b/main/fuelcen.h index 57f809de..3543480e 100644 --- a/main/fuelcen.h +++ b/main/fuelcen.h @@ -48,7 +48,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. // Destroys all fuel centers, clears segment backpointer array. -void fuelcen_reset(); +void fuelcen_reset(void); // Create materialization center int create_matcen( segment * segp ); // Makes a segment a fuel center. @@ -60,7 +60,7 @@ void fuelcen_activate( segment * segp, int station_type ); void fuelcen_delete( segment * segp ); // Charges all fuel centers to max capacity. -void fuelcen_replentish_all(); +void fuelcen_replentish_all(void); // Create a matcen robot extern object *create_morph_robot(segment *segp, vms_vector *object_pos, int object_id); @@ -71,7 +71,7 @@ fix fuelcen_give_fuel(segment *segp, fix MaxAmountCanTake ); fix repaircen_give_shields(segment *segp, fix MaxAmountCanTake ); // Call once per frame. -void fuelcen_update_all(); +void fuelcen_update_all(void); // Called when hit by laser. void fuelcen_damage(segment *segp, fix AmountOfDamage ); diff --git a/main/game.c b/main/game.c index d11fea80..df82b9bb 100644 --- a/main/game.c +++ b/main/game.c @@ -183,8 +183,8 @@ void slide_textures(void); void powerup_grab_cheat_all(void); // Other functions -extern void multi_check_for_killgoal_winner(); -extern void RestoreGameSurfaces(); +extern void multi_check_for_killgoal_winner(void); +extern void RestoreGameSurfaces(void); // window functions @@ -193,7 +193,7 @@ void shrink_window(void); // text functions -void fill_background(); +void fill_background(void); #ifndef RELEASE void show_framerate(void); @@ -1032,8 +1032,8 @@ void game_draw_time_left() extern int Game_pause; -void do_photos(); -void level_with_floor(); +void do_photos(void); +void level_with_floor(void); void modex_clear_box(int x,int y,int w,int h) { @@ -1305,7 +1305,7 @@ void fly_init(object *obj) // ------------------------------------------------------------------------------------ -void test_anim_states(); +void test_anim_states(void); #include "fvi.h" @@ -1707,7 +1707,7 @@ void show_help() } //temp function until Matt cleans up game sequencing -extern void temp_reset_stuff_on_level(); +extern void temp_reset_stuff_on_level(void); fix Rear_view_leave_time = 0x1000; // how long until we decide key is down (Used to be 0x4000) @@ -1800,7 +1800,7 @@ int gr_badtexture = 0; cvar_t Cheats_enabled = { "sv_cheats", "0", CVAR_NONE }; extern int Laser_rapid_fire; -extern void do_lunacy_on(), do_lunacy_off(); +extern void do_lunacy_on(void), do_lunacy_off(void); extern int Physics_cheat_flag,Robots_kill_robots_cheat; extern char BounceCheat,HomingCheat,OldHomingState[20]; @@ -2102,7 +2102,7 @@ grs_canvas * get_current_game_screen() } -extern void kconfig_center_headset(); +extern void kconfig_center_headset(void); #ifndef NDEBUG @@ -2284,12 +2284,12 @@ void do_ambient_sounds() // -- extern void lightning_frame(void); -void game_render_frame(); +void game_render_frame(void); extern void omega_charge_frame(void); extern time_t t_current_time, t_saved_time; -void flicker_lights(); +void flicker_lights(void); void GameLoop(int RenderFlag, int ReadControlsFlag ) { diff --git a/main/game.h b/main/game.h index 64fc75af..4f6be2b3 100644 --- a/main/game.h +++ b/main/game.h @@ -143,7 +143,7 @@ extern int draw_gauges_on; extern void init_game_screen(void); -extern void game_flush_inputs(); // clear all inputs +extern void game_flush_inputs(void); // clear all inputs extern int Playing_game; // True if playing game extern int Auto_flythrough; // if set, start flythough automatically @@ -157,7 +157,7 @@ extern void reset_time(void); // called when starting level // If automap_flag == 1, then call automap routine to write message. extern void save_screen_shot(int automap_flag); -extern grs_canvas * get_current_game_screen(); +extern grs_canvas * get_current_game_screen(void); //valid modes for cockpit #define CM_FULL_COCKPIT 0 // normal screen with cockput @@ -189,13 +189,13 @@ void reset_palette_add(void); void palette_restore(void); // put up the help message -void do_show_help(); +void do_show_help(void); // show a message in a nice little box void show_boxed_message(char *msg); // erases message drawn with show_boxed_message() -void clear_boxed_message(); +void clear_boxed_message(void); // turns off rear view & rear view cockpit void reset_rear_view(void); @@ -203,7 +203,7 @@ void reset_rear_view(void); extern int Game_turbo_mode; // returns ptr to escort robot, or NULL -object *find_escort(); +object *find_escort(void); extern void apply_modified_palette(void); diff --git a/main/gamecntl.c b/main/gamecntl.c index a28aa9ef..8157de91 100644 --- a/main/gamecntl.c +++ b/main/gamecntl.c @@ -114,9 +114,9 @@ extern ubyte DefiningMarkerMessage; // Function prototypes -------------------------------------------------------- -extern void CyclePrimary(); -extern void CycleSecondary(); -extern void InitMarkerInput(); +extern void CyclePrimary(void); +extern void CycleSecondary(void); +extern void InitMarkerInput(void); extern void MarkerInputMessage (int); extern int allowed_to_fire_missile(void); extern int allowed_to_fire_flare(void); @@ -128,9 +128,9 @@ extern void game_render_frame_mono(void); extern void newdemo_strip_frames(char *, int); extern void toggle_cockpit(void); extern int dump_used_textures_all(void); -extern void DropMarker(); -extern void DropSecondaryWeapon(); -extern void DropCurrentWeapon(); +extern void DropMarker(void); +extern void DropSecondaryWeapon(void); +extern void DropCurrentWeapon(void); void FinalCheats(int key); @@ -187,7 +187,7 @@ void transfer_energy_to_shield(fix time) } -void update_vcr_state(); +void update_vcr_state(void); void do_weapon_stuff(void); @@ -288,8 +288,8 @@ void do_weapon_stuff(void) int Game_paused; char *Pause_msg; -extern void game_render_frame(); -extern void show_extra_views(); +extern void game_render_frame(void); +extern void show_extra_views(void); extern fix Flash_effect; void apply_modified_palette(void) @@ -359,7 +359,7 @@ void format_time(char *str, int secs_int) } extern int Redbook_playing; -void do_show_netgame_help(); +void do_show_netgame_help(void); //Process selected keys until game unpaused. returns key that left pause (p or esc) int do_game_pause() @@ -478,7 +478,7 @@ int do_game_pause() } extern int newmenu_dotiny2( char * title, char * subtitle, int nitems, newmenu_item * item, void (*subfunction)(int nitems,newmenu_item * items, int * last_key, int citem) ); -extern int network_who_is_master(),network_how_many_connected(),GetMyNetRanking(); +extern int network_who_is_master(void), network_how_many_connected(void), GetMyNetRanking(void); extern int TotalMissedPackets,TotalPacketsGot; extern char Pauseable_menu; char *NetworkModeNames[]={"Anarchy","Team Anarchy","Robo Anarchy","Cooperative","Capture the Flag","Hoard","Team Hoard","Unknown"}; @@ -839,8 +839,8 @@ int select_next_window_function(int w) extern int Game_paused; -void songs_goto_next_song(); -void songs_goto_prev_song(); +void songs_goto_next_song(void); +void songs_goto_prev_song(void); #ifdef DOOR_DEBUGGING dump_door_debugging_info() @@ -1326,7 +1326,7 @@ void HandleVRKey(int key) } -extern void DropFlag(); +extern void DropFlag(void); void HandleGameKey(int key) { @@ -1850,8 +1850,8 @@ char old_IntMethod; char OldHomingState[20]; extern char Monster_mode; -void fill_background(); -void load_background_bitmap(); +void fill_background(void); +void load_background_bitmap(void); extern int Robots_kill_robots_cheat; diff --git a/main/gamefont.h b/main/gamefont.h index 95ed7b71..215310f5 100644 --- a/main/gamefont.h +++ b/main/gamefont.h @@ -47,8 +47,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. extern grs_font *Gamefonts[MAX_FONTS]; -void gamefont_init(); -void gamefont_close(); +void gamefont_init(void); +void gamefont_close(void); extern int FontHires; extern int FontHiresAvailable; diff --git a/main/gamemine.c b/main/gamemine.c index a6a430a0..cef1513d 100644 --- a/main/gamemine.c +++ b/main/gamemine.c @@ -126,7 +126,7 @@ struct mfi_v19 { }; #endif // 0 -int CreateDefaultNewSegment(); +int CreateDefaultNewSegment(void); int New_file_format_load = 1; // "new file format" is everything newer than d1 shareware diff --git a/main/gamepal.c b/main/gamepal.c index 8c8dbd4e..e8200d37 100644 --- a/main/gamepal.c +++ b/main/gamepal.c @@ -32,7 +32,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "strutil.h" -extern void g3_remap_interp_colors(); +extern void g3_remap_interp_colors(void); char Current_level_palette[FILENAME_LEN]; diff --git a/main/gameseq.c b/main/gameseq.c index 2220c845..41f9b80c 100644 --- a/main/gameseq.c +++ b/main/gameseq.c @@ -727,7 +727,7 @@ void LoadLevel(int level_num, int page_in_textures) if (Current_mission->enhanced) { // load extra data char t[50]; - extern void bm_read_extra_robots(); + extern void bm_read_extra_robots(char *fname, int type); sprintf(t, "%s.ham", Current_mission_filename); bm_read_extra_robots(t, Current_mission->enhanced); } @@ -1540,7 +1540,7 @@ void advancing_to_level_message(void) } -void digi_stop_digi_sounds(); +void digi_stop_digi_sounds(void); void DoPlayerDead(void) diff --git a/main/gameseq.h b/main/gameseq.h index ac88a5ea..84bedcec 100644 --- a/main/gameseq.h +++ b/main/gameseq.h @@ -47,7 +47,7 @@ extern cvar_t Player_highest_level; // // called once at program startup to get the player's name -int RegisterPlayer(); +int RegisterPlayer(void); // Inputs the player's name, without putting up the background screen int RegisterPlayerSub(int allow_abort_flag); @@ -62,8 +62,8 @@ void StartLevel(int random_flag); // Actually does the work to start new level void StartNewLevelSub(int level_num, int page_in_textures, int secret_flag); -void InitPlayerObject(); //make sure player's object set up -void init_player_stats_game(); //clear all stats +void InitPlayerObject(void); //make sure player's object set up +void init_player_stats_game(void); //clear all stats // starts a resumed game loaded from disk void ResumeSavedGame(int start_level); @@ -79,10 +79,10 @@ void DoPlayerDead(void); // Secret levels are -1,-2,-3 void LoadLevel(int level_num, int page_in_textures); -extern void gameseq_remove_unused_players(); +extern void gameseq_remove_unused_players(void); -extern void show_help(); -extern void update_player_stats(); +extern void show_help(void); +extern void update_player_stats(void); // from scores.c @@ -90,7 +90,7 @@ extern void show_high_scores(int place); extern void draw_high_scores(int place); extern int add_player_to_high_scores(player *pp); extern void input_name (int place); -extern int reset_high_scores(); +extern int reset_high_scores(void); extern void init_player_stats_level(int secret_flag); void open_message_window(void); @@ -100,10 +100,10 @@ void close_message_window(void); extern void create_player_appearance_effect(object *player_obj); // goto whatever secrect level is appropriate given the current level -extern void goto_secret_level(); +extern void goto_secret_level(void); // reset stuff so game is semi-normal when playing from editor -void editor_reset_stuff_on_level(); +void editor_reset_stuff_on_level(void); // Show endlevel bonus scores extern void DoEndLevelScoreGlitz(int network); diff --git a/main/gauges.c b/main/gauges.c index d8204bc8..2bd4f14c 100644 --- a/main/gauges.c +++ b/main/gauges.c @@ -1262,7 +1262,7 @@ char *d2_very_short_secondary_weapon_names[] = d2_very_short_secondary_weapon_names[weapon_num-SMISSILE1_INDEX]) //return which bomb will be dropped next time the bomb key is pressed -extern int which_bomb(); +extern int which_bomb(void); void show_bomb_count(int x,int y,int bg_color,int always_show) { diff --git a/main/gauges.h b/main/gauges.h index c3ce1b2f..1f66b9a6 100644 --- a/main/gauges.h +++ b/main/gauges.h @@ -36,20 +36,20 @@ extern bitmap_index Gauges_hires[MAX_GAUGE_BMS]; // hires gauges // Flags for gauges/hud stuff extern cvar_t Reticle_on; -extern void init_gauge_canvases(); -extern void close_gauge_canvases(); +extern void init_gauge_canvases(void); +extern void close_gauge_canvases(void); -extern void show_score(); -extern void show_score_added(); -extern void add_points_to_score(); -extern void add_bonus_points_to_score(); +extern void show_score(void); +extern void show_score_added(void); +extern void add_points_to_score(int points); +extern void add_bonus_points_to_score(int points); void render_gauges(void); void init_gauges(void); extern void check_erase_message(void); -extern void HUD_render_message_frame(); -extern void HUD_clear_messages(); +extern void HUD_render_message_frame(void); +extern void HUD_clear_messages(void); // Call to flash a message on the HUD. Returns true if message drawn. // (message might not be drawn if previous message was same) @@ -57,7 +57,7 @@ extern int HUD_init_message(char *format, ... ); #define gauge_message HUD_init_message -extern void draw_hud(); // draw all the HUD stuff +extern void draw_hud(void); // draw all the HUD stuff extern void player_dead_message(void); //extern void say_afterburner_status(void); diff --git a/main/hudmsg.h b/main/hudmsg.h index 080870b0..11f112f8 100644 --- a/main/hudmsg.h +++ b/main/hudmsg.h @@ -48,6 +48,6 @@ extern void hud_message(int class, char *format, ...) extern void hud_message(int class, char *format, ...); #endif -extern void mekh_resend_last(); -extern void mekh_hud_recall_msgs(); +extern void mekh_resend_last(void); +extern void mekh_hud_recall_msgs(void); #endif diff --git a/main/inferno.h b/main/inferno.h index 00315033..b5c565e0 100644 --- a/main/inferno.h +++ b/main/inferno.h @@ -152,7 +152,7 @@ extern ubyte Version_fix; ** Functions **/ -void quit_request(); +void quit_request(void); #endif diff --git a/main/joydefs.h b/main/joydefs.h index 2d6600da..975fb7f9 100644 --- a/main/joydefs.h +++ b/main/joydefs.h @@ -21,8 +21,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifndef _JOYDEFS_H #define _JOYDEFS_H -void joydefs_calibrate(); -void joydefs_config(); +void joydefs_calibrate(void); +void joydefs_config(void); extern int joydefs_calibrate_flag; diff --git a/main/kconfig.h b/main/kconfig.h index e09cb3dc..c17aa7a2 100644 --- a/main/kconfig.h +++ b/main/kconfig.h @@ -40,10 +40,10 @@ typedef enum AXIS_BANK, } kc_axis_map; -extern void kc_set_controls(); +extern void kc_set_controls(void); // Tries to use vfx1 head tracking. -void kconfig_sense_init(); +void kconfig_sense_init(void); extern int kconfig_is_axes_used(int axis); diff --git a/main/kmatrix.c b/main/kmatrix.c index fc820f64..63af019b 100644 --- a/main/kmatrix.c +++ b/main/kmatrix.c @@ -52,8 +52,8 @@ int Kmatrix_nomovie_message = 0; extern char MaxPowerupsAllowed[], PowerupsInMine[]; void kmatrix_reactor(char *message); -void kmatrix_phallic(); -void kmatrix_redraw_coop(); +void kmatrix_phallic(void); +void kmatrix_redraw_coop(void); #define LHX(x) ((x)*(MenuHires?2:1)) #define LHY(y) ((y)*(MenuHires?2.4:1)) diff --git a/main/kmatrix.h b/main/kmatrix.h index d7f44e5d..cffd69fe 100644 --- a/main/kmatrix.h +++ b/main/kmatrix.h @@ -23,6 +23,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. extern int kmatrix_kills_changed; -void kmatrix_view(); +void kmatrix_view(int network); #endif /* _KMATRIX_H */ diff --git a/main/laser.c b/main/laser.c index 5e7305bc..7e3d8ce9 100644 --- a/main/laser.c +++ b/main/laser.c @@ -48,8 +48,8 @@ int find_homing_object_complete(vms_vector *curpos, object *tracker, int track_o extern char Multi_is_guided; extern char BounceCheat; -extern void newdemo_record_guided_end(); -extern void newdemo_record_guided_start(); +extern void newdemo_record_guided_end(void); +extern void newdemo_record_guided_start(void); int find_homing_object(vms_vector *curpos, object *tracker); diff --git a/main/menu.c b/main/menu.c index 5d2bc626..fcb3f6b5 100644 --- a/main/menu.c +++ b/main/menu.c @@ -100,8 +100,8 @@ extern int Speedtest_on; #define Speedtest_on 0 #endif -void do_sound_menu(); -void do_toggles_menu(); +void do_sound_menu(void); +void do_toggles_menu(void); ubyte do_auto_demo = 1; // Flag used to enable auto demo starting in main menu. cvar_t Player_default_difficulty = { "skill", "1", CVAR_ARCHIVE }; // Last difficulty level chosen by the player @@ -120,7 +120,7 @@ void ipx_set_driver(int ipx_driver); #endif //NETWORK //returns the number of demo files on the disk -int newdemo_count_demos(); +int newdemo_count_demos(void); extern ubyte Version_major,Version_minor; // ------------------------------------------------------------------------ diff --git a/main/menu.h b/main/menu.h index 325874a2..8f29cecb 100644 --- a/main/menu.h +++ b/main/menu.h @@ -21,9 +21,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define _MENU_H // returns number of item chosen -extern int DoMenu(); -extern void do_options_menu(); -extern void d2x_options_menu(); +extern int DoMenu(void); +extern void do_options_menu(void); +extern void d2x_options_menu(void); // can we do highres menus? extern int MenuHiresAvailable; diff --git a/main/mission.c b/main/mission.c index 0d22a707..37657fc4 100644 --- a/main/mission.c +++ b/main/mission.c @@ -815,7 +815,7 @@ int load_mission(mle *mission) if (Current_mission->enhanced) { char t[50]; - extern void bm_read_extra_robots(); + extern void bm_read_extra_robots(char *fname, int type); sprintf(t,"%s.ham",Current_mission_filename); bm_read_extra_robots(t, Current_mission->enhanced); strncpy(t,Current_mission_filename,6); diff --git a/main/morph.h b/main/morph.h index 9d71d567..24fb9fb6 100644 --- a/main/morph.h +++ b/main/morph.h @@ -51,7 +51,7 @@ void draw_morph_object(object *obj); void do_morph_frame(object *obj); //called at the start of a level -void init_morphs(); +void init_morphs(void); extern morph_data *find_morph_data(object *obj); diff --git a/main/movie.h b/main/movie.h index 7a42cb61..bb8b563c 100644 --- a/main/movie.h +++ b/main/movie.h @@ -32,14 +32,14 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. extern int PlayMovie(const char *filename, int allow_abort); extern int PlayMovies(int num_files, const char *filename[], int graphmode, int allow_abort); extern int InitRobotMovie(char *filename); -extern int RotateRobot(); +extern int RotateRobot(void); extern void DeInitRobotMovie(void); // find and initialize the movie libraries -void init_movies(); +void init_movies(void); int init_subtitles(char *filename); -void close_subtitles(); +void close_subtitles(void); extern cvar_t MovieHires; // specifies whether movies use low or high res diff --git a/main/multi.c b/main/multi.c index 488df236..cb0fa3de 100644 --- a/main/multi.c +++ b/main/multi.c @@ -42,26 +42,26 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. void multi_reset_player_object(object *objp); void multi_reset_object_texture(object *objp); -void multi_add_lifetime_killed(); -void multi_add_lifetime_kills(); +void multi_add_lifetime_killed(void); +void multi_add_lifetime_kills(void); void multi_send_play_by_play(int num,int spnum,int dpnum); -void multi_send_heartbeat(); -void multi_send_modem_ping(); -void multi_cap_objects(); +void multi_send_heartbeat(void); +void multi_send_modem_ping(void); +void multi_cap_objects(void); void multi_adjust_remote_cap(int pnum); void multi_save_game(ubyte slot, uint id, char *desc); void multi_restore_game(ubyte slot, uint id); void multi_set_robot_ai(void); -void multi_send_powerup_update(); +void multi_send_powerup_update(void); void bash_to_shield(int i,char *s); -void init_hoard_data(); -void multi_apply_goal_textures(); +void init_hoard_data(void); +void multi_apply_goal_textures(void); int find_goal_texture(ubyte t); -void multi_bad_restore(); +void multi_bad_restore(void); void multi_do_capture_bonus(char *buf); void multi_do_orb_bonus(char *buf); void multi_send_drop_flag(int objnum,int seed); -void multi_send_ranking(); +void multi_send_ranking(void); void multi_do_play_by_play(char *buf); // @@ -430,7 +430,7 @@ get_team(int pnum) return 0; } -extern void game_disable_cheats(); +extern void game_disable_cheats(void); void multi_new_game(void) @@ -1149,7 +1149,7 @@ extern fix StartingShields; fix PingLaunchTime,PingReturnTime; extern void network_send_ping (ubyte); -extern int network_who_is_master(); +extern int network_who_is_master(void); extern char NameReturning; extern int force_cockpit_redraw; @@ -4823,7 +4823,7 @@ void multi_send_finish_game () } -extern void do_final_boss_hacks(); +extern void do_final_boss_hacks(void); void multi_do_finish_game (char *buf) { if (buf[0]!=MULTI_FINISH_GAME) diff --git a/main/multi.h b/main/multi.h index 1ff60fd8..8471edee 100644 --- a/main/multi.h +++ b/main/multi.h @@ -127,7 +127,7 @@ int objnum_remote_to_local(int remote_obj, int owner); int objnum_local_to_remote(int local_obj, sbyte *owner); void map_objnum_local_to_remote(int local, int remote, int owner); void map_objnum_local_to_local(int objnum); -void reset_network_objects(); +void reset_network_objects(void); void multi_init_objects(void); void multi_show_player_list(void); @@ -141,7 +141,7 @@ void multi_send_endlevel_start(int); void multi_send_player_explode(char type); void multi_send_message(void); void multi_send_position(int objnum); -void multi_send_reappear(); +void multi_send_reappear(void); void multi_send_kill(int objnum); void multi_send_remobj(int objnum); void multi_send_quit(int why); @@ -229,8 +229,8 @@ extern int multi_quit_game; extern int multi_sending_message; extern int multi_defining_message; extern void multi_message_input_sub( int key ); -extern void multi_send_message_start(); -extern void multi_send_message_end(); +extern void multi_send_message_start(void); +extern void multi_send_message_end(void); extern int multi_powerup_is_4pack(int ); extern void multi_send_orb_bonus( char pnum ); diff --git a/main/multibot.c b/main/multibot.c index ba9fea8f..f6ab35a8 100644 --- a/main/multibot.c +++ b/main/multibot.c @@ -61,7 +61,7 @@ sbyte robot_fire_buf[MAX_ROBOTS_CONTROLLED][18+3]; #define MULTI_ROBOT_PRIORITY(objnum, pnum) (((objnum % 4) + pnum) % N_players) -extern void multi_send_stolen_items(); +extern void multi_send_stolen_items(void); extern int multi_powerup_is_allowed (int); //#define MULTI_ROBOT_PRIORITY(objnum, pnum) multi_robot_priority(objnum, pnum) diff --git a/main/network.c b/main/network.c index 19d18893..01fa0609 100644 --- a/main/network.c +++ b/main/network.c @@ -174,20 +174,20 @@ int NamesInfoSecurity=-1; netgame_info TempNetInfo; extern void multi_send_drop_marker (int player,vms_vector position,char messagenum,char text[]); -extern void multi_send_kill_goal_counts(); +extern void multi_send_kill_goal_counts(void); extern int newmenu_dotiny( char * title, char * subtitle, int nitems, newmenu_item * item, void (*subfunction)(int nitems,newmenu_item * items, int * last_key, int citem) ); void network_process_naked_pdata (char *,int); -void network_flush(); -void network_listen(); -void network_update_netgame(); +void network_flush(void); +void network_listen(void); +void network_update_netgame(void); void network_check_for_old_version(char pnum); -void network_send_objects(); +void network_send_objects(void); void network_send_rejoin_sync(int player_num); void network_send_game_info(sequence_packet *their); void network_send_endlevel_short_sub(int from_player_num, int to_player); void network_read_sync_packet(netgame_info * sp, int rsinit); -int network_wait_for_playerinfo(); +int network_wait_for_playerinfo(void); void network_process_pdata(char *data); void network_read_object_packet(ubyte *data ); void network_read_endlevel_packet(ubyte *data ); @@ -196,13 +196,13 @@ void network_ping(ubyte flat, int pnum); void network_handle_ping_return(ubyte pnum); void network_process_names_return(ubyte *data); void network_send_player_names(sequence_packet *their); -int network_choose_connect(); -void network_more_game_options(); -void network_count_powerups_in_mine(); +int network_choose_connect(void); +void network_more_game_options(void); +void network_count_powerups_in_mine(void); int network_wait_for_all_info(int choice); -void network_AdjustMaxDataSize(); +void network_AdjustMaxDataSize(void); void network_do_big_wait(int choice); -void network_send_extras(); +void network_send_extras(void); void network_read_pdata_packet(frame_info *pd); void network_read_pdata_short_packet(short_frame_info *pd); @@ -279,13 +279,13 @@ extern ubyte SurfingNet; extern char MaxPowerupsAllowed[MAX_POWERUP_TYPES]; extern char PowerupsInMine[MAX_POWERUP_TYPES]; -extern void multi_send_stolen_items(); +extern void multi_send_stolen_items(void); -int network_wait_for_snyc(); +int network_wait_for_snyc(void); extern void multi_send_wall_status (int,ubyte,ubyte,ubyte); extern void multi_send_wall_status_specific (int,int,ubyte,ubyte,ubyte); -extern void game_disable_cheats(); +extern void game_disable_cheats(void); char IWasKicked=0; #ifdef NETPROFILING @@ -1354,7 +1354,7 @@ void network_send_objects(void) } // For PACKETS_PER_FRAME } -extern void multi_send_powerup_update(); +extern void multi_send_powerup_update(void); void network_send_rejoin_sync(int player_num) { diff --git a/main/network.h b/main/network.h index 068656fa..8b3330f9 100644 --- a/main/network.h +++ b/main/network.h @@ -102,28 +102,28 @@ typedef struct short_frame_info { char data[NET_XDATA_SIZE]; // extra data to be tacked on the end } __pack__ short_frame_info; -void network_start_game(); -void network_join_game(); -void network_rejoin_game(); -void network_leave_game(); +void network_start_game(void); +void network_join_game(void); +void network_rejoin_game(void); +void network_leave_game(void); int network_endlevel(int *secret); void network_endlevel_poll2(int nitems, struct newmenu_item * menus, int * key, int citem); -int network_level_sync(); -void network_send_endlevel_packet(); +int network_level_sync(void); +void network_send_endlevel_packet(void); -int network_delete_extra_objects(); -int network_find_max_net_players(); +int network_delete_extra_objects(void); +int network_find_max_net_players(void); int network_objnum_is_past(int objnum); char * network_get_player_name(int objnum); void network_send_endlevel_sub(int player_num); void network_disconnect_player(int playernum); extern void network_dump_player(ubyte * server, ubyte *node, int why); -extern void network_send_netgame_update(); +extern void network_send_netgame_update(void); -extern int GetMyNetRanking(); +extern int GetMyNetRanking(void); extern int NetGameType; extern int Network_send_objects; @@ -150,6 +150,6 @@ void network_do_frame(int force, int listen); void network_send_data(ubyte * ptr, int len, int urgent); // returns 1 if hoard.ham available -extern int HoardEquipped(); +extern int HoardEquipped(void); #endif /* _NETWORK_H */ diff --git a/main/newdemo.c b/main/newdemo.c index 69704f0a..d56878b9 100644 --- a/main/newdemo.c +++ b/main/newdemo.c @@ -1592,7 +1592,7 @@ void newdemo_pop_ctrlcen_triggers() #define N_PLAYER_SHIP_TEXTURES 6 void nd_render_extras (ubyte,object *); -extern void multi_apply_goal_textures (); +extern void multi_apply_goal_textures(void); ubyte Newdemo_flying_guided=0; int newdemo_read_frame_information() diff --git a/main/newdemo.h b/main/newdemo.h index 1652142a..a8e94d71 100644 --- a/main/newdemo.h +++ b/main/newdemo.h @@ -51,7 +51,7 @@ extern sbyte Newdemo_do_interpolate; extern int Auto_demo; // Functions called during recording process... -extern void newdemo_record_start_demo(); +extern void newdemo_record_start_demo(void); extern void newdemo_record_start_frame(int frame_number, fix frame_time ); extern void newdemo_record_render_object(object * obj); extern void newdemo_record_viewer_object(object * obj); @@ -62,11 +62,11 @@ extern void newdemo_record_sound( int soundno ); extern void newdemo_record_wall_hit_process( int segnum, int side, int damage, int playernum ); extern void newdemo_record_trigger( int segnum, int side, int objnum,int shot ); extern void newdemo_record_hostage_rescued( int hostage_num ); -extern void newdemo_record_morph_frame(); +extern void newdemo_record_morph_frame(morph_data *md); extern void newdemo_record_player_stats(int shields, int energy, int score ); extern void newdemo_record_player_afterburner(fix old_afterburner, fix afterburner); extern void newdemo_record_wall_toggle(int segnum, int side ); -extern void newdemo_record_control_center_destroyed(); +extern void newdemo_record_control_center_destroyed(void); extern void newdemo_record_hud_message(char *s); extern void newdemo_record_palette_effect(short r, short g, short b); extern void newdemo_record_player_energy(int, int); @@ -101,18 +101,18 @@ extern void newdemo_record_secret_exit_blown(int truth); // Functions called during playback process... -extern void newdemo_object_move_all(); -extern void newdemo_playback_one_frame(); -extern void newdemo_goto_end(); -extern void newdemo_goto_beginning(); +extern void newdemo_object_move_all(void); +extern void newdemo_playback_one_frame(void); +extern void newdemo_goto_end(void); +extern void newdemo_goto_beginning(void); // Interactive functions to control playback/record; extern void newdemo_start_playback( char * filename ); -extern void newdemo_stop_playback(); -extern void newdemo_start_recording(); -extern void newdemo_stop_recording(); +extern void newdemo_stop_playback(void); +extern void newdemo_start_recording(void); +extern void newdemo_stop_recording(void); -extern int newdemo_get_percent_done(); +extern int newdemo_get_percent_done(void); extern void newdemo_record_link_sound_to_object3( int soundno, short objnum, fix max_volume, fix max_distance, int loop_start, int loop_end ); extern int newdemo_find_object( int signature ); diff --git a/main/object.c b/main/object.c index ec6d6b93..b10deee5 100644 --- a/main/object.c +++ b/main/object.c @@ -246,7 +246,7 @@ extern fix Max_thrust; //function that takes the same parms as draw_tmap, but renders as flat poly //we need this to do the cloaked effect -extern void draw_tmap_flat(); +extern void draw_tmap_flat(void); //what darkening level to use when cloaked #define CLOAKED_FADE_LEVEL 28 @@ -1356,7 +1356,7 @@ int obj_create_copy(int objnum, vms_vector *new_pos, int newsegnum) } #endif -extern void newdemo_record_guided_end(); +extern void newdemo_record_guided_end(void); //remove object from the world void obj_delete(int objnum) @@ -1508,7 +1508,7 @@ void set_camera_pos(vms_vector *camera_pos, object *objp) extern void drop_player_eggs(object *objp); extern int get_explosion_vclip(object *obj,int stage); -extern void multi_cap_objects(); +extern void multi_cap_objects(void); extern int Proximity_dropped,Smartmines_dropped; // ------------------------------------------------------------------------------------------------------------------ @@ -1910,9 +1910,9 @@ void object_move_one( object * obj ) #ifndef RELEASE case CT_SLEW: - if ( keyd_pressed[KEY_PAD5] ) slew_stop( obj ); + if ( keyd_pressed[KEY_PAD5] ) slew_stop(); if ( keyd_pressed[KEY_NUMLOCK] ) { - slew_reset_orient( obj ); + slew_reset_orient(); * (ubyte *) 0x417 &= ~0x20; //kill numlock } slew_frame(0 ); // Does velocity addition for us. diff --git a/main/object.h b/main/object.h index 0c7b807c..f2a3afbb 100644 --- a/main/object.h +++ b/main/object.h @@ -314,7 +314,7 @@ extern int Player_fired_laser_this_frame; // do whatever setup needs to be done -void init_objects(); +void init_objects(void); // returns segment number object is in. Searches out from object's current // seg, so this shouldn't be called if the object has "jumped" to a new seg @@ -363,16 +363,16 @@ void draw_object_blob(object *obj, bitmap_index bitmap); void draw_object_tmap_rod(object *obj, bitmap_index bitmap, int lighted); // Deletes all objects that have been marked for death. -void obj_delete_all_that_should_be_dead(); +void obj_delete_all_that_should_be_dead(void); // Toggles whether or not lock-boxes draw. -void object_toggle_lock_targets(); +void object_toggle_lock_targets(void); // move all objects for the current frame -void object_move_all(); // moves all objects +void object_move_all(void); // set viewer object to next object in array -void object_goto_next_viewer(); +void object_goto_next_viewer(void); // draw target boxes for nearby robots void object_render_targets(void); @@ -381,7 +381,7 @@ void object_render_targets(void); void object_move_one(object * obj); // make object0 the player, setting all relevant fields -void init_player_object(); +void init_player_object(void); // check if object is in object->segnum. if not, check the adjacent // segs. if not any of these, returns false, else sets obj->segnum & @@ -398,7 +398,7 @@ extern int find_object_seg(object * obj ); // go through all objects and make sure they have the correct segment // numbers used when debugging is on -void fix_object_segs(); +void fix_object_segs(void); // Drops objects contained in objp. int object_create_egg(object *objp); @@ -450,7 +450,7 @@ int drop_marker_object(vms_vector *pos, int segnum, vms_matrix *orient, int mark extern void wake_up_rendered_objects(object *gmissp, int window_num); -extern void AdjustMineSpawn(); +extern void AdjustMineSpawn(void); void reset_player_object(void); diff --git a/main/paging.h b/main/paging.h index 3d047772..0f778ff6 100644 --- a/main/paging.h +++ b/main/paging.h @@ -21,6 +21,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifndef _PAGING_H #define _PAGING_H -void paging_touch_all(); +void paging_touch_all(void); #endif /* _PAGING_H */ diff --git a/main/piggy.h b/main/piggy.h index 67b5dcc3..fc9a6049 100644 --- a/main/piggy.h +++ b/main/piggy.h @@ -53,9 +53,9 @@ typedef struct bitmap_index { ushort index; } __pack__ bitmap_index; -int piggy_init(); -void piggy_close(); -void piggy_dump_all(); +int piggy_init(void); +void piggy_close(void); +void piggy_dump_all(void); bitmap_index piggy_register_bitmap( grs_bitmap * bmp, char * name, int in_file ); int piggy_register_sound( digi_sound * snd, char * name, int in_file ); bitmap_index piggy_find_bitmap( char * name ); @@ -66,7 +66,7 @@ extern int Pigfile_initialized; void piggy_read_bitmap_data(grs_bitmap * bmp); void piggy_read_sound_data(digi_sound *snd); -void piggy_load_level_data(); +void piggy_load_level_data(void); char* piggy_game_bitmap_name(grs_bitmap *bmp); @@ -79,7 +79,7 @@ extern grs_bitmap GameBitmaps[MAX_BITMAP_FILES]; #ifdef PIGGY_USE_PAGING extern void piggy_bitmap_page_in( bitmap_index bmp ); - extern void piggy_bitmap_page_out_all(); + extern void piggy_bitmap_page_out_all(void); extern int piggy_page_flushed; /* Make GNUC use static inline function as #define with backslash continuations causes problems with dos linefeeds */ @@ -105,7 +105,7 @@ do { \ # define PIGGY_PAGE_IN(bmp) #endif -void piggy_read_sounds(); +void piggy_read_sounds(void); //reads in a new pigfile (for new palette) //returns the size of all the bitmap data @@ -114,7 +114,7 @@ void piggy_new_pigfile(char *pigname); //loads custom bitmaps for current level void load_bitmap_replacements(char *level_name); //if descent.pig exists, loads descent 1 texture bitmaps -void load_d1_bitmap_replacements(); +void load_d1_bitmap_replacements(void); #ifdef FAST_FILE_IO #define bitmap_index_read(bi, fp) cfread(bi, sizeof(bitmap_index), 1, fp) diff --git a/main/polyobj.c b/main/polyobj.c index d29eed25..cb83897c 100644 --- a/main/polyobj.c +++ b/main/polyobj.c @@ -846,7 +846,7 @@ void init_polygon_models() { N_polygon_models = 0; - atexit((void (*)())free_polygon_models); + atexit(free_polygon_models); } diff --git a/main/polyobj.h b/main/polyobj.h index 74ad6f57..88887cc6 100644 --- a/main/polyobj.h +++ b/main/polyobj.h @@ -70,7 +70,7 @@ extern int N_polygon_models; // array of names of currently-loaded models extern char Pof_names[MAX_POLYGON_MODELS][13]; -void init_polygon_models(); +void init_polygon_models(void); #ifndef DRIVE int load_polygon_model(char *filename,int n_textures,int first_texture,robot_info *r); diff --git a/main/render.h b/main/render.h index f1c16ea6..65fad32c 100644 --- a/main/render.h +++ b/main/render.h @@ -34,7 +34,7 @@ extern int Clear_window; // 1 = Clear whole background window, 2 = clear view void render_frame(fix eye_offset, int window_num); //draws the world into the current canvas // cycle the flashing light for when mine destroyed -void flash_frame(); +void flash_frame(void); int find_seg_side_face(short x,short y,int *seg,int *side,int *face,int *poly); diff --git a/main/reorder.h b/main/reorder.h index e6787e85..e18b329e 100644 --- a/main/reorder.h +++ b/main/reorder.h @@ -9,7 +9,7 @@ #define _REORDER_H /* These are defined in weapon.c */ -extern void ReorderPrimary(); -extern void ReorderSecondary(); +extern void ReorderPrimary(void); +extern void ReorderSecondary(void); #endif /* _REORDER_H */ diff --git a/main/screens.h b/main/screens.h index 3680ea7e..b84cfe82 100644 --- a/main/screens.h +++ b/main/screens.h @@ -54,7 +54,7 @@ extern int VR_eye_switch; #define VR_BLACK_INDEX 0 extern int VR_eye_offset; extern int VR_eye_offset_changed; -extern void VR_reset_params(); +extern void VR_reset_params(void); extern int VR_use_reg_code; diff --git a/main/segment.h b/main/segment.h index 8f002cac..186adfc5 100644 --- a/main/segment.h +++ b/main/segment.h @@ -246,7 +246,7 @@ extern void delete_segment_from_group(int segment_num, int group_num); extern void add_segment_to_group(int segment_num, int group_num); // Verify that all vertices are legal. -extern void med_check_all_vertices(); +extern void med_check_all_vertices(void); #ifdef FAST_FILE_IO #define segment2_read(s2, fp) cfread(s2, sizeof(segment2), 1, fp) diff --git a/main/slew.h b/main/slew.h index c271affb..4441992d 100644 --- a/main/slew.h +++ b/main/slew.h @@ -28,14 +28,14 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #if 1 //ndef RELEASE //kill error on RELEASE build void slew_init(object *obj); // say this is slew obj -int slew_stop(); // Stops object -void slew_reset_orient(); // Resets orientation +int slew_stop(void); // Stops object +void slew_reset_orient(void); // Resets orientation int slew_frame(int dont_check_keys); // Does slew frame #else #define slew_init(obj) -#define slew_stop(obj) +#define slew_stop() #define slew_reset_orient() #define slew_frame(dont_check_keys) diff --git a/main/songs.c b/main/songs.c index 25568df4..fca2d191 100644 --- a/main/songs.c +++ b/main/songs.c @@ -44,7 +44,7 @@ int Songs_initialized = 0; int Num_songs; -extern void digi_stop_current_song(); +extern void digi_stop_current_song(void); cvar_t Redbook_enabled = { "RedbookEnabled", "1", CVAR_ARCHIVE }; @@ -53,7 +53,7 @@ int Redbook_playing = 0; #define NumLevelSongs (Num_songs - SONG_FIRST_LEVEL_SONG) -extern int CD_blast_mixer(); +extern int CD_blast_mixer(void); #define REDBOOK_VOLUME_SCALE (255/3) // 255 is MAX diff --git a/main/state.c b/main/state.c index 33b7cb63..1bcfa3a0 100644 --- a/main/state.c +++ b/main/state.c @@ -81,8 +81,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define THUMBNAIL_H 50 #define DESC_LENGTH 20 -extern void multi_initiate_save_game(); -extern void multi_initiate_restore_game(); +extern void multi_initiate_save_game(void); +extern void multi_initiate_restore_game(void); extern void apply_all_changed_light(void); extern int Do_appearance_effect; diff --git a/main/switch.h b/main/switch.h index e058f08a..c6782b76 100644 --- a/main/switch.h +++ b/main/switch.h @@ -108,10 +108,10 @@ extern trigger Triggers[MAX_TRIGGERS]; extern int Num_triggers; -extern void trigger_init(); +extern void trigger_init(void); extern void check_trigger(segment *seg, short side, short objnum,int shot); extern int check_trigger_sub(int trigger_num, int player_num,int shot); -extern void triggers_frame_process(); +extern void triggers_frame_process(void); #ifdef FAST_FILE_IO #define v29_trigger_read(t, fp) cfread(t, sizeof(v29_trigger), 1, fp) diff --git a/main/texmerge.c b/main/texmerge.c index 5b6bf89f..0a6fee64 100644 --- a/main/texmerge.c +++ b/main/texmerge.c @@ -53,7 +53,7 @@ static int num_cache_entries = 0; static int cache_hits = 0; static int cache_misses = 0; -void texmerge_close(); +void texmerge_close(void); void merge_textures_super_xparent(int type, grs_bitmap *bottom_bmp, grs_bitmap *top_bmp, ubyte *dest_data); void merge_textures_new(int type, grs_bitmap *bottom_bmp, grs_bitmap *top_bmp, diff --git a/main/texmerge.h b/main/texmerge.h index 40dc4af8..6fec4851 100644 --- a/main/texmerge.h +++ b/main/texmerge.h @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. int texmerge_init(int num_cached_textures); grs_bitmap *texmerge_get_cached_bitmap(int tmap_bottom, int tmap_top); -void texmerge_close(); -void texmerge_flush(); +void texmerge_close(void); +void texmerge_flush(void); #endif /* _TEXMERGE_H */ diff --git a/main/titles.c b/main/titles.c index 6f7c6cea..d43d0a9a 100644 --- a/main/titles.c +++ b/main/titles.c @@ -719,7 +719,7 @@ void flash_cursor(int cursor_flag) vid_update(); } -extern int InitMovieBriefing(); +extern int InitMovieBriefing(void); static int robot_movie_model_map(char kludge) { diff --git a/main/wall.h b/main/wall.h index 54376bb0..8b827b9a 100644 --- a/main/wall.h +++ b/main/wall.h @@ -199,7 +199,7 @@ extern int Num_wall_anims; extern int walls_bm_num[MAX_WALL_ANIMS]; // Initializes all walls (i.e. no special walls.) -extern void wall_init(); +extern void wall_init(void); // Automatically checks if a there is a doorway (i.e. can fly through) extern int wall_is_doorway ( segment *seg, int side ); @@ -240,10 +240,10 @@ extern int wall_hit_process(segment *seg, int side, fix damage, int playernum, o extern void wall_toggle(segment *seg, int side); // Tidy up Walls array for load/save purposes. -extern void reset_walls(); +extern void reset_walls(void); // Called once per frame.. -void wall_frame_process(); +void wall_frame_process(void); extern stuckobj Stuck_objects[MAX_STUCK_OBJECTS]; diff --git a/main/weapon.h b/main/weapon.h index 1525fdaa..16021092 100644 --- a/main/weapon.h +++ b/main/weapon.h @@ -179,7 +179,7 @@ extern ubyte Primary_last_was_super[MAX_PRIMARY_WEAPONS]; extern ubyte Secondary_last_was_super[MAX_SECONDARY_WEAPONS]; extern ubyte SecondaryOrder[], PrimaryOrder[]; -extern void InitWeaponOrdering(); +extern void InitWeaponOrdering(void); extern void auto_select_weapon(int weapon_type); //parm is primary or secondary extern void select_weapon(int weapon_num, int secondary_flag, int print_message,int wait_for_rearm); diff --git a/mem/mem.c b/mem/mem.c index 13fc1043..584d8503 100644 --- a/mem/mem.c +++ b/mem/mem.c @@ -94,7 +94,7 @@ static int LargestIndex = 0; int out_of_memory = 0; -void mem_display_blocks(); +void mem_display_blocks(void); void mem_init() { diff --git a/texmap/scanline.h b/texmap/scanline.h index 9bc16666..ae35fad4 100644 --- a/texmap/scanline.h +++ b/texmap/scanline.h @@ -22,12 +22,12 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifndef _SCANLINE_H #define _SCANLINE_H -extern void c_tmap_scanline_per(); -extern void c_tmap_scanline_per_nolight(); -extern void c_tmap_scanline_lin(); -extern void c_tmap_scanline_lin_nolight(); -extern void c_tmap_scanline_flat(); -extern void c_tmap_scanline_shaded(); +extern void c_tmap_scanline_per(void); +extern void c_tmap_scanline_per_nolight(void); +extern void c_tmap_scanline_lin(void); +extern void c_tmap_scanline_lin_nolight(void); +extern void c_tmap_scanline_flat(void); +extern void c_tmap_scanline_shaded(void); //typedef struct _tmap_scanline_funcs { extern void (*cur_tmap_scanline_per)(void); -- 2.39.2