Skip to content

Commit

Permalink
First multipatch - this fixes all compile warnings on gcc4,
Browse files Browse the repository at this point in the history
but there is one thing that needs to be done - fix 0verkill
for amd64.
  • Loading branch information
Marek committed Jun 19, 2008
1 parent 3f14c21 commit 55d0b2c
Show file tree
Hide file tree
Showing 13 changed files with 166 additions and 154 deletions.
20 changes: 10 additions & 10 deletions avi.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
int TRI_D_ON=0;
int tri_d=0;

unsigned char line[16384];
char line[16384];
/* For loading lines from ASCII files */
unsigned char *lptr;
char *lptr;
/* Used in conjunction with "line" variable */
unsigned char *pos=DUMMY;
/* Pointer to a cube of chars containing all the positions of the avi animation
Expand Down Expand Up @@ -55,13 +55,13 @@ int last_color, last_char;

void load_line(void)
{
again:
lptr=line;
if (!(fgets(line,sizeof(line),f))){
do {
lptr=line;
if (!(fgets(line,sizeof(line),f))){
*line=0;
return;
}
if (*lptr=='#') goto again;
}
} while (*lptr != '#');
}

int read_number(void)
Expand Down Expand Up @@ -177,7 +177,7 @@ void put_attribute(int x,int y,int pos, int chr)
ptr[1]=chr;
}

void load_avi(unsigned char *filename)
void load_avi(char *filename)
{
int xoffset=0, yoffset=-1,pos=-1,x;

Expand Down Expand Up @@ -248,7 +248,7 @@ void normalize_transparency(void)

}

void save_avi(unsigned char *filename)
void save_avi(char *filename)
{
int pos,y,x,t;
unsigned char *char_pointer,*attr_pointer;
Expand Down Expand Up @@ -377,7 +377,7 @@ int get_colour(void){
void print_bottom_line(void)
{
int offs=SCREEN_X*(SCREEN_Y-2);
unsigned char txt[32];
char txt[32];
int x;

memset(screen_a+offs,7,SCREEN_X);
Expand Down
26 changes: 13 additions & 13 deletions bot.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ struct /* keyboard status */
}keyboard_status;


unsigned char *names[N_NAMES]={
char *names[N_NAMES]={
"Terminator",
"Jack The Ripper",
"Rambo",
Expand All @@ -140,7 +140,7 @@ unsigned char *names[N_NAMES]={
int direction=0; /* 0=stop, 1=left, 2=right */
int const1,const2,const3,const4;
unsigned short port=DEFAULT_PORT;
unsigned char *host;
char *host;
int priority;
/* 0=nothing
* 1=kill player
Expand Down Expand Up @@ -245,7 +245,7 @@ void send_quit(void)


/* initiate connection with server */
char * contact_server(int color,unsigned char *name)
char * contact_server(int color, char *name)
{
static unsigned char packet[256];
int l=strlen(name)+1;
Expand Down Expand Up @@ -491,8 +491,8 @@ void clean_memory(void)

void change_level(void)
{
unsigned char *LEVEL;
unsigned char txt[256];
char *LEVEL;
char txt[256];

clean_memory();
free_sprites(level_sprites_start);
Expand Down Expand Up @@ -856,13 +856,13 @@ int process_packet(unsigned char *packet,int l)

case P_MESSAGE:
if (l<2)break; /* invalid packet */
n=2+strlen(packet+1);
n=2+strlen((char *)packet+1);
break;

case P_END:
if (l<2)printf("Game terminated.\n");
else printf("Game terminated by %s.\n",packet+1);
n=2+strlen(packet+1);
n=2+strlen((char *)packet+1);
shut_down(1);

case P_INFO:
Expand All @@ -871,7 +871,7 @@ int process_packet(unsigned char *packet,int l)
for (a=0;a<packet[5]&&a<TOP_PLAYERS_N;a++)
{
int x;
x=strlen(packet+l+9)+1;
x=strlen((char *)packet+l+9)+1;
l+=x+9;
}
n=l;
Expand Down Expand Up @@ -916,17 +916,17 @@ int process_packet(unsigned char *packet,int l)

case P_CHANGE_LEVEL:
{
unsigned char *md5;
char *md5;
int a;
char p;
unsigned char p;

if (l<38)break; /* invalid packet */
a=get_int(packet+1);
if (level_number==a)goto level_changed;
level_number=a;

md5=md5_level(level_number);
if (strcmp(md5,packet+5)) /* MD5s differ */
if (strcmp((char *)md5,(char *)packet+5)) /* MD5s differ */
{
mem_free(md5);
ERROR("Invalid MD5 sum. Can't change level. Exiting...");
Expand Down Expand Up @@ -1038,7 +1038,7 @@ void parse_command_line(int argc,char **argv)
}


unsigned char * select_name(void)
char * select_name(void)
{
return names[(random())%N_NAMES];
}
Expand Down Expand Up @@ -1072,7 +1072,7 @@ int main(int argc,char **argv)
{
int color;
unsigned long_long last_time;
unsigned char *m;
char *m;


#ifdef WIN32
Expand Down
48 changes: 29 additions & 19 deletions client.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ struct msgline_type
}msg_line[N_MESSAGES];

int last_message;
unsigned char error_message[1024];
char error_message[1024];

unsigned char set_size; /* -s option was on the command line */

Expand Down Expand Up @@ -188,7 +188,7 @@ void load_cfg(char *host,char *name,int *color)
{
FILE *stream;
int a;
unsigned char txt[256];
char txt[256];

#ifndef WIN32
sprintf(txt,"%s/%s",getenv("HOME"),CFG_FILE);
Expand Down Expand Up @@ -220,7 +220,7 @@ void load_cfg(char *host,char *name,int *color)
void save_cfg(char *host,char *name,int color)
{
FILE *stream;
unsigned char txt[256];
char txt[256];

#ifndef WIN32
sprintf(txt,"%s/%s",getenv("HOME"),CFG_FILE);
Expand Down Expand Up @@ -381,7 +381,7 @@ void send_quit(void)


/* initiate connection with server */
char * contact_server(int color,unsigned char *name)
char * contact_server(int color,char *name)
{
static unsigned char packet[256];
int l=strlen(name)+1;
Expand Down Expand Up @@ -910,8 +910,8 @@ void draw_scene(void)

void change_level(void)
{
unsigned char *LEVEL;
unsigned char txt[256];
char *LEVEL;
char txt[256];

clean_memory();
free_sprites(level_sprites_start);
Expand Down Expand Up @@ -1161,32 +1161,39 @@ int process_packet(unsigned char *packet,int l)

case P_MESSAGE:
if (l<2)break; /* invalid packet */
add_message(packet+1);
n=2+strlen(packet+1);
add_message((char *)packet+1);
n=2+strlen((char *)packet+1);
break;

case P_CHANGE_LEVEL:
{
unsigned char txt[256];
unsigned char *name;
unsigned char *md5;
char txt[256];
char *name;
char *md5;
int a;
char p;
unsigned char p;

if (l<38)break; /* invalid packet */
a=get_int(packet+1);
if (level_number==a)goto level_changed;
level_number=a;
snprintf(txt,256, "Trying to change level to number %d",level_number);
snprintf(txt,256, "Trying to change level to number %d",
level_number);
add_message(txt);
name=load_level(level_number);
if (!name){snprintf(error_message,1024,"Cannot find level number %d. Game terminated. Press ENTER.", level_number);send_quit();return -1;}
if (!name) {
snprintf(error_message,1024,"Cannot find level "
"number %d. Game terminated. Press ENTER.",
level_number);
send_quit();
return -1;
}
snprintf(txt,256,"Changing level to \"%s\"",name);
mem_free(name);
add_message(txt);

md5=md5_level(level_number);
if (strcmp(md5,packet+5)) /* MD5s differ */
if (strcmp((char *)md5,(char *)packet+5)) /* MD5s differ */
{
mem_free(md5);
snprintf(error_message,1024,"Invalid MD5 sum. Can't change level. Game terminated. Press ENTER.");
Expand Down Expand Up @@ -1226,7 +1233,7 @@ int process_packet(unsigned char *packet,int l)
top_players[a].frags=get_int(packet+l);
top_players[a].deaths=get_int(packet+l+4);
top_players[a].color=packet[l+8];
x=strlen(packet+l+9)+1;
x=strlen((char *)packet+l+9)+1;
memcpy(top_players[a].name,packet+l+9,x);
l+=x+9;
}
Expand Down Expand Up @@ -1508,7 +1515,7 @@ void menu_screen(char *host,char *name,unsigned short *p,int *color)
sprintf(txt,"hero%d",*color);
if (find_sprite(txt,&sprite))
{
unsigned char msg[256];
char msg[256];
mem_free(banner);
shut_down(0);
snprintf(msg,256,"Error: Can't find sprite \"%s\".\n",txt);
Expand Down Expand Up @@ -1997,7 +2004,7 @@ int main(int argc,char **argv)
char host[MAX_HOST_LEN+1];
char name[MAX_NAME_LEN+1];
int a;
unsigned char txt[256];
char txt[256];


#ifdef WIN32
Expand Down Expand Up @@ -2039,7 +2046,10 @@ int main(int argc,char **argv)
for (a=0;a<N_SHRAPNELS;a++)
{
sprintf(txt,"shrapnel%d",a+1);
if (find_sprite(txt,&shrapnel_sprite[a])){fprintf(stderr,"Can't find sprite \"%s\".\n",txt);EXIT(1);}
if (find_sprite(txt,&shrapnel_sprite[a])) {
fprintf(stderr,"Can't find sprite \"%s\".\n",txt);
EXIT(1);
}
}

signal(SIGINT,signal_handler);
Expand Down
27 changes: 14 additions & 13 deletions data.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ unsigned char *area_a;


struct sprite *sprites=DUMMY;
unsigned char **sprite_names=DUMMY;
char **sprite_names=DUMMY;
int n_sprites; /* number of sprites */

struct object_list *last_obj;
Expand Down Expand Up @@ -120,7 +120,7 @@ void _skip_ws(char **txt)
/* find sprite according to its name */
/* returns 1 on error */
/* it's slow but not called in speed critical parts of the program */
int find_sprite(unsigned char *name,int *num)
int find_sprite(char *name,int *num)
{
for ((*num)=0;(*num)<n_sprites;(*num)++)
if (!strcmp(sprite_names[*num],name))return 0;
Expand Down Expand Up @@ -185,7 +185,7 @@ int _convert_type(unsigned char c)


/* load static data */
void load_data(unsigned char * filename)
void load_data(char * filename)
{
FILE * stream;
static char line[1024];
Expand Down Expand Up @@ -234,7 +234,7 @@ void load_data(unsigned char * filename)


/* load sprites */
void load_sprites(unsigned char * filename)
void load_sprites(char * filename)
{
FILE *stream;
static char line[1024];
Expand All @@ -258,7 +258,7 @@ void load_sprites(unsigned char * filename)
*p=0;p++;
l=strlen(q);
n_sprites++;
sprite_names=(unsigned char **)mem_realloc(sprite_names,n_sprites*sizeof(unsigned char*));
sprite_names=(char **)mem_realloc(sprite_names,n_sprites*sizeof(unsigned char*));
if (!sprite_names){ERROR("Memory allocation error!\n");EXIT(1);}
sprites=(struct sprite *)mem_realloc(sprites,n_sprites*sizeof(struct sprite));
if (!sprites){ERROR("Memory allocation error!\n");EXIT(1);}
Expand All @@ -284,7 +284,7 @@ void free_sprites(int start_num)
free_sprite(sprites+a);
}
n_sprites=start_num;
sprite_names=(unsigned char **)mem_realloc(sprite_names,n_sprites*sizeof(unsigned char*));
sprite_names=(char **)mem_realloc(sprite_names,n_sprites*sizeof(unsigned char*));
if (!sprite_names){ERROR("Memory allocation error!\n");EXIT(1);}
sprites=mem_realloc(sprites,n_sprites*sizeof(struct sprite));
if (!sprites){ERROR("Memory allocation error!\n");EXIT(1);}
Expand All @@ -293,10 +293,10 @@ void free_sprites(int start_num)

/* returns allocated string with level name or NULL on error */
/* level_num is a line number in the LEVEL_FILE */
unsigned char *load_level(int level_num)
char *load_level(int level_num)
{
unsigned char txt[1024];
unsigned char *retval;
char txt[1024];
char *retval;
int a;
FILE *f;

Expand Down Expand Up @@ -583,9 +583,10 @@ void update_position(struct it* obj,my_double new_x,my_double new_y,int width, i
}


unsigned char *__add_md5(unsigned char *filename, int *len, unsigned char**result)
unsigned char *__add_md5(char *filename, int *len, unsigned char**result)
{
unsigned char *p,*q;
unsigned char *p;
char *q;
int a;

q=MD5File(filename,NULL);
Expand All @@ -604,12 +605,12 @@ unsigned char *__add_md5(unsigned char *filename, int *len, unsigned char**resul
* level_num is the line number in level.dat file
* returns allocated string with the MD5 sum or NULL (on error)
*/
unsigned char* md5_level(int level_num)
char* md5_level(int level_num)
{
unsigned char *result=0;
char *q;
int len=0;
unsigned char p[2048];
char p[2048];

q=load_level(level_num);
if (!q)return NULL;
Expand Down
Loading

0 comments on commit 55d0b2c

Please sign in to comment.