From 93f72b175a094e39742ee28a7b99561ef6d760c4 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Mon, 19 Jan 2015 20:14:30 -0800 Subject: [PATCH] explicit casts --- 2d/font.c | 4 ++-- 2d/pcx.c | 2 +- 2d/rle.c | 6 +++--- 3d/clipper.c | 2 +- arch/linux/ipx_mcast4.c | 6 +++--- arch/linux/ipx_udp.c | 7 +++---- arch/linux/ukali.c | 6 ++---- arch/ogl/gr.c | 2 +- arch/sdl/digi.c | 2 +- include/cfile.h | 14 +++++++------- include/maths.h | 2 +- main/ai.c | 2 +- main/automap.c | 2 +- main/cmd.c | 6 +++--- main/config.c | 2 +- main/console.c | 10 +++++----- main/crypt.c | 2 +- main/cvar.c | 2 +- main/escort.c | 2 +- main/fuelcen.c | 4 ++-- main/fvi.c | 2 +- main/game.c | 4 ++-- main/gamerend.c | 2 +- main/gameseq.c | 2 +- main/kconfig.c | 10 +++++----- main/laser.c | 2 +- main/multi.c | 10 +++++----- main/scores.c | 4 ++-- maths/fixc.c | 8 ++++---- maths/vecmat.c | 8 ++++---- mem/mem.c | 2 +- misc/args.c | 6 +++--- 32 files changed, 71 insertions(+), 74 deletions(-) diff --git a/2d/font.c b/2d/font.c index 7145acca..ce1c3317 100644 --- a/2d/font.c +++ b/2d/font.c @@ -1498,7 +1498,7 @@ grs_font * gr_init_font( char * fontname ) colormap[TRANSPARENCY_COLOR] = TRANSPARENCY_COLOR; // changed from colormap[255] = 255 to this for macintosh - decode_data_asm(font->ft_data, ptr - font->ft_data, colormap, freq ); + decode_data_asm(font->ft_data, (int)(ptr - font->ft_data), colormap, freq ); } @@ -1625,7 +1625,7 @@ void gr_remap_font( grs_font *font, char * fontname, char *font_data ) colormap[TRANSPARENCY_COLOR] = TRANSPARENCY_COLOR; // changed from colormap[255] = 255 to this for macintosh - decode_data_asm(font->ft_data, ptr - font->ft_data, colormap, freq ); + decode_data_asm(font->ft_data, (int)(ptr - font->ft_data), colormap, freq ); } diff --git a/2d/pcx.c b/2d/pcx.c index a005a8df..cd70ef3e 100644 --- a/2d/pcx.c +++ b/2d/pcx.c @@ -322,7 +322,7 @@ int pcx_write_bitmap( char * filename, grs_bitmap * bmp, ubyte * palette ) for (i=0; i<768; i++ ) palette[i] <<= 2; - retval = PHYSFS_write(PCXfile, palette, 768, 1); + retval = (int)PHYSFS_write(PCXfile, palette, 768, 1); for (i=0; i<768; i++ ) palette[i] >>= 2; diff --git a/2d/rle.c b/2d/rle.c index 03cb36bf..b4bbf017 100644 --- a/2d/rle.c +++ b/2d/rle.c @@ -416,7 +416,7 @@ int gr_rle_encode( int org_size, ubyte *src, ubyte *dest ) } *dest++ = RLE_CODE; - return dest-dest_start; + return (int)(dest - dest_start); } @@ -954,7 +954,7 @@ void rle_swap_0_255(grs_bitmap *bmp) temp[4 + i] = ptr2 - start; ptr += line_size; // go to next line } - len = ptr2 - temp; + len = (int)(ptr2 - temp); *((int *)temp) = len; // set total size memcpy(bmp->bm_data, temp, len); d_free(temp); @@ -1005,7 +1005,7 @@ void rle_remap(grs_bitmap *bmp, ubyte *colormap) temp[4 + i] = ptr2 - start; ptr += line_size; // go to next line } - len = ptr2 - temp; + len = (int)(ptr2 - temp); *((int *)temp) = len; // set total size memcpy(bmp->bm_data, temp, len); d_free(temp); diff --git a/3d/clipper.c b/3d/clipper.c index bc9dd2b7..fe3d5f27 100644 --- a/3d/clipper.c +++ b/3d/clipper.c @@ -200,7 +200,7 @@ int clip_plane(int plane_flag,g3s_point **src,g3s_point **dest,int *nv,g3s_codes } } - return (dest-save_dest); + return (int)(dest - save_dest); } diff --git a/arch/linux/ipx_mcast4.c b/arch/linux/ipx_mcast4.c index 1953dd58..2d939a23 100644 --- a/arch/linux/ipx_mcast4.c +++ b/arch/linux/ipx_mcast4.c @@ -180,7 +180,7 @@ static int ipx_mcast4_SendPacket(ipx_socket_t *sk, IPXPacket_t *IPXHeader, u_cha puts(")."); #endif - i = sendto(sk->fd, data, dataLen, 0, (struct sockaddr *)&toaddr, sizeof(toaddr)); + i = (int)sendto(sk->fd, data, dataLen, 0, (struct sockaddr *)&toaddr, sizeof(toaddr)); return i; } @@ -190,7 +190,7 @@ static int ipx_mcast4_ReceivePacket(ipx_socket_t *sk, char *outbuf, int outbufsi struct sockaddr_in fromaddr; uint fromaddrsize = sizeof(fromaddr); - if((size = recvfrom(sk->fd, outbuf, outbufsize, 0, (struct sockaddr*)&fromaddr, &fromaddrsize)) < 0) + if ((size = (int)recvfrom(sk->fd, outbuf, outbufsize, 0, (struct sockaddr*)&fromaddr, &fromaddrsize)) < 0) return -1; #ifdef IPX_MCAST4_DEBUG @@ -308,7 +308,7 @@ static int ipx_mcast4_SendGamePacket(ipx_socket_t *sk, ubyte *data, int dataLen) msg("ipx_mcast4_SendGamePacket"); - i = sendto(sk->fd, data, dataLen, 0, (struct sockaddr *)&toaddr, sizeof(toaddr)); + i = (int)sendto(sk->fd, data, dataLen, 0, (struct sockaddr *)&toaddr, sizeof(toaddr)); return i; } diff --git a/arch/linux/ipx_udp.c b/arch/linux/ipx_udp.c index e4d0190d..cc8b0c6f 100644 --- a/arch/linux/ipx_udp.c +++ b/arch/linux/ipx_udp.c @@ -360,7 +360,7 @@ int ipx_udp_GetMyAddress(void) { char buf[256]; int i; -char *s,*s2,*ns; + char *s = NULL, *s2, *ns; if (!have_empty_address()) return 0; @@ -517,8 +517,7 @@ static int ipx_udp_SendPacket(ipx_socket_t *mysock, IPXPacket_t *IPXHeader, dumpaddr(dest); puts(")."); #endif - i=sendto(mysock->fd,buf-(compatibility?6:2),(compatibility?8:4)+dataLen, - 0,(struct sockaddr *)dest,sizeof(*dest)); + i = (int)sendto(mysock->fd, buf - (compatibility?6:2), (compatibility?8:4) + dataLen, 0, (struct sockaddr *)dest, sizeof(*dest)); if (bcast==-1) return (i<8?-1:i-8); } return(dataLen); @@ -539,7 +538,7 @@ static int ipx_udp_ReceivePacket(ipx_socket_t *s, char *outbuf, int outbufsize, size_t offs; int i; - if ((size=recvfrom(s->fd,outbuf,outbufsize,0,(struct sockaddr *)&fromaddr,&fromaddrsize))<0) + if ((size = (int)recvfrom(s->fd, outbuf, outbufsize, 0, (struct sockaddr *)&fromaddr, &fromaddrsize)) < 0) return -1; #ifdef UDPDEBUG printf(MSGHDR "recvfrom((%d-8=%d),",size,size-8); diff --git a/arch/linux/ukali.c b/arch/linux/ukali.c index 23bb72ee..2a8780e2 100644 --- a/arch/linux/ukali.c +++ b/arch/linux/ukali.c @@ -51,8 +51,7 @@ int knix_newSock(void) { int knix_Send(int hand, char *data, int len) { int i = 0, t; - while ((t = sendto(hand, data, len, 0, (struct sockaddr *)&kalinix_addr, - sizeof(kalinix_addr))) < 0) { + while ((t = (int)sendto(hand, data, len, 0, (struct sockaddr *)&kalinix_addr, sizeof(kalinix_addr))) < 0) { i++; if (i > 10) return 0; @@ -67,8 +66,7 @@ int knix_Recv(int hand, char *data, int len) { tlen = sizeof(taddr); - return recvfrom(hand, data, len, 0, (struct sockaddr *)&taddr, (unsigned int *)&tlen); - + return (int)recvfrom(hand, data, len, 0, (struct sockaddr *)&taddr, (unsigned int *)&tlen); } int knix_WaitforSocket(int hand, int timems) { diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c index e4cb586d..7aa217b8 100644 --- a/arch/ogl/gr.c +++ b/arch/ogl/gr.c @@ -864,7 +864,7 @@ void write_bmp(char *savename,int w,int h,unsigned char *buf){ x=0;y=w*h*3; while (y > 0) { - r = PHYSFS_write(f, buf + x, 1, y); + r = (int)PHYSFS_write(f, buf + x, 1, y); if (r<=0){ mprintf((0,"screenshot error, couldn't write to %s (err %i)\n",savename,errno)); break; diff --git a/arch/sdl/digi.c b/arch/sdl/digi.c index e0bfcc63..81dc58ea 100644 --- a/arch/sdl/digi.c +++ b/arch/sdl/digi.c @@ -183,7 +183,7 @@ static void audio_mixcallback(void *userdata, Uint8 *stream, int len) s = *sp; *(sp++) = mix8[ s + fixmul(v, vr) + 0x80 ]; } - sl->position = sldata - sl->samples; + sl->position = (int)(sldata - sl->samples); } } } diff --git a/include/cfile.h b/include/cfile.h index 198e2bce..edf67061 100644 --- a/include/cfile.h +++ b/include/cfile.h @@ -32,11 +32,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define CFILE PHYSFS_file #define cfopen(f,m) PHYSFSX_openReadBuffered(f) -#define cfread(p,s,n,fp) PHYSFS_read(fp,p,s,n) +#define cfread(p,s,n,fp) ((int)PHYSFS_read(fp,p,s,n)) #define cfclose PHYSFS_close -#define cftell PHYSFS_tell +#define cftell(f) ((int)PHYSFS_tell(f)) #define cfexist PHYSFS_exists -#define cfilelength PHYSFS_fileLength +#define cfilelength(f) ((int)PHYSFS_fileLength(f)) //Specify the name of the hogfile. Returns 1 if hogfile found & had files static inline int cfile_init(char *hogname) @@ -68,7 +68,7 @@ static inline int cfile_size(char *hogname) fp = PHYSFS_openRead(hogname); if (fp == NULL) return -1; - size = PHYSFS_fileLength(fp); + size = (int)PHYSFS_fileLength(fp); cfclose(fp); return size; @@ -84,7 +84,7 @@ static inline int cfgetc(PHYSFS_file *const fp) return c; } -static inline int cfseek(PHYSFS_file *fp, long int offset, int where) +static inline int cfseek(PHYSFS_file *fp, int offset, int where) { int c, goal_position; @@ -94,10 +94,10 @@ static inline int cfseek(PHYSFS_file *fp, long int offset, int where) goal_position = offset; break; case SEEK_CUR: - goal_position = PHYSFS_tell(fp) + offset; + goal_position = (int)PHYSFS_tell(fp) + offset; break; case SEEK_END: - goal_position = PHYSFS_fileLength(fp) + offset; + goal_position = (int)PHYSFS_fileLength(fp) + offset; break; default: return 1; diff --git a/include/maths.h b/include/maths.h index e5fecbba..58521e29 100644 --- a/include/maths.h +++ b/include/maths.h @@ -30,7 +30,7 @@ quadint; //Convert an int to a fix -#define i2f(i) ((i)<<16) +#define i2f(i) ((fix)((i)<<16)) //Get the int part of a fix #define f2i(f) ((f)>>16) diff --git a/main/ai.c b/main/ai.c index 9723c358..11ecb2c7 100644 --- a/main/ai.c +++ b/main/ai.c @@ -1606,7 +1606,7 @@ int ai_save_state(PHYSFS_file *fp) { int temp; - temp = Point_segs_free_ptr - Point_segs; + temp = (int)(Point_segs_free_ptr - Point_segs); PHYSFS_write(fp, &temp, sizeof(int), 1); } diff --git a/main/automap.c b/main/automap.c index c573633e..46d89805 100644 --- a/main/automap.c +++ b/main/automap.c @@ -1325,7 +1325,7 @@ void add_one_edge( short va, short vb, ubyte color, ubyte side, short segnum, in e->segnum[0] = segnum; //Edge_used_list[Num_edges] = e-Edges; if ( (e-Edges) > Highest_edge_index ) - Highest_edge_index = e - Edges; + Highest_edge_index = (int)(e - Edges); Num_edges++; } else { //Assert(e->num_faces < 8 ); diff --git a/main/cmd.c b/main/cmd.c index e4228a0b..1bee8e96 100644 --- a/main/cmd.c +++ b/main/cmd.c @@ -128,7 +128,7 @@ void cmd_parse(char *input) strncpy( buffer, &input[i], CMD_MAX_LENGTH ); //printf("lead strip \"%s\"\n",buffer); - l = strlen(buffer); + l = (int)strlen(buffer); /* If command is empty, give up */ if (l==0) return; @@ -138,7 +138,7 @@ void cmd_parse(char *input) //printf("trail strip \"%s\"\n",buffer); /* Split into tokens */ - l = strlen(buffer); + l = (int)strlen(buffer); num_tokens = 1; tokens[0] = buffer; @@ -291,7 +291,7 @@ char *cmd_complete(char *input) cmd_t *ptr; cmd_alias_t *aptr; - int len = strlen(input); + int len = (int)strlen(input); if (!len) return NULL; diff --git a/main/config.c b/main/config.c index db0f8b6e..2ff24744 100644 --- a/main/config.c +++ b/main/config.c @@ -391,7 +391,7 @@ int ReadConfigFile() gr_palette_set_gamma( Config_gamma_level.intval ); - Detail_level = strtol(Config_detail_level.string, NULL, 10); + Detail_level = (int)strtol(Config_detail_level.string, NULL, 10); if (Detail_level == NUM_DETAIL_LEVELS - 1) { int count,dummy,oc,od,wd,wrd,da,sc; diff --git a/main/console.c b/main/console.c index c1644df0..a9ffa097 100644 --- a/main/console.c +++ b/main/console.c @@ -746,7 +746,7 @@ void DrawCommandLine() { grs_canvas *canv_save; short orig_color; - commandbuffer = console->VChars - strlen(console->Prompt)-1; // -1 to make cursor visible + commandbuffer = console->VChars - (int)strlen(console->Prompt) - 1; // -1 to make cursor visible #if 0 CurrentFont = console->ConsoleSurface->cv_font; @@ -1029,7 +1029,7 @@ void CON_TabCompletion(void) { if(!command) return; //no tab completion took place so return silently - j = strlen(command); + j = (int)strlen(command); if(j > CON_CHARS_PER_LINE - 2) j = CON_CHARS_PER_LINE-1; @@ -1082,7 +1082,7 @@ void Cursor_Home(void) { } void Cursor_End(void) { - console->CursorPos = strlen(console->Command); + console->CursorPos = (int)strlen(console->Command); strncat(console->LCommand, console->RCommand, strlen(console->RCommand)); memset(console->RCommand, 0, CON_CHARS_PER_LINE); } @@ -1138,7 +1138,7 @@ void Command_Up(void) { memset(console->RCommand, 0, CON_CHARS_PER_LINE); console->Offset = 0; strcpy(console->LCommand, console->CommandLines[console->CommandScrollBack]); - console->CursorPos = strlen(console->CommandLines[console->CommandScrollBack]); + console->CursorPos = (int)strlen(console->CommandLines[console->CommandScrollBack]); CON_UpdateConsole(); } } @@ -1152,7 +1152,7 @@ void Command_Down(void) { console->Offset = 0; if(console->CommandScrollBack > -1) strcpy(console->LCommand, console->CommandLines[console->CommandScrollBack]); - console->CursorPos = strlen(console->LCommand); + console->CursorPos = (int)strlen(console->LCommand); CON_UpdateConsole(); } } diff --git a/main/crypt.c b/main/crypt.c index f18d0b29..4ed5d147 100644 --- a/main/crypt.c +++ b/main/crypt.c @@ -32,7 +32,7 @@ char *jcrypt (char *plainstring) int i, t, len; static char cryptstring[20]; - len=strlen (plainstring); + len = (int)strlen(plainstring); if (len > 8) len = 8; diff --git a/main/cvar.c b/main/cvar.c index 74204abd..a708c2e1 100644 --- a/main/cvar.c +++ b/main/cvar.c @@ -106,7 +106,7 @@ cvar_t *cvar_find(char *cvar_name) char *cvar_complete(char *text) { cvar_t *ptr; - int len = strlen(text); + int len = (int)strlen(text); if (!len) return NULL; diff --git a/main/escort.c b/main/escort.c index b619b0c7..d049c8bc 100644 --- a/main/escort.c +++ b/main/escort.c @@ -411,7 +411,7 @@ void buddy_message(char * format, ... ) gb_str[0] = 1; gb_str[1] = BM_XRGB(28, 0, 0); strcpy(&gb_str[2], guidebot_name); - t = strlen(gb_str); + t = (int)strlen(gb_str); gb_str[t] = ':'; gb_str[t+1] = 1; gb_str[t+2] = BM_XRGB(0, 31, 0); diff --git a/main/fuelcen.c b/main/fuelcen.c index c90b362c..ad180ec9 100644 --- a/main/fuelcen.c +++ b/main/fuelcen.c @@ -466,7 +466,7 @@ void robotmaker_proc( FuelCenter * robotcen ) if (robotcen->Timer > top_time ) { int count=0; - int i, my_station_num = robotcen-Station; + int i, my_station_num = (int)(robotcen - Station); object *obj; // Make sure this robotmaker hasn't put out its max without having any of them killed. @@ -560,7 +560,7 @@ void robotmaker_proc( FuelCenter * robotcen ) #ifndef SHAREWARE #ifdef NETWORK if (Game_mode & GM_MULTI) - multi_send_create_robot(robotcen-Station, OBJECT_NUMBER(obj), type); + multi_send_create_robot((int)(robotcen - Station), OBJECT_NUMBER(obj), type); #endif #endif obj->matcen_creator = (robotcen-Station) | 0x80; diff --git a/main/fvi.c b/main/fvi.c index 32ab2636..3cf53a15 100644 --- a/main/fvi.c +++ b/main/fvi.c @@ -155,7 +155,7 @@ uint check_point_to_face(vms_vector *checkp, side *s,int facenum,int nv,int *ver //now do 2d check to see if point is in side //project polygon onto plane by finding largest component of normal - t.x = labs(norm.xyz[0]); t.y = labs(norm.xyz[1]); t.z = labs(norm.xyz[2]); + t.x = (fix)labs(norm.xyz[0]); t.y = (fix)labs(norm.xyz[1]); t.z = (fix)labs(norm.xyz[2]); if (t.x > t.y) if (t.x > t.z) biggest=0; else biggest=2; else if (t.y > t.z) biggest=1; else biggest=2; diff --git a/main/game.c b/main/game.c index 2e0de2c3..a2895af8 100644 --- a/main/game.c +++ b/main/game.c @@ -2896,7 +2896,7 @@ int mark_player_path_to_segment(int segnum) return 0; } - player_hide_index = Point_segs_free_ptr - Point_segs; + player_hide_index = (int)(Point_segs_free_ptr - Point_segs); Point_segs_free_ptr += player_path_length; if (Point_segs_free_ptr - Point_segs + MAX_PATH_LENGTH*2 > MAX_POINT_SEGS) { @@ -2996,7 +2996,7 @@ void flickering_light_write(flickering_light *fl, PHYSFS_file *fp) { PHYSFS_writeSLE16(fp, fl->segnum); PHYSFS_writeSLE16(fp, fl->sidenum); - PHYSFS_writeULE32(fp, fl->mask); + PHYSFS_writeULE32(fp, (uint32_t)fl->mask); PHYSFSX_writeFix(fp, fl->timer); PHYSFSX_writeFix(fp, fl->delay); } diff --git a/main/gamerend.c b/main/gamerend.c index 6c5e697d..7ac750e7 100644 --- a/main/gamerend.c +++ b/main/gamerend.c @@ -93,7 +93,7 @@ void draw_centered_text( int y, char * s ) int i, l; char p; - l = strlen(s); + l = (int)strlen(s); if ( string_width( s, l ) < grd_curcanv->cv_bitmap.bm_w ) { gr_string( 0x8000, y, s ); diff --git a/main/gameseq.c b/main/gameseq.c index 11b3d1ad..6fd7663b 100644 --- a/main/gameseq.c +++ b/main/gameseq.c @@ -1997,7 +1997,7 @@ void InitPlayerPosition(int random_flag) int i, closest = -1, trys=0; fix closest_dist = 0x7ffffff, dist; - d_srand(clock()); + d_srand((unsigned int)clock()); #ifndef NDEBUG if (NumNetPlayerPositions != MAX_NUM_NET_PLAYERS) diff --git a/main/kconfig.c b/main/kconfig.c index d87f5c38..429a99c5 100644 --- a/main/kconfig.c +++ b/main/kconfig.c @@ -1006,7 +1006,7 @@ void kc_change_key( kc_item * item ) if (k!=KEY_ESC) { for (i=0; i max) @@ -1112,7 +1112,7 @@ void kc_change_joyaxis( kc_item * item ) } for (i=0; i100) @@ -1446,7 +1446,7 @@ void multi_message_input_sub( int key ) strcpy( pcolon+1, ptext ); else strcpy( Network_message, ptext ); - multi_message_index = strlen( Network_message ); + multi_message_index = (int)strlen( Network_message ); } } } @@ -1564,7 +1564,7 @@ multi_do_message(char *buf) if ((tilde=strchr (buf+loc,'$'))) // do that stupid name stuff { // why'd I put this in? Probably for the - tloc=tilde-(buf+loc); // same reason you can name your guidebot + tloc = (int)(tilde - (buf + loc)); // same reason you can name your guidebot mprintf ((0,"Tloc=%d\n",tloc)); if (tloc>0) @@ -1579,7 +1579,7 @@ multi_do_message(char *buf) mesbuf[0] = 1; mesbuf[1] = BM_XRGB(28, 0, 0); strcpy(&mesbuf[2], Players[(int)buf[1]].callsign); - t = strlen(mesbuf); + t = (int)strlen(mesbuf); mesbuf[t] = ':'; mesbuf[t+1] = 1; mesbuf[t+2] = BM_XRGB(0, 31, 0); @@ -1596,7 +1596,7 @@ multi_do_message(char *buf) mesbuf[0] = 1; mesbuf[1] = BM_XRGB(0, 32, 32); strcpy(&mesbuf[2], Players[(int)buf[1]].callsign); - t = strlen(mesbuf); + t = (int)strlen(mesbuf); mesbuf[t] = ':'; mesbuf[t+1] = 1; mesbuf[t+2] = BM_XRGB(0, 31, 0); diff --git a/main/scores.c b/main/scores.c index 617515d6..3f505c7c 100644 --- a/main/scores.c +++ b/main/scores.c @@ -136,7 +136,7 @@ void scores_read() return; } - fsize = PHYSFS_fileLength(fp); + fsize = (int)PHYSFS_fileLength(fp); if ( fsize != sizeof(all_scores) ) { PHYSFS_close(fp); @@ -177,7 +177,7 @@ void int_to_string( int number, char *dest ) sprintf( buffer, "%d", number ); - l = strlen(buffer); + l = (int)strlen(buffer); if (l<=3) { // Don't bother with less than 3 digits sprintf( dest, "%d", number ); diff --git a/maths/fixc.c b/maths/fixc.c index bfeece9d..d3973025 100644 --- a/maths/fixc.c +++ b/maths/fixc.c @@ -58,7 +58,7 @@ void fixmulaccum(quadint *q,fix a,fix b) neg = ((a^b) < 0); - aa = labs(a); bb = labs(b); + aa = (uint32_t)labs(a); bb = (uint32_t)labs(b); ah = aa>>16; al = aa&0xffff; bh = bb>>16; bl = bb&0xffff; @@ -280,7 +280,7 @@ unsigned int fixdivquadlongu(uint nl, uint nh, uint d) unsigned int fixdivquadlongu(uint nl, uint nh, uint d) { uint64_t n = (uint64_t)nl | (((uint64_t)nh) << 32 ); - return n / ((uint64_t)d); + return (unsigned int)(n / ((uint64_t)d)); } #else //of ifdef NO_FIX_INLINE @@ -453,7 +453,7 @@ fixang fix_asin(fix v) fix vv; int i,f,aa; - vv = labs(v); + vv = (fix)labs(v); if (vv >= f1_0) //check for out of range return 0x4000; @@ -476,7 +476,7 @@ fixang fix_acos(fix v) fix vv; int i,f,aa; - vv = labs(v); + vv = (fix)labs(v); if (vv >= f1_0) //check for out of range return 0; diff --git a/maths/vecmat.c b/maths/vecmat.c index 53897d5f..9cf70dc7 100644 --- a/maths/vecmat.c +++ b/maths/vecmat.c @@ -224,9 +224,9 @@ fix vm_vec_mag_quick(vms_vector *v) { fix a,b,c,bc; - a = labs(v->x); - b = labs(v->y); - c = labs(v->z); + a = (fix)labs(v->x); + b = (fix)labs(v->y); + c = (fix)labs(v->z); if (a < b) { fix t=a; a=b; b=t; @@ -379,7 +379,7 @@ void check_vec(vms_vector *v) fix check; int cnt = 0; - check = labs(v->x) | labs(v->y) | labs(v->z); + check = (fix)labs(v->x) | (fix)labs(v->y) | (fix)labs(v->z); if (check == 0) return; diff --git a/mem/mem.c b/mem/mem.c index 3f717144..b91bdb8d 100644 --- a/mem/mem.c +++ b/mem/mem.c @@ -382,7 +382,7 @@ char *mem_strdup(char *str, char *var, char *filename, int line) { char *newstr; - newstr = mem_malloc(strlen(str) + 1, var, filename, line, 0); + newstr = mem_malloc((int)strlen(str) + 1, var, filename, line, 0); strcpy(newstr, str); return newstr; diff --git a/misc/args.c b/misc/args.c index 605b33fa..ae763ee5 100644 --- a/misc/args.c +++ b/misc/args.c @@ -51,15 +51,15 @@ int FindResArg(char *prefix, int *sw, int *sh) int i; int w, h; char *endptr; - int prefixlen = strlen(prefix); + int prefixlen = (int)strlen(prefix); for (i = 0; i < Num_args; ++i) if (Args[i][0] == '-' && !strnicmp(Args[i] + 1, prefix, prefixlen)) { - w = strtol(Args[i] + 1 + prefixlen, &endptr, 10); + w = (int)strtol(Args[i] + 1 + prefixlen, &endptr, 10); if (w > 0 && endptr && endptr[0] == 'x') { - h = strtol(endptr + 1, &endptr, 10); + h = (int)strtol(endptr + 1, &endptr, 10); if (h > 0 && endptr[0] == '\0') { *sw = w; -- 2.39.2