From e62c47ae893028408edf60dc9d4109f9ca799408 Mon Sep 17 00:00:00 2001 From: Dwachs Date: Tue, 27 Jul 2010 14:16:31 +0000 Subject: [PATCH] (ansgar) correct some spelling errors, mainly recieve -> receive git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@3559 8aca7d54-2c30-db11-9de9-000461428c89 --- boden/wege/schiene.h | 2 +- dataobj/network.cc | 14 +++++++------- dataobj/network.h | 8 ++++---- dataobj/network_packet.cc | 4 ++-- font.cc | 2 +- gui/fahrplan_gui.cc | 2 +- player/ai.cc | 2 +- simfab.cc | 2 +- simutrans/history.txt | 4 ++-- simworld.cc | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/boden/wege/schiene.h b/boden/wege/schiene.h index 6e5b5f430c9..fee120694e3 100644 --- a/boden/wege/schiene.h +++ b/boden/wege/schiene.h @@ -25,7 +25,7 @@ class schiene_t : public weg_t { protected: /** - * Bound when this block was sucessfully reserved by the convoi + * Bound when this block was successfully reserved by the convoi * @author prissi */ convoihandle_t reserved; diff --git a/dataobj/network.cc b/dataobj/network.cc index fd8b366915d..0cd25b517cb 100644 --- a/dataobj/network.cc +++ b/dataobj/network.cc @@ -192,7 +192,7 @@ const char *network_connect(const char *cp) // garanteed individual file name ... char filename[256]; sprintf( filename, "client%i-network.sve", client_id ); - err = network_recieve_file( my_client_socket, filename, len ); + err = network_receive_file( my_client_socket, filename, len ); } end: if(err) { @@ -319,7 +319,7 @@ static int fill_set(fd_set *fds) /* do appropriate action for network server: * - either connect to a new client - * - recieve commands + * - receive commands */ network_command_t* network_check_activity(int timeout) { @@ -373,7 +373,7 @@ network_command_t* network_check_activity(int timeout) if( sender==INVALID_SOCKET ) { return NULL; } - // recieve only one command + // receive only one command FD_ZERO(&fds); FD_SET(sender,&fds); tv.tv_usec = 0; @@ -386,7 +386,7 @@ network_command_t* network_check_activity(int timeout) network_remove_client(sender); } else { - dbg->warning( "network_check_activity()", "recieved cmd id=%d %s", nwc->get_id(), nwc->get_name()); + dbg->warning( "network_check_activity()", "received cmd id=%d %s", nwc->get_id(), nwc->get_name()); } // read something sucessful return nwc; @@ -469,7 +469,7 @@ void network_send_server(network_command_t* nwc ) -uint16 network_recieve_data( SOCKET sender, void *dest, const uint16 length ) +uint16 network_receive_data( SOCKET sender, void *dest, const uint16 length ) { fd_set fds; uint16 bytes = 0; @@ -540,12 +540,12 @@ const char *network_send_file( uint32 client_id, const char *filename ) } -const char *network_recieve_file( SOCKET s, const char *save_as, const long length ) +const char *network_receive_file( SOCKET s, const char *save_as, const long length ) { // ok, we have a socket to connect remove(save_as); - DBG_MESSAGE("network_recieve_file","Game size %li", length ); + DBG_MESSAGE("network_receive_file","Game size %li", length ); if(is_display_init() && length>0) { display_set_progress_text(translator::translate("Transferring game ...")); diff --git a/dataobj/network.h b/dataobj/network.h index d55eb2da818..22ffe5f39d5 100644 --- a/dataobj/network.h +++ b/dataobj/network.h @@ -47,20 +47,20 @@ bool network_init_server( int port ); /* do appropriate action for network server: * - either connect to a new client - * - recieve commands + * - receive commands * returns pointer to commmand or NULL * timeout in milliseconds */ network_command_t* network_check_activity(int timeout); -// recieves x bytes from socket sender -uint16 network_recieve_data( SOCKET sender, void *dest, const uint16 length ); +// receives x bytes from socket sender +uint16 network_receive_data( SOCKET sender, void *dest, const uint16 length ); // before calling this, the server should have saved the current game as "server-network.sve" const char *network_send_file( uint32 client_id, const char *filename ); // this saves the game from network under "client-network.sve" -const char *network_recieve_file( SOCKET s, const char *name, const long len ); +const char *network_receive_file( SOCKET s, const char *name, const long len ); // number of currently active clients int network_get_clients(); diff --git a/dataobj/network_packet.cc b/dataobj/network_packet.cc index 4e002eb384b..3384e86b3ac 100644 --- a/dataobj/network_packet.cc +++ b/dataobj/network_packet.cc @@ -28,7 +28,7 @@ packet_t::packet_t(SOCKET sender) : memory_rw_t(buf,MAX_PACKET_LEN,false) } // read the header - if( network_recieve_data(sender,buf,HEADER_SIZE)!=HEADER_SIZE ) { + if( network_receive_data(sender,buf,HEADER_SIZE)!=HEADER_SIZE ) { error = true; network_remove_client( sender ); return; @@ -42,7 +42,7 @@ packet_t::packet_t(SOCKET sender) : memory_rw_t(buf,MAX_PACKET_LEN,false) } // receive the rest of the packet - if( network_recieve_data( sender, buf+HEADER_SIZE, size-HEADER_SIZE )!=size-HEADER_SIZE ) { + if( network_receive_data( sender, buf+HEADER_SIZE, size-HEADER_SIZE )!=size-HEADER_SIZE ) { error = true; network_remove_client( sender ); return; diff --git a/font.cc b/font.cc index 550884cdedf..4261aa12615 100644 --- a/font.cc +++ b/font.cc @@ -316,7 +316,7 @@ bool load_font(font_type* fnt, const char* fname) fnt->screen_width[32] = 4; fnt->char_data[CHARACTER_LEN*32 + CHARACTER_LEN-1] = 0; // space width - fprintf(stderr, "%s sucessfully loaded as old format prop font!\n", fname); + fprintf(stderr, "%s successfully loaded as old format prop font!\n", fname); return true; } diff --git a/gui/fahrplan_gui.cc b/gui/fahrplan_gui.cc index 71e9dece7f2..820de70c3e3 100644 --- a/gui/fahrplan_gui.cc +++ b/gui/fahrplan_gui.cc @@ -75,7 +75,7 @@ void fahrplan_gui_t::gimme_stop_name(cbuffer_t & buf, karte_t *welt, const spiel void fahrplan_gui_t::gimme_short_stop_name(cbuffer_t &buf, karte_t *welt, const spieler_t *sp, const schedule_t *fpl, int i, int max_chars) { if(i<0 || fpl==NULL || i>=fpl->get_count()) { - dbg->warning("void fahrplan_gui_t::gimme_stop_name()","tried to recieved unused entry %i in schedule %p.",i,fpl); + dbg->warning("void fahrplan_gui_t::gimme_stop_name()","tried to receive unused entry %i in schedule %p.",i,fpl); return; } const linieneintrag_t& entry = fpl->eintrag[i]; diff --git a/player/ai.cc b/player/ai.cc index 433e2cf8584..6addc565384 100755 --- a/player/ai.cc +++ b/player/ai.cc @@ -141,7 +141,7 @@ bool ai_t::call_general_tool( int tool, koord k, const char *param ) dbg->message("ai_t::call_general_tool()","failed for tool %i at (%s) because of \"%s\"", tool, pos.get_str(), err ); } else { - dbg->message("ai_t::call_general_tool()","not succesful for tool %i at (%s)", tool, pos.get_str() ); + dbg->message("ai_t::call_general_tool()","not successful for tool %i at (%s)", tool, pos.get_str() ); } } werkzeug_t::general_tool[tool]->set_default_param(old_param); diff --git a/simfab.cc b/simfab.cc index 2fadd0f0bfc..7f2bc4e02c9 100644 --- a/simfab.cc +++ b/simfab.cc @@ -469,7 +469,7 @@ DBG_DEBUG("fabrik_t::rdwr()","loading factory '%s'",s); file->rdwr_byte(rotate, "\n"); - // now rebuilt information for recieved goods + // now rebuilt information for received goods file->rdwr_long(eingang_count, "\n"); for(i=0; i