From 3f770896f518db5ca1b9183e1c00c8d9d0ae3580 Mon Sep 17 00:00:00 2001 From: Florian Schulze Date: Sun, 22 Dec 2002 16:15:01 +0000 Subject: [PATCH] Small patch to remove unused arguments for the dat_* function family (Ulrich Eckhardt). --- fireworks.c | 2 +- globals.pre | 6 +++--- main.c | 58 ++++++++++++++++++++++++++--------------------------- menu.c | 4 ++-- sdl/sound.c | 15 ++++++++------ 5 files changed, 44 insertions(+), 41 deletions(-) diff --git a/fireworks.c b/fireworks.c index 5ca42f4..1366f5b 100644 --- a/fireworks.c +++ b/fireworks.c @@ -53,7 +53,7 @@ void fireworks(void) register_background(NULL, NULL); - if ((handle = dat_open("level.pcx", datfile_name, "rb")) == 0) { + if ((handle = dat_open("level.pcx")) == 0) { strcpy(main_info.error_str, "Error loading 'level.pcx', aborting...\n"); return; } diff --git a/globals.pre b/globals.pre index 81a138e..11337b9 100644 --- a/globals.pre +++ b/globals.pre @@ -247,7 +247,7 @@ typedef struct { } mouse_t; extern main_info_t main_info; -extern player_t player[4]; +extern player_t player[JNB_MAX_PLAYERS]; extern player_anim_t player_anims[7]; extern object_t objects[NUM_OBJECTS]; extern joy_t joy; @@ -289,8 +289,8 @@ int init_program(int argc, char *argv[], char *pal); void deinit_program(void); unsigned short rnd(unsigned short max); int read_level(void); -unsigned char *dat_open(char *file_name, char *dat_name, char *mode); -int dat_filelen(char *file_name, char *dat_name); +unsigned char *dat_open(char *file_name); +int dat_filelen(char *file_name); void write_calib_data(void); diff --git a/main.c b/main.c index c5957f2..699bde1 100644 --- a/main.c +++ b/main.c @@ -1523,7 +1523,7 @@ int main(int argc, char *argv[]) flippage(main_info.view_page); - if ((handle = dat_open("menu.pcx", datfile_name, "rb")) == 0) { + if ((handle = dat_open("menu.pcx")) == 0) { strcpy(main_info.error_str, "Error loading 'menu.pcx', aborting...\n"); return 1; } @@ -2509,7 +2509,7 @@ int init_level(int level, char *pal) int c1, c2; int s1, s2; - if ((handle = dat_open("level.pcx", datfile_name, "rb")) == 0) { + if ((handle = dat_open("level.pcx")) == 0) { strcpy(main_info.error_str, "Error loading 'level.pcx', aborting...\n"); return 1; } @@ -2519,7 +2519,7 @@ int init_level(int level, char *pal) } if (flip) flip_pixels(background_pic); - if ((handle = dat_open("mask.pcx", datfile_name, "rb")) == 0) { + if ((handle = dat_open("mask.pcx")) == 0) { strcpy(main_info.error_str, "Error loading 'mask.pcx', aborting...\n"); return 1; } @@ -2827,7 +2827,7 @@ int init_program(int argc, char *argv[], char *pal) } } - if ((handle = dat_open("menu.pcx", datfile_name, "rb")) == 0) { + if ((handle = dat_open("menu.pcx")) == 0) { strcpy(main_info.error_str, "Error loading 'menu.pcx', aborting...\n"); return 1; } @@ -2836,38 +2836,38 @@ int init_program(int argc, char *argv[], char *pal) return 1; } - if ((handle = dat_open("rabbit.gob", datfile_name, "rb")) == 0) { + if ((handle = dat_open("rabbit.gob")) == 0) { strcpy(main_info.error_str, "Error loading 'rabbit.gob', aborting...\n"); return 1; } - if (register_gob(handle, &rabbit_gobs, dat_filelen("rabbit.gob", datfile_name))) { + if (register_gob(handle, &rabbit_gobs, dat_filelen("rabbit.gob"))) { /* error */ return 1; } - if ((handle = dat_open("objects.gob", datfile_name, "rb")) == 0) { + if ((handle = dat_open("objects.gob")) == 0) { strcpy(main_info.error_str, "Error loading 'objects.gob', aborting...\n"); return 1; } - if (register_gob(handle, &object_gobs, dat_filelen("objects.gob", datfile_name))) { + if (register_gob(handle, &object_gobs, dat_filelen("objects.gob"))) { /* error */ return 1; } - if ((handle = dat_open("font.gob", datfile_name, "rb")) == 0) { + if ((handle = dat_open("font.gob")) == 0) { strcpy(main_info.error_str, "Error loading 'font.gob', aborting...\n"); return 1; } - if (register_gob(handle, &font_gobs, dat_filelen("font.gob", datfile_name))) { + if (register_gob(handle, &font_gobs, dat_filelen("font.gob"))) { /* error */ return 1; } - if ((handle = dat_open("numbers.gob", datfile_name, "rb")) == 0) { + if ((handle = dat_open("numbers.gob")) == 0) { strcpy(main_info.error_str, "Error loading 'numbers.gob', aborting...\n"); return 1; } - if (register_gob(handle, &number_gobs, dat_filelen("numbers.gob", datfile_name))) { + if (register_gob(handle, &number_gobs, dat_filelen("numbers.gob"))) { /* error */ return 1; } @@ -2890,7 +2890,7 @@ int init_program(int argc, char *argv[], char *pal) dj_set_nosound(1); dj_start(); - if ((handle = dat_open("jump.mod", datfile_name, "rb")) == 0) { + if ((handle = dat_open("jump.mod")) == 0) { strcpy(main_info.error_str, "Error loading 'jump.mod', aborting...\n"); return 1; } @@ -2899,7 +2899,7 @@ int init_program(int argc, char *argv[], char *pal) return 1; } - if ((handle = dat_open("bump.mod", datfile_name, "rb")) == 0) { + if ((handle = dat_open("bump.mod")) == 0) { strcpy(main_info.error_str, "Error loading 'bump.mod', aborting...\n"); return 1; } @@ -2908,7 +2908,7 @@ int init_program(int argc, char *argv[], char *pal) return 1; } - if ((handle = dat_open("scores.mod", datfile_name, "rb")) == 0) { + if ((handle = dat_open("scores.mod")) == 0) { strcpy(main_info.error_str, "Error loading 'scores.mod', aborting...\n"); return 1; } @@ -2917,47 +2917,47 @@ int init_program(int argc, char *argv[], char *pal) return 1; } - if ((handle = dat_open("jump.smp", datfile_name, "rb")) == 0) { + if ((handle = dat_open("jump.smp")) == 0) { strcpy(main_info.error_str, "Error loading 'jump.smp', aborting...\n"); return 1; } - if (dj_load_sfx(handle, 0, dat_filelen("jump.smp", datfile_name), DJ_SFX_TYPE_SMP, SFX_JUMP) != 0) { + if (dj_load_sfx(handle, 0, dat_filelen("jump.smp"), DJ_SFX_TYPE_SMP, SFX_JUMP) != 0) { strcpy(main_info.error_str, "Error loading 'jump.smp', aborting...\n"); return 1; } - if ((handle = dat_open("death.smp", datfile_name, "rb")) == 0) { + if ((handle = dat_open("death.smp")) == 0) { strcpy(main_info.error_str, "Error loading 'death.smp', aborting...\n"); return 1; } - if (dj_load_sfx(handle, 0, dat_filelen("death.smp", datfile_name), DJ_SFX_TYPE_SMP, SFX_DEATH) != 0) { + if (dj_load_sfx(handle, 0, dat_filelen("death.smp"), DJ_SFX_TYPE_SMP, SFX_DEATH) != 0) { strcpy(main_info.error_str, "Error loading 'death.smp', aborting...\n"); return 1; } - if ((handle = dat_open("spring.smp", datfile_name, "rb")) == 0) { + if ((handle = dat_open("spring.smp")) == 0) { strcpy(main_info.error_str, "Error loading 'spring.smp', aborting...\n"); return 1; } - if (dj_load_sfx(handle, 0, dat_filelen("spring.smp", datfile_name), DJ_SFX_TYPE_SMP, SFX_SPRING) != 0) { + if (dj_load_sfx(handle, 0, dat_filelen("spring.smp"), DJ_SFX_TYPE_SMP, SFX_SPRING) != 0) { strcpy(main_info.error_str, "Error loading 'spring.smp', aborting...\n"); return 1; } - if ((handle = dat_open("splash.smp", datfile_name, "rb")) == 0) { + if ((handle = dat_open("splash.smp")) == 0) { strcpy(main_info.error_str, "Error loading 'splash.smp', aborting...\n"); return 1; } - if (dj_load_sfx(handle, 0, dat_filelen("splash.smp", datfile_name), DJ_SFX_TYPE_SMP, SFX_SPLASH) != 0) { + if (dj_load_sfx(handle, 0, dat_filelen("splash.smp"), DJ_SFX_TYPE_SMP, SFX_SPLASH) != 0) { strcpy(main_info.error_str, "Error loading 'splash.smp', aborting...\n"); return 1; } - if ((handle = dat_open("fly.smp", datfile_name, "rb")) == 0) { + if ((handle = dat_open("fly.smp")) == 0) { strcpy(main_info.error_str, "Error loading 'fly.smp', aborting...\n"); return 1; } - if (dj_load_sfx(handle, 0, dat_filelen("fly.smp", datfile_name), DJ_SFX_TYPE_SMP, SFX_FLY) != 0) { + if (dj_load_sfx(handle, 0, dat_filelen("fly.smp"), DJ_SFX_TYPE_SMP, SFX_FLY) != 0) { strcpy(main_info.error_str, "Error loading 'fly.smp', aborting...\n"); return 1; } @@ -3045,7 +3045,7 @@ int init_program(int argc, char *argv[], char *pal) } } if (load_flag == 1) { - if ((handle = dat_open("calib.dat", datfile_name, "rb")) == 0) { + if ((handle = dat_open("calib.dat")) == 0) { strcpy(main_info.error_str, "Error loading 'calib.dat', aborting...\n"); return 1; } @@ -3128,7 +3128,7 @@ int read_level(void) int c1, c2; int chr; - if ((handle = dat_open("levelmap.txt", datfile_name, "rb")) == 0) { + if ((handle = dat_open("levelmap.txt")) == 0) { strcpy(main_info.error_str, "Error loading 'levelmap.txt', aborting...\n"); return 1; } @@ -3155,7 +3155,7 @@ int read_level(void) } -unsigned char *dat_open(char *file_name, char *dat_name, char *mode) +unsigned char *dat_open(char *file_name) { int num; int c1; @@ -3195,7 +3195,7 @@ unsigned char *dat_open(char *file_name, char *dat_name, char *mode) } -int dat_filelen(char *file_name, char *dat_name) +int dat_filelen(char *file_name) { unsigned char *ptr; int num; diff --git a/menu.c b/menu.c index c310c77..9a8fa2a 100644 --- a/menu.c +++ b/menu.c @@ -559,7 +559,7 @@ int menu_init(void) fillpalette(0, 0, 0); - if ((handle = dat_open("menu.pcx", datfile_name, "rb")) == 0) { + if ((handle = dat_open("menu.pcx")) == 0) { strcpy(main_info.error_str, "Error loading 'menu.pcx', aborting...\n"); return 1; } @@ -567,7 +567,7 @@ int menu_init(void) strcpy(main_info.error_str, "Error loading 'menu.pcx', aborting...\n"); return 1; } - if ((handle = dat_open("menumask.pcx", datfile_name, "rb")) == 0) { + if ((handle = dat_open("menumask.pcx")) == 0) { strcpy(main_info.error_str, "Error loading 'menumask.pcx', aborting...\n"); return 1; } diff --git a/sdl/sound.c b/sdl/sound.c index 48d7b72..1741bc5 100644 --- a/sdl/sound.c +++ b/sdl/sound.c @@ -480,18 +480,21 @@ char dj_ready_mod(char mod_num) switch (mod_num) { case MOD_MENU: - fp = dat_open("jump.mod", datfile_name, "rb"); - len = dat_filelen("jump.mod", datfile_name); + fp = dat_open("jump.mod"); + len = dat_filelen("jump.mod"); break; case MOD_GAME: - fp = dat_open("bump.mod", datfile_name, "rb"); - len = dat_filelen("bump.mod", datfile_name); + fp = dat_open("bump.mod"); + len = dat_filelen("bump.mod"); break; case MOD_SCORES: - fp = dat_open("scores.mod", datfile_name, "rb"); - len = dat_filelen("scores.mod", datfile_name); + fp = dat_open("scores.mod"); + len = dat_filelen("scores.mod"); break; default: + fprintf(stderr, "bogus parameter to dj_ready_mod()\n"); + fp = NULL; + len = 0; break; } -- 2.39.2