Skip to content

Commit f453e62

Browse files
author
Marek
committed
Removed put_ and get_float and replaced it with put_
and get_int since they were the same
1 parent 527211f commit f453e62

File tree

6 files changed

+132
-148
lines changed

6 files changed

+132
-148
lines changed

‎bot.c

+30-30
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,10 @@ char * contact_server(int color, char *name)
312312
get_int16(packet+5), /* sprite */
313313
0, /* position */
314314
get_int16(packet+23), /* status */
315-
get_float(packet+7), /* X */
316-
get_float(packet+11), /* Y */
317-
get_float(packet+15), /* XSPEED */
318-
get_float(packet+19), /* YSPEED */
315+
get_int(packet+7), /* X */
316+
get_int(packet+11), /* Y */
317+
get_int(packet+15), /* XSPEED */
318+
get_int(packet+19), /* YSPEED */
319319
0
320320
);
321321
break;
@@ -516,7 +516,7 @@ void update_game(void)
516516
int w,h;
517517
unsigned char stop_x,stop_y,sy;
518518
unsigned long_long t;
519-
my_double x,y,x1,y1,DELTA_TIME;
519+
int x,y,x1,y1,DELTA_TIME;
520520

521521
for(p=&objects;p->next;p=p->next)
522522
{
@@ -643,10 +643,10 @@ int process_packet(char *packet,int l)
643643
get_int16(packet+5), /* sprite */
644644
0, /* anim position */
645645
get_int16(packet+23), /* status */
646-
get_float(packet+7), /* x */
647-
get_float(packet+11), /* y */
648-
get_float(packet+15), /* xspeed */
649-
get_float(packet+19), /* yspeed */
646+
get_int(packet+7), /* x */
647+
get_int(packet+11), /* y */
648+
get_int(packet+15), /* xspeed */
649+
get_int(packet+19), /* yspeed */
650650
0 /* data */
651651
);
652652
break;
@@ -672,10 +672,10 @@ int process_packet(char *packet,int l)
672672
if (!p)break;
673673
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
674674
p->member.update_counter=packet[5];
675-
p->member.x=get_float(packet+6);
676-
p->member.y=get_float(packet+10);
677-
p->member.xspeed=get_float(packet+14);
678-
p->member.yspeed=get_float(packet+18);
675+
p->member.x=get_int(packet+6);
676+
p->member.y=get_int(packet+10);
677+
p->member.xspeed=get_int(packet+14);
678+
p->member.yspeed=get_int(packet+18);
679679
p->member.status=get_int16(packet+22);
680680
p->member.data=0;
681681
p->member.ttl=get_int16(packet+24);
@@ -695,10 +695,10 @@ int process_packet(char *packet,int l)
695695
if (!p)break;
696696
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
697697
p->member.update_counter=packet[5];
698-
p->member.x=get_float(packet+6);
699-
p->member.y=get_float(packet+10);
700-
p->member.xspeed=get_float(packet+14);
701-
p->member.yspeed=get_float(packet+18);
698+
p->member.x=get_int(packet+6);
699+
p->member.y=get_int(packet+10);
700+
p->member.xspeed=get_int(packet+14);
701+
p->member.yspeed=get_int(packet+18);
702702
}
703703
break;
704704

@@ -712,8 +712,8 @@ int process_packet(char *packet,int l)
712712
if (!p)break;
713713
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
714714
p->member.update_counter=packet[5];
715-
p->member.xspeed=get_float(packet+6);
716-
p->member.yspeed=get_float(packet+10);
715+
p->member.xspeed=get_int(packet+6);
716+
p->member.yspeed=get_int(packet+10);
717717
}
718718
break;
719719

@@ -727,8 +727,8 @@ int process_packet(char *packet,int l)
727727
if (!p)break;
728728
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
729729
p->member.update_counter=packet[5];
730-
p->member.x=get_float(packet+6);
731-
p->member.y=get_float(packet+10);
730+
p->member.x=get_int(packet+6);
731+
p->member.y=get_int(packet+10);
732732
}
733733
break;
734734

@@ -742,8 +742,8 @@ int process_packet(char *packet,int l)
742742
if (!p)break;
743743
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
744744
p->member.update_counter=packet[5];
745-
p->member.xspeed=get_float(packet+6);
746-
p->member.yspeed=get_float(packet+10);
745+
p->member.xspeed=get_int(packet+6);
746+
p->member.yspeed=get_int(packet+10);
747747
p->member.status=get_int16(packet+14);
748748
/* kdyz tasi, tak se nahodi ttl */
749749
if (p->member.type==T_PLAYER&&(p->member.status&32)&&(p->member.status&16))
@@ -761,8 +761,8 @@ int process_packet(char *packet,int l)
761761
if (!p)break;
762762
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
763763
p->member.update_counter=packet[5];
764-
p->member.x=get_float(packet+6);
765-
p->member.y=get_float(packet+10);
764+
p->member.x=get_int(packet+6);
765+
p->member.y=get_int(packet+10);
766766
p->member.status=get_int16(packet+14);
767767
/* kdyz tasi, tak se nahodi ttl */
768768
if (p->member.type==T_PLAYER&&(p->member.status&32)&&(p->member.status&16))
@@ -780,8 +780,8 @@ int process_packet(char *packet,int l)
780780
if (!p)break;
781781
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
782782
p->member.update_counter=packet[5];
783-
p->member.xspeed=get_float(packet+6);
784-
p->member.yspeed=get_float(packet+10);
783+
p->member.xspeed=get_int(packet+6);
784+
p->member.yspeed=get_int(packet+10);
785785
p->member.status=get_int16(packet+14);
786786
p->member.ttl=get_int16(packet+16);
787787
/* kdyz tasi, tak se nahodi ttl */
@@ -800,8 +800,8 @@ int process_packet(char *packet,int l)
800800
if (!p)break;
801801
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
802802
p->member.update_counter=packet[5];
803-
p->member.x=get_float(packet+6);
804-
p->member.y=get_float(packet+10);
803+
p->member.x=get_int(packet+6);
804+
p->member.y=get_int(packet+10);
805805
p->member.status=get_int16(packet+14);
806806
p->member.ttl=get_int16(packet+16);
807807
/* kdyz tasi, tak se nahodi ttl */
@@ -893,7 +893,7 @@ int process_packet(char *packet,int l)
893893
for (b=0;b<N_SHRAPNELS_EXPLODE;b++)
894894
{
895895
double angle=(double)b*2*M_PI/N_SHRAPNELS_EXPLODE;
896-
my_double spd=add_int(mul_int(my_and(mul_int(weapon[WEAPON_GRENADE].speed,b+1),15),16),100);
896+
int spd=add_int(mul_int(my_and(mul_int(weapon[WEAPON_GRENADE].speed,b+1),15),16),100);
897897

898898
new_obj(
899899
i,

‎client.c

+30-30
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,10 @@ char * contact_server(int color,char *name)
448448
get_int16(packet+5), /* sprite */
449449
0, /* position */
450450
get_int16(packet+23), /* status */
451-
get_float(packet+7), /* X */
452-
get_float(packet+11), /* Y */
453-
get_float(packet+15), /* XSPEED */
454-
get_float(packet+19), /* YSPEED */
451+
get_int(packet+7), /* X */
452+
get_int(packet+11), /* Y */
453+
get_int(packet+15), /* XSPEED */
454+
get_int(packet+19), /* YSPEED */
455455
0
456456
);
457457
break;
@@ -539,7 +539,7 @@ void update_game(void)
539539
int w,h;
540540
unsigned char stop_x,stop_y,sy;
541541
unsigned long_long t;
542-
my_double x,y,x1,y1,DELTA_TIME;
542+
int x,y,x1,y1,DELTA_TIME;
543543

544544
for(p=&objects;p->next;p=p->next)
545545
{
@@ -948,10 +948,10 @@ int process_packet(char *packet,int l)
948948
get_int16(packet+5), /* sprite */
949949
0, /* anim position */
950950
get_int16(packet+23), /* status */
951-
get_float(packet+7), /* x */
952-
get_float(packet+11), /* y */
953-
get_float(packet+15), /* xspeed */
954-
get_float(packet+19), /* yspeed */
951+
get_int(packet+7), /* x */
952+
get_int(packet+11), /* y */
953+
get_int(packet+15), /* xspeed */
954+
get_int(packet+19), /* yspeed */
955955
0 /* data */
956956
);
957957
break;
@@ -977,10 +977,10 @@ int process_packet(char *packet,int l)
977977
if (!p)break;
978978
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
979979
p->member.update_counter=packet[5];
980-
p->member.x=get_float(packet+6);
981-
p->member.y=get_float(packet+10);
982-
p->member.xspeed=get_float(packet+14);
983-
p->member.yspeed=get_float(packet+18);
980+
p->member.x=get_int(packet+6);
981+
p->member.y=get_int(packet+10);
982+
p->member.xspeed=get_int(packet+14);
983+
p->member.yspeed=get_int(packet+18);
984984
p->member.status=get_int16(packet+22);
985985
p->member.data=0;
986986
p->member.ttl=get_int16(packet+24);
@@ -1000,10 +1000,10 @@ int process_packet(char *packet,int l)
10001000
if (!p)break;
10011001
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
10021002
p->member.update_counter=packet[5];
1003-
p->member.x=get_float(packet+6);
1004-
p->member.y=get_float(packet+10);
1005-
p->member.xspeed=get_float(packet+14);
1006-
p->member.yspeed=get_float(packet+18);
1003+
p->member.x=get_int(packet+6);
1004+
p->member.y=get_int(packet+10);
1005+
p->member.xspeed=get_int(packet+14);
1006+
p->member.yspeed=get_int(packet+18);
10071007
}
10081008
break;
10091009

@@ -1017,8 +1017,8 @@ int process_packet(char *packet,int l)
10171017
if (!p)break;
10181018
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
10191019
p->member.update_counter=packet[5];
1020-
p->member.xspeed=get_float(packet+6);
1021-
p->member.yspeed=get_float(packet+10);
1020+
p->member.xspeed=get_int(packet+6);
1021+
p->member.yspeed=get_int(packet+10);
10221022
}
10231023
break;
10241024

@@ -1032,8 +1032,8 @@ int process_packet(char *packet,int l)
10321032
if (!p)break;
10331033
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
10341034
p->member.update_counter=packet[5];
1035-
p->member.x=get_float(packet+6);
1036-
p->member.y=get_float(packet+10);
1035+
p->member.x=get_int(packet+6);
1036+
p->member.y=get_int(packet+10);
10371037
}
10381038
break;
10391039

@@ -1047,8 +1047,8 @@ int process_packet(char *packet,int l)
10471047
if (!p)break;
10481048
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
10491049
p->member.update_counter=packet[5];
1050-
p->member.xspeed=get_float(packet+6);
1051-
p->member.yspeed=get_float(packet+10);
1050+
p->member.xspeed=get_int(packet+6);
1051+
p->member.yspeed=get_int(packet+10);
10521052
p->member.status=get_int16(packet+14);
10531053
/* kdyz tasi, tak se nahodi ttl */
10541054
if (p->member.type==T_PLAYER&&(p->member.status&32)&&(p->member.status&16))
@@ -1066,8 +1066,8 @@ int process_packet(char *packet,int l)
10661066
if (!p)break;
10671067
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
10681068
p->member.update_counter=packet[5];
1069-
p->member.x=get_float(packet+6);
1070-
p->member.y=get_float(packet+10);
1069+
p->member.x=get_int(packet+6);
1070+
p->member.y=get_int(packet+10);
10711071
p->member.status=get_int16(packet+14);
10721072
/* kdyz tasi, tak se nahodi ttl */
10731073
if (p->member.type==T_PLAYER&&(p->member.status&32)&&(p->member.status&16))
@@ -1085,8 +1085,8 @@ int process_packet(char *packet,int l)
10851085
if (!p)break;
10861086
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
10871087
p->member.update_counter=packet[5];
1088-
p->member.xspeed=get_float(packet+6);
1089-
p->member.yspeed=get_float(packet+10);
1088+
p->member.xspeed=get_int(packet+6);
1089+
p->member.yspeed=get_int(packet+10);
10901090
p->member.status=get_int16(packet+14);
10911091
p->member.ttl=get_int16(packet+16);
10921092
/* kdyz tasi, tak se nahodi ttl */
@@ -1105,8 +1105,8 @@ int process_packet(char *packet,int l)
11051105
if (!p)break;
11061106
if(packet[5]-(p->member.update_counter)>127)break; /* throw out old updates */
11071107
p->member.update_counter=packet[5];
1108-
p->member.x=get_float(packet+6);
1109-
p->member.y=get_float(packet+10);
1108+
p->member.x=get_int(packet+6);
1109+
p->member.y=get_int(packet+10);
11101110
p->member.status=get_int16(packet+14);
11111111
p->member.ttl=get_int16(packet+16);
11121112
/* kdyz tasi, tak se nahodi ttl */
@@ -1256,7 +1256,7 @@ int process_packet(char *packet,int l)
12561256
for (b=0;b<N_SHRAPNELS_EXPLODE;b++)
12571257
{
12581258
double angle=(double)b*2*M_PI/N_SHRAPNELS_EXPLODE;
1259-
my_double spd=add_int(mul_int(my_and(mul_int(weapon[WEAPON_GRENADE].speed,b+1),15),16),100);
1259+
int spd=add_int(mul_int(my_and(mul_int(weapon[WEAPON_GRENADE].speed,b+1),15),16),100);
12601260

12611261
new_obj(
12621262
i,

‎data.c

+7-19
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,10 @@ struct it * new_obj(
333333
int sprite,
334334
unsigned char pos,
335335
int status,
336-
my_double x,
337-
my_double y,
338-
my_double xspeed,
339-
my_double yspeed,
336+
int x,
337+
int y,
338+
int xspeed,
339+
int yspeed,
340340
void * data)
341341
{
342342
last_obj->next=mem_alloc(sizeof(struct object_list));
@@ -417,18 +417,6 @@ int get_int16(char *p)
417417
}
418418

419419

420-
my_double get_float(char *p)
421-
{
422-
return get_int(p);
423-
}
424-
425-
426-
void put_float(char *p,my_double num)
427-
{
428-
put_int(p, num);
429-
}
430-
431-
432420
unsigned long_long get_long_long(unsigned char *p)
433421
{
434422
#define ULL unsigned long_long
@@ -448,7 +436,7 @@ unsigned long_long get_long_long(unsigned char *p)
448436
/* test if vertical line from yh to yl can move from old_x to new_x axis */
449437
/* returns farthest possible x axis */
450438
/* flag is filled with 1 if objects is stopped */
451-
my_double can_go_x(my_double old_x,my_double new_x,int yh, int yl,unsigned char *flag)
439+
int can_go_x(int old_x,int new_x,int yh, int yl,unsigned char *flag)
452440
{
453441
int x,y;
454442

@@ -482,7 +470,7 @@ my_double can_go_x(my_double old_x,my_double new_x,int yh, int yl,unsigned char
482470
/* returns farthest possible y axis */
483471
/* flag is filled with 1 if objects is stopped */
484472
/* down ladder: 1=fall through ladders etc., 0=stand on ladders */
485-
my_double can_go_y(my_double old_y, my_double new_y,int xl, int xr,unsigned char *flag,unsigned char down_ladder)
473+
int can_go_y(int old_y, int new_y,int xl, int xr,unsigned char *flag,unsigned char down_ladder)
486474
{
487475
int x,y;
488476

@@ -555,7 +543,7 @@ get_dimensions(int type,int status,struct pos *s,int *w,int *h)
555543

556544

557545
/* updates object's position */
558-
void update_position(struct it* obj,my_double new_x,my_double new_y,int width, int height,unsigned char *fx,unsigned char *fy)
546+
void update_position(struct it* obj,int new_x,int new_y,int width, int height,unsigned char *fx,unsigned char *fy)
559547
{
560548
unsigned char down_ladder=0;
561549

0 commit comments

Comments
 (0)