Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
games
clanbomber2
clanbomber2-string_const.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File clanbomber2-string_const.patch of Package clanbomber2
Index: clanbomber/Client.cpp =================================================================== --- clanbomber/Client.cpp.orig 2011-06-17 13:11:57.000000000 +0200 +++ clanbomber/Client.cpp 2011-06-17 14:00:00.286645350 +0200 @@ -71,7 +71,7 @@ unsigned char client_colors[8][3]={{128, #define CLIENTMSG(x...) #endif -Client::Client(ClanBomberApplication* app, char* srv_name) +Client::Client(ClanBomberApplication* app, const char* srv_name) { cb_app=app; bombers_updated=false; @@ -205,7 +205,7 @@ void Client::receive_from_server() int buf[4096]; int bufsize=sizeof(buf); socklen_t addr_len=sizeof(struct sockaddr); - memset((char*)&server_addr, 0, addr_len); + memset(&server_addr, 0, addr_len); int brecv=recvfrom(my_udp_socket, buf, bufsize, 0, (sockaddr*)&server_addr, &addr_len); bytes_received=brecv; if(bytes_received>4 && bytes_received<bufsize) { @@ -443,7 +443,7 @@ bool Client::connect_to_server() is_error=true; } if(!is_error) { - memset((char*)&server_addr, 0, sizeof(server_addr)); + memset(&server_addr, 0, sizeof(server_addr)); server_addr.sin_family=PF_INET; server_addr.sin_addr=*((struct in_addr*)he->h_addr); server_addr.sin_port=htons(NET_SERVER_TCP_PORT); @@ -458,7 +458,7 @@ bool Client::connect_to_server() if(iat==INADDR_NONE) { return false; } - memset((char*)&server_addr, 0, sizeof(server_addr)); + memset(&server_addr, 0, sizeof(server_addr)); server_addr.sin_family=PF_INET; server_addr.sin_addr.s_addr=iat; server_addr.sin_port=htons(NET_SERVER_TCP_PORT); @@ -500,7 +500,7 @@ bool Client::init_udp_socket() sprintf(last_error, "!!! could not find host entity for '%s' !!!", server_name); return false; } - memset((char*)&server_address, 0, sizeof(server_address)); + memset(&server_address, 0, sizeof(server_address)); server_address.sin_family=PF_INET; server_address.sin_addr=*((struct in_addr *)he->h_addr); server_address.sin_port=htons(NET_SERVER_UDP_PORT); @@ -541,22 +541,22 @@ int Client::get_my_index() return my_index; } -char* Client::get_name() +const char* Client::get_name() { return my_name; } -char* Client::get_ip() +const char* Client::get_ip() { return my_ip; } -char* Client::get_server_name() +const char* Client::get_server_name() { return server_name; } -char* Client::get_server_ip() +const char* Client::get_server_ip() { return server_ip; } @@ -588,7 +588,7 @@ void Client::end_the_game() end_current_game=true; } -void Client::send_SERVER_BOMBER_CONFIG(bool enable, int skin, int team, int controller, int rel_pos, char* name) +void Client::send_SERVER_BOMBER_CONFIG(bool enable, int skin, int team, int controller, int rel_pos, const char* name) { CLIENTMSG("--- client sent SERVER_BOMBER_CONFIG\n"); reset_keep_alive_timer(); @@ -611,7 +611,7 @@ void Client::send_SERVER_BOMBER_CONFIG(b total_bytes_sent+=bytes_sent; } -void Client::send_CLIENT_BOMBER_CONFIG(bool enable, int skin, int controller, int rel_pos, char* name) +void Client::send_CLIENT_BOMBER_CONFIG(bool enable, int skin, int controller, int rel_pos, const char* name) { CLIENTMSG("--- client sent CLIENT_BOMBER_CONFIG\n"); reset_keep_alive_timer(); @@ -891,7 +891,7 @@ int Client::get_last_chat_message_client return last_chat_message_client_index; } -int* Client::pack_string(char* name, int bytelen, int* intlen) +int* Client::pack_string(const char* name, int bytelen, int* intlen) { int* trans=new int[(bytelen/4)+1]; int int_nr=0; @@ -1084,12 +1084,12 @@ void Client::increase_maps_played() maps_played++; } -char* Client::get_new_server_name() +const char* Client::get_new_server_name() { return client_names[current_client_info_index]; } -char* Client::get_new_server_ip() +const char* Client::get_new_server_ip() { return client_ips[current_client_info_index]; } Index: clanbomber/Client.h =================================================================== --- clanbomber/Client.h.orig 2007-10-15 14:55:56.000000000 +0200 +++ clanbomber/Client.h 2011-06-17 13:54:54.130755905 +0200 @@ -76,7 +76,7 @@ typedef enum class Client { public: - Client(ClanBomberApplication* app, char* server_name); + Client(ClanBomberApplication* app, const char* server_name); ~Client(); static int receive_from_server_thread(void* param); static void printt(void); @@ -92,10 +92,10 @@ class Client bool init_my_name(); bool init_my_ip(); int get_my_index(); - char* get_name(); - char* get_ip(); - char* get_server_name(); - char* get_server_ip(); + const char* get_name(); + const char* get_ip(); + const char* get_server_name(); + const char* get_server_ip(); char* get_last_error(); void reset(); bool server_started_game(); @@ -112,7 +112,7 @@ class Client int get_server_frame_counter(); int get_last_chat_message_client_index(); CL_String current_chat_message; - static int* pack_string(char* name, int bytelen, int* intlen); + static int* pack_string(const char* name, int bytelen, int* intlen); static char* unpack_string(int* namebuf, int bytelen, int* intlen); static char* determine_fqdn (void); int* pack_map(int width, int height, int* intlen, bool with_random=false); @@ -126,8 +126,8 @@ class Client void update_traffic_statistics(); void output_traffic_statistics(); void increase_maps_played(); - char* get_new_server_name(); - char* get_new_server_ip(); + const char* get_new_server_name(); + const char* get_new_server_ip(); int get_previous_client_index(); void send_old_bomber_config_to_new_server(int previous_client_index); static int get_client_color_r_by_index(int client_index); @@ -135,8 +135,8 @@ class Client static int get_client_color_b_by_index(int client_index); int get_server_ping(); public: - void send_SERVER_BOMBER_CONFIG(bool enable, int skin, int team, int controller, int rel_pos, char* name); - void send_CLIENT_BOMBER_CONFIG(bool enable, int skin, int controller, int rel_pos, char* name); + void send_SERVER_BOMBER_CONFIG(bool enable, int skin, int team, int controller, int rel_pos, const char* name); + void send_CLIENT_BOMBER_CONFIG(bool enable, int skin, int controller, int rel_pos, const char* name); void send_CLIENT_BOMBER_DIR(int bomber_number, Direction updir); void send_CLIENT_BOMBER_BOMB(int pwr, int obj_id); void send_CLIENT_CHAT_MESSAGE(int autom); @@ -199,10 +199,10 @@ class Client Thread* updating_thread; Mutex* thread_mutex; int nr_of_clients; - char* my_name; - char* my_ip; - char* server_name; - char* server_ip; + const char* my_name; + const char* my_ip; + const char* server_name; + const char* server_ip; int my_tcp_socket; int my_udp_socket; sockaddr_in server_address; Index: clanbomber/Config.cpp =================================================================== --- clanbomber/Config.cpp.orig 2007-10-15 15:58:16.000000000 +0200 +++ clanbomber/Config.cpp 2011-06-17 13:57:42.742492962 +0200 @@ -185,12 +185,12 @@ void BomberConfig::set_config_index(int config_index=index; } -char* BomberConfig::get_client_ip() +const char* BomberConfig::get_client_ip() { return client_ip; } -void BomberConfig::set_client_ip(char* ip_string) +void BomberConfig::set_client_ip(const char* ip_string) { client_ip = ip_string; } Index: clanbomber/Config.h =================================================================== --- clanbomber/Config.h.orig 2007-10-15 14:55:56.000000000 +0200 +++ clanbomber/Config.h 2011-06-17 14:02:07.464935729 +0200 @@ -44,8 +44,8 @@ public: void set_enabled(bool _enabled); void set_local(bool _local); bool is_local(); - char* get_client_ip(); - void set_client_ip(char* ip_string); + const char* get_client_ip(); + void set_client_ip(const char* ip_string); void set_client_index(int index); int get_client_index(); int get_config_index(); @@ -64,7 +64,7 @@ protected: int client_index; int config_index; bool server_bomber; - char* client_ip; + const char* client_ip; }; class Config Index: clanbomber/Explosion.h =================================================================== --- clanbomber/Explosion.h.orig 2007-10-15 14:55:56.000000000 +0200 +++ clanbomber/Explosion.h 2011-06-17 13:32:23.808846444 +0200 @@ -32,7 +32,7 @@ public: virtual void show(); virtual void act(); - char* get_name() + const char* get_name() { return "Explosion"; } Index: clanbomber/Extra.h =================================================================== --- clanbomber/Extra.h.orig 2007-10-15 14:55:56.000000000 +0200 +++ clanbomber/Extra.h 2011-06-17 13:32:34.489703726 +0200 @@ -33,7 +33,7 @@ public: void act(); - char* get_name() + const char* get_name() { return "Extra"; } Index: clanbomber/Server.h =================================================================== --- clanbomber/Server.h.orig 2007-10-15 14:55:56.000000000 +0200 +++ clanbomber/Server.h 2011-06-17 15:16:09.029222039 +0200 @@ -143,15 +143,15 @@ class Server void update_objects(); void start_updating_objects(); void add_received_objects(int client_nr, int bytes_received, int* buf); - bool add_client(char* client_name, char* client_ip); + bool add_client(const char* client_name, const char* client_ip); bool add_client(int socket); - char* get_name(); - char* get_ip(); + const char* get_name(); + const char* get_ip(); char* get_last_error(); int get_nr_of_clients(); char* get_client_location(int client_nr); int get_client_index_by_ip(in_addr ip); - char* get_client_ip_by_index(int index); + const char* get_client_ip_by_index(int index); void send_update_messages_to_clients(int current_frame_nr); void analyze_game_mode(); bool is_in_demo_mode(); @@ -236,8 +236,8 @@ class Server Thread* updating_thread; char* my_name; char* my_ip; - char* client_names[NET_SERVER_MAX_CLIENTS]; - char* client_ips[NET_SERVER_MAX_CLIENTS]; + const char* client_names[NET_SERVER_MAX_CLIENTS]; + const char* client_ips[NET_SERVER_MAX_CLIENTS]; bool big_endian; bool client_convert[NET_SERVER_MAX_CLIENTS]; int my_tcp_socket; Index: clanbomber/clanstring.h =================================================================== --- clanbomber/clanstring.h.orig 2011-06-17 13:25:34.000000000 +0200 +++ clanbomber/clanstring.h 2011-06-17 13:59:19.175197987 +0200 @@ -334,7 +334,7 @@ public: { if (str==NULL) { - return ""; + return const_cast<char *>(""); } return str; } Index: clanbomber/Resources.cpp =================================================================== --- clanbomber/Resources.cpp.orig 2007-10-15 15:00:48.000000000 +0200 +++ clanbomber/Resources.cpp 2011-06-17 15:14:06.154874190 +0200 @@ -640,7 +640,7 @@ void Resources::Surface::get_rect( int f ret_rect->h = sprite_height; } -IDirectFBSurface* Resources::load_surface(char *filename) +IDirectFBSurface* Resources::load_surface(const char *filename) { IDirectFBImageProvider *provider; @@ -701,7 +701,7 @@ int Resources::sample_read_chunk_header } -IFusionSoundBuffer* Resources::load_sample(char *filename) +IFusionSoundBuffer* Resources::load_sample(const char *filename) { DFBResult ret; int fd; Index: clanbomber/Resources.h =================================================================== --- clanbomber/Resources.h.orig 2011-06-17 13:19:46.000000000 +0200 +++ clanbomber/Resources.h 2011-06-17 14:08:03.504149270 +0200 @@ -125,11 +125,11 @@ public: protected: - static IDirectFBSurface* load_surface( char *filename ); + static IDirectFBSurface* load_surface( const char *filename ); static int sample_read_chunk_header( int fd, char *magic); static DFBResult sample_read_file_header( int fd ); - static IFusionSoundBuffer* load_sample( char *filename ); + static IFusionSoundBuffer* load_sample( const char *filename ); static IDirectFBFont *fnt_big; static IDirectFBFont *fnt_small; Index: clanbomber/Server.cpp =================================================================== --- clanbomber/Server.cpp.orig 2011-06-17 13:11:57.000000000 +0200 +++ clanbomber/Server.cpp 2011-06-17 15:16:06.662253862 +0200 @@ -412,7 +412,7 @@ void Server::add_received_objects(int cl received_objects[client_nr].push_back(tmp); } -bool Server::add_client(char* client_name, char* client_ip) +bool Server::add_client(const char* client_name, const char* client_ip) { int free_index=get_next_free_client_index(); keep_client_alive(free_index); @@ -471,12 +471,12 @@ bool Server::add_client(int socket) return true; } -char* Server::get_name() +const char* Server::get_name() { return my_name; } -char* Server::get_ip() +const char* Server::get_ip() { return my_ip; } @@ -518,7 +518,7 @@ int Server::get_client_index_by_ip(in_ad return -1; } -char* Server::get_client_ip_by_index(int index) +const char* Server::get_client_ip_by_index(int index) { return client_ips[index]; } @@ -1356,7 +1356,7 @@ void Server::delete_client(int client_in Config::bomber[i].disable(); Config::bomber[i].set_local(true); Config::bomber[i].set_client_index(-1); - free(Config::bomber[i].get_client_ip()); + free(const_cast<char *>(Config::bomber[i].get_client_ip())); Config::bomber[i].set_client_ip(NULL); Config::bomber[i].set_server_bomber(false); ServerSetup::unselect_player(i); Index: clanbomber/GameObject.cpp =================================================================== --- clanbomber/GameObject.cpp.orig 2007-10-15 14:55:56.000000000 +0200 +++ clanbomber/GameObject.cpp 2011-06-17 14:12:54.727233829 +0200 @@ -30,7 +30,7 @@ #include <math.h> -char* GameObject::objecttype2string(ObjectType t) +const char* GameObject::objecttype2string(ObjectType t) { switch(t) { case GameObject::BOMB: Index: clanbomber/GameObject.h =================================================================== --- clanbomber/GameObject.h.orig 2007-10-15 14:55:56.000000000 +0200 +++ clanbomber/GameObject.h 2011-06-17 14:15:15.295343820 +0200 @@ -105,7 +105,7 @@ public: CORPSE_PART } ObjectType; - static char* objecttype2string(ObjectType t); + static const char* objecttype2string(ObjectType t); virtual ObjectType get_type() const =0; virtual void stop(bool by_arrow=false); Index: clanbomber/GameStatus_Team.cpp =================================================================== --- clanbomber/GameStatus_Team.cpp.orig 2007-10-15 14:55:56.000000000 +0200 +++ clanbomber/GameStatus_Team.cpp 2011-06-17 14:18:08.606013986 +0200 @@ -35,7 +35,7 @@ static GameStatus_Team* game_status_team = NULL; static SimpleTimer demo_mode_timer; -char* GameStatus_Team::team_names[4] = { "BLOOD TEAM", "GOLD TEAM", "WATER TEAM", "LEAF TEAM" }; +const char* GameStatus_Team::team_names[4] = { "BLOOD TEAM", "GOLD TEAM", "WATER TEAM", "LEAF TEAM" }; #include <math.h> Index: clanbomber/GameStatus_Team.h =================================================================== --- clanbomber/GameStatus_Team.h.orig 2007-10-15 14:55:56.000000000 +0200 +++ clanbomber/GameStatus_Team.h 2011-06-17 14:19:24.498993950 +0200 @@ -44,7 +44,7 @@ protected: static team_color team_colors[4]; - static char* team_names[4]; + static const char* team_names[4]; }; #endif Index: clanbomber/MapEntry.cpp =================================================================== --- clanbomber/MapEntry.cpp.orig 2007-10-15 14:55:56.000000000 +0200 +++ clanbomber/MapEntry.cpp 2011-06-17 15:18:06.586641350 +0200 @@ -295,7 +295,7 @@ void MapEntry::set_name(CL_String _name) map_name = _name; } -void MapEntry::reset_filename(char* client_name) +void MapEntry::reset_filename(const char* client_name) { if (client_name != NULL) { map_name = map_name + "(" + client_name + ")"; @@ -370,7 +370,7 @@ void MapEntry::randomize_bomber_position } } -unsigned int MapEntry::get_name_checksum(char* name) +unsigned int MapEntry::get_name_checksum(const char* name) { int name_cs = 0; if (name == NULL) { Index: clanbomber/MapEntry.h =================================================================== --- clanbomber/MapEntry.h.orig 2007-10-15 14:55:56.000000000 +0200 +++ clanbomber/MapEntry.h 2011-06-17 15:17:26.069186152 +0200 @@ -48,7 +48,7 @@ public: void set_max_players(int nr); void set_author(CL_String _author); void set_name(CL_String _name); - void reset_filename(char* client_name); + void reset_filename(const char* client_name); void write_back(); void clear(); void reload(); @@ -56,7 +56,7 @@ public: void delete_file(); void randomize_bomber_positions(); - unsigned int get_name_checksum(char* name); + unsigned int get_name_checksum(const char* name); unsigned int get_data_checksum(); protected: CL_String path; Index: clanbomber/Map.h =================================================================== --- clanbomber/Map.h.orig 2007-10-15 14:55:56.000000000 +0200 +++ clanbomber/Map.h 2011-06-17 15:19:46.868292935 +0200 @@ -73,7 +73,7 @@ public: // static stuff static CL_List<MapEntry> map_list; bool is_received_by_client; - char* current_server_map_name; + const char* current_server_map_name; unsigned int get_current_map_name_checksum(); int get_map_name_checksums(unsigned int** chesksum_array);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
