[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src action/action_unload.c clone/ccl_...
|
From: |
Ingo Ruhnke |
|
Subject: |
[Stratagus-CVS] stratagus/src action/action_unload.c clone/ccl_... |
|
Date: |
Fri, 18 Jul 2003 16:26:20 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Ingo Ruhnke <address@hidden> 03/07/18 16:26:20
Modified files:
src/action : action_unload.c
src/clone : ccl_player.c unit_draw.c
src/game : trigger.c
src/include : stratagus.h
src/map : ccl_map.c
src/missile : missile.c
src/pathfinder : pathfinder.c
src/ui : menu_proc.c
src/unit : upgrade.c
src/video : font.c
Log message:
- fixed a few comments that made doxygen spit out warrnings
Patches:
Index: stratagus/src/action/action_unload.c
diff -u stratagus/src/action/action_unload.c:1.37
stratagus/src/action/action_unload.c:1.38
--- stratagus/src/action/action_unload.c:1.37 Fri Jul 11 10:35:29 2003
+++ stratagus/src/action/action_unload.c Fri Jul 18 16:26:19 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: action_unload.c,v 1.37 2003/07/11 14:35:29 n0body Exp $
+// $Id: action_unload.c,v 1.38 2003/07/18 20:26:19 grumbel Exp $
//@{
@@ -123,8 +123,6 @@
** Reappear unit on map.
**
** @param unit Unit to drop out.
-** @param addx Tile size in x.
-** @param addy Tile size in y.
**
** @return True if unit can be unloaded.
**
Index: stratagus/src/clone/ccl_player.c
diff -u stratagus/src/clone/ccl_player.c:1.35
stratagus/src/clone/ccl_player.c:1.36
--- stratagus/src/clone/ccl_player.c:1.35 Fri Jul 11 10:35:29 2003
+++ stratagus/src/clone/ccl_player.c Fri Jul 18 16:26:20 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_player.c,v 1.35 2003/07/11 14:35:29 n0body Exp $
+// $Id: ccl_player.c,v 1.36 2003/07/18 20:26:20 grumbel Exp $
//@{
@@ -293,10 +293,10 @@
/**
** Change unit owner
**
-** @param pos1 top left tile
-** @param pos2 bottom right tile
-** @param old old player number
-** @param new new player number
+** @param pos1 top left tile
+** @param pos2 bottom right tile
+** @param oldplayer old player number
+** @param newplayer new player number
**/
local SCM CclChangeUnitsOwner(SCM pos1, SCM pos2, SCM oldplayer, SCM newplayer)
{
@@ -560,7 +560,7 @@
/**
** Get player resources.
**
-** @param plyr Player
+** @param player Player
** @param resource Resource name
**
** @return Player resource
Index: stratagus/src/clone/unit_draw.c
diff -u stratagus/src/clone/unit_draw.c:1.143
stratagus/src/clone/unit_draw.c:1.144
--- stratagus/src/clone/unit_draw.c:1.143 Fri Jul 11 10:35:30 2003
+++ stratagus/src/clone/unit_draw.c Fri Jul 18 16:26:20 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit_draw.c,v 1.143 2003/07/11 14:35:30 n0body Exp $
+// $Id: unit_draw.c,v 1.144 2003/07/18 20:26:20 grumbel Exp $
//@{
@@ -649,7 +649,7 @@
global void SaveDecorations(FILE* file)
{
fprintf(file,"\n;;; -----------------------------------------\n");
- fprintf(file,";;; MODULE: decorations $Id: unit_draw.c,v 1.143 2003/07/11
14:35:30 n0body Exp $\n\n");
+ fprintf(file,";;; MODULE: decorations $Id: unit_draw.c,v 1.144 2003/07/18
20:26:20 grumbel Exp $\n\n");
fprintf(file,"(mana-sprite \"%s\" %d %d %d %d)\n",
ManaSprite.File,ManaSprite.HotX,ManaSprite.HotY,
@@ -1735,7 +1735,7 @@
/**
** Draw construction.
**
-** @param construction Construction pointer.
+** @param unit Unit pointer.
** @param frame Frame number to draw.
** @param x X position.
** @param y Y position.
@@ -1928,7 +1928,8 @@
/**
** Find all units to draw in viewport.
**
-** @param v Viewport to be drawn.
+** @param vp Viewport to be drawn.
+** @param table
**
** @todo FIXME: Must use the redraw tile flags in this function
*/
Index: stratagus/src/game/trigger.c
diff -u stratagus/src/game/trigger.c:1.39 stratagus/src/game/trigger.c:1.40
--- stratagus/src/game/trigger.c:1.39 Fri Jul 11 10:35:30 2003
+++ stratagus/src/game/trigger.c Fri Jul 18 16:26:20 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: trigger.c,v 1.39 2003/07/11 14:35:30 n0body Exp $
+// $Id: trigger.c,v 1.40 2003/07/18 20:26:20 grumbel Exp $
//@{
@@ -260,7 +260,7 @@
/**
** Player has the quantity of unit-type at a location.
**
-** (if-unit-at <player> <op> <quantity> <unit> <location> <location>)
+** (if-unit-at {player} {op} {quantity} {unit} {location} {location})
*/
local SCM CclIfUnitAt(SCM list)
{
@@ -1093,7 +1093,7 @@
/**
** Print a trigger from a LISP object.
** This is a modified version of lprin1g that prints
-** (lambda) instead of #<CLOSURE>
+** (lambda) instead of #<CLOSURE>
**
** @param exp Expression
** @param f File to print to
@@ -1190,7 +1190,7 @@
int trigger;
fprintf(file,"\n;;; -----------------------------------------\n");
- fprintf(file,";;; MODULE: trigger $Id: trigger.c,v 1.39 2003/07/11
14:35:30 n0body Exp $\n\n");
+ fprintf(file,";;; MODULE: trigger $Id: trigger.c,v 1.40 2003/07/18
20:26:20 grumbel Exp $\n\n");
i=0;
trigger=-1;
Index: stratagus/src/include/stratagus.h
diff -u stratagus/src/include/stratagus.h:1.6
stratagus/src/include/stratagus.h:1.7
--- stratagus/src/include/stratagus.h:1.6 Fri Jul 11 10:35:30 2003
+++ stratagus/src/include/stratagus.h Fri Jul 18 16:26:20 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: stratagus.h,v 1.6 2003/07/11 14:35:30 n0body Exp $
+// $Id: stratagus.h,v 1.7 2003/07/18 20:26:20 grumbel Exp $
#ifndef __STRATAGUS_H__
#define __STRATAGUS_H__
@@ -178,7 +178,7 @@
/**
** This simulates vararg macros.
- ** @example
+ ** Example:
** DebugLevel0("Test %d\n" _C_ 1);
** DebugLevel0("Test %d %d\n" _C_ 1 _C_ 2);
*/
Index: stratagus/src/map/ccl_map.c
diff -u stratagus/src/map/ccl_map.c:1.32 stratagus/src/map/ccl_map.c:1.33
--- stratagus/src/map/ccl_map.c:1.32 Fri Jul 11 10:35:31 2003
+++ stratagus/src/map/ccl_map.c Fri Jul 18 16:26:20 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_map.c,v 1.32 2003/07/11 14:35:31 n0body Exp $
+// $Id: ccl_map.c,v 1.33 2003/07/18 20:26:20 grumbel Exp $
//@{
@@ -277,10 +277,10 @@
/**
** Show Map Location
**
-** @param X tile location.
-** @param Y tile location.
-** @param radius of view.
-** @param cycles show vision for.
+** @param x X tile location.
+** @param y Y tile location.
+** @param radius radius of view.
+** @param cycle cycles show vision for.
*/
local SCM CclShowMapLocation(SCM x, SCM y, SCM radius, SCM cycle)
{
Index: stratagus/src/missile/missile.c
diff -u stratagus/src/missile/missile.c:1.72
stratagus/src/missile/missile.c:1.73
--- stratagus/src/missile/missile.c:1.72 Fri Jul 11 10:35:32 2003
+++ stratagus/src/missile/missile.c Fri Jul 18 16:26:20 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: missile.c,v 1.72 2003/07/11 14:35:32 n0body Exp $
+// $Id: missile.c,v 1.73 2003/07/18 20:26:20 grumbel Exp $
//@{
@@ -717,6 +717,7 @@
** Draw all missiles on map.
**
** @param vp Viewport pointer.
+** @param table
*/
global int FindAndSortMissiles(const Viewport* vp, Missile** table)
{
@@ -1523,7 +1524,7 @@
int i;
fprintf(file,"\n;;; -----------------------------------------\n");
- fprintf(file,";;; MODULE: missile-types $Id: missile.c,v 1.72 2003/07/11
14:35:32 n0body Exp $\n\n");
+ fprintf(file,";;; MODULE: missile-types $Id: missile.c,v 1.73 2003/07/18
20:26:20 grumbel Exp $\n\n");
//
// Original number to internal missile-type name.
@@ -1618,7 +1619,7 @@
Missile* const* missiles;
fprintf(file,"\n;;; -----------------------------------------\n");
- fprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.72 2003/07/11
14:35:32 n0body Exp $\n\n");
+ fprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.73 2003/07/18
20:26:20 grumbel Exp $\n\n");
for( missiles=GlobalMissiles; *missiles; ++missiles ) {
SaveMissile(*missiles,file);
Index: stratagus/src/pathfinder/pathfinder.c
diff -u stratagus/src/pathfinder/pathfinder.c:1.50
stratagus/src/pathfinder/pathfinder.c:1.51
--- stratagus/src/pathfinder/pathfinder.c:1.50 Fri Jul 11 10:35:33 2003
+++ stratagus/src/pathfinder/pathfinder.c Fri Jul 18 16:26:20 2003
@@ -28,7 +28,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: pathfinder.c,v 1.50 2003/07/11 14:35:33 n0body Exp $
+// $Id: pathfinder.c,v 1.51 2003/07/18 20:26:20 grumbel Exp $
//@{
@@ -153,10 +153,10 @@
/**
** Mark place in matrix.
**
-** @param x X position of target area
-** @param y Y position of target area
-** @param w Width of target area
-** @param h Height of target area
+** @param x1 X1 position of target area
+** @param y1 Y1 position of target area
+** @param x2 X2 position of target area, range is [x1,x2]
+** @param y2 Y2 position of target area, range is [y1,y2]
** @param matrix Target area marked in matrix
**
** @returns depth, -1 unreachable
@@ -442,13 +442,10 @@
** Fast search new path.
**
** @param unit Path for this unit.
-** @param gx Goal X position.
-** @param gy Goal Y position.
-** @param ox Offset in X.
-** @param oy Offset in Y.
-**
-** @param xdp OUT: Pointer for x direction.
-** @param ydp OUT: Pointer for y direction.
+** @param x1
+** @param y1
+** @param x2
+** @param y2
**
** @return >0 remaining path length, 0 wait for path, -1
** reached goal, -2 can't reach the goal.
@@ -616,10 +613,10 @@
** Complex search new path.
**
** @param unit Path for this unit.
-** @param gx Goal X position.
-** @param gy Goal Y position.
-** @param ox Offset in X.
-** @param oy Offset in Y.
+** @param x1
+** @param y1
+** @param x2
+** @param y2
**
** @param path OUT: part of the path.
**
@@ -884,8 +881,6 @@
** @note The destination could become negative coordinates!
**
** @param unit Path for this unit.
-** @param xdp Pointer for x direction return.
-** @param ydp Pointer for y direction return.
**
** @return >0 remaining path length, 0 wait for path, -1
** reached goal, -2 can't reach the goal.
Index: stratagus/src/ui/menu_proc.c
diff -u stratagus/src/ui/menu_proc.c:1.97 stratagus/src/ui/menu_proc.c:1.98
--- stratagus/src/ui/menu_proc.c:1.97 Fri Jul 11 10:35:33 2003
+++ stratagus/src/ui/menu_proc.c Fri Jul 18 16:26:20 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: menu_proc.c,v 1.97 2003/07/11 14:35:33 n0body Exp $
+// $Id: menu_proc.c,v 1.98 2003/07/18 20:26:20 grumbel Exp $
//@{
@@ -217,6 +217,8 @@
** @param y Y display position
** @param font font number for text
** @param text text to print on button
+** @param normalcolor
+** @param reversecolor
*/
global void DrawMenuButton(MenuButtonId button,unsigned flags,int w,int h,int
x,int y,
const int font,const unsigned char *text,char *normalcolor,char
*reversecolor)
Index: stratagus/src/unit/upgrade.c
diff -u stratagus/src/unit/upgrade.c:1.53 stratagus/src/unit/upgrade.c:1.54
--- stratagus/src/unit/upgrade.c:1.53 Fri Jul 11 10:35:34 2003
+++ stratagus/src/unit/upgrade.c Fri Jul 18 16:26:20 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: upgrade.c,v 1.53 2003/07/11 14:35:34 n0body Exp $
+// $Id: upgrade.c,v 1.54 2003/07/18 20:26:20 grumbel Exp $
//@{
@@ -101,7 +101,7 @@
**
** @param ident upgrade identifier.
** @param icon icon displayed for this upgrade,
-** NULL for generated name (icon-<ident>).
+** NULL for generated name (icon-<em>ident</em>).
** @param costs costs to upgrade.
**
** @return upgrade id or -1 for error
@@ -550,7 +550,7 @@
int p;
fprintf(file,"\n;;; -----------------------------------------\n");
- fprintf(file,";;; MODULE: upgrades $Id: upgrade.c,v 1.53 2003/07/11
14:35:34 n0body Exp $\n\n");
+ fprintf(file,";;; MODULE: upgrades $Id: upgrade.c,v 1.54 2003/07/18
20:26:20 grumbel Exp $\n\n");
//
// Save all upgrades
Index: stratagus/src/video/font.c
diff -u stratagus/src/video/font.c:1.51 stratagus/src/video/font.c:1.52
--- stratagus/src/video/font.c:1.51 Fri Jul 11 10:35:34 2003
+++ stratagus/src/video/font.c Fri Jul 18 16:26:20 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: font.c,v 1.51 2003/07/11 14:35:34 n0body Exp $
+// $Id: font.c,v 1.52 2003/07/18 20:26:20 grumbel Exp $
//@{
@@ -344,6 +344,7 @@
}
}
+#ifdef USE_OPENGL
/**
** Draw character with current color.
**
@@ -355,7 +356,6 @@
** @param x X screen position
** @param y Y screen position
*/
-#ifdef USE_OPENGL
local void VideoDrawCharOpenGL(const Graphic* sprite,
int gx,int gy,int w,int h,int x,int y)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src action/action_unload.c clone/ccl_...,
Ingo Ruhnke <=