[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus data/ccl/stratagus.ccl doc/ChangeLog....
|
From: |
Russell Smith |
|
Subject: |
[Stratagus-CVS] stratagus data/ccl/stratagus.ccl doc/ChangeLog.... |
|
Date: |
Wed, 17 Sep 2003 05:17:15 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Russell Smith <address@hidden> 03/09/17 05:17:13
Modified files:
data/ccl : stratagus.ccl
doc : ChangeLog.html
doc/ccl : config.html
src/ai : ai_plan.c
src/include : missile.h stratagus.h
src/missile : missile.c
src/ui : ccl_ui.c mouse.c
Log message:
Made Green Action Cross Configurable
Patches:
Index: stratagus/data/ccl/stratagus.ccl
diff -u stratagus/data/ccl/stratagus.ccl:1.13
stratagus/data/ccl/stratagus.ccl:1.14
--- stratagus/data/ccl/stratagus.ccl:1.13 Sun Sep 14 02:53:06 2003
+++ stratagus/data/ccl/stratagus.ccl Wed Sep 17 05:17:12 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.13 2003/09/14 06:53:06 mr-russ Exp $
+;; $Id: stratagus.ccl,v 1.14 2003/09/17 09:17:12 mr-russ Exp $
;; For documentation see stratagus/doc/ccl/ccl.html
@@ -259,6 +259,9 @@
;; Change next, for the wanted mouse scale. (only SVGALIB)
(set-mouse-scale! 1)
+
+;; Set the name of the missile to use when clicking
+(set-click-missile! 'missile-green-cross)
;; Edit this to enable/disable grabbing the mouse.
(set-grab-mouse! #f)
Index: stratagus/doc/ChangeLog.html
diff -u stratagus/doc/ChangeLog.html:1.528 stratagus/doc/ChangeLog.html:1.529
--- stratagus/doc/ChangeLog.html:1.528 Mon Sep 15 01:51:00 2003
+++ stratagus/doc/ChangeLog.html Wed Sep 17 05:17:12 2003
@@ -2,7 +2,7 @@
<html>
<head>
<!--
----- $Id: ChangeLog.html,v 1.528 2003/09/15 05:51:00 mr-russ Exp $
+---- $Id: ChangeLog.html,v 1.529 2003/09/17 09:17:12 mr-russ Exp $
---- (c) Copyright 1998-2003 by Lutz Sammer
@@ -36,7 +36,7 @@
<li>Future 1.19 Release<p>
<ul>
<li>++
- <li>Fixed Bug #4721: Sound effects are white noise (from Nehal Mistry and
Russell Smith).
+ <li>Made Green Action Cross Configurable (from Russell Smith).
<li>NEW_UI: Can highlight buttons now to show actions (from Martin Renold).
<li>Removed old pathfinder, A-Star is not an option now (from Russell
Smith).
<li>Added MinRange to Orders, Pathfinder finds correct paths for a ranged
attack now (from Russell Smith).
Index: stratagus/doc/ccl/config.html
diff -u stratagus/doc/ccl/config.html:1.24 stratagus/doc/ccl/config.html:1.25
--- stratagus/doc/ccl/config.html:1.24 Sun Sep 14 02:53:07 2003
+++ stratagus/doc/ccl/config.html Wed Sep 17 05:17:12 2003
@@ -62,6 +62,7 @@
<a href="#set-brightness!">set-brightness!</a>
<a href="#set-building-capture!">set-building-capture!</a>
<a href="#set-burn-buildings!">set-burn-buildings!</a>
+<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-double-click-delay!">set-double-click-delay!</a>
@@ -435,6 +436,27 @@
<pre>
(set-burn-buildings! 25 2)
</pre>
+
+<h4>Used</h4>
+
+<a href="../../data/ccl/stratagus.ccl"> $LIBRARYPATH/ccl/stratagus.ccl </a>
+
+<a name="set-click-missile!"></a>
+<h3>(set-click-missile! missile)</h3>
+
+Sets the missile to use for displaying when a player clicks on a location on
the map.
+
+<dl>
+<dt>missile</dt>
+<dd>The missile to use, as defined in the missiles section</dd>
+</dl>
+
+<h4>Example</h4>
+
+<pre>
+ (set-click-missile! 'missile-green-cross)
+</pre>
+
<h4>Used</h4>
<a href="../../data/ccl/stratagus.ccl"> $LIBARYPATH/ccl/stratagus.ccl </a>
@@ -1573,7 +1595,7 @@
<a href="../../data/ccl/stratagus.ccl"> $LIBARYPATH/ccl/stratagus.ccl </a>
<hr>
-Last changed: $Id: config.html,v 1.24 2003/09/14 06:53:07 mr-russ Exp $<br>
+Last changed: $Id: config.html,v 1.25 2003/09/17 09:17:12 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/ai/ai_plan.c
diff -u stratagus/src/ai/ai_plan.c:1.15 stratagus/src/ai/ai_plan.c:1.16
--- stratagus/src/ai/ai_plan.c:1.15 Fri Jul 11 10:35:29 2003
+++ stratagus/src/ai/ai_plan.c Wed Sep 17 05:17:12 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ai_plan.c,v 1.15 2003/07/11 14:35:29 n0body Exp $
+// $Id: ai_plan.c,v 1.16 2003/09/17 09:17:12 mr-russ Exp $
#ifdef NEW_AI // {
@@ -179,9 +179,6 @@
}
if( CanMoveToMask(x,y,mask) ) { // reachable
- /*MakeLocalMissile(MissileTypeRedCross,
- x*TileSizeX+TileSizeX/2,y*TileSizeY+TileSizeY/2,
- x*TileSizeX+TileSizeX/2,y*TileSizeY+TileSizeY/2);*/
*m=66;
points[wp].X=x; // push the point
@@ -309,9 +306,6 @@
}
if( CanMoveToMask(x,y,mask) ) { // reachable
- /*MakeLocalMissile(MissileTypeGreenCross,
- x*TileSizeX+TileSizeX/2,y*TileSizeY+TileSizeY/2,
- x*TileSizeX+TileSizeX/2,y*TileSizeY+TileSizeY/2);*/
*m=1;
points[wp].X=x; // push the point
Index: stratagus/src/include/missile.h
diff -u stratagus/src/include/missile.h:1.62
stratagus/src/include/missile.h:1.63
--- stratagus/src/include/missile.h:1.62 Sun Aug 17 11:57:07 2003
+++ stratagus/src/include/missile.h Wed Sep 17 05:17:12 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: missile.h,v 1.62 2003/08/17 15:57:07 n0body Exp $
+// $Id: missile.h,v 1.63 2003/09/17 09:17:12 mr-russ Exp $
#ifndef __MISSILE_H__
#define __MISSILE_H__
@@ -487,8 +487,6 @@
extern MissileType* MissileTypes; /// All missile-types
extern MissileType* MissileTypeSmallFire; /// Small fire missile-type
extern MissileType* MissileTypeBigFire; /// Big fire
missile-type
-extern MissileType* MissileTypeGreenCross; /// Green cross missile-type
-extern MissileType* MissileTypeRedCross; /// Red cross missile-type
extern MissileType* MissileTypeExplosion; /// Explosion missile-type
extern MissileType* MissileTypeHit; /// Hit missile-type
Index: stratagus/src/include/stratagus.h
diff -u stratagus/src/include/stratagus.h:1.12
stratagus/src/include/stratagus.h:1.13
--- stratagus/src/include/stratagus.h:1.12 Thu Sep 11 18:07:53 2003
+++ stratagus/src/include/stratagus.h Wed Sep 17 05:17:12 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: stratagus.h,v 1.12 2003/09/11 22:07:53 n0body Exp $
+// $Id: stratagus.h,v 1.13 2003/09/17 09:17:12 mr-russ Exp $
#ifndef __STRATAGUS_H__
#define __STRATAGUS_H__
@@ -466,6 +466,7 @@
extern char* MenuBackgroundWithTitle; /// File for menu with title
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* 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.77
stratagus/src/missile/missile.c:1.78
--- stratagus/src/missile/missile.c:1.77 Mon Aug 25 07:21:18 2003
+++ stratagus/src/missile/missile.c Wed Sep 17 05:17:13 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: missile.c,v 1.77 2003/08/25 11:21:18 mr-russ Exp $
+// $Id: missile.c,v 1.78 2003/09/17 09:17:13 mr-russ Exp $
//@{
@@ -103,8 +103,6 @@
*/
global MissileType* MissileTypeSmallFire; /// Small fire missile-type
global MissileType* MissileTypeBigFire; /// Big fire
missile-type
-global MissileType* MissileTypeGreenCross; /// Green cross missile-type
-global MissileType* MissileTypeRedCross; /// Red cross missile-type
/// missile-type for the explosion missile
global MissileType* MissileTypeExplosion;
global MissileType* MissileTypeHit; /// Hit missile-type
@@ -1525,7 +1523,7 @@
int i;
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: missile-types $Id: missile.c,v 1.77 2003/08/25
11:21:18 mr-russ Exp $\n\n");
+ CLprintf(file,";;; MODULE: missile-types $Id: missile.c,v 1.78 2003/09/17
09:17:13 mr-russ Exp $\n\n");
//
// Original number to internal missile-type name.
@@ -1620,7 +1618,7 @@
Missile* const* missiles;
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.77 2003/08/25
11:21:18 mr-russ Exp $\n\n");
+ CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.78 2003/09/17
09:17:13 mr-russ Exp $\n\n");
for( missiles=GlobalMissiles; *missiles; ++missiles ) {
SaveMissile(*missiles,file);
@@ -1659,8 +1657,6 @@
MissileTypeSmallFire=MissileTypeByIdent("missile-small-fire");
MissileTypeBigFire=MissileTypeByIdent("missile-big-fire");
- MissileTypeGreenCross=MissileTypeByIdent("missile-green-cross");
- MissileTypeRedCross=MissileTypeByIdent("missile-red-cross");
MissileTypeExplosion = MissileTypeByIdent("missile-explosion");
MissileTypeHit = MissileTypeByIdent("missile-hit");
}
@@ -1689,8 +1685,6 @@
MissileTypeSmallFire=NULL;
MissileTypeBigFire=NULL;
- MissileTypeGreenCross=NULL;
- MissileTypeRedCross=NULL;
MissileTypeHit=NULL;
}
Index: stratagus/src/ui/ccl_ui.c
diff -u stratagus/src/ui/ccl_ui.c:1.124 stratagus/src/ui/ccl_ui.c:1.125
--- stratagus/src/ui/ccl_ui.c:1.124 Sun Sep 14 07:51:33 2003
+++ stratagus/src/ui/ccl_ui.c Wed Sep 17 05:17:13 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_ui.c,v 1.124 2003/09/14 11:51:33 martinxyz Exp $
+// $Id: ccl_ui.c,v 1.125 2003/09/17 09:17:13 mr-russ Exp $
//@{
@@ -64,6 +64,7 @@
local SCM ChooseTargetFinishHook; /// Script to draw target selection buttons
#endif
+global char* ClickMissile;
/*----------------------------------------------------------------------------
-- Functions
----------------------------------------------------------------------------*/
@@ -784,6 +785,30 @@
}
/**
+** Set which missile is used for right click
+**
+** @param missile missile name to use
+** @return old value
+*/
+local SCM CclSetClickMissile(SCM missile)
+{
+ SCM old;
+
+ old=NIL;
+
+ if( ClickMissile ) {
+ old=gh_str02scm(ClickMissile);
+ free( ClickMissile );
+ ClickMissile = NULL;
+ }
+
+ if( !gh_null_p(missile) ) {
+ ClickMissile=gh_scm2newstr(missile,NULL);
+ }
+ return old;
+}
+
+/**
** Game contrast.
**
** @param contrast New contrast 0 - 400.
@@ -3690,6 +3715,8 @@
gh_new_procedure1_0("set-mouse-adjust!",CclSetMouseAdjust);
gh_new_procedure1_0("set-mouse-scale!",CclSetMouseScale);
+
+ gh_new_procedure1_0("set-click-missile!",CclSetClickMissile);
gh_new_procedure1_0("set-contrast!",CclSetContrast);
gh_new_procedure1_0("set-brightness!",CclSetBrightness);
Index: stratagus/src/ui/mouse.c
diff -u stratagus/src/ui/mouse.c:1.146 stratagus/src/ui/mouse.c:1.147
--- stratagus/src/ui/mouse.c:1.146 Thu Sep 11 06:49:12 2003
+++ stratagus/src/ui/mouse.c Wed Sep 17 05:17:13 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: mouse.c,v 1.146 2003/09/11 10:49:12 n0body Exp $
+// $Id: mouse.c,v 1.147 2003/09/17 09:17:13 mr-russ Exp $
//@{
@@ -1230,11 +1230,13 @@
sx = CursorX - vp->X + TileSizeX * vp->MapX;
sy = CursorY - vp->Y + TileSizeY * vp->MapY;
if( MouseButtons&LeftButton ) {
- MakeLocalMissile(MissileTypeGreenCross
+ if( ClickMissile ) {
+ MakeLocalMissile(MissileTypeByIdent(ClickMissile)
,vp->MapX*TileSizeX+CursorX - vp->X
,vp->MapY*TileSizeY+CursorY - vp->Y
,vp->MapX*TileSizeX+CursorX - vp->X
,vp->MapY*TileSizeY+CursorY - vp->Y);
+ }
SendCommand(sx, sy);
}
#ifdef NEW_UI
@@ -1264,8 +1266,10 @@
UpdateButtonPanel();
MustRedraw|=RedrawButtonPanel|RedrawCursor;
#endif
- MakeLocalMissile(MissileTypeGreenCross
+ if( ClickMissile ) {
+ MakeLocalMissile(MissileTypeByIdent(ClickMissile)
,sx+TileSizeX/2,sy+TileSizeY/2,0,0);
+ }
SendCommand(sx,sy);
#ifdef NEW_UI
ChooseTargetFinish();
@@ -1454,11 +1458,13 @@
if( UnitUnderCursor &&
(unit=UnitOnMapTile(x/TileSizeX,y/TileSizeY)) ) {
unit->Blink=4; // if right click on building -- blink
} else { // if not not click on building -- green cross
- MakeLocalMissile(MissileTypeGreenCross
- ,TheUI.MouseViewport->MapX*TileSizeX
- +CursorX-TheUI.MouseViewport->X
- ,TheUI.MouseViewport->MapY*TileSizeY
- +CursorY-TheUI.MouseViewport->Y,0,0);
+ if( ClickMissile ) {
+ MakeLocalMissile(MissileTypeByIdent(ClickMissile)
+ ,TheUI.MouseViewport->MapX*TileSizeX
+ +CursorX-TheUI.MouseViewport->X
+ ,TheUI.MouseViewport->MapY*TileSizeY
+ +CursorY-TheUI.MouseViewport->Y,0,0);
+ }
}
DoRightButton(x,y);
}
@@ -1472,9 +1478,11 @@
ScreenMinimap2MapX(CursorX), ScreenMinimap2MapY(CursorY));
} else if( MouseButtons&RightButton ) {
if( !GameObserve && !GamePaused ) {
- MakeLocalMissile(MissileTypeGreenCross
+ if( ClickMissile ) {
+ MakeLocalMissile(MissileTypeByIdent(ClickMissile)
,ScreenMinimap2MapX(CursorX)*TileSizeX+TileSizeX/2
,ScreenMinimap2MapY(CursorY)*TileSizeY+TileSizeY/2,0,0);
+ }
// DoRightButton() takes screen map coordinates
DoRightButton(ScreenMinimap2MapX(CursorX) * TileSizeX,
ScreenMinimap2MapY(CursorY) * TileSizeY);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus data/ccl/stratagus.ccl doc/ChangeLog....,
Russell Smith <=