From 2ae6fe45198d7c8a1d1456059a9413f5ece82ee2 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 27 Mar 2003 01:25:41 +0000 Subject: [PATCH] fix d2x keys, read/write from plr file --- ChangeLog | 3 +++ main/gamecntl.c | 10 +++++----- main/kconfig.c | 8 +++++--- main/playsave.c | 21 ++++++++++++++++++--- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index f445b277..0e316d49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-03-26 Bradley Bell + * main/gamecntl.c, main/kconfig.c, main/playsave.c: fix d2x keys, + read/write from plr file + * main/ai.h, main/collide.c, main/escort.c, main/escort.h, main/fuelcen.c, main/gamecntl.c, main/playsave.c, main/powerup.c: added escort.h header diff --git a/main/gamecntl.c b/main/gamecntl.c index 7e2f702e..1dbdda59 100644 --- a/main/gamecntl.c +++ b/main/gamecntl.c @@ -1,4 +1,4 @@ -/* $Id: gamecntl.c,v 1.16 2003-03-15 00:20:37 btb Exp $ */ +/* $Id: gamecntl.c,v 1.17 2003-03-27 01:25:41 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -97,6 +97,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "ai.h" #include "rbaudio.h" #include "switch.h" +#include "escort.h" #ifdef POLY_ACC #include "poly_acc.h" @@ -976,7 +977,6 @@ int select_next_window_function(int w) return 1; //screen_changed } -extern void do_escort_menu(void),change_guidebot_name(void); extern int Game_paused; void songs_goto_next_song(); @@ -1532,6 +1532,7 @@ void HandleGameKey(int key) case KEY_COMMAND+KEY_F: r_framerate.value = !r_framerate.value; break; #endif +#if 0 // weapon selection handled in controls_read_all, d1x-style // MWA changed the weapon select cases to have each case call do_weapon_select // the macintosh keycodes aren't consecutive from 1 -- 0 on the keyboard -- boy is that STUPID!!!! // Select primary or secondary weapon. @@ -1566,6 +1567,7 @@ void HandleGameKey(int key) case KEY_0: do_weapon_select(4 , 1); break; +#endif case KEY_1 + KEY_SHIFTED: case KEY_2 + KEY_SHIFTED: @@ -2086,9 +2088,7 @@ extern char Monster_mode; void fill_background(); void load_background_bitmap(); -extern int Buddy_dude_cheat,Robots_kill_robots_cheat; -extern char guidebot_name[]; -extern char real_guidebot_name[]; +extern int Robots_kill_robots_cheat; void FinalCheats(int key) { diff --git a/main/kconfig.c b/main/kconfig.c index e670f719..a6a1b5ce 100644 --- a/main/kconfig.c +++ b/main/kconfig.c @@ -1,4 +1,4 @@ -/* $Id: kconfig.c,v 1.18 2003-03-14 05:11:29 btb Exp $ */ +/* $Id: kconfig.c,v 1.19 2003-03-27 01:25:41 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -346,7 +346,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ #ifdef RCS -static char rcsid[] = "$Id: kconfig.c,v 1.18 2003-03-14 05:11:29 btb Exp $"; +static char rcsid[] = "$Id: kconfig.c,v 1.19 2003-03-27 01:25:41 btb Exp $"; #endif #ifdef WINDOWS @@ -505,7 +505,9 @@ char * key_text[256] = { \ #endif /* OGL */ #endif -ubyte system_keys[] = { KEY_ESC, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12, KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, KEY_MINUS, KEY_EQUAL, KEY_PRINT_SCREEN }; +//added/removed by Victor Rachels for adding rebindable keys for these +// KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0 +ubyte system_keys[] = { KEY_ESC, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12, KEY_MINUS, KEY_EQUAL, KEY_PRINT_SCREEN }; //extern void GameLoop(int, int ); diff --git a/main/playsave.c b/main/playsave.c index 5ac7f364..de6dc8fc 100644 --- a/main/playsave.c +++ b/main/playsave.c @@ -1,4 +1,4 @@ -/* $Id: playsave.c,v 1.9 2003-02-27 04:24:43 btb Exp $ */ +/* $Id: playsave.c,v 1.10 2003-03-27 01:25:41 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -289,6 +289,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "makesig.h" #include "byteswap.h" #include "fileutil.h" +#include "escort.h" #define SAVE_FILE_ID MAKE_SIG('D','P','L','R') @@ -315,7 +316,7 @@ int n_highest_levels; hli highest_levels[MAX_MISSIONS]; -#define PLAYER_FILE_VERSION 24 //increment this every time the player file changes +#define PLAYER_FILE_VERSION 25 //increment this every time the player file changes //version 5 -> 6: added new highest level information //version 6 -> 7: stripped out the old saved_game array. @@ -336,6 +337,7 @@ hli highest_levels[MAX_MISSIONS]; //version 21 -> 22: save lifetime netstats //version 22 -> 23: ?? //version 23 -> 24: add name of joystick for windows version. +//version 24 -> 25: add d2x keys array #define COMPATIBLE_PLAYER_FILE_VERSION 17 @@ -416,6 +418,10 @@ RetrySelection: for (i=0;i= 25) + fread(kconfig_d2x_settings, MAX_D2X_CONTROLS, 1, file); + else + for(i=0; i < MAX_D2X_CONTROLS; i++) + kconfig_d2x_settings[i] = default_kconfig_d2x_settings[i]; + if (player_file_version>=16) { Cockpit_3d_view[0]=file_read_int(file); @@ -926,6 +938,9 @@ int write_player_file() fwrite (&PrimaryOrder[i],sizeof(ubyte),1,file); fwrite (&SecondaryOrder[i],sizeof(ubyte),1,file); } + + fwrite(kconfig_d2x_settings, MAX_D2X_CONTROLS, 1, file); + file_write_int (Cockpit_3d_view[0],file); file_write_int (Cockpit_3d_view[1],file); -- 2.39.2