Skip to content

Commit

Permalink
(ansgar) correct some spelling errors, mainly recieve -> receive
Browse files Browse the repository at this point in the history
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@3559 8aca7d54-2c30-db11-9de9-000461428c89
  • Loading branch information
Dwachs committed Jul 27, 2010
1 parent 5795059 commit e62c47a
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion boden/wege/schiene.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions dataobj/network.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 ..."));
Expand Down
8 changes: 4 additions & 4 deletions dataobj/network.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions dataobj/network_packet.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion font.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion gui/fahrplan_gui.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion player/ai.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion simfab.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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<eingang_count; i++) {
ware_production_t dummy;
Expand Down
4 changes: 2 additions & 2 deletions simutrans/history.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1888,7 +1888,7 @@ Release of 87.01
4-Nov-2005 (prissi)
FIX: loading old maps with obsolete docks
FIX: no route next to attraction should now have a more meaningful number (so you can better guess how much you have to transport)
FIX: mail from attractions and factories again 4x recieved mail
FIX: mail from attractions and factories again 4x received mail
CHANGE: some further small optimizations for faster drawing of dialoges
CHANGE: vehicles now sorted in depot by intro year and engine type
3-Nov-2005 (mip)
Expand Down Expand Up @@ -6284,7 +6284,7 @@ You can use this version with the 0.81.35exp base package.
- FIX: midi playlist displays message
"Musicplaying disabled/not available" if either no MIDI
files could be loaded or if the soundcard could not be
initialized succesfully
initialized successfully
- FIX: Song name in playlist is updated if a new song starts
playing

Expand Down
2 changes: 1 addition & 1 deletion simworld.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5232,7 +5232,7 @@ bool karte_t::interactive(uint32 quit_month)
}

if( umgebung_t::networkmode ) {
// did we recieved a new command?
// did we receive a new command?
network_command_t *nwc = network_check_activity( min(5u,next_step_time-dr_time()) );
if( nwc==NULL && !network_check_server_connection() ) {
network_disconnect();
Expand Down

0 comments on commit e62c47a

Please sign in to comment.