Menu
▾
▴
[Crossfire-cvs] CVS commit: client
|
From: <cro...@li...> - 2005-03-23 22:21:22
|
Module Name: client
Committed By: tchize
Date: Wed Mar 23 22:19:11 UTC 2005
Modified Files:
client/common: client.h
client/gtk: map.c sdl.c
client/gtk-v2/src: map.c opengl.c sdl.c
Log Message:
Fixed smoothing on non floor layer.
Start of context diffs
Index: client/common/client.h
diff -c client/common/client.h:1.25 client/common/client.h:1.26
*** client/common/client.h:1.25 Mon Mar 21 23:22:58 2005
--- client/common/client.h Wed Mar 23 14:18:41 2005
***************
*** 1,6 ****
/*
* static char *rcsid_client_h =
! * "$Id: client.h,v 1.25 2005/03/22 07:22:58 mwedel Exp $";
*/
/*
Crossfire client, a client program for the crossfire program.
--- 1,6 ----
/*
* static char *rcsid_client_h =
! * "$Id: client.h,v 1.26 2005/03/23 22:18:41 tchize Exp $";
*/
/*
Crossfire client, a client program for the crossfire program.
***************
*** 74,80 ****
extern Animations animations[MAXANIM];
! #define CAN_SMOOTH(__SMOOTHLEVEL) (__SMOOTHLEVEL)
/* ClientSocket could probably hold more of the global values - it could
* probably hold most all socket/communication related values instead
--- 74,85 ----
extern Animations animations[MAXANIM];
! #define CAN_SMOOTH(__SQUARE,__LEVEL) ( ( \
! (__SQUARE.heads[__LEVEL].face==0) \
! && (__LEVEL >0) \
! ) \
! || (__SQUARE.smooth[layer]) \
! )
/* ClientSocket could probably hold more of the global values - it could
* probably hold most all socket/communication related values instead
Index: client/gtk/map.c
diff -c client/gtk/map.c:1.25 client/gtk/map.c:1.26
*** client/gtk/map.c:1.25 Mon Mar 21 23:22:59 2005
--- client/gtk/map.c Wed Mar 23 14:18:57 2005
***************
*** 1,5 ****
char *rcsid_gtk_map_c =
! "$Id: map.c,v 1.25 2005/03/22 07:22:59 mwedel Exp $";
/*
Crossfire client, a client program for the crossfire program.
--- 1,5 ----
char *rcsid_gtk_map_c =
! "$Id: map.c,v 1.26 2005/03/23 22:18:57 tchize Exp $";
/*
Crossfire client, a client program for the crossfire program.
***************
*** 433,439 ****
int dosmooth=0;
if ( (the_map.cells[mx][my].heads[0].face==0)
! || !CAN_SMOOTH(the_map.cells[mx][my].smooth[layer]) )
return;
for (i=0;i<8;i++){
emx=mx+dx[i];
--- 433,439 ----
int dosmooth=0;
if ( (the_map.cells[mx][my].heads[0].face==0)
! || !CAN_SMOOTH(the_map.cells[mx][my],layer) )
return;
for (i=0;i<8;i++){
emx=mx+dx[i];
Index: client/gtk/sdl.c
diff -c client/gtk/sdl.c:1.16 client/gtk/sdl.c:1.17
*** client/gtk/sdl.c:1.16 Mon Mar 21 23:22:59 2005
--- client/gtk/sdl.c Wed Mar 23 14:19:00 2005
***************
*** 1,5 ****
char *rcsid_gtk_sdl_c =
! "$Id: sdl.c,v 1.16 2005/03/22 07:22:59 mwedel Exp $";
/*
CrossFire, A Multiplayer game for X-windows
--- 1,5 ----
char *rcsid_gtk_sdl_c =
! "$Id: sdl.c,v 1.17 2005/03/23 22:19:00 tchize Exp $";
/*
CrossFire, A Multiplayer game for X-windows
***************
*** 637,644 ****
src.w=dst.w;
src.h=dst.h;
if ( (the_map.cells[mx][my].heads[0].face==0)
! || !CAN_SMOOTH(the_map.cells[mx][my].smooth[layer]) )
return;
for (i=0;i<8;i++){
emx=mx+dx[i];
emy=my+dy[i];
--- 637,645 ----
src.w=dst.w;
src.h=dst.h;
if ( (the_map.cells[mx][my].heads[0].face==0)
! || !CAN_SMOOTH(the_map.cells[mx][my],layer) ){
return;
+ }
for (i=0;i<8;i++){
emx=mx+dx[i];
emy=my+dy[i];
Index: client/gtk-v2/src/map.c
diff -c client/gtk-v2/src/map.c:1.3 client/gtk-v2/src/map.c:1.4
*** client/gtk-v2/src/map.c:1.3 Mon Mar 21 23:23:00 2005
--- client/gtk-v2/src/map.c Wed Mar 23 14:19:01 2005
***************
*** 1,5 ****
char *rcsid_gtk2_map_c =
! "$Id: map.c,v 1.3 2005/03/22 07:23:00 mwedel Exp $";
/*
Crossfire client, a client program for the crossfire program.
--- 1,5 ----
char *rcsid_gtk2_map_c =
! "$Id: map.c,v 1.4 2005/03/23 22:19:01 tchize Exp $";
/*
Crossfire client, a client program for the crossfire program.
***************
*** 512,518 ****
int smoothface;
int dosmooth=0;
if ( (the_map.cells[mx][my].heads[0].face==0)
! || !CAN_SMOOTH(the_map.cells[mx][my].smooth[layer]) )
return;
for (i=0;i<8;i++){
emx=mx+dx[i];
--- 512,518 ----
int smoothface;
int dosmooth=0;
if ( (the_map.cells[mx][my].heads[0].face==0)
! || !CAN_SMOOTH(the_map.cells[mx][my],layer) )
return;
for (i=0;i<8;i++){
emx=mx+dx[i];
Index: client/gtk-v2/src/opengl.c
diff -c client/gtk-v2/src/opengl.c:1.1 client/gtk-v2/src/opengl.c:1.2
*** client/gtk-v2/src/opengl.c:1.1 Mon Mar 21 23:23:00 2005
--- client/gtk-v2/src/opengl.c Wed Mar 23 14:19:02 2005
***************
*** 1,5 ****
char *rcsid_gtk_opengl_c =
! "$Id: opengl.c,v 1.1 2005/03/22 07:23:00 mwedel Exp $";
/*
Crossfire client, a client program for the crossfire program.
--- 1,5 ----
char *rcsid_gtk_opengl_c =
! "$Id: opengl.c,v 1.2 2005/03/23 22:19:02 tchize Exp $";
/*
Crossfire client, a client program for the crossfire program.
***************
*** 429,435 ****
my = y + pl_pos.y;
if ( the_map.cells[mx][my].heads[layer].face!=0 &&
! CAN_SMOOTH(the_map.cells[mx][my].smooth[layer]))
drawsmooth_opengl(x, y, mx, my, layer);
}
}
--- 429,435 ----
my = y + pl_pos.y;
if ( the_map.cells[mx][my].heads[layer].face!=0 &&
! CAN_SMOOTH(the_map.cells[mx][my],layer))
drawsmooth_opengl(x, y, mx, my, layer);
}
}
***************
*** 624,630 ****
glEnd();
}
! if (use_config[CONFIG_SMOOTH] && CAN_SMOOTH(the_map.cells[mx][my].smooth[layer]) &&
the_map.cells[mx][my].heads[layer].face !=0) {
got_smooth=1;
--- 624,630 ----
glEnd();
}
! if (use_config[CONFIG_SMOOTH] && CAN_SMOOTH(the_map.cells[mx][my],layer) &&
the_map.cells[mx][my].heads[layer].face !=0) {
got_smooth=1;
Index: client/gtk-v2/src/sdl.c
diff -c client/gtk-v2/src/sdl.c:1.2 client/gtk-v2/src/sdl.c:1.3
*** client/gtk-v2/src/sdl.c:1.2 Mon Mar 21 23:23:00 2005
--- client/gtk-v2/src/sdl.c Wed Mar 23 14:19:11 2005
***************
*** 1,5 ****
char *rcsid_gtk_sdl_c =
! "$Id: sdl.c,v 1.2 2005/03/22 07:23:00 mwedel Exp $";
/*
Crossfire client, a client program for the crossfire program.
--- 1,5 ----
char *rcsid_gtk_sdl_c =
! "$Id: sdl.c,v 1.3 2005/03/23 22:19:11 tchize Exp $";
/*
Crossfire client, a client program for the crossfire program.
***************
*** 649,655 ****
src.w=dst.w;
src.h=dst.h;
if ( (the_map.cells[mx][my].heads[0].face==0)
! || !CAN_SMOOTH(the_map.cells[mx][my].smooth[layer]) )
return;
for (i=0;i<8;i++){
emx=mx+dx[i];
--- 649,655 ----
src.w=dst.w;
src.h=dst.h;
if ( (the_map.cells[mx][my].heads[0].face==0)
! || !CAN_SMOOTH(the_map.cells[mx][my],layer) )
return;
for (i=0;i<8;i++){
emx=mx+dx[i];
|
