mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r176) -Fix: network_gui const and warnings fixes (Tron)

release/0.4.5
darkvater 2004-09-07 19:34:55 +00:00
parent bf9c8068be
commit 3a241b5cce
4 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions.h
View File

@ -137,7 +137,7 @@ void NetworkCoreInit();
void NetworkCoreShutdown(); void NetworkCoreShutdown();
void NetworkCoreDisconnect(); void NetworkCoreDisconnect();
void NetworkCoreLoop(bool incomming); void NetworkCoreLoop(bool incomming);
bool NetworkCoreConnectGame(byte* b, unsigned short port); bool NetworkCoreConnectGame(const byte* b, unsigned short port);
bool NetworkCoreStartGame(); bool NetworkCoreStartGame();
void NetworkLobbyShutdown(); void NetworkLobbyShutdown();

3
gui.h
View File

@ -1,6 +1,8 @@
#ifndef GUI_H #ifndef GUI_H
#define GUI_H #define GUI_H
#include "window.h"
/* main_gui.c */ /* main_gui.c */
void SetupColorsAndInitialWindow(); void SetupColorsAndInitialWindow();
void CcPlaySound10(bool success, uint tile, uint32 p1, uint32 p2); void CcPlaySound10(bool success, uint tile, uint32 p1, uint32 p2);
@ -82,6 +84,7 @@ void ShowSmallMap();
void ShowExtraViewPortWindow(); void ShowExtraViewPortWindow();
void SetVScrollCount(Window *w, int num); void SetVScrollCount(Window *w, int num);
void SetHScrollCount(Window *w, int num); void SetHScrollCount(Window *w, int num);
int HandleEditBoxKey(Window *w, int wid, WindowEvent *we);
void ShowCheatWindow(); void ShowCheatWindow();
void AskForNewGameToStart(); void AskForNewGameToStart();

12
network.c
View File

@ -191,7 +191,7 @@ typedef struct FutureSeeds {
// remember some future seeds that the server sent to us. // remember some future seeds that the server sent to us.
static FutureSeeds _future_seed[8]; static FutureSeeds _future_seed[8];
static int _num_future_seed; static uint _num_future_seed;
static SOCKET _listensocket; // tcp socket static SOCKET _listensocket; // tcp socket
@ -683,7 +683,7 @@ static bool ReadPackets(ClientState *cs)
} }
} }
assert(size>=0 && size < sizeof(cs->buf)); assert(size < sizeof(cs->buf));
memcpy(cs->buf, network_buffer + pos, size); memcpy(cs->buf, network_buffer + pos, size);
} }
@ -1307,7 +1307,7 @@ void NetworkUDPSend(bool client, struct sockaddr_in recv,struct UDPPacket packet
} }
bool NetworkUDPSearchGame(byte ** _network_detected_serverip, unsigned short * _network_detected_serverport) { bool NetworkUDPSearchGame(const byte ** _network_detected_serverip, unsigned short * _network_detected_serverport) {
struct UDPPacket packet; struct UDPPacket packet;
int timeout=3000; int timeout=3000;
@ -1336,7 +1336,7 @@ bool NetworkUDPSearchGame(byte ** _network_detected_serverip, unsigned short * _
} }
return (_network_detected_serverport>0); return (*_network_detected_serverport>0);
} }
@ -1478,11 +1478,11 @@ DEBUG(misc,3) ("[NET][Core] shutdown()");
/* *************************************************** */ /* *************************************************** */
bool NetworkCoreConnectGame(byte* b, unsigned short port) bool NetworkCoreConnectGame(const byte* b, unsigned short port)
{ {
if (!_network_available) return false; if (!_network_available) return false;
if (strcmp((char *) b,"auto")==0) { if (strcmp(b,"auto")==0) {
// do autodetect // do autodetect
NetworkUDPSearchGame(&b, &port); NetworkUDPSearchGame(&b, &port);
} }

51
network_gui.c
View File

@ -10,16 +10,11 @@
#define MAX_QUERYSTR_LEN 64 #define MAX_QUERYSTR_LEN 64
static byte _edit_str_buf[MAX_QUERYSTR_LEN*2]; static byte _edit_str_buf[MAX_QUERYSTR_LEN*2];
static void ShowNetworkStartServerWindow(); static void ShowNetworkStartServerWindow();
#if 0
static void ShowNetworkLobbyWindow(); static void ShowNetworkLobbyWindow();
#endif
extern void ShowDropDownMenu(Window *w, const StringID *strings, int selected, int button, uint32 disabled_mask);
extern int HandleEditBoxKey(Window *w, int wid, WindowEvent *we);
void ShowQueryString(StringID str, StringID caption, int maxlen, int maxwidth, byte window_class, uint16 window_number);
static byte _selected_field; static byte _selected_field;
char *direct_ip = NULL;
static const StringID _connection_types_dropdown[] = { static const StringID _connection_types_dropdown[] = {
STR_NETWORK_LAN, STR_NETWORK_LAN,
@ -65,8 +60,7 @@ static void NetworkGameWindowWndProc(Window *w, WindowEvent *e)
NetworkLobbyShutdown(); NetworkLobbyShutdown();
break; break;
case 3: { /* Find server automaticaly */ case 3: { /* Find server automaticaly */
byte *b = "auto"; NetworkCoreConnectGame("auto", _network_server_port);
NetworkCoreConnectGame(b, _network_server_port);
} break; } break;
case 4: { /* Connect via direct ip */ case 4: { /* Connect via direct ip */
StringID str; StringID str;
@ -103,7 +97,7 @@ static void NetworkGameWindowWndProc(Window *w, WindowEvent *e)
break; break;
case WE_KEYPRESS: case WE_KEYPRESS:
if(_selected_field != 6) if (_selected_field != 6)
break; break;
switch (HandleEditBoxKey(w, 6, e)) { switch (HandleEditBoxKey(w, 6, e)) {
@ -114,7 +108,7 @@ static void NetworkGameWindowWndProc(Window *w, WindowEvent *e)
break; break;
case WE_ON_EDIT_TEXT: { case WE_ON_EDIT_TEXT: {
byte *b = e->edittext.str; const byte *b = e->edittext.str;
if (*b == 0) if (*b == 0)
return; return;
NetworkCoreConnectGame(b,_network_server_port); NetworkCoreConnectGame(b,_network_server_port);
@ -304,6 +298,7 @@ static void ShowNetworkStartServerWindow()
WP(w,querystr_d).buf = _edit_str_buf; WP(w,querystr_d).buf = _edit_str_buf;
} }
#if 0
static void NetworkLobbyWindowWndProc(Window *w, WindowEvent *e) static void NetworkLobbyWindowWndProc(Window *w, WindowEvent *e)
{ {
switch(e->event) { switch(e->event) {
@ -362,33 +357,32 @@ static void NetworkLobbyWindowWndProc(Window *w, WindowEvent *e)
} }
static const Widget _network_lobby_window_widgets[] = { static const Widget _network_lobby_window_widgets[] = {
{ WWT_PUSHTXTBTN, BGC, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW }, { WWT_PUSHTXTBTN, BGC, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW },
{ WWT_CAPTION, BGC, 10, 399, 0, 13, STR_NETWORK_GAME_LOBBY }, { WWT_CAPTION, BGC, 10, 399, 0, 13, STR_NETWORK_GAME_LOBBY, STR_NULL},
{ WWT_IMGBTN, BGC, 0, 399, 14, 299, 0x0}, { WWT_IMGBTN, BGC, 0, 399, 14, 299, 0x0, STR_NULL},
// chat widget // chat widget
{ WWT_IMGBTN, BGC, 10, 240, 30, 240, 0x0}, { WWT_IMGBTN, BGC, 10, 240, 30, 240, 0x0, STR_NULL},
{ WWT_SCROLLBAR, BGC, 241, 251, 30, 240, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, { WWT_SCROLLBAR, BGC, 241, 251, 30, 240, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
// send message prompt // send message prompt
{ WWT_IMGBTN, BGC, 10, 200, 241, 252, 0x0, STR_NETWORK_ENTER_NAME_TIP}, { WWT_IMGBTN, BGC, 10, 200, 241, 252, 0x0, STR_NETWORK_ENTER_NAME_TIP},
{ WWT_PUSHTXTBTN, BTC, 201, 251, 241, 252, STR_NETWORK_SEND, STR_NETWORK_SEND_TIP}, { WWT_PUSHTXTBTN, BTC, 201, 251, 241, 252, STR_NETWORK_SEND, STR_NETWORK_SEND_TIP},
// company name // company name
{ WWT_IMGBTN, BGC, 100, 251, 254, 265, 0x0, STR_NETWORK_COMPANY_NAME_TIP}, { WWT_IMGBTN, BGC, 100, 251, 254, 265, 0x0, STR_NETWORK_COMPANY_NAME_TIP},
// player information // player information
{ WWT_IMGBTN, BGC, 260, 379, 30, 221, 0x0}, { WWT_IMGBTN, BGC, 260, 379, 30, 221, 0x0, STR_NULL},
{ WWT_SCROLLBAR, BGC, 380, 390, 30, 221, 0x1, STR_0190_SCROLL_BAR_SCROLLS_LIST}, { WWT_SCROLLBAR, BGC, 380, 390, 30, 221, 0x1, STR_0190_SCROLL_BAR_SCROLLS_LIST},
// buttons // buttons
{ WWT_PUSHTXTBTN, BTC, 260, 390, 233, 244, STR_NETWORK_NEW_COMPANY, STR_NETWORK_NEW_COMPANY_TIP}, { WWT_PUSHTXTBTN, BTC, 260, 390, 233, 244, STR_NETWORK_NEW_COMPANY, STR_NETWORK_NEW_COMPANY_TIP},
{ WWT_PUSHTXTBTN, BTC, 260, 390, 254, 265, STR_NETWORK_SPECTATE_GAME, STR_NETWORK_SPECTATE_GAME_TIP}, { WWT_PUSHTXTBTN, BTC, 260, 390, 254, 265, STR_NETWORK_SPECTATE_GAME, STR_NETWORK_SPECTATE_GAME_TIP},
{ WWT_PUSHTXTBTN, BTC, 80, 180, 280, 291, STR_NETWORK_READY, STR_NULL}, { WWT_PUSHTXTBTN, BTC, 80, 180, 280, 291, STR_NETWORK_READY, STR_NULL},
{ WWT_PUSHTXTBTN, BTC, 220, 320, 280, 291, STR_012E_CANCEL, STR_NULL}, { WWT_PUSHTXTBTN, BTC, 220, 320, 280, 291, STR_012E_CANCEL, STR_NULL},
{ WWT_LAST},
{ WWT_LAST},
}; };
static const WindowDesc _network_lobby_window_desc = { static const WindowDesc _network_lobby_window_desc = {
@ -414,5 +408,4 @@ static void ShowNetworkLobbyWindow()
WP(w,querystr_d).maxwidth = 240; WP(w,querystr_d).maxwidth = 240;
WP(w,querystr_d).buf = _edit_str_buf; WP(w,querystr_d).buf = _edit_str_buf;
} }
#endif