From ac28eb407daaee8a92fb9efb28ac2426c4edb97b Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 10 Jun 2009 19:03:08 +0000 Subject: Add key bindings for pause, message refresh. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1586 --- src/g_game.c | 12 ++++++++---- src/hu_stuff.c | 3 ++- src/hu_stuff.h | 1 - src/i_system.c | 15 ++++++++++++++- src/m_config.c | 16 ++++++++++++++++ 5 files changed, 40 insertions(+), 7 deletions(-) (limited to 'src') 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 data1 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; ysym); } -- cgit v1.2.3 From 43748a366a4bc5494c15995273bfe158530e03de Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Thu, 11 Jun 2009 21:34:36 +0000 Subject: Include libc_wince.a in chocolate-server build. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1595 --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 64e23b79..208039a5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,7 @@ net_structrw.c net_structrw.h \ z_native.c z_zone.h chocolate_server_SOURCES=$(DEDSERV_FILES) -chocolate_server_LDADD = @LDFLAGS@ @SDLNET_LIBS@ +chocolate_server_LDADD = ../wince/libc_wince.a @LDFLAGS@ @SDLNET_LIBS@ MAIN_SOURCE_FILES=\ am_map.c am_map.h \ -- cgit v1.2.3