Skip to content

Commit 55d0b2c

Browse files
author
Marek
committed
First multipatch - this fixes all compile warnings on gcc4,
but there is one thing that needs to be done - fix 0verkill for amd64.
1 parent 3f14c21 commit 55d0b2c

13 files changed

+166
-154
lines changed

‎avi.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
int TRI_D_ON=0;
1414
int tri_d=0;
1515

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

5656
void load_line(void)
5757
{
58-
again:
59-
lptr=line;
60-
if (!(fgets(line,sizeof(line),f))){
58+
do {
59+
lptr=line;
60+
if (!(fgets(line,sizeof(line),f))){
6161
*line=0;
6262
return;
63-
}
64-
if (*lptr=='#') goto again;
63+
}
64+
} while (*lptr != '#');
6565
}
6666

6767
int read_number(void)
@@ -177,7 +177,7 @@ void put_attribute(int x,int y,int pos, int chr)
177177
ptr[1]=chr;
178178
}
179179

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

@@ -248,7 +248,7 @@ void normalize_transparency(void)
248248

249249
}
250250

251-
void save_avi(unsigned char *filename)
251+
void save_avi(char *filename)
252252
{
253253
int pos,y,x,t;
254254
unsigned char *char_pointer,*attr_pointer;
@@ -377,7 +377,7 @@ int get_colour(void){
377377
void print_bottom_line(void)
378378
{
379379
int offs=SCREEN_X*(SCREEN_Y-2);
380-
unsigned char txt[32];
380+
char txt[32];
381381
int x;
382382

383383
memset(screen_a+offs,7,SCREEN_X);

‎bot.c

+13-13
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ struct /* keyboard status */
116116
}keyboard_status;
117117

118118

119-
unsigned char *names[N_NAMES]={
119+
char *names[N_NAMES]={
120120
"Terminator",
121121
"Jack The Ripper",
122122
"Rambo",
@@ -140,7 +140,7 @@ unsigned char *names[N_NAMES]={
140140
int direction=0; /* 0=stop, 1=left, 2=right */
141141
int const1,const2,const3,const4;
142142
unsigned short port=DEFAULT_PORT;
143-
unsigned char *host;
143+
char *host;
144144
int priority;
145145
/* 0=nothing
146146
* 1=kill player
@@ -245,7 +245,7 @@ void send_quit(void)
245245

246246

247247
/* initiate connection with server */
248-
char * contact_server(int color,unsigned char *name)
248+
char * contact_server(int color, char *name)
249249
{
250250
static unsigned char packet[256];
251251
int l=strlen(name)+1;
@@ -491,8 +491,8 @@ void clean_memory(void)
491491

492492
void change_level(void)
493493
{
494-
unsigned char *LEVEL;
495-
unsigned char txt[256];
494+
char *LEVEL;
495+
char txt[256];
496496

497497
clean_memory();
498498
free_sprites(level_sprites_start);
@@ -856,13 +856,13 @@ int process_packet(unsigned char *packet,int l)
856856

857857
case P_MESSAGE:
858858
if (l<2)break; /* invalid packet */
859-
n=2+strlen(packet+1);
859+
n=2+strlen((char *)packet+1);
860860
break;
861861

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

868868
case P_INFO:
@@ -871,7 +871,7 @@ int process_packet(unsigned char *packet,int l)
871871
for (a=0;a<packet[5]&&a<TOP_PLAYERS_N;a++)
872872
{
873873
int x;
874-
x=strlen(packet+l+9)+1;
874+
x=strlen((char *)packet+l+9)+1;
875875
l+=x+9;
876876
}
877877
n=l;
@@ -916,17 +916,17 @@ int process_packet(unsigned char *packet,int l)
916916

917917
case P_CHANGE_LEVEL:
918918
{
919-
unsigned char *md5;
919+
char *md5;
920920
int a;
921-
char p;
921+
unsigned char p;
922922

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

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

10401040

1041-
unsigned char * select_name(void)
1041+
char * select_name(void)
10421042
{
10431043
return names[(random())%N_NAMES];
10441044
}
@@ -1072,7 +1072,7 @@ int main(int argc,char **argv)
10721072
{
10731073
int color;
10741074
unsigned long_long last_time;
1075-
unsigned char *m;
1075+
char *m;
10761076

10771077

10781078
#ifdef WIN32

‎client.c

+29-19
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ struct msgline_type
136136
}msg_line[N_MESSAGES];
137137

138138
int last_message;
139-
unsigned char error_message[1024];
139+
char error_message[1024];
140140

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

@@ -188,7 +188,7 @@ void load_cfg(char *host,char *name,int *color)
188188
{
189189
FILE *stream;
190190
int a;
191-
unsigned char txt[256];
191+
char txt[256];
192192

193193
#ifndef WIN32
194194
sprintf(txt,"%s/%s",getenv("HOME"),CFG_FILE);
@@ -220,7 +220,7 @@ void load_cfg(char *host,char *name,int *color)
220220
void save_cfg(char *host,char *name,int color)
221221
{
222222
FILE *stream;
223-
unsigned char txt[256];
223+
char txt[256];
224224

225225
#ifndef WIN32
226226
sprintf(txt,"%s/%s",getenv("HOME"),CFG_FILE);
@@ -381,7 +381,7 @@ void send_quit(void)
381381

382382

383383
/* initiate connection with server */
384-
char * contact_server(int color,unsigned char *name)
384+
char * contact_server(int color,char *name)
385385
{
386386
static unsigned char packet[256];
387387
int l=strlen(name)+1;
@@ -910,8 +910,8 @@ void draw_scene(void)
910910

911911
void change_level(void)
912912
{
913-
unsigned char *LEVEL;
914-
unsigned char txt[256];
913+
char *LEVEL;
914+
char txt[256];
915915

916916
clean_memory();
917917
free_sprites(level_sprites_start);
@@ -1161,32 +1161,39 @@ int process_packet(unsigned char *packet,int l)
11611161

11621162
case P_MESSAGE:
11631163
if (l<2)break; /* invalid packet */
1164-
add_message(packet+1);
1165-
n=2+strlen(packet+1);
1164+
add_message((char *)packet+1);
1165+
n=2+strlen((char *)packet+1);
11661166
break;
11671167

11681168
case P_CHANGE_LEVEL:
11691169
{
1170-
unsigned char txt[256];
1171-
unsigned char *name;
1172-
unsigned char *md5;
1170+
char txt[256];
1171+
char *name;
1172+
char *md5;
11731173
int a;
1174-
char p;
1174+
unsigned char p;
11751175

11761176
if (l<38)break; /* invalid packet */
11771177
a=get_int(packet+1);
11781178
if (level_number==a)goto level_changed;
11791179
level_number=a;
1180-
snprintf(txt,256, "Trying to change level to number %d",level_number);
1180+
snprintf(txt,256, "Trying to change level to number %d",
1181+
level_number);
11811182
add_message(txt);
11821183
name=load_level(level_number);
1183-
if (!name){snprintf(error_message,1024,"Cannot find level number %d. Game terminated. Press ENTER.", level_number);send_quit();return -1;}
1184+
if (!name) {
1185+
snprintf(error_message,1024,"Cannot find level "
1186+
"number %d. Game terminated. Press ENTER.",
1187+
level_number);
1188+
send_quit();
1189+
return -1;
1190+
}
11841191
snprintf(txt,256,"Changing level to \"%s\"",name);
11851192
mem_free(name);
11861193
add_message(txt);
11871194

11881195
md5=md5_level(level_number);
1189-
if (strcmp(md5,packet+5)) /* MD5s differ */
1196+
if (strcmp((char *)md5,(char *)packet+5)) /* MD5s differ */
11901197
{
11911198
mem_free(md5);
11921199
snprintf(error_message,1024,"Invalid MD5 sum. Can't change level. Game terminated. Press ENTER.");
@@ -1226,7 +1233,7 @@ int process_packet(unsigned char *packet,int l)
12261233
top_players[a].frags=get_int(packet+l);
12271234
top_players[a].deaths=get_int(packet+l+4);
12281235
top_players[a].color=packet[l+8];
1229-
x=strlen(packet+l+9)+1;
1236+
x=strlen((char *)packet+l+9)+1;
12301237
memcpy(top_players[a].name,packet+l+9,x);
12311238
l+=x+9;
12321239
}
@@ -1508,7 +1515,7 @@ void menu_screen(char *host,char *name,unsigned short *p,int *color)
15081515
sprintf(txt,"hero%d",*color);
15091516
if (find_sprite(txt,&sprite))
15101517
{
1511-
unsigned char msg[256];
1518+
char msg[256];
15121519
mem_free(banner);
15131520
shut_down(0);
15141521
snprintf(msg,256,"Error: Can't find sprite \"%s\".\n",txt);
@@ -1997,7 +2004,7 @@ int main(int argc,char **argv)
19972004
char host[MAX_HOST_LEN+1];
19982005
char name[MAX_NAME_LEN+1];
19992006
int a;
2000-
unsigned char txt[256];
2007+
char txt[256];
20012008

20022009

20032010
#ifdef WIN32
@@ -2039,7 +2046,10 @@ int main(int argc,char **argv)
20392046
for (a=0;a<N_SHRAPNELS;a++)
20402047
{
20412048
sprintf(txt,"shrapnel%d",a+1);
2042-
if (find_sprite(txt,&shrapnel_sprite[a])){fprintf(stderr,"Can't find sprite \"%s\".\n",txt);EXIT(1);}
2049+
if (find_sprite(txt,&shrapnel_sprite[a])) {
2050+
fprintf(stderr,"Can't find sprite \"%s\".\n",txt);
2051+
EXIT(1);
2052+
}
20432053
}
20442054

20452055
signal(SIGINT,signal_handler);

‎data.c

+14-13
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ unsigned char *area_a;
3131

3232

3333
struct sprite *sprites=DUMMY;
34-
unsigned char **sprite_names=DUMMY;
34+
char **sprite_names=DUMMY;
3535
int n_sprites; /* number of sprites */
3636

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

186186

187187
/* load static data */
188-
void load_data(unsigned char * filename)
188+
void load_data(char * filename)
189189
{
190190
FILE * stream;
191191
static char line[1024];
@@ -234,7 +234,7 @@ void load_data(unsigned char * filename)
234234

235235

236236
/* load sprites */
237-
void load_sprites(unsigned char * filename)
237+
void load_sprites(char * filename)
238238
{
239239
FILE *stream;
240240
static char line[1024];
@@ -258,7 +258,7 @@ void load_sprites(unsigned char * filename)
258258
*p=0;p++;
259259
l=strlen(q);
260260
n_sprites++;
261-
sprite_names=(unsigned char **)mem_realloc(sprite_names,n_sprites*sizeof(unsigned char*));
261+
sprite_names=(char **)mem_realloc(sprite_names,n_sprites*sizeof(unsigned char*));
262262
if (!sprite_names){ERROR("Memory allocation error!\n");EXIT(1);}
263263
sprites=(struct sprite *)mem_realloc(sprites,n_sprites*sizeof(struct sprite));
264264
if (!sprites){ERROR("Memory allocation error!\n");EXIT(1);}
@@ -284,7 +284,7 @@ void free_sprites(int start_num)
284284
free_sprite(sprites+a);
285285
}
286286
n_sprites=start_num;
287-
sprite_names=(unsigned char **)mem_realloc(sprite_names,n_sprites*sizeof(unsigned char*));
287+
sprite_names=(char **)mem_realloc(sprite_names,n_sprites*sizeof(unsigned char*));
288288
if (!sprite_names){ERROR("Memory allocation error!\n");EXIT(1);}
289289
sprites=mem_realloc(sprites,n_sprites*sizeof(struct sprite));
290290
if (!sprites){ERROR("Memory allocation error!\n");EXIT(1);}
@@ -293,10 +293,10 @@ void free_sprites(int start_num)
293293

294294
/* returns allocated string with level name or NULL on error */
295295
/* level_num is a line number in the LEVEL_FILE */
296-
unsigned char *load_level(int level_num)
296+
char *load_level(int level_num)
297297
{
298-
unsigned char txt[1024];
299-
unsigned char *retval;
298+
char txt[1024];
299+
char *retval;
300300
int a;
301301
FILE *f;
302302

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

585585

586-
unsigned char *__add_md5(unsigned char *filename, int *len, unsigned char**result)
586+
unsigned char *__add_md5(char *filename, int *len, unsigned char**result)
587587
{
588-
unsigned char *p,*q;
588+
unsigned char *p;
589+
char *q;
589590
int a;
590591

591592
q=MD5File(filename,NULL);
@@ -604,12 +605,12 @@ unsigned char *__add_md5(unsigned char *filename, int *len, unsigned char**resul
604605
* level_num is the line number in level.dat file
605606
* returns allocated string with the MD5 sum or NULL (on error)
606607
*/
607-
unsigned char* md5_level(int level_num)
608+
char* md5_level(int level_num)
608609
{
609610
unsigned char *result=0;
610611
char *q;
611612
int len=0;
612-
unsigned char p[2048];
613+
char p[2048];
613614

614615
q=load_level(level_num);
615616
if (!q)return NULL;

0 commit comments

Comments
 (0)