diff options
author | Simon Howard | 2009-06-10 19:03:08 +0000 |
---|---|---|
committer | Simon Howard | 2009-06-10 19:03:08 +0000 |
commit | ac28eb407daaee8a92fb9efb28ac2426c4edb97b (patch) | |
tree | cd4f3f467ea3e3e5daddb65f82af25b94eeb1960 /src | |
parent | b6491fa4aefc073a760d4bad51f55c2d6c0f5f35 (diff) | |
download | chocolate-doom-ac28eb407daaee8a92fb9efb28ac2426c4edb97b.tar.gz chocolate-doom-ac28eb407daaee8a92fb9efb28ac2426c4edb97b.tar.bz2 chocolate-doom-ac28eb407daaee8a92fb9efb28ac2426c4edb97b.zip |
Add key bindings for pause, message refresh.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1586
Diffstat (limited to 'src')
-rw-r--r-- | src/g_game.c | 12 | ||||
-rw-r--r-- | src/hu_stuff.c | 3 | ||||
-rw-r--r-- | src/hu_stuff.h | 1 | ||||
-rw-r--r-- | src/i_system.c | 15 | ||||
-rw-r--r-- | src/m_config.c | 16 |
5 files changed, 40 insertions, 7 deletions
diff --git a/src/g_game.c b/src/g_game.c index cd070884..8255fdd0 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -182,6 +182,8 @@ int key_weapon5 = '5'; int key_weapon6 = '6'; int key_weapon7 = '7'; int key_weapon8 = '8'; + +int key_pause = KEY_PAUSE; int mousebfire = 0; int mousebstrafe = 1; @@ -790,13 +792,15 @@ boolean G_Responder (event_t* ev) switch (ev->type) { case ev_keydown: - if (ev->data1 == KEY_PAUSE) + if (ev->data1 == key_pause) { sendpause = true; - return true; - } - if (ev->data1 <NUMKEYS) + } + else if (ev->data1 <NUMKEYS) + { gamekeydown[ev->data1] = true; + } + return true; // eat key down events case ev_keyup: diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 886236ba..0ab750fb 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -88,6 +88,7 @@ char* player_names[] = HUSTR_PLRRED }; +int key_message_refresh = KEY_ENTER; char chat_char; // remove later. static player_t* plr; @@ -597,7 +598,7 @@ boolean HU_Responder(event_t *ev) if (!chat_on) { - if (ev->data1 == HU_MSGREFRESH) + if (ev->data1 == key_message_refresh) { message_on = true; message_counter = HU_MSGTIMEOUT; diff --git a/src/hu_stuff.h b/src/hu_stuff.h index 310201f6..9b1618c1 100644 --- a/src/hu_stuff.h +++ b/src/hu_stuff.h @@ -40,7 +40,6 @@ #define HU_BROADCAST 5 -#define HU_MSGREFRESH KEY_ENTER #define HU_MSGX 0 #define HU_MSGY 0 #define HU_MSGWIDTH 64 // in characters diff --git a/src/i_system.c b/src/i_system.c index 714f63cc..5f90fd7d 100644 --- a/src/i_system.c +++ b/src/i_system.c @@ -133,6 +133,9 @@ void I_Init (void) I_InitJoystick(); } +#define ENDOOM_W 80 +#define ENDOOM_H 25 + // // Displays the text mode ending screen after the game quits // @@ -141,6 +144,8 @@ void I_Endoom(void) { unsigned char *endoom_data; unsigned char *screendata; + int y; + int indent; endoom_data = W_CacheLumpName(DEH_String("ENDOOM"), PU_STATIC); @@ -156,7 +161,15 @@ void I_Endoom(void) // Write the data to the screen memory screendata = TXT_GetScreenData(); - memcpy(screendata, endoom_data, 4000); + + indent = (ENDOOM_W - TXT_SCREEN_W) / 2; + + for (y=0; y<TXT_SCREEN_H; ++y) + { + memcpy(screendata + (y * TXT_SCREEN_W * 2), + endoom_data + (y * ENDOOM_W + indent) * 2, + TXT_SCREEN_W * 2); + } // Wait for a keypress diff --git a/src/m_config.c b/src/m_config.c index 5bc46ca3..9e770e48 100644 --- a/src/m_config.c +++ b/src/m_config.c @@ -87,6 +87,8 @@ extern int key_use; extern int key_strafe; extern int key_speed; +extern int key_pause; + // Menu control keys: extern int key_menu_activate; @@ -137,6 +139,8 @@ extern int key_weapon5; extern int key_weapon6; extern int key_weapon7; extern int key_weapon8; + +extern int key_message_refresh; extern int mousebfire; extern int mousebstrafe; @@ -767,6 +771,12 @@ static default_t extra_defaults_list[] = #endif //! + // Key to pause or unpause the game. + // + + CONFIG_VARIABLE_KEY(key_pause, key_pause), + + //! // Key that activates the menu when pressed. // @@ -1017,6 +1027,12 @@ static default_t extra_defaults_list[] = // CONFIG_VARIABLE_KEY(key_weapon8, key_weapon8), + + //! + // Key to re-display last message. + // + + CONFIG_VARIABLE_KEY(key_message_refresh, key_message_refresh), }; static default_collection_t extra_defaults = |