Menu
▾
▴
crossfire-cvs — List for CVS update messages only.
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(187) |
Dec
(318) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(268) |
Feb
(231) |
Mar
(251) |
Apr
(372) |
May
(258) |
Jun
(197) |
Jul
(85) |
Aug
(175) |
Sep
(77) |
Oct
(213) |
Nov
(108) |
Dec
(53) |
| 2002 |
Jan
(38) |
Feb
(50) |
Mar
(32) |
Apr
(30) |
May
(34) |
Jun
(24) |
Jul
(42) |
Aug
(29) |
Sep
(58) |
Oct
(57) |
Nov
(73) |
Dec
(51) |
| 2003 |
Jan
(98) |
Feb
(64) |
Mar
(39) |
Apr
(38) |
May
(67) |
Jun
(39) |
Jul
(80) |
Aug
(21) |
Sep
(82) |
Oct
(85) |
Nov
(48) |
Dec
(30) |
| 2004 |
Jan
(29) |
Feb
(82) |
Mar
(43) |
Apr
(54) |
May
(60) |
Jun
(41) |
Jul
(23) |
Aug
(35) |
Sep
(55) |
Oct
(53) |
Nov
(18) |
Dec
(22) |
| 2005 |
Jan
(49) |
Feb
(28) |
Mar
(112) |
Apr
(60) |
May
(120) |
Jun
(67) |
Jul
(129) |
Aug
(67) |
Sep
(173) |
Oct
(221) |
Nov
(126) |
Dec
(198) |
| 2006 |
Jan
(172) |
Feb
(141) |
Mar
(54) |
Apr
(15) |
May
(60) |
Jun
(50) |
Jul
(79) |
Aug
(118) |
Sep
(114) |
Oct
(78) |
Nov
(56) |
Dec
(106) |
| 2007 |
Jan
(80) |
Feb
(268) |
Mar
(238) |
Apr
(222) |
May
(198) |
Jun
(178) |
Jul
(114) |
Aug
(234) |
Sep
(202) |
Oct
(141) |
Nov
(182) |
Dec
(446) |
| 2008 |
Jan
(260) |
Feb
(143) |
Mar
(210) |
Apr
(158) |
May
(342) |
Jun
(195) |
Jul
(309) |
Aug
(99) |
Sep
(154) |
Oct
(279) |
Nov
(555) |
Dec
(327) |
| 2009 |
Jan
(182) |
Feb
(289) |
Mar
(30) |
Apr
(51) |
May
(59) |
Jun
(304) |
Jul
(95) |
Aug
(50) |
Sep
(16) |
Oct
(44) |
Nov
(57) |
Dec
(27) |
| 2010 |
Jan
(59) |
Feb
(178) |
Mar
(220) |
Apr
(272) |
May
(297) |
Jun
(75) |
Jul
(104) |
Aug
(157) |
Sep
(247) |
Oct
(105) |
Nov
(100) |
Dec
(75) |
| 2011 |
Jan
(61) |
Feb
(32) |
Mar
(47) |
Apr
(79) |
May
(68) |
Jun
(247) |
Jul
(174) |
Aug
(98) |
Sep
(127) |
Oct
(198) |
Nov
(627) |
Dec
(421) |
| 2012 |
Jan
(521) |
Feb
(372) |
Mar
(489) |
Apr
(256) |
May
(143) |
Jun
(132) |
Jul
(74) |
Aug
(38) |
Sep
(42) |
Oct
(18) |
Nov
(58) |
Dec
(21) |
| 2013 |
Jan
(10) |
Feb
(10) |
Mar
(68) |
Apr
(50) |
May
(33) |
Jun
(17) |
Jul
(100) |
Aug
(111) |
Sep
(107) |
Oct
(21) |
Nov
(63) |
Dec
(53) |
| 2014 |
Jan
(29) |
Feb
(20) |
Mar
(39) |
Apr
(86) |
May
(122) |
Jun
(87) |
Jul
(7) |
Aug
(35) |
Sep
(40) |
Oct
(39) |
Nov
(21) |
Dec
(18) |
| 2015 |
Jan
(6) |
Feb
(56) |
Mar
(67) |
Apr
(24) |
May
(86) |
Jun
(5) |
Jul
(2) |
Aug
(17) |
Sep
(2) |
Oct
(14) |
Nov
(80) |
Dec
(97) |
| 2016 |
Jan
(9) |
Feb
(14) |
Mar
(3) |
Apr
(2) |
May
(45) |
Jun
(9) |
Jul
(5) |
Aug
(21) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(2) |
| 2017 |
Jan
(9) |
Feb
|
Mar
(7) |
Apr
|
May
(24) |
Jun
(35) |
Jul
(60) |
Aug
(44) |
Sep
(22) |
Oct
(1) |
Nov
(2) |
Dec
(2) |
| 2018 |
Jan
(21) |
Feb
(6) |
Mar
(1) |
Apr
(1) |
May
(11) |
Jun
(2) |
Jul
(1) |
Aug
(5) |
Sep
(11) |
Oct
(15) |
Nov
(4) |
Dec
(55) |
| 2019 |
Jan
(41) |
Feb
(9) |
Mar
(23) |
Apr
(25) |
May
(55) |
Jun
(82) |
Jul
(19) |
Aug
(81) |
Sep
(15) |
Oct
(11) |
Nov
(12) |
Dec
(37) |
| 2020 |
Jan
(11) |
Feb
(34) |
Mar
(77) |
Apr
(24) |
May
(6) |
Jun
(14) |
Jul
(4) |
Aug
(76) |
Sep
(141) |
Oct
(62) |
Nov
(46) |
Dec
(116) |
| 2021 |
Jan
(188) |
Feb
(134) |
Mar
(38) |
Apr
(55) |
May
(12) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
1
(1) |
2
(4) |
|
3
(1) |
4
|
5
|
6
|
7
|
8
(2) |
9
|
|
10
|
11
|
12
|
13
|
14
|
15
|
16
|
|
17
|
18
|
19
|
20
|
21
|
22
(1) |
23
(1) |
|
24
(1) |
25
|
26
|
27
(3) |
28
(3) |
29
|
30
(2) |
|
31
(2) |
|
|
|
|
|
|
|
From: <cro...@li...> - 2003-08-31 23:02:46
|
Module Name: maps Committed By: temitchell Date: Sun Aug 31 23:02:44 UTC 2003 Modified Files: maps/todd/aljwaf: ruins Log Message: - oops fix the paths for this map and this map set Start of context diffs Index: maps/todd/aljwaf/ruins diff -c maps/todd/aljwaf/ruins:1.2 maps/todd/aljwaf/ruins:1.3 *** maps/todd/aljwaf/ruins:1.2 Sat Oct 26 22:18:19 2002 --- maps/todd/aljwaf/ruins Sun Aug 31 16:02:44 2003 *************** *** 5904,5910 **** y 14 end arch ruins ! slaying /quests/todd/aljwaf/crypt2 hp 2 sp 2 x 22 --- 5904,5910 ---- y 14 end arch ruins ! slaying crypt2 hp 2 sp 2 x 22 *************** *** 6491,6497 **** y 10 end arch ruins ! slaying /quests/todd/aljwaf/crypt4 hp 8 sp 1 x 24 --- 6491,6497 ---- y 10 end arch ruins ! slaying crypt4 hp 8 sp 1 x 24 *************** *** 8749,8755 **** y 24 end arch ruins ! slaying /quests/todd/aljwaf/crypt3 hp 1 sp 1 x 31 --- 8749,8755 ---- y 24 end arch ruins ! slaying crypt3 hp 1 sp 1 x 31 *************** *** 11235,11241 **** msg You enter the ruined crypt. endmsg ! slaying /quests/todd/aljwaf/crypt hp 1 sp 1 x 39 --- 11235,11241 ---- msg You enter the ruined crypt. endmsg ! slaying crypt hp 1 sp 1 x 39 *************** *** 11276,11282 **** y 18 end arch ruins ! slaying /quests/todd/aljwaf/crypt5 hp 8 sp 3 x 39 --- 11276,11282 ---- y 18 end arch ruins ! slaying crypt5 hp 8 sp 3 x 39 *************** *** 13463,13469 **** y 18 end arch ruins ! slaying /quests/todd/aljwaf/crypt6 hp 1 sp 1 x 47 --- 13463,13469 ---- y 18 end arch ruins ! slaying crypt6 hp 1 sp 1 x 47 *************** *** 14143,14156 **** y 49 end arch ruined_tower ! slaying /quests/todd/aljwaf/tower2 hp 6 sp 12 x 21 y 26 end arch ruined_tower ! slaying /quests/todd/aljwaf/tower3 hp 6 sp 12 x 29 --- 14143,14156 ---- y 49 end arch ruined_tower ! slaying tower2 hp 6 sp 12 x 21 y 26 end arch ruined_tower ! slaying tower3 hp 6 sp 12 x 29 *************** *** 14161,14174 **** y 29 end arch ruined_tower ! slaying /quests/todd/aljwaf/tower1 hp 6 sp 12 x 31 y 36 end arch ruined_tower ! slaying /quests/todd/aljwaf/tower4 hp 6 sp 12 x 37 --- 14161,14174 ---- y 29 end arch ruined_tower ! slaying tower1 hp 6 sp 12 x 31 y 36 end arch ruined_tower ! slaying tower4 hp 6 sp 12 x 37 |
|
From: <cro...@li...> - 2003-08-31 09:48:21
|
Module Name: CFJavaEditor Committed By: avogl Date: Sun Aug 31 09:48:19 UTC 2003 Modified Files: CFJavaEditor/resource/HelpFiles: tut_map.html Log Message: Added a brief description in the online docu how to insert into the inventory of an object. Can be found in the section "Basics for Designing a Map". --AV Start of context diffs Index: CFJavaEditor/resource/HelpFiles/tut_map.html diff -c CFJavaEditor/resource/HelpFiles/tut_map.html:1.1 CFJavaEditor/resource/HelpFiles/tut_map.html:1.2 *** CFJavaEditor/resource/HelpFiles/tut_map.html:1.1 Fri Aug 16 11:48:34 2002 --- CFJavaEditor/resource/HelpFiles/tut_map.html Sun Aug 31 02:48:18 2003 *************** *** 1,7 **** <HTML> <HEAD> ! <META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac"> ! <TITLE>Credits</TITLE> </HEAD> <BODY> --- 1,6 ---- <HTML> <HEAD> ! <TITLE>Basics for Designing a Map</TITLE> </HEAD> <BODY> *************** *** 39,44 **** --- 38,50 ---- </P> <P> + To insert into the <B>inventory</B> of an object (often needed for containers and monsters), proceed as follows:<br> + In the left-side panel, select the object you want to insert. + On the map view or map-archpanel, select (highlight) the target object that you + want to insert into. Press the "Add Inv." button to insert. + </P> + + <P> To <B>delete</B> an object, simply middle click on it. You can drag the mouse to delete multiple objects. Deleting specific objects out of a stack is possible by middle-clicking in the map-archpanel.<br> *************** *** 56,60 **** --- 62,67 ---- the file "autojoin.txt" in order to have the autojoining feature work for all the available wall-styles.<br> </P> + </BODY> </HTML> |
|
From: <cro...@li...> - 2003-08-30 18:15:56
|
Module Name: arch Committed By: temitchell Date: Sat Aug 30 18:15:53 UTC 2003 Added Files: arch/system: duplicator.arc duplicator.base.111.png Start of context diffs Index: arch/system/duplicator.arc diff -c /dev/null arch/system/duplicator.arc:1.1 *** /dev/null Sat Aug 30 11:15:53 2003 --- arch/system/duplicator.arc Sat Aug 30 11:15:53 2003 *************** *** 0 **** --- 1,12 ---- + Object duplicator + name duplicator + face duplicator.111 + hp 1 + invisible 1 + color_fg blue + type 83 + activate_on_push 1 + activate_on_release 1 + no_pick 1 + editable 32 + end |
|
From: <cro...@li...> - 2003-08-30 18:13:43
|
Module Name: CFJavaEditor
Committed By: temitchell
Date: Sat Aug 30 18:13:40 UTC 2003
Modified Files:
CFJavaEditor/resource/conf: types.xml
Log Message:
-- change spelling of duplicator to match server code
Start of context diffs
Index: CFJavaEditor/resource/conf/types.xml
diff -c CFJavaEditor/resource/conf/types.xml:1.3 CFJavaEditor/resource/conf/types.xml:1.4
*** CFJavaEditor/resource/conf/types.xml:1.3 Sun May 4 11:38:45 2003
--- CFJavaEditor/resource/conf/types.xml Sat Aug 30 11:13:40 2003
***************
*** 1436,1461 ****
</type>
<!--####################################################################-->
! <type number="83" name="Dublicator">
<ignore>
<ignore_list name="system_object" />
</ignore>
<description><![CDATA[
! When activated, a dublicator can dublicate, multiply or destroy a pile of
! objects which lies somewhere on top of the dublicator.
! The dublicator has one arch name specified as <target arch>,
and only objects of this archetype can be affected.<br>
It will multiply the number of items in the pile, by the <multiply factor>.
If the latter is set to zero, it will destroy objects. ]]>
</description>
<use><![CDATA[
! I hope it is clear that one must be very cautious when inserting a dublicator
anywhere with <multiply factor> greater than one.
It is designed to be used for betting mechanisms only (bet -> win/loose).
! It is <b>not acceptable</b> to allow dublication of anything other than
coins, gold and jewels. Besides, it is very important that the chance to
loose the input matches the chance to earn winnings.<br>
! A dublicator with <multiply factor> 3 for example should have a
loosing rate of 2/3 = 67%. ]]>
</use>
<attribute arch="other_arch" editor="target arch" type="string">
--- 1436,1461 ----
</type>
<!--####################################################################-->
! <type number="83" name="Duplicator">
<ignore>
<ignore_list name="system_object" />
</ignore>
<description><![CDATA[
! When activated, a duplicator can duplicate, multiply or destroy a pile of
! objects which lies somewhere on top of the duplicator.
! The duplicator has one arch name specified as <target arch>,
and only objects of this archetype can be affected.<br>
It will multiply the number of items in the pile, by the <multiply factor>.
If the latter is set to zero, it will destroy objects. ]]>
</description>
<use><![CDATA[
! I hope it is clear that one must be very cautious when inserting a duplicator
anywhere with <multiply factor> greater than one.
It is designed to be used for betting mechanisms only (bet -> win/loose).
! It is <b>not acceptable</b> to allow duplication of anything other than
coins, gold and jewels. Besides, it is very important that the chance to
loose the input matches the chance to earn winnings.<br>
! A duplicator with <multiply factor> 3 for example should have a
loosing rate of 2/3 = 67%. ]]>
</use>
<attribute arch="other_arch" editor="target arch" type="string">
***************
*** 1469,1475 ****
</attribute>
<attribute arch="connected" editor="connection" type="int">
An activator (lever, altar, button, etc) with matching connection value
! is able to trigger this dublicator. Be very careful that players cannot
abuse it to create endless amounts of money or other valuable stuff!
</attribute>
</type>
--- 1469,1475 ----
</attribute>
<attribute arch="connected" editor="connection" type="int">
An activator (lever, altar, button, etc) with matching connection value
! is able to trigger this duplicator. Be very careful that players cannot
abuse it to create endless amounts of money or other valuable stuff!
</attribute>
</type>
***************
*** 4789,4792 ****
</attribute>
</type>
! </types>
--- 4789,4792 ----
</attribute>
</type>
! </types>
|
|
From: <cro...@li...> - 2003-08-28 02:06:42
|
Module Name: crossfire
Committed By: temitchell
Date: Thu Aug 28 02:06:41 UTC 2003
Modified Files:
crossfire/lib: treasures
Log Message:
- oops no brains yet...
Start of context diffs
Index: crossfire/lib/treasures
diff -c crossfire/lib/treasures:1.64 crossfire/lib/treasures:1.65
*** crossfire/lib/treasures:1.64 Wed Aug 27 19:03:03 2003
--- crossfire/lib/treasures Wed Aug 27 19:06:41 2003
***************
*** 1,6 ****
# This file contains various treasures, with generation rules.
#
! # $Id: treasures,v 1.64 2003/08/28 02:03:03 temitchell Exp $
#
# As of version 0.91.1, what this file was extended to handle list
# re-linking and generation of only 1 item on that list. This does away
--- 1,6 ----
# This file contains various treasures, with generation rules.
#
! # $Id: treasures,v 1.65 2003/08/28 02:06:41 temitchell Exp $
#
# As of version 0.91.1, what this file was extended to handle list
# re-linking and generation of only 1 item on that list. This does away
***************
*** 595,603 ****
more
arch tooth
chance 10
- more
- arch brain
- chance 3
end
# gnoll/giant parts
treasureone giant_parts
--- 595,600 ----
|
|
From: <cro...@li...> - 2003-08-28 02:03:34
|
Module Name: crossfire
Committed By: temitchell
Date: Thu Aug 28 02:03:03 UTC 2003
Modified Files:
crossfire/lib: treasures
Log Message:
- add ape treasures
Start of context diffs
Index: crossfire/lib/treasures
diff -c crossfire/lib/treasures:1.63 crossfire/lib/treasures:1.64
*** crossfire/lib/treasures:1.63 Tue May 27 07:21:44 2003
--- crossfire/lib/treasures Wed Aug 27 19:03:03 2003
***************
*** 1,6 ****
# This file contains various treasures, with generation rules.
#
! # $Id: treasures,v 1.63 2003/05/27 14:21:44 avogl Exp $
#
# As of version 0.91.1, what this file was extended to handle list
# re-linking and generation of only 1 item on that list. This does away
--- 1,6 ----
# This file contains various treasures, with generation rules.
#
! # $Id: treasures,v 1.64 2003/08/28 02:03:03 temitchell Exp $
#
# As of version 0.91.1, what this file was extended to handle list
# re-linking and generation of only 1 item on that list. This does away
***************
*** 586,591 ****
--- 586,604 ----
arch grat_pelt
chance 10
end
+ treasureone ape_parts
+ arch liver
+ chance 20
+ more
+ arch heart
+ chance 10
+ more
+ arch tooth
+ chance 10
+ more
+ arch brain
+ chance 3
+ end
# gnoll/giant parts
treasureone giant_parts
arch fl_corpse
***************
*** 2597,2602 ****
--- 2610,2619 ----
treasure bear
list bear_parts
chance 40
+ end
+ treasure ape
+ list ape_parts
+ chance 25
end
treasure dwolf
list dwolf_parts
|
|
From: <cro...@li...> - 2003-08-28 01:45:33
|
Module Name: arch Committed By: temitchell Date: Thu Aug 28 01:45:27 UTC 2003 Added Files: arch/monster/animal: ape.arc ape.base.131.png ape.base.132.png ape.base.171.png ape.base.172.png Log Message: - a dancing ape - I animated the nethack/slashem ape FYI... Start of context diffs Index: arch/monster/animal/ape.arc diff -c /dev/null arch/monster/animal/ape.arc:1.1 *** /dev/null Wed Aug 27 18:45:27 2003 --- arch/monster/animal/ape.arc Wed Aug 27 18:45:27 2003 *************** *** 0 **** --- 1,37 ---- + Object ape + name ape + randomitems ape + race animal + face ape.171 + anim + facings 2 + ape.131 + ape.132 + ape.171 + ape.172 + mina + monster 1 + sleep 1 + no_pick 1 + alive 1 + exp 200 + level 7 + ac 0 + wc 5 + hp 260 + maxhp 260 + Con 2 + Wis 6 + Str 24 + Dex 25 + Int 8 + dam 30 + speed -0.2 + resist_electricity 30 + resist_physical 20 + weight 140000 + run_away 35 + can_apply 24 + editable 1 + magicmap brown + end |
|
From: <cro...@li...> - 2003-08-27 04:33:21
|
Module Name: arch Committed By: temitchell Date: Wed Aug 27 04:31:59 UTC 2003 Modified Files: arch/monster/humanoid/Class: pirate.clsc.111.png pirate.clsc.112.png Log Message: - classic pirates. Start of context diffs Index: arch/monster/humanoid/Class/pirate.clsc.111.png |
|
From: <cro...@li...> - 2003-08-27 04:03:02
|
Module Name: arch Committed By: temitchell Date: Wed Aug 27 04:02:58 UTC 2003 Modified Files: arch/monster/humanoid/Class: northman.arc pirate.arc pirate.base.111.png pirate.base.112.png Log Message: - Introducing the new 2003 pirate, notice the jaunty moustache... Start of context diffs Index: arch/monster/humanoid/Class/northman.arc diff -c arch/monster/humanoid/Class/northman.arc:1.1 arch/monster/humanoid/Class/northman.arc:1.2 *** arch/monster/humanoid/Class/northman.arc:1.1 Sun Jun 15 23:31:15 2003 --- arch/monster/humanoid/Class/northman.arc Tue Aug 26 21:02:57 2003 *************** *** 24,30 **** hp 50 maxhp 50 exp 40 ! speed 0.15 weight 50000 level 3 editable 1 --- 24,30 ---- hp 50 maxhp 50 exp 40 ! speed -0.15 weight 50000 level 3 editable 1 |
|
From: <cro...@li...> - 2003-08-27 00:00:56
|
Module Name: crossfire
Committed By: temitchell
Date: Wed Aug 27 00:00:47 UTC 2003
Modified Files:
crossfire: ChangeLog
crossfire/common: init.c
crossfire/include: config.h global.h
crossfire/lib: settings
crossfire/server: attack.c c_misc.c init.c
Added Files:
crossfire/lib/help: peaceful
Log Message:
Added friendly_fire to attack.c, called from hit_player.
Will put a cap on maxdam that is a percentage (1-100%)
of damage (min 1)based on SET_FRIENDLY_FIRE value (in settings)when
players attack other players in peaceful mode. Changed who, statistics
commands to show this setting better and added a help file for peaceful.
It would be nice to have a indicator (even a toggle button?)in the
client for this as well.
Start of context diffs
Index: crossfire/ChangeLog
diff -c crossfire/ChangeLog:1.71 crossfire/ChangeLog:1.72
*** crossfire/ChangeLog:1.71 Tue Jul 8 05:45:04 2003
--- crossfire/ChangeLog Tue Aug 26 17:00:44 2003
***************
*** 17,22 ****
--- 17,30 ----
------------------------------------------------------------------------------
Changes for CVS:
+ friendly_fire:
+ Added friendly_fire to attack.c, called from hit_player.
+ Will put a cap on maxdam that is a percentage (1-100%) of damage (min 1)
+ based on SET_FRIENDLY_FIRE value when players attack in peaceful mode.
+ Changed who, statistics to show this setting better and added help file for peaceful.
+ It would be nice to have a indicator in the client for this as well.
+ TM - 2003-08-25
+
protocol/doc/code:
Changed the way smoothing is done. Switched the smooth
command to binary mode, rebuild archetype files, added doc
***************
*** 8774,8777 ****
Have it re-draw the look window when you middle click on something (ie
apply) in that window. This fixes a bug with bags/sacks, of it
not updating when an item is used directly from a sack.
-
--- 8782,8784 ----
Index: crossfire/common/init.c
diff -c crossfire/common/init.c:1.31 crossfire/common/init.c:1.32
*** crossfire/common/init.c:1.31 Thu Jun 19 03:59:26 2003
--- crossfire/common/init.c Tue Aug 26 17:00:45 2003
***************
*** 1,6 ****
/*
* static char *rcsid_init_c =
! * "$Id: init.c,v 1.31 2003/06/19 10:59:26 tchize Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_init_c =
! * "$Id: init.c,v 1.32 2003/08/27 00:00:45 temitchell Exp $";
*/
/*
***************
*** 69,74 ****
--- 69,75 ----
RECYCLE_TMP_MAPS,
EXPLORE_MODE,
SPELLPOINT_LEVEL_DEPEND,
+ SET_FRIENDLY_FIRE,
MOTD,
"", /* DM_MAIL */
0, /* This and the next 3 values are metaserver values */
***************
*** 411,414 ****
LOG(llevDebug, "got %d messages in %d categories.\n", total, mess+1);
close_and_delete(fp, comp);
}
-
--- 412,414 ----
Index: crossfire/include/config.h
diff -c crossfire/include/config.h:1.55 crossfire/include/config.h:1.56
*** crossfire/include/config.h:1.55 Fri Jul 25 19:10:40 2003
--- crossfire/include/config.h Tue Aug 26 17:00:45 2003
***************
*** 1,6 ****
/*
* static char *rcsid_config_h =
! * "$Id: config.h,v 1.55 2003/07/26 02:10:40 temitchell Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_config_h =
! * "$Id: config.h,v 1.56 2003/08/27 00:00:45 temitchell Exp $";
*/
/*
***************
*** 132,137 ****
--- 132,138 ----
#define EXPLORE_MODE FALSE
#define STAT_LOSS_ON_DEATH FALSE
#define CASTING_TIME FALSE
+ #define SET_FRIENDLY_FIRE 5
/* you can edit the ones below */
Index: crossfire/include/global.h
diff -c crossfire/include/global.h:1.42 crossfire/include/global.h:1.43
*** crossfire/include/global.h:1.42 Sat Aug 2 09:25:22 2003
--- crossfire/include/global.h Tue Aug 26 17:00:45 2003
***************
*** 1,6 ****
/*
* static char *rcsid_global_h =
! * "$Id: global.h,v 1.42 2003/08/02 16:25:22 tchize Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_global_h =
! * "$Id: global.h,v 1.43 2003/08/27 00:00:45 temitchell Exp $";
*/
/*
***************
*** 325,330 ****
--- 325,331 ----
uint8 search_items; /* search_items command */
uint8 spell_encumbrance; /* encumbrance effects spells */
uint8 spell_failure_effects; /* nasty backlash to spell failures */
+ uint16 set_friendly_fire; /* Percent of damage done by peaceful player vs player damage */
uint8 casting_time; /* it takes awhile to cast a spell */
uint8 real_wiz; /* use mud-like wizards */
uint8 recycle_tmp_maps; /* re-use tmp maps. */
Index: crossfire/lib/settings
diff -c crossfire/lib/settings:1.10 crossfire/lib/settings:1.11
*** crossfire/lib/settings:1.10 Thu Jun 19 03:59:33 2003
--- crossfire/lib/settings Tue Aug 26 17:00:46 2003
***************
*** 173,175 ****
--- 173,181 ----
use_permanent_experience false
+ # This allows reduced damage against other players when in
+ # peaceful mode. The value is the percent of damage done
+ # compared to normal. This does not change damage done
+ # by not targeted things like walls, explosions, cone spells, disease, poison...
+
+ set_friendly_fire 5
Index: crossfire/lib/help/peaceful
diff -c /dev/null crossfire/lib/help/peaceful:1.1
*** /dev/null Tue Aug 26 17:00:48 2003
--- crossfire/lib/help/peaceful Tue Aug 26 17:00:46 2003
***************
*** 0 ****
--- 1,8 ----
+ The 'peaceful' command will switch you between peaceful and hostile attack modes.
+
+ When peaceful is on you will not automatically attack other player when bumping into them and will do reduced damage against other players if you do attack them (friendly fire).
+ Having peaceful mode on only lowers damage against other players, it has no effect on damage done to monsters or other NPCs, so it is generally advisable to remain in peaceful mode unless you are looking for trouble.
+ It is still entirely possible to kill other players when in peaceful mode so you should still be careful when interacting with other players.
+ Hostile mode (peaceful off) will enable melee combat when bumping into other players and does normal damage for other attacks as well.
+
+ Damage done by area effect attacks like cone spells, explosive detonations, fireballs, poisons, cloud or swarm attacks, runes or disease are not modified by peaceful/hostile mode.
Index: crossfire/server/attack.c
diff -c crossfire/server/attack.c:1.89 crossfire/server/attack.c:1.90
*** crossfire/server/attack.c:1.89 Thu Jun 26 04:27:43 2003
--- crossfire/server/attack.c Tue Aug 26 17:00:46 2003
***************
*** 1,6 ****
/*
* static char *rcsid_attack_c =
! * "$Id: attack.c,v 1.89 2003/06/26 11:27:43 gros Exp $";
*/
/*
CrossFire, A Multiplayer game for X-windows
--- 1,6 ----
/*
* static char *rcsid_attack_c =
! * "$Id: attack.c,v 1.90 2003/08/27 00:00:46 temitchell Exp $";
*/
/*
CrossFire, A Multiplayer game for X-windows
***************
*** 1574,1579 ****
--- 1574,1612 ----
return maxdam;
}
+ /* Find out if this is friendly fire (PVP and attacker is peaceful) or not
+ * Returns 0 this is not friendly fire
+ */
+
+ int friendly_fire(object *op, object *hitter){
+ object *owner;
+ int friendlyfire;
+
+ if (hitter->head) hitter=hitter->head;
+
+ friendlyfire = 0;
+
+ if(op->type == PLAYER){
+
+ if(hitter->type == PLAYER && hitter->contr->peaceful == 1)
+ return 1;
+
+ if(owner = get_owner(hitter)){
+ if(owner->type == PLAYER && owner->contr->peaceful == 1)
+ friendlyfire = 2;
+ }
+
+ if(hitter->type == CONE || hitter->type == FBALL || hitter->type == FIREWALL
+ || hitter->type == SWARM_SPELL || hitter->type == POISONCLOUD
+ || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)
+
+ friendlyfire = 0;
+ }
+
+ return friendlyfire;
+ }
+
+
/* This isn't used just for players, but in fact most objects.
* op is the object to be hit, dam is the amount of damage, hitter
* is what is hitting the object, and type is the attacktype.
***************
*** 1591,1596 ****
--- 1624,1630 ----
int simple_attack;
tag_t op_tag, hitter_tag;
int rtn_kill = 0;
+ int friendlyfire;
if (get_attack_mode (&op, &hitter, &simple_attack))
return 0;
***************
*** 1702,1708 ****
maxdam = ndam;
maxattacktype = 1<<attacknum;
}
! }
}
#ifdef ATTACK_DEBUG
--- 1736,1754 ----
maxdam = ndam;
maxattacktype = 1<<attacknum;
}
!
! /* if this is friendly fire then do a set % of damage only*/
! friendlyfire = friendly_fire(op, hitter);
! if (friendlyfire){
!
! maxdam = ((dam * settings.set_friendly_fire) / 100)+1;
!
! #ifdef ATTACK_DEBUG
! LOG(llevDebug,"Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
! friendlyfire, settings.set_friendly_fire, dam, maxdam);
! #endif
! }
! }
}
#ifdef ATTACK_DEBUG
***************
*** 2120,2124 ****
||op->type==FBULLET||op->type==FBALL))
return 1;
return 0;
! }
!
--- 2166,2169 ----
||op->type==FBULLET||op->type==FBALL))
return 1;
return 0;
! }
Index: crossfire/server/c_misc.c
diff -c crossfire/server/c_misc.c:1.33 crossfire/server/c_misc.c:1.34
*** crossfire/server/c_misc.c:1.33 Mon Jun 30 12:59:20 2003
--- crossfire/server/c_misc.c Tue Aug 26 17:00:47 2003
***************
*** 1,6 ****
/*
* static char *rcsid_c_misc_c =
! * "$Id: c_misc.c,v 1.33 2003/06/30 19:59:20 tchize Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_c_misc_c =
! * "$Id: c_misc.c,v 1.34 2003/08/27 00:00:47 temitchell Exp $";
*/
/*
***************
*** 265,278 ****
pl->socket.host,
pl->ob->map->path,
QUERY_FLAG(pl->ob,FLAG_WIZ)?" [WIZ]":"",
! pl->peaceful?"P":"W",pl->ob->count);
else
! (void) sprintf(buf,"%s the %s (@%s) [%s]%s%s",pl->ob->name,
(pl->own_title[0]=='\0'?pl->title:pl->own_title),
- pl->socket.host,
pl->ob->map->path,
QUERY_FLAG(pl->ob,FLAG_WIZ)?" [WIZ]":"",
! pl->peaceful?"P":"W");
new_draw_info(NDI_UNIQUE, 0,op,buf);
}
}
--- 265,277 ----
pl->socket.host,
pl->ob->map->path,
QUERY_FLAG(pl->ob,FLAG_WIZ)?" [WIZ]":"",
! pl->peaceful?"Peaceful":"Hostile",pl->ob->count);
else
! (void) sprintf(buf,"%s the %s [%s]%s%s",pl->ob->name,
(pl->own_title[0]=='\0'?pl->title:pl->own_title),
pl->ob->map->path,
QUERY_FLAG(pl->ob,FLAG_WIZ)?" [WIZ]":"",
! pl->peaceful?"Peaceful":"Hostile");
new_draw_info(NDI_UNIQUE, 0,op,buf);
}
}
***************
*** 633,639 ****
pl->contr->orig_stats.Pow, pl->stats.Pow, 20+pl->arch->clone.stats.Pow);
new_draw_info_format(NDI_UNIQUE, 0, pl, "Cha %2d/ %3d/%3d",
pl->contr->orig_stats.Cha, pl->stats.Cha, 20+pl->arch->clone.stats.Cha);
!
/* Can't think of anything else to print right now */
return 0;
}
--- 632,639 ----
pl->contr->orig_stats.Pow, pl->stats.Pow, 20+pl->arch->clone.stats.Pow);
new_draw_info_format(NDI_UNIQUE, 0, pl, "Cha %2d/ %3d/%3d",
pl->contr->orig_stats.Cha, pl->stats.Cha, 20+pl->arch->clone.stats.Cha);
! new_draw_info_format(NDI_UNIQUE, 0, pl, "\nAttack Mode: %s",pl->contr->peaceful? "Peaceful":"Hostile");
!
/* Can't think of anything else to print right now */
return 0;
}
Index: crossfire/server/init.c
diff -c crossfire/server/init.c:1.48 crossfire/server/init.c:1.49
*** crossfire/server/init.c:1.48 Sun Mar 23 22:58:33 2003
--- crossfire/server/init.c Tue Aug 26 17:00:47 2003
***************
*** 1,6 ****
/*
* static char *rcsid_init_c =
! * "$Id: init.c,v 1.48 2003/03/24 06:58:33 mwedel Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_init_c =
! * "$Id: init.c,v 1.49 2003/08/27 00:00:47 temitchell Exp $";
*/
/*
***************
*** 584,589 ****
--- 584,597 ----
LOG(llevError,"load_settings: Unkown value for simple_exp: %s\n",
cp);
}
+ } else if (!strcasecmp(buf, "set_friendly_fire")) {
+ int val = atoi(cp);
+
+ if (val < 1 || val >100)
+ LOG(llevError, "load_settings: set_friendly_fire must be between 1 an 100"
+ ", %d is invalid\n", val);
+ else
+ settings.set_friendly_fire = val;
} else {
LOG(llevError,"Unknown value in settings file: %s\n", buf);
}
***************
*** 1051,1054 ****
return test;
}
-
--- 1059,1061 ----
|
|
From: <cro...@li...> - 2003-08-24 16:01:38
|
Module Name: crossfire
Committed By: temitchell
Date: Sat Aug 23 16:17:20 UTC 2003
Modified Files:
crossfire/common: map.c
Log Message:
- fix this as per authors request (Nicolas Weeger).
Start of context diffs
Index: crossfire/common/map.c
diff -c crossfire/common/map.c:1.56 crossfire/common/map.c:1.57
*** crossfire/common/map.c:1.56 Sat Aug 2 09:25:23 2003
--- crossfire/common/map.c Sat Aug 23 09:17:19 2003
***************
*** 1,6 ****
/*
* static char *rcsid_map_c =
! * "$Id: map.c,v 1.56 2003/08/02 16:25:23 tchize Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_map_c =
! * "$Id: map.c,v 1.57 2003/08/23 16:17:19 temitchell Exp $";
*/
/*
***************
*** 188,194 ****
else
strcpy(buf, name);
#ifdef WIN32 /* ***win32: check this sucker in windows style. */
! return(_access(name,0));
#else
/* old method (strchr(buf, '\0')) seemd very odd to me -
--- 188,194 ----
else
strcpy(buf, name);
#ifdef WIN32 /* ***win32: check this sucker in windows style. */
! return(_access(buf,0));
#else
/* old method (strchr(buf, '\0')) seemd very odd to me -
|
|
From: <cro...@li...> - 2003-08-23 17:37:54
|
Module Name: crossfire
Committed By: temitchell
Date: Sat Aug 23 17:37:53 UTC 2003
Modified Files:
crossfire/server: win32.c
Log Message:
- commit patch by Nicolas Weeger to fix random maps on win32
Start of context diffs
Index: crossfire/server/win32.c
diff -c crossfire/server/win32.c:1.2 crossfire/server/win32.c:1.3
*** crossfire/server/win32.c:1.2 Fri Apr 6 12:07:27 2001
--- crossfire/server/win32.c Sat Aug 23 10:37:53 2003
***************
*** 102,107 ****
--- 102,110 ----
if (dp->offset != 0) {
if (_findnext(dp->handle, &(dp->fileinfo)) < 0) {
dp->finished = 1;
+ if (ENOENT == errno)
+ /* Clear error set to mean no more files else that breaks things */
+ errno = 0;
return NULL;
}
}
***************
*** 109,115 ****
strncpy(dp->dent.d_name, dp->fileinfo.name, _MAX_FNAME);
dp->dent.d_ino = 1;
! dp->dent.d_reclen = strlen(dp->dent.d_name);
dp->dent.d_off = dp->offset;
return &(dp->dent);
--- 112,119 ----
strncpy(dp->dent.d_name, dp->fileinfo.name, _MAX_FNAME);
dp->dent.d_ino = 1;
! /* reclen is used as meaning the length of the whole record */
! dp->dent.d_reclen = strlen(dp->dent.d_name) + sizeof(char) + sizeof(dp->dent.d_ino) + sizeof(dp->dent.d_reclen) + sizeof(dp->dent.d_off);
dp->dent.d_off = dp->offset;
return &(dp->dent);
|
|
From: <cro...@li...> - 2003-08-22 10:22:16
|
Module Name: crossfire
Committed By: temitchell
Date: Thu Aug 21 20:00:08 UTC 2003
Modified Files:
crossfire/server: c_wiz.c
Log Message:
- moved get_other_player_from_name to beginning of the file to clear
"assignment makes pointer from int without a cast" warnings up.
Start of context diffs
Index: crossfire/server/c_wiz.c
diff -c crossfire/server/c_wiz.c:1.34 crossfire/server/c_wiz.c:1.35
*** crossfire/server/c_wiz.c:1.34 Fri Jul 25 19:10:40 2003
--- crossfire/server/c_wiz.c Thu Aug 21 13:00:07 2003
***************
*** 1,6 ****
/*
* static char *rcsid_c_wiz_c =
! * "$Id: c_wiz.c,v 1.34 2003/07/26 02:10:40 temitchell Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_c_wiz_c =
! * "$Id: c_wiz.c,v 1.35 2003/08/21 20:00:07 temitchell Exp $";
*/
/*
***************
*** 42,47 ****
--- 42,80 ----
#include <treasure.h>
#include <skills.h>
+ /* Enough of the DM functions seem to need this that I broke
+ * it out to a seperate function. name is the person
+ * being saught, rq is who is looking for them. This
+ * prints diagnostics messages, and returns the
+ * other player, or NULL otherwise.
+ */
+ static player *get_other_player_from_name(object *op, char *name)
+ {
+ player *pl;
+
+ if (!name) return NULL;
+
+ for(pl=first_player;pl!=NULL;pl=pl->next)
+ if(!strncmp(pl->ob->name, name, MAX_NAME))
+ break;
+
+ if(pl==NULL) {
+ new_draw_info(NDI_UNIQUE, 0,op,"No such player.");
+ return NULL;
+ }
+
+ if (pl->ob == op) {
+ new_draw_info(NDI_UNIQUE, 0, op, "You can't do that to yourself.");
+ return NULL;
+ }
+ if(pl->state != ST_PLAYING) {
+ new_draw_info(NDI_UNIQUE, 0,op,"That player is in no state for that right now.");
+ return NULL;
+ }
+ return pl;
+ }
+
+
int command_loadtest(object *op, char *params){
int x,y;
char buf[1024];
***************
*** 318,357 ****
}
}
return 1;
! }
!
!
! /* Enough of the DM functions seem to need this that I broke
! * it out to a seperate function. name is the person
! * being saught, rq is who is looking for them. This
! * prints diagnostics messages, and returns the
! * other player, or NULL otherwise.
! */
! static player *get_other_player_from_name(object *op, char *name)
! {
! player *pl;
!
! if (!name) return NULL;
!
! for(pl=first_player;pl!=NULL;pl=pl->next)
! if(!strncmp(pl->ob->name, name, MAX_NAME))
! break;
!
! if(pl==NULL) {
! new_draw_info(NDI_UNIQUE, 0,op,"No such player.");
! return NULL;
! }
!
! if (pl->ob == op) {
! new_draw_info(NDI_UNIQUE, 0, op, "You can't do that to yourself.");
! return NULL;
! }
! if(pl->state != ST_PLAYING) {
! new_draw_info(NDI_UNIQUE, 0,op,"That player is in no state for that right now.");
! return NULL;
! }
! return pl;
! }
int command_freeze(object *op, char *params)
{
--- 351,357 ----
}
}
return 1;
! }
int command_freeze(object *op, char *params)
{
|
|
From: <cro...@li...> - 2003-08-08 17:49:32
|
Module Name: crossfire
Committed By: tchize
Date: Fri Aug 8 17:49:31 UTC 2003
Modified Files:
crossfire/common: loader.c loader.l
crossfire/socket: request.c
Log Message:
Comments cleanup in the FASTCAT saving code (long waited by mwedel i
suppose :P) and in the smoothing map1function
The following files had too many changes to show the context diffs here:
cvs rdiff -r1.46 -r1.47 crossfire/common/loader.c
cvs rdiff -r1.47 -r1.48 crossfire/common/loader.l
Start of context diffs
Index: crossfire/socket/request.c
diff -c crossfire/socket/request.c:1.50 crossfire/socket/request.c:1.51
*** crossfire/socket/request.c:1.50 Tue Jul 8 05:45:28 2003
--- crossfire/socket/request.c Fri Aug 8 10:49:31 2003
***************
*** 1,6 ****
/*
* static char *rcsid_init_c =
! * "$Id: request.c,v 1.50 2003/07/08 12:45:28 tchize Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_init_c =
! * "$Id: request.c,v 1.51 2003/08/08 17:49:31 tchize Exp $";
*/
/*
***************
*** 549,555 ****
*/
if(!strcmp(" CF DX CLIENT", cp) || ns->sc_version < 1024 )
{
! sprintf(version_warning,"drawinfo %d %s", NDI_RED, "**** VERSION WARNING ****\n**** CLIENT IS TO OLD!! UPDATE THE CLIENT!! ****");
Write_String_To_Socket(ns, version_warning, strlen(version_warning));
}
--- 549,555 ----
*/
if(!strcmp(" CF DX CLIENT", cp) || ns->sc_version < 1024 )
{
! sprintf(version_warning,"drawinfo %d %s", NDI_RED, "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
Write_String_To_Socket(ns, version_warning, strlen(version_warning));
}
***************
*** 1008,1014 ****
{
short face_num;
! if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
else
face_num = 0;
--- 1008,1014 ----
{
short face_num;
! if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
else
face_num = 0;
***************
*** 1223,1279 ****
ob=NULL;
head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
- /* Check to see if this head is part of the set of objects
- * we would normally send for this space. If so, then
- * don't use the head value. We need to do the check
- * here and not when setting up the heads[] value for two reasons -
- * 1) the heads[] values will get used even if the space is not visible.
- * 2) its possible the head is not on the same map as a part, and I'd
- * rather not need to do the map translation overhead.
- */
- /*if (head) {
- for (i=0; i<MAP_LAYERS; i++)
- if (GET_MAP_FACE_OBJ(mp, mx, my, i) &&
- GET_MAP_FACE_OBJ(mp, mx, my, i)->face == head->face) {
- heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
- head = NULL;
- break;
- }
- }
! ob = head;*/
! if (!ob) ob = GET_MAP_FACE_OBJ(mp, mx, my, layer);
/* If there is no object for this space, or if the face for the object
! * is the blank face, set the face number to zero.
! * else if we have the stored head object for this space, that takes
! * precedence over the other object for this space.
! * otherwise, we do special head processing
*/
if (!ob || ob->face == blank_face) smoothlevel=0;
else {
- /* if the faces for the different parts of a multipart object
- * are the same, we only want to send the bottom right most
- * portion of the object. That info is in the tail_.. values
- * of the head. Note that for the head itself, ob->head will
- * be null, so we only do this block if we are working on
- * a tail piece.
- */
-
- {
- /* In this case, we are already at the lower right or single part object,
- * so nothing special
- */
smoothlevel = ob->smoothlevel;
-
- /* clear out any head entries that have the same face as this one */
- /* useless in update_smooth
- for (bx=0; bx<layer; bx++)
- if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
- heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
- heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
- */
- }
} /* else not already head object or blank face */
/* We've gotten what face we want to use for the object. Now see if
--- 1223,1237 ----
ob=NULL;
head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
! ob = GET_MAP_FACE_OBJ(mp, mx, my, layer);
/* If there is no object for this space, or if the face for the object
! * is the blank face, set the smoothlevel to zero.
*/
if (!ob || ob->face == blank_face) smoothlevel=0;
else {
smoothlevel = ob->smoothlevel;
} /* else not already head object or blank face */
/* We've gotten what face we want to use for the object. Now see if
***************
*** 1294,1307 ****
/* returns the size of a data for a map square as returned by
* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
* available.
! */
int getExtendedMapInfoSize(NewSocket* ns){
int result=0;
if (ns->ext_mapinfos){
if (ns->EMI_smooth)
result+=1; /*One byte for smoothlevel*/
}
! return result;
}
/* this function uses the new map1 protocol command to send the map
* to the client. It is necessary because the old map command supports
--- 1252,1265 ----
/* returns the size of a data for a map square as returned by
* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
* available.
! */
int getExtendedMapInfoSize(NewSocket* ns){
int result=0;
if (ns->ext_mapinfos){
if (ns->EMI_smooth)
result+=1; /*One byte for smoothlevel*/
}
! return result;
}
/* this function uses the new map1 protocol command to send the map
* to the client. It is necessary because the old map command supports
***************
*** 1327,1333 ****
void draw_client_map1(object *pl)
{
int x,y,ax, ay, d, nx,ny, startlen, max_x, max_y, oldlen;
! int estartlen, eoldlen;
SockList sl;
SockList esl; /*For extended Map info*/
uint16 mask,emask,eentrysize;
--- 1285,1291 ----
void draw_client_map1(object *pl)
{
int x,y,ax, ay, d, nx,ny, startlen, max_x, max_y, oldlen;
! int estartlen, eoldlen;
SockList sl;
SockList esl; /*For extended Map info*/
uint16 mask,emask,eentrysize;
***************
*** 1573,1579 ****
if (emask & 0xf) {
esl.buf[eoldlen+1] = emask & 0xff;
} else {
- /*printf ("rollbacking esl %d on %d \n",eoldlen,estartlen);*/
esl.len = eoldlen;
}
} /* else this is a viewable space */
--- 1531,1536 ----
|
|
From: <cro...@li...> - 2003-08-08 17:06:41
|
Module Name: client
Committed By: tchize
Date: Fri Aug 8 17:06:40 UTC 2003
Modified Files:
client/gtk: map.c
Log Message:
Fixed a bug in gtk client which cleared multipart object when tail was
scrolling in the map.
Start of context diffs
Index: client/gtk/map.c
diff -c client/gtk/map.c:1.15 client/gtk/map.c:1.16
*** client/gtk/map.c:1.15 Wed Jul 16 05:36:31 2003
--- client/gtk/map.c Fri Aug 8 10:06:40 2003
***************
*** 1,6 ****
/*
* static char *rcsid_map_c =
! * "$Id: map.c,v 1.15 2003/07/16 12:36:31 tchize Exp $";
*/
/*
Crossfire client, a client program for the crossfire program.
--- 1,6 ----
/*
* static char *rcsid_map_c =
! * "$Id: map.c,v 1.16 2003/08/08 17:06:40 tchize Exp $";
*/
/*
Crossfire client, a client program for the crossfire program.
***************
*** 355,363 ****
if( x < 0 || y < 0 || x >= the_map.x || y >= the_map.y)
continue;
!
the_map.cells[x][y].need_update= 1;
! the_map.cells[x][y].cleared= 1;
}
} /* for y */
} /* for x */
--- 355,370 ----
if( x < 0 || y < 0 || x >= the_map.x || y >= the_map.y)
continue;
!
the_map.cells[x][y].need_update= 1;
! /*After long long long investigations on why the multipart objects did
! disappear when entering map view from right or bottom, scrolling
! through whole server code, i concluded the following line should be
! commented. If a multipart object was on a square outside of map,
! containing the tail, tail may be cleared by following process and
! so we end up with things like tower disappearance.
! tc...@my...*/
! /*the_map.cells[x][y].cleared= 1;*/
}
} /* for y */
} /* for x */
***************
*** 365,371 ****
#ifdef HAVE_SDL
if (use_config[CONFIG_SDL])
sdl_mapscroll(dx,dy);
! else
#endif
map_did_scroll = 1;
/* fprintf(stderr,"scroll command: %d %d\n", dx, dy);*/
--- 372,378 ----
#ifdef HAVE_SDL
if (use_config[CONFIG_SDL])
sdl_mapscroll(dx,dy);
! else
#endif
map_did_scroll = 1;
/* fprintf(stderr,"scroll command: %d %d\n", dx, dy);*/
***************
*** 439,445 ****
sfaces[i]=0; /*black picture*/
}else{
slevels[i]=the_map.cells[emx][emy].smooth[layer];
! sfaces[i]=getsmooth(the_map.cells[emx][emy].heads[layer].face);
dosmooth=1;
}
}
--- 446,452 ----
sfaces[i]=0; /*black picture*/
}else{
slevels[i]=the_map.cells[emx][emy].smooth[layer];
! sfaces[i]=getsmooth(the_map.cells[emx][emy].heads[layer].face);
dosmooth=1;
}
}
***************
*** 532,538 ****
my = y + pl_pos.y;
/* Don't need to touch this space */
! if (!redraw && !the_map.cells[mx][my].need_update && !map_did_scroll&& !the_map.cells[mx][my].need_resmooth)
continue;
/* First, we need to black out this space. */
gdk_draw_rectangle(mapwindow, drawingarea->style->black_gc, TRUE, x * map_image_size, y * map_image_size, map_image_size, map_image_size);
--- 539,545 ----
my = y + pl_pos.y;
/* Don't need to touch this space */
! if (!redraw && !the_map.cells[mx][my].need_update && !map_did_scroll&& !the_map.cells[mx][my].need_resmooth)
continue;
/* First, we need to black out this space. */
gdk_draw_rectangle(mapwindow, drawingarea->style->black_gc, TRUE, x * map_image_size, y * map_image_size, map_image_size, map_image_size);
|
|
From: <cro...@li...> - 2003-08-03 19:02:35
|
Module Name: CFJavaEditor
Committed By: avogl
Date: Sun Aug 3 19:02:35 UTC 2003
Modified Files:
CFJavaEditor/src/cfeditor: ArchObjectStack.java
Log Message:
Small patch to make the JavaEditor ignore
all directories starting with dot ('.') character,
concerning the arch loading proccess.
--AndreasV
Start of context diffs
Index: CFJavaEditor/src/cfeditor/ArchObjectStack.java
diff -c CFJavaEditor/src/cfeditor/ArchObjectStack.java:1.13 CFJavaEditor/src/cfeditor/ArchObjectStack.java:1.14
*** CFJavaEditor/src/cfeditor/ArchObjectStack.java:1.13 Sat Jul 19 08:15:36 2003
--- CFJavaEditor/src/cfeditor/ArchObjectStack.java Sun Aug 3 12:02:34 2003
***************
*** 344,350 ****
name = f.getName();
if (f.isDirectory()) {
// now, setup the arch panels
! if(name.equalsIgnoreCase("cvs")!=true && name.equalsIgnoreCase("dev")!=true)
{
if(folder_level > 0 && folder_level < 2) // add first folders as panels
{
--- 344,351 ----
name = f.getName();
if (f.isDirectory()) {
// now, setup the arch panels
! if(name.equalsIgnoreCase("cvs")!=true && name.equalsIgnoreCase("dev")!=true
! && !name.startsWith("."))
{
if(folder_level > 0 && folder_level < 2) // add first folders as panels
{
***************
*** 363,370 ****
loadArchFromFiles(new File(f, children[i]),index);
folder_level--;
}
! }
! else {
if(name.equalsIgnoreCase("cvs")!=true && name.equalsIgnoreCase("dev")!=true) {
if((len = (int)name.length()) >= 5) {
--- 364,371 ----
loadArchFromFiles(new File(f, children[i]),index);
folder_level--;
}
! }
! else {
if(name.equalsIgnoreCase("cvs")!=true && name.equalsIgnoreCase("dev")!=true) {
if((len = (int)name.length()) >= 5) {
|
|
From: <cro...@li...> - 2003-08-02 22:05:06
|
Module Name: arch Committed By: temitchell Date: Sat Aug 2 22:05:05 UTC 2003 Modified Files: arch/ground: sea.clsc.111.png sea.clsc.112.png sea.clsc.113.png sea.clsc.114.png Log Message: - to replace the classic image to match the others Start of context diffs Index: arch/ground/sea.clsc.111.png |
|
From: <cro...@li...> - 2003-08-02 20:44:55
|
Module Name: arch Committed By: temitchell Date: Sat Aug 2 20:44:54 UTC 2003 Modified Files: arch/ground/Mountain: mountain4.base.111.png mountain5.base.111.png Log Message: - much needed tiling fixes to these. Start of context diffs Index: arch/ground/Mountain/mountain4.base.111.png Index: arch/ground/Mountain/mountain5.base.111.png |
|
From: <cro...@li...> - 2003-08-02 16:25:23
|
Module Name: crossfire
Committed By: tchize
Date: Sat Aug 2 16:25:23 UTC 2003
Modified Files:
crossfire/common: map.c
crossfire/include: global.h
Log Message:
WIN32 bugfixes, (mappath fix and uint64 fix)
thanks to Nicolas Wegeer for submit.
Partial Transcript from mail:
...
The first, global.patch, fixes bad u/sint46 for Win32 in
include/global.h
There was no SIZEOF_LONG defined, so it would error...
Also, the Python includes define SIZEOF_LONG_LONG as 8, so it's better
to have some coherence somewhere :-)
The second is for common/map.c
It fixes broken check_path which would simply ignore the prepend_dir
argument, resulting in broken map links in big maps... (would try to
find map in world/world_xxx_xxx instead of
share/maps/world/world_xxx_xxx).
I think they don't change anything for other platforms.
...
Start of context diffs
Index: crossfire/common/map.c
diff -c crossfire/common/map.c:1.55 crossfire/common/map.c:1.56
*** crossfire/common/map.c:1.55 Mon Jun 30 12:14:13 2003
--- crossfire/common/map.c Sat Aug 2 09:25:23 2003
***************
*** 1,6 ****
/*
* static char *rcsid_map_c =
! * "$Id: map.c,v 1.55 2003/06/30 19:14:13 tchize Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_map_c =
! * "$Id: map.c,v 1.56 2003/08/02 16:25:23 tchize Exp $";
*/
/*
***************
*** 179,187 ****
int check_path (char *name, int prepend_dir)
{
- #ifdef WIN32 /* ***win32: check this sucker in windows style. */
- return(_access(name,0));
- #else
char buf[MAX_BUF], *endbuf;
struct stat statbuf;
int mode = 0, i;
--- 179,184 ----
***************
*** 190,195 ****
--- 187,195 ----
strcpy (buf, create_pathname(name));
else
strcpy(buf, name);
+ #ifdef WIN32 /* ***win32: check this sucker in windows style. */
+ return(_access(name,0));
+ #else
/* old method (strchr(buf, '\0')) seemd very odd to me -
* this method should be equivalant and is clearer.
Index: crossfire/include/global.h
diff -c crossfire/include/global.h:1.41 crossfire/include/global.h:1.42
*** crossfire/include/global.h:1.41 Fri Mar 7 21:35:32 2003
--- crossfire/include/global.h Sat Aug 2 09:25:22 2003
***************
*** 1,6 ****
/*
* static char *rcsid_global_h =
! * "$Id: global.h,v 1.41 2003/03/08 05:35:32 mwedel Exp $";
*/
/*
--- 1,6 ----
/*
* static char *rcsid_global_h =
! * "$Id: global.h,v 1.42 2003/08/02 16:25:22 tchize Exp $";
*/
/*
***************
*** 59,64 ****
--- 59,74 ----
typedef signed char sint8;
typedef unsigned short Fontindex;
+ #ifdef WIN32
+ // Python plugin stuff defines SIZEOF_LONG_LONG as 8, and besides __int64 is a 64b type on MSVC...
+ // So let's force the typedef
+ typedef unsigned __int64 uint64;
+ typedef signed __int64 sint64;
+ // Needed for experience
+ #define atoll _atoi64
+
+ #else // WIN32
+
#if SIZEOF_LONG == 8
typedef unsigned long uint64;
typedef signed long sint64;
***************
*** 70,76 ****
error correct and send mail to crossfire-devel on how to do this
#endif
!
/* global stuff used by new skill/experience system -b.t.
--- 80,86 ----
error correct and send mail to crossfire-devel on how to do this
#endif
! #endif // WIN32
/* global stuff used by new skill/experience system -b.t.
|
|
From: <cro...@li...> - 2003-08-02 16:02:51
|
Module Name: crossfire
Committed By: tchize
Date: Sat Aug 2 16:02:51 UTC 2003
Modified Files:
crossfire/server: c_object.c
Log Message:
Correct a bug in find_best_object_apply_match so now match is coherent
with find_best_object_match
patch according to what submitted by Nicolas Wegeer on cf-devel mailing
on 1st of august 2003 with subject
"[CF-Devel] Patch submission: apply item matching bug"
Start of context diffs
Index: crossfire/server/c_object.c
diff -c crossfire/server/c_object.c:1.49 crossfire/server/c_object.c:1.50
*** crossfire/server/c_object.c:1.49 Thu Jun 26 04:27:43 2003
--- crossfire/server/c_object.c Sat Aug 2 09:02:50 2003
***************
*** 1,6 ****
/*
* static char *rcsid_c_object_c =
! * "$Id: c_object.c,v 1.49 2003/06/26 11:27:43 gros Exp $";
*/
/*
CrossFire, A Multiplayer game for X-windows
--- 1,6 ----
/*
* static char *rcsid_c_object_c =
! * "$Id: c_object.c,v 1.50 2003/08/02 16:02:50 tchize Exp $";
*/
/*
CrossFire, A Multiplayer game for X-windows
***************
*** 83,89 ****
for (tmp=pl->inv; tmp; tmp=tmp->below) {
if (tmp->invisible) continue;
! if ((tmpmatch=item_matched_string(pl, tmp, params))>=match_val) {
if ((aflag==AP_APPLY) && (QUERY_FLAG(tmp,FLAG_APPLIED))) continue;
if ((aflag==AP_UNAPPLY) && (!QUERY_FLAG(tmp,FLAG_APPLIED))) continue;
match_val=tmpmatch;
--- 83,89 ----
for (tmp=pl->inv; tmp; tmp=tmp->below) {
if (tmp->invisible) continue;
! if ((tmpmatch=item_matched_string(pl, tmp, params))>match_val) {
if ((aflag==AP_APPLY) && (QUERY_FLAG(tmp,FLAG_APPLIED))) continue;
if ((aflag==AP_UNAPPLY) && (!QUERY_FLAG(tmp,FLAG_APPLIED))) continue;
match_val=tmpmatch;
|
|
From: <cro...@li...> - 2003-08-01 02:24:29
|
Module Name: maps-bigworld Committed By: temitchell Date: Fri Aug 1 02:24:28 UTC 2003 Modified Files: maps-bigworld/python/IPO: seen.py Log Message: - add in DM check so that seen script gives DM the last IP used by the player they are asking about. Start of context diffs Index: maps-bigworld/python/IPO/seen.py diff -c maps-bigworld/python/IPO/seen.py:1.1 maps-bigworld/python/IPO/seen.py:1.2 *** maps-bigworld/python/IPO/seen.py:1.1 Thu Jul 24 22:27:20 2003 --- maps-bigworld/python/IPO/seen.py Thu Jul 31 19:24:28 2003 *************** *** 42,50 **** if len(text)==2: if log.exist(text[1]): ip, date, count = log.info(text[1]) ! CFPython.Say(whoami, "I have seen '%s' joining %d times, last at %s." % (text[1], count, date)) else: ! CFPython.Say(whoami, "I have never seen '%s' joining" % text[1]) else: CFPython.Say(whoami, 'Usage "seen <friend>"') --- 42,53 ---- if len(text)==2: if log.exist(text[1]): ip, date, count = log.info(text[1]) ! if (CFPython.IsDungeonMaster(activator)): ! CFPython.Say(whoami, "I have seen '%s' %d times.\nI saw them last coming from\nIP: %s\non %s." % (text[1], count, ip, date)) ! else: ! CFPython.Say(whoami, "I have seen '%s' %d times.\nI saw them last at %s." % (text[1], count, date)) else: ! CFPython.Say(whoami, "I have never seen '%s'." % text[1]) else: CFPython.Say(whoami, 'Usage "seen <friend>"') |
