From nelson@media.mit.edu Sat Nov 14 22:32:07 1998 Return-Path: Received: from localhost (jsno@localhost [127.0.0.1]) by superr.cluster (8.8.7/8.8.7) with ESMTP id WAA00354 for ; Sat, 14 Nov 1998 22:32:04 +0930 Received: from downunder.net.au by fetchmail-4.6.0 POP3 for (single-drop); Sat, 14 Nov 1998 22:32:07 CST Received: from aleve.media.mit.edu (aleve.media.mit.edu [18.85.2.171]) by manor.dayworld.net.au (8.8.4/8.8.4) with ESMTP id GAA26485 for ; Fri, 13 Nov 1998 06:58:49 +0930 Received: from pinotnoir.media.mit.edu (nelson@pinotnoir.media.mit.edu [18.85.16.104]) by aleve.media.mit.edu (8.8.7/ML970927) with ESMTP id QAA13555; Thu, 12 Nov 1998 16:34:06 -0500 (EST) Received: (from nelson@localhost) by pinotnoir.media.mit.edu (8.8.5/8.8.5) id QAA02270; Thu, 12 Nov 1998 16:34:02 -0500 Date: Thu, 12 Nov 1998 16:34:02 -0500 Message-Id: <199811122134.QAA02270@pinotnoir.media.mit.edu> From: nelson@media.mit.edu (Nelson Minar) To: jsno@downunder.net.au Subject: nighthawk patch for key configs Status: RO X-Status: A I played with nighthawk, like it - it's cute! Just a quick patch for you, lets the user reconfigure the arrow keys to somewhere else diff -r -C2 nighthawk/options.h nighthawk-patched/options.h *** nighthawk/options.h Mon Jun 22 06:31:37 1998 --- nighthawk-patched/options.h Thu Nov 12 15:59:58 1998 *************** *** 9,14 **** -------------------------------------------------------------------------- --------------------------------------------------------------------------*/ ! #define INSTALL_DIR "/home/jsno/proj/nighthawk" ! #define SCORES_FILE "/var/tmp/nighthawk.scores" /* --- 9,14 ---- -------------------------------------------------------------------------- --------------------------------------------------------------------------*/ ! #define INSTALL_DIR "/tmp" ! #define SCORES_FILE "/tmp/nighthawk.scores" /* *************** *** 19,28 **** */ #define KEY_SELECT ' ' #define KEY_TRANSFER_MODE 't' #define KEY_HEADSUP 'h' ! #define KEY_STATUS 's' #define KEY_PAUSE 'p' #define KEY_QUIT 'q' /*------------------------------------------------------------------------ --- 19,33 ---- */ + /* Keys can be a letter, or XK_Up, XK_Down, XK_Left, XK_Right for arrows */ #define KEY_SELECT ' ' #define KEY_TRANSFER_MODE 't' #define KEY_HEADSUP 'h' ! #define KEY_STATUS 'r' #define KEY_PAUSE 'p' #define KEY_QUIT 'q' + #define KEY_UP 'w' + #define KEY_DOWN 's' + #define KEY_LEFT 'a' + #define KEY_RIGHT 'd' /*------------------------------------------------------------------------ *************** *** 32,38 **** -------------------------------------------------------------------------- --------------------------------------------------------------------------*/ ! #define DEFAULT_SAM_RATE 11000 ! #define DEFAULT_PRECISION 8 ! #define DEFAULT_STEREO 0 #define NO_FX_CHANNELS 8 --- 37,43 ---- -------------------------------------------------------------------------- --------------------------------------------------------------------------*/ ! #define DEFAULT_SAM_RATE 22000 ! #define DEFAULT_PRECISION 16 ! #define DEFAULT_STEREO 1 #define NO_FX_CHANNELS 8 diff -r -C2 nighthawk/src/Makefile nighthawk-patched/src/Makefile *** nighthawk/src/Makefile Mon Jun 22 07:32:46 1998 --- nighthawk-patched/src/Makefile Thu Nov 12 15:56:16 1998 *************** *** 6,10 **** CC = gcc CP = g++ ! OPTIONS = -Wall -O2 -pipe -O2 -fomit-frame-pointer \ -DVERSION='"$(VERSION)"' --- 6,10 ---- CC = gcc CP = g++ ! OPTIONS = -Wall -g -pipe -fomit-frame-pointer \ -DVERSION='"$(VERSION)"' diff -r -C2 nighthawk/src/floor.cc nighthawk-patched/src/floor.cc *** nighthawk/src/floor.cc Sun May 17 06:37:08 1998 --- nighthawk-patched/src/floor.cc Thu Nov 12 15:54:46 1998 *************** *** 347,360 **** switch(XLookupKeysym((XKeyEvent *)event,0)) { ! case XK_Up: spos_y -= SPRITE_SIZE_Y; break; ! case XK_Down: spos_y += SPRITE_SIZE_Y; break; ! case XK_Left: spos_x -= SPRITE_SIZE_X; break; ! case XK_Right: spos_x += SPRITE_SIZE_X; break; --- 347,360 ---- switch(XLookupKeysym((XKeyEvent *)event,0)) { ! case KEY_UP: spos_y -= SPRITE_SIZE_Y; break; ! case KEY_DOWN: spos_y += SPRITE_SIZE_Y; break; ! case KEY_LEFT: spos_x -= SPRITE_SIZE_X; break; ! case KEY_RIGHT: spos_x += SPRITE_SIZE_X; break; *************** *** 372,376 **** *(fmap + (ipy * fmap_x_size) + ipx) = sprite_sel_ptr; break; ! case 's': save(); break; --- 372,376 ---- *(fmap + (ipy * fmap_x_size) + ipx) = sprite_sel_ptr; break; ! case KEY_STATUS: // this is wrong. save(); break; diff -r -C2 nighthawk/src/object.cc nighthawk-patched/src/object.cc *** nighthawk/src/object.cc Thu May 14 08:06:35 1998 --- nighthawk-patched/src/object.cc Thu Nov 12 15:53:25 1998 *************** *** 1079,1095 **** switch(XLookupKeysym((XKeyEvent *)event,0)) { ! case XK_Up: pos_dx = 0; pos_dy = -stats.speed; break; ! case XK_Down: pos_dx = 0; pos_dy = stats.speed; break; ! case XK_Left: pos_dx = -stats.speed; pos_dy = 0; break; ! case XK_Right: pos_dx = stats.speed; pos_dy = 0; --- 1079,1095 ---- switch(XLookupKeysym((XKeyEvent *)event,0)) { ! case KEY_UP: pos_dx = 0; pos_dy = -stats.speed; break; ! case KEY_DOWN: pos_dx = 0; pos_dy = stats.speed; break; ! case KEY_LEFT: pos_dx = -stats.speed; pos_dy = 0; break; ! case KEY_RIGHT: pos_dx = stats.speed; pos_dy = 0; diff -r -C2 nighthawk/src/ship.cc nighthawk-patched/src/ship.cc *** nighthawk/src/ship.cc Wed May 20 07:27:55 1998 --- nighthawk-patched/src/ship.cc Thu Nov 12 15:54:01 1998 *************** *** 605,613 **** switch(ch) { ! case XK_Up: transport_change_up(); sound_engine_cmd(SND_CMD_FX,FX_SELECT,0xff,0x80); break; ! case XK_Down: transport_change_dn(); sound_engine_cmd(SND_CMD_FX,FX_SELECT,0xff,0x80); --- 605,613 ---- switch(ch) { ! case KEY_UP: transport_change_up(); sound_engine_cmd(SND_CMD_FX,FX_SELECT,0xff,0x80); break; ! case KEY_DOWN: transport_change_dn(); sound_engine_cmd(SND_CMD_FX,FX_SELECT,0xff,0x80); *************** *** 650,659 **** state = 1; break; ! case XK_Left: if(console_ptr > 0) console_ptr--; sound_engine_cmd(SND_CMD_FX,FX_SELECT,0xff,0x80); break; ! case XK_Right: if(console_ptr < DROID_999) console_ptr++; --- 650,659 ---- state = 1; break; ! case KEY_LEFT: if(console_ptr > 0) console_ptr--; sound_engine_cmd(SND_CMD_FX,FX_SELECT,0xff,0x80); break; ! case KEY_RIGHT: if(console_ptr < DROID_999) console_ptr++; diff -r -C2 nighthawk/src_sound/Makefile nighthawk-patched/src_sound/Makefile *** nighthawk/src_sound/Makefile Mon Jun 22 06:54:33 1998 --- nighthawk-patched/src_sound/Makefile Thu Nov 12 15:56:25 1998 *************** *** 3,7 **** ############################################################################ CC = gcc ! OPTIONS = -Wall -O2 -pipe -fomit-frame-pointer LIB = -lm --- 3,7 ---- ############################################################################ CC = gcc ! OPTIONS = -Wall -g -pipe -fomit-frame-pointer LIB = -lm