[CF-Devel] Small patch: a few warnings :)
crossfire-devel at archives.real-time.com
crossfire-devel at archives.real-time.com
Tue Feb 24 16:22:11 CST 2004
Hello.
Here's just a small patch to fix a few warnings.
Just type mistaches (map coordinates are sint16, not int, and stats are signed
char, not int)
Nicolas 'Ryo'
-------------- next part --------------
Index: server/apply.c
===================================================================
RCS file: /cvsroot/crossfire/crossfire/server/apply.c,v
retrieving revision 1.98
diff -u -r1.98 apply.c
--- server/apply.c 18 Feb 2004 05:28:54 -0000 1.98
+++ server/apply.c 24 Feb 2004 22:07:30 -0000
@@ -3165,7 +3165,7 @@
do {
i=10; /* let's give it 10 tries */
while((tmp=generate_treasure(op->randomitems,
- op->stats.exp?op->stats.exp:MAX(op->map->difficulty, 5)))==NULL&&--i);
+ op->stats.exp?(int)op->stats.exp:MAX(op->map->difficulty, 5)))==NULL&&--i);
if(tmp==NULL)
return 0;
if(QUERY_FLAG(tmp, FLAG_CURSED) || QUERY_FLAG(tmp, FLAG_DAMNED)) {
@@ -3186,7 +3186,7 @@
return 0;
while ((op->stats.hp--)>0)
create_treasure(op->randomitems, op, op->map?GT_ENVIRONMENT:0,
- op->stats.exp ? op->stats.exp :
+ op->stats.exp ? (int)op->stats.exp :
op->map == NULL ? 14: op->map->difficulty,0);
/* If we generated on object and put it in this object inventory,
@@ -3272,7 +3272,8 @@
void eat_special_food(object *who, object *food) {
object *force;
- int i, did_one=0, k;
+ int i, did_one=0;
+ signed char k;
force = get_archetype(FORCE_NAME);
@@ -3457,7 +3458,7 @@
*/
int i,j;
for(i=0;i<7;i++) {
- int stat=get_attr_value(stats,i);
+ signed char stat=get_attr_value(stats,i);
int race_bonus = get_attr_value(&(pl->arch->clone.stats),i);
stat += get_attr_value(ns,i);
if(stat > 20 + race_bonus) {
Index: server/spell_attack.c
===================================================================
RCS file: /cvsroot/crossfire/crossfire/server/spell_attack.c,v
retrieving revision 1.6
diff -u -r1.6 spell_attack.c
--- server/spell_attack.c 24 Feb 2004 05:43:58 -0000 1.6
+++ server/spell_attack.c 24 Feb 2004 22:07:34 -0000
@@ -275,7 +275,7 @@
if(op->range>0) {
for(i=1;i<9;i++) {
- int dx,dy;
+ sint16 dx,dy;
dx=op->x+freearr_x[i];
dy=op->y+freearr_y[i];
@@ -700,7 +700,7 @@
}
for(i= -1;i<2;i++) {
- int x=op->x+freearr_x[absdir(op->stats.sp+i)],
+ sint16 x=op->x+freearr_x[absdir(op->stats.sp+i)],
y=op->y+freearr_y[absdir(op->stats.sp+i)];
if(ok_to_put_more(op->map,x,y,op,op->attacktype)) {
@@ -747,7 +747,7 @@
}
for(i=range_min;i<=range_max;i++) {
- int x,y, d;
+ sint16 x,y, d;
/* We can't use absdir here, because it never returns
* 0. If this is a rune, we want to hit the person on top
@@ -909,7 +909,7 @@
object *tmp;
- int dx=op->x+freearr_x[dir], dy=op->y+freearr_y[dir];
+ sint16 dx=op->x+freearr_x[dir], dy=op->y+freearr_y[dir];
if(get_map_flags(op->map,NULL, dx,dy, NULL,NULL) & (P_OUT_OF_MAP | P_WALL)) {
new_draw_info(NDI_UNIQUE, 0,op,"There is something in the way.");
@@ -1458,7 +1458,8 @@
*/
void move_ball_spell(object *op) {
- int i,nx,ny,j,dam_save,dir, mflags;
+ int i,j,dam_save,dir, mflags;
+ sint16 nx,ny;
object *owner;
mapstruct *m;
-------------- next part --------------
_______________________________________________
crossfire-devel mailing list
crossfire-devel at lists.real-time.com
https://mailman.real-time.com/mailman/listinfo/crossfire-devel
More information about the crossfire
mailing list