From 007e23461ea24cd805b1945f8e7aaf533c067f58 Mon Sep 17 00:00:00 2001 From: zicodxx <> Date: Thu, 15 Jan 2009 01:05:31 +0000 Subject: [PATCH] Cleaning up the mess from revision 892... --- CHANGELOG.txt | 6 +++++- main/game.c | 52 +++++++++++++++++++++++------------------------ main/inferno.h | 4 ++-- main/netdrv.c | 9 ++++---- main/netdrv_udp.c | 5 ++--- 5 files changed, 39 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index f21e122d6..b4f1d8e9f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,8 +1,12 @@ D1X-Rebirth Changelog +20090115 +-------- +main/inferno.h, main/netdrv_udp.c, main/netdrv.c, main/game.c: Cleaning up the mess from revision 892... + 20090114 -------- -numerous: Patch from Damjan Cvetko for better support building with a non-free compiler... +main/network.c, main/multi.c, main/inferno.h, main/netdrv_udp.c, main/netdrv_udp.h, main/config.c, main/netdrv.c, main/game.c, arch/ogl/ogl.c, arch/ogl/gr.c, arch/sdl/digi_mixer_music.c, include/ogl_init.h, include/cfile.h, misc/args.c: Patch from Damjan Cvetko for better support building with a non-free compiler... 20090113 -------- diff --git a/main/game.c b/main/game.c index 4b4ded33e..3342da1f4 100644 --- a/main/game.c +++ b/main/game.c @@ -1859,15 +1859,15 @@ void HandleDemoKey(int key) } break; #endif - D1X_MAC(case KEY_COMMAND+KEY_1:) + KEY_MAC(case KEY_COMMAND+KEY_1:) case KEY_F1: show_newdemo_help(); break; - D1X_MAC(case KEY_COMMAND+KEY_2:) + KEY_MAC(case KEY_COMMAND+KEY_2:) case KEY_F2: Config_menu_flag = 1; break; - D1X_MAC(case KEY_COMMAND+KEY_3:) + KEY_MAC(case KEY_COMMAND+KEY_3:) case KEY_F3: toggle_cockpit(); break; - D1X_MAC(case KEY_COMMAND+KEY_4:) + KEY_MAC(case KEY_COMMAND+KEY_4:) case KEY_F4: Newdemo_show_percentage = !Newdemo_show_percentage; break; - D1X_MAC(case KEY_COMMAND+KEY_7:) + KEY_MAC(case KEY_COMMAND+KEY_7:) case KEY_F7: #ifdef NETWORK Show_kill_list = (Show_kill_list+1) % ((Game_mode & GM_TEAM) ? 4 : 3); @@ -1899,7 +1899,7 @@ void HandleDemoKey(int key) case KEY_CTRLED + KEY_LEFT: newdemo_goto_beginning(); break; - D1X_MAC(case KEY_COMMAND+KEY_P:) + KEY_MAC(case KEY_COMMAND+KEY_P:) case KEY_PAUSE: do_game_pause(); break; @@ -2178,20 +2178,20 @@ void HandleGameKey(int key) Function_mode = FMODE_MENU; } break; - D1X_MAC(case KEY_COMMAND+KEY_1:) + KEY_MAC(case KEY_COMMAND+KEY_1:) case KEY_F1: if (Game_mode & GM_MULTI) show_netgame_help(); else show_help(); break; - D1X_MAC(case KEY_COMMAND+KEY_2:) + KEY_MAC(case KEY_COMMAND+KEY_2:) case KEY_F2: Config_menu_flag = 1; break; - D1X_MAC(case KEY_COMMAND+KEY_3:) + KEY_MAC(case KEY_COMMAND+KEY_3:) case KEY_F3: toggle_cockpit(); break; #ifdef NETWORK - D1X_MAC(case KEY_COMMAND+KEY_ALTED+KEY_4:) + KEY_MAC(case KEY_COMMAND+KEY_ALTED+KEY_4:) case KEY_ALTED + KEY_F4: Show_reticle_name = (Show_reticle_name+1)%2; break; #endif - D1X_MAC(case KEY_COMMAND+KEY_5:) + KEY_MAC(case KEY_COMMAND+KEY_5:) case KEY_F5: if ( Newdemo_state == ND_STATE_RECORDING ) newdemo_stop_recording(); @@ -2199,7 +2199,7 @@ void HandleGameKey(int key) newdemo_start_recording(); break; #ifdef NETWORK - D1X_MAC(case KEY_COMMAND+KEY_6:) + KEY_MAC(case KEY_COMMAND+KEY_6:) case KEY_F6: if (restrict_mode && WaitForRefuseAnswer) { @@ -2207,18 +2207,18 @@ void HandleGameKey(int key) HUD_init_message ("Player accepted!"); } break; - D1X_MAC(case KEY_COMMAND+KEY_7:) + KEY_MAC(case KEY_COMMAND+KEY_7:) case KEY_F7: Show_kill_list = (Show_kill_list+1) % ((Game_mode & GM_TEAM) ? 4 : 3); break; #endif case KEY_ALTED+KEY_F7: - D1X_MAC(case KEY_COMMAND+KEY_ALTED+KEY_7:) + KEY_MAC(case KEY_COMMAND+KEY_ALTED+KEY_7:) PlayerCfg.HudMode=(PlayerCfg.HudMode+1)%GAUGE_HUD_NUMMODES; write_player_file(); break; #ifdef NETWORK - D1X_MAC(case KEY_COMMAND+KEY_8:) + KEY_MAC(case KEY_COMMAND+KEY_8:) case KEY_F8: multi_send_message_start(); break; @@ -2268,7 +2268,7 @@ void HandleGameKey(int key) #endif #endif - D1X_MAC( case KEY_COMMAND+KEY_P: ) + KEY_MAC( case KEY_COMMAND+KEY_P: ) case KEY_PAUSE: do_game_pause(); break; #ifdef macintosh case KEY_COMMAND + KEY_SHIFTED + KEY_3: @@ -2287,11 +2287,11 @@ void HandleGameKey(int key) break; } - D1X_MAC(case KEY_COMMAND+KEY_S:) - D1X_MAC(case KEY_COMMAND+KEY_ALTED+KEY_2:) + KEY_MAC(case KEY_COMMAND+KEY_S:) + KEY_MAC(case KEY_COMMAND+KEY_ALTED+KEY_2:) case KEY_ALTED+KEY_F2: if (!Player_is_dead) state_save_all( 0 ); break; // 0 means not between levels. - D1X_MAC(case KEY_COMMAND+KEY_O:) - D1X_MAC(case KEY_COMMAND+KEY_ALTED+KEY_3:) + KEY_MAC(case KEY_COMMAND+KEY_O:) + KEY_MAC(case KEY_COMMAND+KEY_ALTED+KEY_3:) case KEY_ALTED+KEY_F3: if (!Player_is_dead) state_restore_all(1); break; /* @@ -2300,14 +2300,14 @@ void HandleGameKey(int key) * ============================================== */ case KEY_ALTED + KEY_SHIFTED + KEY_F9: - D1X_MAC(case KEY_COMMAND+KEY_E:) + KEY_MAC(case KEY_COMMAND+KEY_E:) songs_stop_redbook(); RBAEjectDisk(); break; case KEY_ALTED + KEY_SHIFTED + KEY_F10: - D1X_MAC(case KEY_COMMAND+KEY_UP:) - D1X_MAC(case KEY_COMMAND+KEY_DOWN:) + KEY_MAC(case KEY_COMMAND+KEY_UP:) + KEY_MAC(case KEY_COMMAND+KEY_DOWN:) if (GameCfg.SndEnableRedbook && !RBAPauseResume()) { if (Function_mode == FMODE_GAME) @@ -2322,12 +2322,12 @@ void HandleGameKey(int key) case KEY_MINUS + KEY_ALTED: case KEY_ALTED + KEY_SHIFTED + KEY_F11: - D1X_MAC(case KEY_COMMAND+KEY_LEFT:) + KEY_MAC(case KEY_COMMAND+KEY_LEFT:) songs_goto_prev_song(); break; case KEY_EQUAL + KEY_ALTED: case KEY_ALTED + KEY_SHIFTED + KEY_F12: - D1X_MAC(case KEY_COMMAND+KEY_RIGHT:) + KEY_MAC(case KEY_COMMAND+KEY_RIGHT:) songs_goto_next_song(); break; @@ -2435,7 +2435,7 @@ void HandleGameKey(int key) break; } case KEY_DEBUGGED+KEY_F: - D1X_MAC(case KEY_COMMAND+KEY_F:) + KEY_MAC(case KEY_COMMAND+KEY_F:) GameArg.SysFPSIndicator = !GameArg.SysFPSIndicator; break; case KEY_DEBUGGED+KEY_SPACEBAR: // Toggle physics flying diff --git a/main/inferno.h b/main/inferno.h index bf13ad44c..905935697 100644 --- a/main/inferno.h +++ b/main/inferno.h @@ -21,10 +21,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define _INFERNO_H #if defined(__APPLE__) || defined(macintosh) -#define D1X_MAC(x) x +#define KEY_MAC(x) x #else // do not use MAC, it will break MSVC compilation somewhere in rpcdce.h -#define D1X_MAC(x) +#define KEY_MAC(x) #endif /** diff --git a/main/netdrv.c b/main/netdrv.c index a0be5435b..08c0bfdc4 100644 --- a/main/netdrv.c +++ b/main/netdrv.c @@ -116,21 +116,20 @@ void NetDrvClose() int NetDrvInit( int socket_number ) { static int cleanup = 0; +#ifdef _WIN32 + WORD wVersionRequested; + WSADATA wsaData; +#endif if (!driver) return -1; #ifdef _WIN32 - { - WORD wVersionRequested; - WSADATA wsaData; - wVersionRequested = MAKEWORD(2, 0); if (WSAStartup( wVersionRequested, &wsaData)) { return -1; } - } #endif memset(MyAddress,0,10); diff --git a/main/netdrv_udp.c b/main/netdrv_udp.c index bc06446a5..e5f58d5f0 100755 --- a/main/netdrv_udp.c +++ b/main/netdrv_udp.c @@ -44,6 +44,7 @@ void UDPReceiveCFG(char *text, struct _sockaddr *sAddr) case CFG_FIRSTCONTACT_REQ: { int i, clientid=0; + ubyte outbuf[6]; // Check if sAddr is not used already (existing client or if client got this packet) for (i = 1; i < MAX_CONNECTIONS; i++) @@ -70,8 +71,6 @@ void UDPReceiveCFG(char *text, struct _sockaddr *sAddr) if (!clientid) return; - { - ubyte outbuf[6]; UDPPeers[clientid].valid=1; UDPPeers[clientid].timestamp=timer_get_fixed_seconds(); memset(UDPPeers[clientid].hs_list,0,MAX_CONNECTIONS); @@ -82,7 +81,7 @@ void UDPReceiveCFG(char *text, struct _sockaddr *sAddr) outbuf[4]=CFG_FIRSTCONTACT_ACK; // CFG Type outbuf[5]=clientid; // personal ID for the client sendto (UDP_sock, outbuf, sizeof(outbuf), 0, (struct sockaddr *) sAddr, sizeof(struct _sockaddr)); // Send! - } + return; }