[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus doc/ChangeLog.html doc/ccl/ccl-index....
|
From: |
Russell Smith |
|
Subject: |
[Stratagus-CVS] stratagus doc/ChangeLog.html doc/ccl/ccl-index.... |
|
Date: |
Sun, 21 Sep 2003 06:03:58 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Russell Smith <address@hidden> 03/09/21 06:03:57
Modified files:
doc : ChangeLog.html
doc/ccl : ccl-index.html config.html
src/clone : unit.c
src/include : missile.h stratagus.h
src/missile : missile.c
src/ui : ccl_ui.c
data/ccl : stratagus.ccl
Log message:
Made damage display missile configurable in ccl
Patches:
Index: stratagus/data/ccl/stratagus.ccl
diff -u stratagus/data/ccl/stratagus.ccl:1.14
stratagus/data/ccl/stratagus.ccl:1.15
--- stratagus/data/ccl/stratagus.ccl:1.14 Wed Sep 17 05:17:12 2003
+++ stratagus/data/ccl/stratagus.ccl Sun Sep 21 06:03:57 2003
@@ -26,7 +26,7 @@
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
;;
-;; $Id: stratagus.ccl,v 1.14 2003/09/17 09:17:12 mr-russ Exp $
+;; $Id: stratagus.ccl,v 1.15 2003/09/21 10:03:57 mr-russ Exp $
;; For documentation see stratagus/doc/ccl/ccl.html
@@ -262,6 +262,9 @@
;; Set the name of the missile to use when clicking
(set-click-missile! 'missile-green-cross)
+
+;; Set the name of the missile to use when displaying damage
+(set-damage-missile! 'missile-hit)
;; Edit this to enable/disable grabbing the mouse.
(set-grab-mouse! #f)
Index: stratagus/doc/ChangeLog.html
diff -u stratagus/doc/ChangeLog.html:1.540 stratagus/doc/ChangeLog.html:1.541
--- stratagus/doc/ChangeLog.html:1.540 Sun Sep 21 05:31:50 2003
+++ stratagus/doc/ChangeLog.html Sun Sep 21 06:03:54 2003
@@ -2,7 +2,7 @@
<html>
<head>
<!--
----- $Id: ChangeLog.html,v 1.540 2003/09/21 09:31:50 mr-russ Exp $
+---- $Id: ChangeLog.html,v 1.541 2003/09/21 10:03:54 mr-russ Exp $
---- (c) Copyright 1998-2003 by Lutz Sammer
@@ -36,6 +36,7 @@
<li>Future 1.19 Release<p>
<ul>
<li>++
+ <li>Made damage display missile configurable in ccl (from Russell Smith).
<li>Made explode-when-killed define a missile (from Russell Smith).
<li>Fixed bug: did not save improve-production (from Russell Smith).
<li>RevealAttacker does what it should, attack the attacker (from Russell
Smith).
Index: stratagus/doc/ccl/ccl-index.html
diff -u stratagus/doc/ccl/ccl-index.html:1.42
stratagus/doc/ccl/ccl-index.html:1.43
--- stratagus/doc/ccl/ccl-index.html:1.42 Sun Sep 14 07:21:34 2003
+++ stratagus/doc/ccl/ccl-index.html Sun Sep 21 06:03:55 2003
@@ -418,6 +418,8 @@
<dd></dd>
<dt><a href="config.html#set-contrast!">set-contrast!</a></dt>
<dd></dd>
+<dt><a href="config.html#set-damage-missile!">set-damage-missile!</a></dt>
+<dd></dd>
<dt><a href="game.html#set-default-map!">set-default-map!</a></dt>
<dd></dd>
<dt><a href="game.html#set-diplomacy!">set-diplomacy!</a></dt>
@@ -611,7 +613,7 @@
<!-- SCRIPT END -->
</dl>
-Last changed: $Id: ccl-index.html,v 1.42 2003/09/14 11:21:34 martinxyz Exp
$<br>
+Last changed: $Id: ccl-index.html,v 1.43 2003/09/21 10:03:55 mr-russ Exp $<br>
All trademarks and copyrights on this page are owned by their respective
owners.
<address>(c) 2002-2003 by <a href="http://stratagus.org";>
The Stratagus Project</a></address></body></html>
Index: stratagus/doc/ccl/config.html
diff -u stratagus/doc/ccl/config.html:1.26 stratagus/doc/ccl/config.html:1.27
--- stratagus/doc/ccl/config.html:1.26 Sun Sep 21 05:31:51 2003
+++ stratagus/doc/ccl/config.html Sun Sep 21 06:03:55 2003
@@ -65,6 +65,7 @@
<a href="#set-click-missile!">set-click-missile!</a>
<a href="#set-color-cycle-all!">set-color-cycle-all!</a>
<a href="#set-contrast!">set-contrast!</a>
+<a href="#set-damage-missile!">set-damage-missile!</a>
<a href="#set-double-click-delay!">set-double-click-delay!</a>
<a href="#set-editor-select-icon!">set-editor-select-icon!</a>
<a href="#set-editor-units-icon!">set-editor-units-icon!</a>
@@ -509,6 +510,26 @@
<a href="../../data/ccl/stratagus.ccl"> $LIBARYPATH/ccl/stratagus.ccl </a>
+<a name="set-damage-missile!"></a>
+<h3>(set-damage-missile! missile)</h3>
+
+Sets the missile to use for displaying the damage done to units
+
+<dl>
+<dt>missile</dt>
+<dd>missile name to use to display the damage</dd>
+</dl>
+
+<h4>Example</h4>
+
+<pre>
+ (set-damage-missile! 'missile-hit)
+</pre>
+
+<h4>Used</h4>
+
+<a href="../../data/ccl/stratagus.ccl"> $LIBARYPATH/ccl/stratagus.ccl </a>
+
<a name="set-double-click-delay!"></a>
<h3>(set-double-click-delay! delay)</h3>
@@ -1596,7 +1617,7 @@
<a href="../../data/ccl/stratagus.ccl"> $LIBARYPATH/ccl/stratagus.ccl </a>
<hr>
-Last changed: $Id: config.html,v 1.26 2003/09/21 09:31:51 mr-russ Exp $<br>
+Last changed: $Id: config.html,v 1.27 2003/09/21 10:03:55 mr-russ Exp $<br>
All trademarks and copyrights on this page are owned by their respective
owners.
<address>(c) 2002-2003 by <a href="http://stratagus.org";>
The Stratagus Project</a></address></body></html>
Index: stratagus/src/clone/unit.c
diff -u stratagus/src/clone/unit.c:1.300 stratagus/src/clone/unit.c:1.301
--- stratagus/src/clone/unit.c:1.300 Sun Sep 21 05:31:52 2003
+++ stratagus/src/clone/unit.c Sun Sep 21 06:03:56 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit.c,v 1.300 2003/09/21 09:31:52 mr-russ Exp $
+// $Id: unit.c,v 1.301 2003/09/21 10:03:56 mr-russ Exp $
//@{
@@ -3246,13 +3246,13 @@
CommandStopUnit(attacker); // Attacker shouldn't continue attack!
}
- if( UnitVisibleOnMap(target) || ReplayRevealMap ) {
- MakeLocalMissile(MissileTypeHit,
+ if( (UnitVisibleOnMap(target) || ReplayRevealMap) && DamageMissile ) {
+ MakeLocalMissile(MissileTypeByIdent(DamageMissile),
target->X*TileSizeX+target->Type->TileWidth*TileSizeX/2,
target->Y*TileSizeY+target->Type->TileHeight*TileSizeY/2,
target->X*TileSizeX+target->Type->TileWidth*TileSizeX/2+3,
target->Y*TileSizeY+target->Type->TileHeight*TileSizeY/2
- -MissileTypeHit->Range)->Damage=-damage;
+ -MissileTypeByIdent(DamageMissile)->Range)->Damage=-damage;
}
#if 0
@@ -3964,7 +3964,7 @@
int InRun, RunStart;
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: units $Id: unit.c,v 1.300 2003/09/21 09:31:52
mr-russ Exp $\n\n");
+ CLprintf(file,";;; MODULE: units $Id: unit.c,v 1.301 2003/09/21 10:03:56
mr-russ Exp $\n\n");
//
// Local variables
Index: stratagus/src/include/missile.h
diff -u stratagus/src/include/missile.h:1.63
stratagus/src/include/missile.h:1.64
--- stratagus/src/include/missile.h:1.63 Wed Sep 17 05:17:12 2003
+++ stratagus/src/include/missile.h Sun Sep 21 06:03:56 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: missile.h,v 1.63 2003/09/17 09:17:12 mr-russ Exp $
+// $Id: missile.h,v 1.64 2003/09/21 10:03:56 mr-russ Exp $
#ifndef __MISSILE_H__
#define __MISSILE_H__
@@ -488,7 +488,6 @@
extern MissileType* MissileTypeSmallFire; /// Small fire missile-type
extern MissileType* MissileTypeBigFire; /// Big fire
missile-type
extern MissileType* MissileTypeExplosion; /// Explosion missile-type
-extern MissileType* MissileTypeHit; /// Hit missile-type
extern const char* MissileClassNames[]; /// Missile class names
Index: stratagus/src/include/stratagus.h
diff -u stratagus/src/include/stratagus.h:1.14
stratagus/src/include/stratagus.h:1.15
--- stratagus/src/include/stratagus.h:1.14 Sun Sep 21 03:51:01 2003
+++ stratagus/src/include/stratagus.h Sun Sep 21 06:03:56 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: stratagus.h,v 1.14 2003/09/21 07:51:01 mr-russ Exp $
+// $Id: stratagus.h,v 1.15 2003/09/21 10:03:56 mr-russ Exp $
#ifndef __STRATAGUS_H__
#define __STRATAGUS_H__
@@ -467,6 +467,7 @@
extern char* TitleMusic; /// File for title music
extern char* MenuMusic; /// File for menu music
extern char* ClickMissile; /// Missile to show when you click
+extern char* DamageMissile; /// Missile to show damage caused
extern char* StratagusLibPath; /// Location of stratagus data
extern int SpeedBuild; /// Speed factor for building
Index: stratagus/src/missile/missile.c
diff -u stratagus/src/missile/missile.c:1.79
stratagus/src/missile/missile.c:1.80
--- stratagus/src/missile/missile.c:1.79 Sun Sep 21 03:13:51 2003
+++ stratagus/src/missile/missile.c Sun Sep 21 06:03:56 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: missile.c,v 1.79 2003/09/21 07:13:51 mr-russ Exp $
+// $Id: missile.c,v 1.80 2003/09/21 10:03:56 mr-russ Exp $
//@{
@@ -105,7 +105,6 @@
global MissileType* MissileTypeBigFire; /// Big fire
missile-type
/// missile-type for the explosion missile
global MissileType* MissileTypeExplosion;
-global MissileType* MissileTypeHit; /// Hit missile-type
IfDebug(
global int NoWarningMissileType; /// quiet ident lookup.
@@ -1508,7 +1507,7 @@
int i;
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: missile-types $Id: missile.c,v 1.79 2003/09/21
07:13:51 mr-russ Exp $\n\n");
+ CLprintf(file,";;; MODULE: missile-types $Id: missile.c,v 1.80 2003/09/21
10:03:56 mr-russ Exp $\n\n");
//
// Original number to internal missile-type name.
@@ -1603,7 +1602,7 @@
Missile* const* missiles;
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.79 2003/09/21
07:13:51 mr-russ Exp $\n\n");
+ CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.80 2003/09/21
10:03:56 mr-russ Exp $\n\n");
for( missiles=GlobalMissiles; *missiles; ++missiles ) {
SaveMissile(*missiles,file);
@@ -1643,7 +1642,6 @@
MissileTypeSmallFire=MissileTypeByIdent("missile-small-fire");
MissileTypeBigFire=MissileTypeByIdent("missile-big-fire");
MissileTypeExplosion = MissileTypeByIdent("missile-explosion");
- MissileTypeHit = MissileTypeByIdent("missile-hit");
}
/**
@@ -1670,7 +1668,6 @@
MissileTypeSmallFire=NULL;
MissileTypeBigFire=NULL;
- MissileTypeHit=NULL;
}
/**
Index: stratagus/src/ui/ccl_ui.c
diff -u stratagus/src/ui/ccl_ui.c:1.126 stratagus/src/ui/ccl_ui.c:1.127
--- stratagus/src/ui/ccl_ui.c:1.126 Thu Sep 18 13:56:04 2003
+++ stratagus/src/ui/ccl_ui.c Sun Sep 21 06:03:56 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_ui.c,v 1.126 2003/09/18 17:56:04 n0body Exp $
+// $Id: ccl_ui.c,v 1.127 2003/09/21 10:03:56 mr-russ Exp $
//@{
@@ -65,6 +65,7 @@
#endif
global char* ClickMissile;
+global char* DamageMissile;
/*----------------------------------------------------------------------------
-- Functions
----------------------------------------------------------------------------*/
@@ -809,6 +810,29 @@
}
/**
+** Set which missile shows Damage
+**
+** @param missile missile name to use
+** @return old value
+*/
+local SCM CclSetDamageMissile(SCM missile)
+{
+ SCM old;
+
+ old=NIL;
+
+ if( DamageMissile ) {
+ old=gh_str02scm(DamageMissile);
+ free( DamageMissile );
+ DamageMissile = NULL;
+ }
+
+ if( !gh_null_p(missile) ) {
+ DamageMissile=gh_scm2newstr(missile,NULL);
+ }
+ return old;
+}
+/**
** Game contrast.
**
** @param contrast New contrast 0 - 400.
@@ -3717,6 +3741,7 @@
gh_new_procedure1_0("set-mouse-scale!",CclSetMouseScale);
gh_new_procedure1_0("set-click-missile!",CclSetClickMissile);
+ gh_new_procedure1_0("set-damage-missile!",CclSetDamageMissile);
gh_new_procedure1_0("set-contrast!",CclSetContrast);
gh_new_procedure1_0("set-brightness!",CclSetBrightness);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus doc/ChangeLog.html doc/ccl/ccl-index....,
Russell Smith <=