Menu
▾
▴
[Crossfire-cvs] CVS commit: crossfire
|
From: <cro...@li...> - 2003-03-24 06:58:36
|
Module Name: crossfire
Committed By: mwedel
Date: Mon Mar 24 06:58:34 UTC 2003
Modified Files:
crossfire: ChangeLog
crossfire/common: glue.c
crossfire/lib: animations archetypes bmaps bmaps.paths crossfire.0
crossfire.1 faces
crossfire/server: init.c player.c
Log Message:
common/glue.c, include/funcpoint.h: remove draw_func() pointer - no longer
needed, so code that sets up pointer removed.
lib/*: rebuilt - facings added to old player animation information.
ruined_temple archetype added.
server/init.c: remove set_draw() function
server/player.c: remove call to draw() - socket code takes care of this.
socket/info.c: remove draw() - instead, draw_client_map() can be used,
as that is most the only thing draw() did anyways.
socket/loop.c: Update draw() calls to draw_client_map()
socket/request.c: Remove special handling for darkness==4 cases (first
space that is in full darkness) - this is extra complications and causes
display problems. Update draw_client_map() to include the little bit
of logic that draw() had that this function did not have.
MSW 2003-03-24
The following files had too many changes to show the context diffs here:
cvs rdiff -r1.53 -r1.54 crossfire/lib/animations
cvs rdiff -r1.124 -r1.125 crossfire/lib/archetypes
cvs rdiff -r1.54 -r1.55 crossfire/lib/bmaps.paths
Start of context diffs
Index: crossfire/ChangeLog
diff -c crossfire/ChangeLog:1.58 crossfire/ChangeLog:1.59
*** crossfire/ChangeLog:1.58 Fri Mar 21 00:01:03 2003
--- crossfire/ChangeLog Sun Mar 23 22:58:07 2003
***************
*** 17,22 ****
--- 17,37 ----
------------------------------------------------------------------------------
Changes for CVS:
+ common/glue.c, include/funcpoint.h: remove draw_func() pointer - no longer
+ needed, so code that sets up pointer removed.
+ lib/*: rebuilt - facings added to old player animation information.
+ ruined_temple archetype added.
+ server/init.c: remove set_draw() function
+ server/player.c: remove call to draw() - socket code takes care of this.
+ socket/info.c: remove draw() - instead, draw_client_map() can be used,
+ as that is most the only thing draw() did anyways.
+ socket/loop.c: Update draw() calls to draw_client_map()
+ socket/request.c: Remove special handling for darkness==4 cases (first
+ space that is in full darkness) - this is extra complications and causes
+ display problems. Update draw_client_map() to include the little bit
+ of logic that draw() had that this function did not have.
+ MSW 2003-03-24
+
server/spell_effect.c: Some code cleanuip to cast_change_attr - mostly
to combine the processing of the stat improving spells together.
The actual change to playability is that bless and holy possession
Index: crossfire/common/glue.c
diff -c crossfire/common/glue.c:1.9 crossfire/common/glue.c:1.10
*** crossfire/common/glue.c:1.9 Thu Jan 16 20:38:35 2003
--- crossfire/common/glue.c Sun Mar 23 22:58:07 2003
***************
*** 1,6 ****
/*
* static char *rcsid_glue_c =
! * "$Id: glue.c,v 1.9 2003/01/17 04:38:35 garbled Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_glue_c =
! * "$Id: glue.c,v 1.10 2003/03/24 06:58:07 mwedel Exp $";
*/
/*
***************
*** 43,49 ****
type_func_map update_buttons_func;
type_func_int_int_ob_cchar draw_info_func;
type_move_apply_func move_apply_func;
- type_func_ob draw_func;
type_func_ob_ob monster_check_apply_func;
type_func_void init_blocksview_players_func;
type_func_int_map_char info_map_func;
--- 43,48 ----
***************
*** 84,90 ****
update_buttons_func = dummy_function_map;
draw_info_func = dummy_draw_info;
move_apply_func = dummy_move_apply_func;
- draw_func = dummy_function_ob;
monster_check_apply_func = dummy_function_ob2;
init_blocksview_players_func = dummy_function;
info_map_func = dummy_function_mapstr;
--- 83,88 ----
***************
*** 169,183 ****
void set_move_apply(type_move_apply_func addr) {
move_apply_func = addr;
- }
-
- /*
- * Specify which function to call to draw on the graphic-window
- * of a player.
- */
-
- void set_draw(type_func_ob addr) {
- draw_func = addr;
}
/*
--- 167,172 ----
Index: crossfire/lib/crossfire.0
Index: crossfire/lib/crossfire.1
Index: crossfire/lib/faces
diff -c crossfire/lib/faces:1.46 crossfire/lib/faces:1.47
*** crossfire/lib/faces:1.46 Sun Feb 23 23:38:59 2003
--- crossfire/lib/faces Sun Mar 23 22:58:33 2003
***************
*** 4911,4916 ****
--- 4911,4919 ----
face elf.151
color_fg black
end
+ face elf.152
+ color_fg black
+ end
face elf.171
color_fg black
end
***************
*** 8795,8806 ****
--- 8798,8815 ----
face orc_chief.111
color_fg black
end
+ face orc_chief.112
+ color_fg black
+ end
face orc_gen.111
color_fg red
end
face orc_leader.111
color_fg black
end
+ face orc_leader.112
+ color_fg black
+ end
face orcchop.111
magicmap red
end
***************
*** 11639,11644 ****
--- 11648,11659 ----
visibility 100
end
face temple1.411
+ visibility 100
+ end
+ face temple_ruin.311
+ visibility 100
+ end
+ face temple_ruin.411
visibility 100
end
face thaumaturg_desk.111
Index: crossfire/server/init.c
diff -c crossfire/server/init.c:1.47 crossfire/server/init.c:1.48
*** crossfire/server/init.c:1.47 Thu Feb 13 21:57:57 2003
--- crossfire/server/init.c Sun Mar 23 22:58:33 2003
***************
*** 1,6 ****
/*
* static char *rcsid_init_c =
! * "$Id: init.c,v 1.47 2003/02/14 05:57:57 garbled Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_init_c =
! * "$Id: init.c,v 1.48 2003/03/24 06:58:33 mwedel Exp $";
*/
/*
***************
*** 913,919 ****
set_update_buttons(update_buttons);
set_draw_info(new_draw_info);
set_move_apply(move_apply);
- set_draw(draw);
set_monster_check_apply(monster_check_apply);
set_move_teleporter(move_teleporter);
set_move_firewall(move_firewall);
--- 913,918 ----
***************
*** 923,929 ****
set_esrv_send_item(esrv_send_item);
set_esrv_del_item(esrv_del_item);
set_esrv_update_item(esrv_update_item);
- /* set_init_blocksview_players(init_blocksview_players); */
set_info_map(new_info_map);
set_set_darkness_map(set_darkness_map);
set_dragon_gain_func(dragon_ability_gain);
--- 922,927 ----
Index: crossfire/server/player.c
diff -c crossfire/server/player.c:1.126 crossfire/server/player.c:1.127
*** crossfire/server/player.c:1.126 Wed Mar 19 00:04:52 2003
--- crossfire/server/player.c Sun Mar 23 22:58:33 2003
***************
*** 1,6 ****
/*
* static char *rcsid_player_c =
! * "$Id: player.c,v 1.126 2003/03/19 08:04:52 mwedel Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_player_c =
! * "$Id: player.c,v 1.127 2003/03/24 06:58:33 mwedel Exp $";
*/
/*
***************
*** 998,1004 ****
int m=1-(RANDOM()&2);
if(move_ob(op,absdir(dir+diff*m),op)||
(diff==0&&move_ob(op,absdir(dir-diff*m),op))) {
- draw(op);
return;
}
}
--- 998,1003 ----
|
