[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src ai/ai.c ai/ai_local.h ai/script_a...
|
From: |
address@hidden |
|
Subject: |
[Stratagus-CVS] stratagus/src ai/ai.c ai/ai_local.h ai/script_a... |
|
Date: |
17 Jan 2004 02:17:43 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 04/01/17 02:17:39
Modified files:
src/ai : ai.c ai_local.h script_ai.c
src/editor : editloop.c script_editor.c
src/game : campaign.c game.c intro.c loadgame.c savegame.c
trigger.c
src/include : Module.make font.h script.h script_helpers.h
script_sound.h spells.h trigger.h unit.h
src/map : map.c map_save.c script_map.c script_tileset.c
tileset.c
src/missile : script_missile.c
src/network : commands.c master.c
src/pathfinder : script_pathfinder.c
src/sound : script_sound.c sound_server.c
src/stratagus : construct.c groups.c script.c script_player.c
script_spell.c selection.c stratagus.c
src/ui : icons.c interface.c menu_proc.c menus.c
script_ui.c
src/unit : depend.c script_unit.c script_unittype.c unit.c
unit_draw.c unittype.c upgrade.c
src/video : font.c
Log message:
Renamed ccl.h to script.h
Patches:
Index: stratagus/src/ai/ai.c
diff -u stratagus/src/ai/ai.c:1.109 stratagus/src/ai/ai.c:1.110
--- stratagus/src/ai/ai.c:1.109 Thu Jan 15 09:31:02 2004
+++ stratagus/src/ai/ai.c Sat Jan 17 02:17:21 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ai.c,v 1.109 2004/01/14 22:31:02 nobody_ Exp $
+// $Id: ai.c,v 1.110 2004/01/16 15:17:21 wizzard Exp $
//@{
@@ -147,8 +147,8 @@
#include "player.h"
#include "unit.h"
-#include "ccl.h"
-#include "ccl_helpers.h"
+#include "script.h"
+#include "script_helpers.h"
#include "actions.h"
#include "map.h"
@@ -821,7 +821,7 @@
{
CLprintf(file, "\n--- -----------------------------------------\n");
CLprintf(file,
- "--- MODULE: AI $Id: ai.c,v 1.109 2004/01/14 22:31:02 nobody_
Exp $\n\n");
+ "--- MODULE: AI $Id: ai.c,v 1.110 2004/01/16 15:17:21 wizzard
Exp $\n\n");
#if 0
SaveAiTypesWcName(file);
SaveAiHelper(file);
Index: stratagus/src/ai/ai_local.h
diff -u stratagus/src/ai/ai_local.h:1.54 stratagus/src/ai/ai_local.h:1.55
--- stratagus/src/ai/ai_local.h:1.54 Sun Jan 4 09:33:25 2004
+++ stratagus/src/ai/ai_local.h Sat Jan 17 02:17:21 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ai_local.h,v 1.54 2004/01/03 22:33:25 jsalmon3 Exp $
+// $Id: ai_local.h,v 1.55 2004/01/16 15:17:21 wizzard Exp $
#ifndef __AI_LOCAL_H__
#define __AI_LOCAL_H__
@@ -37,7 +37,7 @@
-- Includes
----------------------------------------------------------------------------*/
-#include "ccl.h"
+#include "script.h"
#include "player.h"
#include "unittype.h"
#include "upgrade.h"
Index: stratagus/src/ai/script_ai.c
diff -u stratagus/src/ai/script_ai.c:1.97 stratagus/src/ai/script_ai.c:1.98
--- stratagus/src/ai/script_ai.c:1.97 Sun Jan 4 09:33:25 2004
+++ stratagus/src/ai/script_ai.c Sat Jan 17 02:17:21 2004
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_ai.c,v 1.97 2004/01/03 22:33:25 jsalmon3 Exp $
+// $Id: script_ai.c,v 1.98 2004/01/16 15:17:21 wizzard Exp $
//@{
@@ -41,11 +41,11 @@
#include "stratagus.h"
#include "unittype.h"
-#include "ccl.h"
+#include "script.h"
#include "ai.h"
#include "pathfinder.h"
#include "ai_local.h"
-#include "ccl_helpers.h"
+#include "script_helpers.h"
/**
Index: stratagus/src/editor/editloop.c
diff -u stratagus/src/editor/editloop.c:1.155
stratagus/src/editor/editloop.c:1.156
--- stratagus/src/editor/editloop.c:1.155 Thu Jan 15 13:04:14 2004
+++ stratagus/src/editor/editloop.c Sat Jan 17 02:17:22 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: editloop.c,v 1.155 2004/01/15 02:04:14 jsalmon3 Exp $
+// $Id: editloop.c,v 1.156 2004/01/16 15:17:22 wizzard Exp $
//@{
@@ -56,7 +56,7 @@
#include "iocompat.h"
#include "commands.h"
-#include "ccl.h"
+#include "script.h"
extern void DoScrollArea(enum _scroll_state_ state, int fast);
Index: stratagus/src/editor/script_editor.c
diff -u stratagus/src/editor/script_editor.c:1.17
stratagus/src/editor/script_editor.c:1.18
--- stratagus/src/editor/script_editor.c:1.17 Fri Jan 2 08:24:05 2004
+++ stratagus/src/editor/script_editor.c Sat Jan 17 02:17:22 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_editor.c,v 1.17 2004/01/01 21:24:05 jsalmon3 Exp $
+// $Id: script_editor.c,v 1.18 2004/01/16 15:17:22 wizzard Exp $
//@{
@@ -40,7 +40,7 @@
#include "stratagus.h"
#include "editor.h"
-#include "ccl.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Defines
Index: stratagus/src/game/campaign.c
diff -u stratagus/src/game/campaign.c:1.43 stratagus/src/game/campaign.c:1.44
--- stratagus/src/game/campaign.c:1.43 Wed Jan 14 10:54:09 2004
+++ stratagus/src/game/campaign.c Sat Jan 17 02:17:23 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: campaign.c,v 1.43 2004/01/13 23:54:09 wizzard Exp $
+// $Id: campaign.c,v 1.44 2004/01/16 15:17:23 wizzard Exp $
//@{
@@ -39,7 +39,7 @@
#include <string.h>
#include "stratagus.h"
-#include "ccl.h"
+#include "script.h"
#include "unittype.h"
#include "map.h"
#include "campaign.h"
@@ -561,7 +561,7 @@
int i;
CLprintf(file, "\n--- -----------------------------------------\n");
- CLprintf(file, "--- MODULE: campaign $Id: campaign.c,v 1.43 2004/01/13
23:54:09 wizzard Exp $\n\n");
+ CLprintf(file, "--- MODULE: campaign $Id: campaign.c,v 1.44 2004/01/16
15:17:23 wizzard Exp $\n\n");
if (!CurrentCampaign) {
return;
}
Index: stratagus/src/game/game.c
diff -u stratagus/src/game/game.c:1.124 stratagus/src/game/game.c:1.125
--- stratagus/src/game/game.c:1.124 Fri Jan 16 21:35:33 2004
+++ stratagus/src/game/game.c Sat Jan 17 02:17:23 2004
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: game.c,v 1.124 2004/01/16 10:35:33 wizzard Exp $
+// $Id: game.c,v 1.125 2004/01/16 15:17:23 wizzard Exp $
//@{
@@ -64,7 +64,7 @@
#include "trigger.h"
#include "commands.h"
-#include "ccl.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Variables
Index: stratagus/src/game/intro.c
diff -u stratagus/src/game/intro.c:1.121 stratagus/src/game/intro.c:1.122
--- stratagus/src/game/intro.c:1.121 Thu Jan 15 13:04:51 2004
+++ stratagus/src/game/intro.c Sat Jan 17 02:17:23 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: intro.c,v 1.121 2004/01/15 02:04:51 jsalmon3 Exp $
+// $Id: intro.c,v 1.122 2004/01/16 15:17:23 wizzard Exp $
//@{
@@ -46,7 +46,7 @@
#include "sound_server.h"
#include "sound.h"
#include "settings.h"
-#include "ccl.h"
+#include "script.h"
#include "campaign.h"
#include "cursor.h"
#include "menus.h"
Index: stratagus/src/game/loadgame.c
diff -u stratagus/src/game/loadgame.c:1.78 stratagus/src/game/loadgame.c:1.79
--- stratagus/src/game/loadgame.c:1.78 Fri Jan 16 21:35:33 2004
+++ stratagus/src/game/loadgame.c Sat Jan 17 02:17:23 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: loadgame.c,v 1.78 2004/01/16 10:35:33 wizzard Exp $
+// $Id: loadgame.c,v 1.79 2004/01/16 15:17:23 wizzard Exp $
//@{
@@ -48,7 +48,7 @@
#include "missile.h"
#include "tileset.h"
#include "map.h"
-#include "ccl.h"
+#include "script.h"
#include "ui.h"
#include "ai.h"
#include "campaign.h"
Index: stratagus/src/game/savegame.c
diff -u stratagus/src/game/savegame.c:1.41 stratagus/src/game/savegame.c:1.42
--- stratagus/src/game/savegame.c:1.41 Sat Jan 3 11:27:32 2004
+++ stratagus/src/game/savegame.c Sat Jan 17 02:17:23 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: savegame.c,v 1.41 2004/01/03 00:27:32 jsalmon3 Exp $
+// $Id: savegame.c,v 1.42 2004/01/16 15:17:23 wizzard Exp $
//@{
@@ -58,7 +58,7 @@
#include "iolib.h"
#include "spells.h"
#include "commands.h"
-#include "ccl.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Variables
@@ -100,7 +100,7 @@
CLprintf(file, "---SaveGame(\n");
CLprintf(file, "--- \"comment\", \"Generated by Stratagus Version "
VERSION "\",\n");
CLprintf(file, "--- \"comment\", \"Visit http://Stratagus.Org for more
informations\",\n");
- CLprintf(file, "--- \"comment\", \"$Id: savegame.c,v 1.41 2004/01/03
00:27:32 jsalmon3 Exp $\",\n");
+ CLprintf(file, "--- \"comment\", \"$Id: savegame.c,v 1.42 2004/01/16
15:17:23 wizzard Exp $\",\n");
CLprintf(file, "--- \"type\", \"%s\",\n", "single-player");
CLprintf(file, "--- \"date\", \"%s\",\n", s);
CLprintf(file, "--- \"map\", \"%s\",\n", TheMap.Description);
Index: stratagus/src/game/trigger.c
diff -u stratagus/src/game/trigger.c:1.57 stratagus/src/game/trigger.c:1.58
--- stratagus/src/game/trigger.c:1.57 Thu Jan 15 10:17:26 2004
+++ stratagus/src/game/trigger.c Sat Jan 17 02:17:23 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: trigger.c,v 1.57 2004/01/14 23:17:26 nobody_ Exp $
+// $Id: trigger.c,v 1.58 2004/01/16 15:17:23 wizzard Exp $
//@{
@@ -40,7 +40,7 @@
#include <setjmp.h>
#include "stratagus.h"
-#include "ccl.h"
+#include "script.h"
#include "unittype.h"
#include "player.h"
#include "trigger.h"
@@ -1305,7 +1305,7 @@
int trigger;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: trigger $Id: trigger.c,v 1.57 2004/01/14
23:17:26 nobody_ Exp $\n\n");
+ CLprintf(file, ";;; MODULE: trigger $Id: trigger.c,v 1.58 2004/01/16
15:17:23 wizzard Exp $\n\n");
i = 0;
trigger = -1;
Index: stratagus/src/include/Module.make
diff -u stratagus/src/include/Module.make:1.7
stratagus/src/include/Module.make:1.8
--- stratagus/src/include/Module.make:1.7 Fri Jan 2 08:24:08 2004
+++ stratagus/src/include/Module.make Sat Jan 17 02:17:24 2004
@@ -1,2 +1,2 @@
-HDRS += src/include/actions.h src/include/ai.h src/include/avi.h
src/include/campaign.h src/include/ccl.h src/include/ccl_helpers.h
src/include/ccl_sound.h src/include/cdaudio.h src/include/commands.h
src/include/construct.h src/include/cursor.h src/include/deco.h
src/include/depend.h src/include/editor.h src/include/fc_types.h
src/include/font.h src/include/stratagus.h src/include/icons.h
src/include/interface.h src/include/iocompat.h src/include/iolib.h
src/include/libcda.h src/include/map.h src/include/master.h src/include/menus.h
src/include/minimap.h src/include/missile.h src/include/movie.h
src/include/mpq.h src/include/myendian.h src/include/net_lowlevel.h
src/include/netconnect.h src/include/network.h src/include/pathfinder.h
src/include/player.h src/include/pud.h src/include/rdtsc.h
src/include/settings.h src/include/sound.h src/include/sound_id.h
src/include/sound_server.h src/include/spells.h src/include/tileset.h
src/include/trigger.h src/include/ui.h src/include/unit.h
src/include/unitsound.h src/include/unittype.h src/include/upgrade.h
src/include/upgrade_structs.h src/include/video.h src/include/wav.h
+HDRS += src/include/actions.h src/include/ai.h src/include/avi.h
src/include/campaign.h src/include/script.h src/include/script_helpers.h
src/include/ccl_sound.h src/include/cdaudio.h src/include/commands.h
src/include/construct.h src/include/cursor.h src/include/deco.h
src/include/depend.h src/include/editor.h src/include/fc_types.h
src/include/font.h src/include/stratagus.h src/include/icons.h
src/include/interface.h src/include/iocompat.h src/include/iolib.h
src/include/libcda.h src/include/map.h src/include/master.h src/include/menus.h
src/include/minimap.h src/include/missile.h src/include/movie.h
src/include/mpq.h src/include/myendian.h src/include/net_lowlevel.h
src/include/netconnect.h src/include/network.h src/include/pathfinder.h
src/include/player.h src/include/pud.h src/include/rdtsc.h
src/include/settings.h src/include/sound.h src/include/sound_id.h
src/include/sound_server.h src/include/spells.h src/include/tileset.h
src/include/trigger.h src/include/ui.h src/include/unit.h
src/include/unitsound.h src/include/unittype.h src/include/upgrade.h
src/include/upgrade_structs.h src/include/video.h src/include/wav.h
HDRS += src/include/etlib/dllist.h src/include/etlib/generic.h
src/include/etlib/hash.h src/include/etlib/xmalloc.h
Index: stratagus/src/include/font.h
diff -u stratagus/src/include/font.h:1.34 stratagus/src/include/font.h:1.35
--- stratagus/src/include/font.h:1.34 Fri Jan 16 07:33:51 2004
+++ stratagus/src/include/font.h Sat Jan 17 02:17:24 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: font.h,v 1.34 2004/01/15 20:33:51 jsalmon3 Exp $
+// $Id: font.h,v 1.35 2004/01/16 15:17:24 wizzard Exp $
#ifndef __FONT_H__
#define __FONT_H__
@@ -83,7 +83,7 @@
-- Includes
----------------------------------------------------------------------------*/
-#include "ccl.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Definitions
Index: stratagus/src/include/script.h
diff -u stratagus/src/include/script.h:1.50 stratagus/src/include/script.h:1.51
--- stratagus/src/include/script.h:1.50 Fri Jan 2 14:13:58 2004
+++ stratagus/src/include/script.h Sat Jan 17 02:17:24 2004
@@ -8,7 +8,7 @@
// T H E W A R B E G I N S
// Stratagus - A free fantasy real time strategy game engine
//
-/address@hidden ccl.h - The clone configuration language headerfile. */
+/address@hidden script.h - The clone configuration language headerfile. */
//
// (c) Copyright 1998-2004 by Lutz Sammer and Jimmy Salmon
//
@@ -26,10 +26,10 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script.h,v 1.50 2004/01/02 03:13:58 jsalmon3 Exp $
+// $Id: script.h,v 1.51 2004/01/16 15:17:24 wizzard Exp $
-#ifndef __CCL_H__
-#define __CCL_H__
+#ifndef __SCRIPT_H__
+#define __SCRIPT_H__
//@{
Index: stratagus/src/include/script_helpers.h
diff -u stratagus/src/include/script_helpers.h:1.7
stratagus/src/include/script_helpers.h:1.8
--- stratagus/src/include/script_helpers.h:1.7 Fri Jan 2 08:24:08 2004
+++ stratagus/src/include/script_helpers.h Sat Jan 17 02:17:24 2004
@@ -8,7 +8,7 @@
// T H E W A R B E G I N S
// Stratagus - A free fantasy real time strategy game engine
//
-/address@hidden ccl_helpers.h - The clone configuration language headerfile. */
+/address@hidden script_helpers.h - The clone configuration language
headerfile. */
//
// (c) Copyright 2003-2004 by Ludovic Pollet
//
@@ -26,13 +26,13 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_helpers.h,v 1.7 2004/01/01 21:24:08 jsalmon3 Exp $
+// $Id: script_helpers.h,v 1.8 2004/01/16 15:17:24 wizzard Exp $
-#ifndef __CCL_HELPERS__
-#define __CCL_HELPERS__
+#ifndef __SCRIPT_HELPERS__
+#define __SCRIPT_HELPERS__
//@{
//@}
-#endif // !__CCL_H__
+#endif // !__SCRIPT_H__
Index: stratagus/src/include/script_sound.h
diff -u stratagus/src/include/script_sound.h:1.22
stratagus/src/include/script_sound.h:1.23
--- stratagus/src/include/script_sound.h:1.22 Fri Jan 2 08:24:08 2004
+++ stratagus/src/include/script_sound.h Sat Jan 17 02:17:24 2004
@@ -26,10 +26,10 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_sound.h,v 1.22 2004/01/01 21:24:08 jsalmon3 Exp $
+// $Id: script_sound.h,v 1.23 2004/01/16 15:17:24 wizzard Exp $
-#ifndef __CCL_SOUND_H__
-#define __CCL_SOUND_H__
+#ifndef __SCRIPT_SOUND_H__
+#define __SCRIPT_SOUND_H__
//@{
@@ -39,7 +39,7 @@
#ifdef WITH_SOUND // {
-#include "ccl.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Functions
Index: stratagus/src/include/spells.h
diff -u stratagus/src/include/spells.h:1.44 stratagus/src/include/spells.h:1.45
--- stratagus/src/include/spells.h:1.44 Fri Jan 2 08:24:08 2004
+++ stratagus/src/include/spells.h Sat Jan 17 02:17:24 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: spells.h,v 1.44 2004/01/01 21:24:08 jsalmon3 Exp $
+// $Id: spells.h,v 1.45 2004/01/16 15:17:24 wizzard Exp $
#ifndef __SPELLS_H__
#define __SPELLS_H__
@@ -45,7 +45,7 @@
#include "unittype.h"
#include "unit.h"
#include "missile.h"
-#include "ccl.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Definitons
Index: stratagus/src/include/trigger.h
diff -u stratagus/src/include/trigger.h:1.17
stratagus/src/include/trigger.h:1.18
--- stratagus/src/include/trigger.h:1.17 Fri Jan 2 08:24:08 2004
+++ stratagus/src/include/trigger.h Sat Jan 17 02:17:25 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: trigger.h,v 1.17 2004/01/01 21:24:08 jsalmon3 Exp $
+// $Id: trigger.h,v 1.18 2004/01/16 15:17:25 wizzard Exp $
#ifndef __TRIGGER_H__
#define __TRIGGER_H__
@@ -37,7 +37,7 @@
-- Includes
----------------------------------------------------------------------------*/
-#include "ccl.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Declarations
Index: stratagus/src/include/unit.h
diff -u stratagus/src/include/unit.h:1.246 stratagus/src/include/unit.h:1.247
--- stratagus/src/include/unit.h:1.246 Fri Jan 16 02:15:08 2004
+++ stratagus/src/include/unit.h Sat Jan 17 02:17:25 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit.h,v 1.246 2004/01/15 15:15:08 nobody_ Exp $
+// $Id: unit.h,v 1.247 2004/01/16 15:17:25 wizzard Exp $
#ifndef __UNIT_H__
#define __UNIT_H__
@@ -377,7 +377,7 @@
#include "upgrade_structs.h"
#include "upgrade.h"
#include "construct.h"
-#include "ccl.h"
+#include "script.h"
#include "SDL.h"
Index: stratagus/src/map/map.c
diff -u stratagus/src/map/map.c:1.73 stratagus/src/map/map.c:1.74
--- stratagus/src/map/map.c:1.73 Thu Jan 15 13:06:21 2004
+++ stratagus/src/map/map.c Sat Jan 17 02:17:25 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: map.c,v 1.73 2004/01/15 02:06:21 jsalmon3 Exp $
+// $Id: map.c,v 1.74 2004/01/16 15:17:25 wizzard Exp $
//@{
@@ -48,7 +48,7 @@
#include "ui.h"
#include "editor.h"
-#include "ccl.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Variables
Index: stratagus/src/map/map_save.c
diff -u stratagus/src/map/map_save.c:1.23 stratagus/src/map/map_save.c:1.24
--- stratagus/src/map/map_save.c:1.23 Sat Jan 3 16:38:15 2004
+++ stratagus/src/map/map_save.c Sat Jan 17 02:17:26 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: map_save.c,v 1.23 2004/01/03 05:38:15 jsalmon3 Exp $
+// $Id: map_save.c,v 1.24 2004/01/16 15:17:26 wizzard Exp $
//@{
@@ -46,7 +46,7 @@
#include "pud.h"
#include "ui.h"
-#include "ccl.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Variables
@@ -68,7 +68,7 @@
int i;
CLprintf(file, "\n--- -----------------------------------------\n");
- CLprintf(file, "--- MODULE: map $Id: map_save.c,v 1.23 2004/01/03
05:38:15 jsalmon3 Exp $\n");
+ CLprintf(file, "--- MODULE: map $Id: map_save.c,v 1.24 2004/01/16
15:17:26 wizzard Exp $\n");
CLprintf(file, "StratagusMap(\n");
Index: stratagus/src/map/script_map.c
diff -u stratagus/src/map/script_map.c:1.53 stratagus/src/map/script_map.c:1.54
--- stratagus/src/map/script_map.c:1.53 Thu Jan 15 01:06:40 2004
+++ stratagus/src/map/script_map.c Sat Jan 17 02:17:26 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_map.c,v 1.53 2004/01/14 14:06:40 nobody_ Exp $
+// $Id: script_map.c,v 1.54 2004/01/16 15:17:26 wizzard Exp $
//@{
@@ -39,7 +39,7 @@
#include <stdlib.h>
#include "stratagus.h"
-#include "ccl.h"
+#include "script.h"
#include "map.h"
#include "minimap.h"
#include "actions.h"
Index: stratagus/src/map/script_tileset.c
diff -u stratagus/src/map/script_tileset.c:1.37
stratagus/src/map/script_tileset.c:1.38
--- stratagus/src/map/script_tileset.c:1.37 Fri Jan 9 16:44:38 2004
+++ stratagus/src/map/script_tileset.c Sat Jan 17 02:17:26 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_tileset.c,v 1.37 2004/01/09 05:44:38 jsalmon3 Exp $
+// $Id: script_tileset.c,v 1.38 2004/01/16 15:17:26 wizzard Exp $
//@{
@@ -39,7 +39,7 @@
#include <stdlib.h>
#include "stratagus.h"
-#include "ccl.h"
+#include "script.h"
#include "tileset.h"
#include "map.h"
Index: stratagus/src/map/tileset.c
diff -u stratagus/src/map/tileset.c:1.64 stratagus/src/map/tileset.c:1.65
--- stratagus/src/map/tileset.c:1.64 Thu Jan 15 13:06:22 2004
+++ stratagus/src/map/tileset.c Sat Jan 17 02:17:26 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: tileset.c,v 1.64 2004/01/15 02:06:22 jsalmon3 Exp $
+// $Id: tileset.c,v 1.65 2004/01/16 15:17:26 wizzard Exp $
//@{
@@ -38,7 +38,7 @@
#include <stdlib.h>
#include <string.h>
-#include "ccl.h"
+#include "script.h"
#include "stratagus.h"
#include "tileset.h"
#include "map.h"
@@ -692,7 +692,7 @@
char** sp;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: tileset $Id: tileset.c,v 1.64 2004/01/15
02:06:22 jsalmon3 Exp $\n\n");
+ CLprintf(file, ";;; MODULE: tileset $Id: tileset.c,v 1.65 2004/01/16
15:17:26 wizzard Exp $\n\n");
// Original number to internal tileset name
Index: stratagus/src/missile/script_missile.c
diff -u stratagus/src/missile/script_missile.c:1.55
stratagus/src/missile/script_missile.c:1.56
--- stratagus/src/missile/script_missile.c:1.55 Sun Jan 11 07:57:14 2004
+++ stratagus/src/missile/script_missile.c Sat Jan 17 02:17:27 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_missile.c,v 1.55 2004/01/10 20:57:14 jsalmon3 Exp $
+// $Id: script_missile.c,v 1.56 2004/01/16 15:17:27 wizzard Exp $
//@{
@@ -43,8 +43,8 @@
#include "tileset.h"
#include "unittype.h"
#include "missile.h"
-#include "ccl_sound.h"
-#include "ccl.h"
+#include "script_sound.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Variables
Index: stratagus/src/network/commands.c
diff -u stratagus/src/network/commands.c:1.89
stratagus/src/network/commands.c:1.90
--- stratagus/src/network/commands.c:1.89 Sat Jan 3 11:28:57 2004
+++ stratagus/src/network/commands.c Sat Jan 17 02:17:27 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: commands.c,v 1.89 2004/01/03 00:28:57 jsalmon3 Exp $
+// $Id: commands.c,v 1.90 2004/01/16 15:17:27 wizzard Exp $
//@{
@@ -47,8 +47,8 @@
#include "network.h"
#include "netconnect.h"
#include "campaign.h" // for
CurrentMapPath
-#include "ccl.h"
-#include "ccl_helpers.h"
+#include "script.h"
+#include "script_helpers.h"
#include "commands.h"
#include "interface.h"
#include "iocompat.h"
@@ -174,7 +174,7 @@
replay->Comment1 = strdup("Generated by Stratagus Version " VERSION "");
replay->Comment2 = strdup("Visit http://Stratagus.Org for more
information");
- replay->Comment3 = strdup("$Id: commands.c,v 1.89 2004/01/03 00:28:57
jsalmon3 Exp $");
+ replay->Comment3 = strdup("$Id: commands.c,v 1.90 2004/01/16 15:17:27
wizzard Exp $");
if (GameSettings.NetGameType == SettingsSinglePlayerGame) {
replay->Type = ReplaySinglePlayer;
Index: stratagus/src/network/master.c
diff -u stratagus/src/network/master.c:1.23 stratagus/src/network/master.c:1.24
--- stratagus/src/network/master.c:1.23 Sat Dec 20 16:33:33 2003
+++ stratagus/src/network/master.c Sat Jan 17 02:17:28 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: master.c,v 1.23 2003/12/20 05:33:33 jsalmon3 Exp $
+// $Id: master.c,v 1.24 2004/01/16 15:17:28 wizzard Exp $
//@{
@@ -50,7 +50,7 @@
#include "iocompat.h"
#include "network.h"
#include "netconnect.h"
-#include "ccl.h"
+#include "script.h"
#include "master.h"
#include "net_lowlevel.h"
Index: stratagus/src/pathfinder/script_pathfinder.c
diff -u stratagus/src/pathfinder/script_pathfinder.c:1.29
stratagus/src/pathfinder/script_pathfinder.c:1.30
--- stratagus/src/pathfinder/script_pathfinder.c:1.29 Fri Jan 2 08:24:11 2004
+++ stratagus/src/pathfinder/script_pathfinder.c Sat Jan 17 02:17:28 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_pathfinder.c,v 1.29 2004/01/01 21:24:11 jsalmon3 Exp $
+// $Id: script_pathfinder.c,v 1.30 2004/01/16 15:17:28 wizzard Exp $
//@{
@@ -47,7 +47,7 @@
#include "unittype.h"
#include "player.h"
#include "unit.h"
-#include "ccl.h"
+#include "script.h"
#include "pathfinder.h"
/*----------------------------------------------------------------------------
Index: stratagus/src/sound/script_sound.c
diff -u stratagus/src/sound/script_sound.c:1.62
stratagus/src/sound/script_sound.c:1.63
--- stratagus/src/sound/script_sound.c:1.62 Fri Jan 2 08:24:13 2004
+++ stratagus/src/sound/script_sound.c Sat Jan 17 02:17:29 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_sound.c,v 1.62 2004/01/01 21:24:13 jsalmon3 Exp $
+// $Id: script_sound.c,v 1.63 2004/01/16 15:17:29 wizzard Exp $
//@{
@@ -43,7 +43,7 @@
#include <stdlib.h>
-#include "ccl.h"
+#include "script.h"
#include "sound_id.h"
#include "sound.h"
#include "sound_server.h"
@@ -787,7 +787,7 @@
#else // }{ WITH_SOUND
-#include "ccl.h"
+#include "script.h"
/**
** Global volume support
Index: stratagus/src/sound/sound_server.c
diff -u stratagus/src/sound/sound_server.c:1.129
stratagus/src/sound/sound_server.c:1.130
--- stratagus/src/sound/sound_server.c:1.129 Fri Jan 2 11:57:28 2004
+++ stratagus/src/sound/sound_server.c Sat Jan 17 02:17:29 2004
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: sound_server.c,v 1.129 2004/01/02 00:57:28 jsalmon3 Exp $
+// $Id: sound_server.c,v 1.130 2004/01/16 15:17:29 wizzard Exp $
//@{
@@ -80,7 +80,7 @@
#include "sound_server.h"
#include "sound.h"
#include "cdaudio.h"
-#include "ccl.h"
+#include "script.h"
#ifdef USE_LIBMODPLUG
#include "../libmodplug/modplug.h"
Index: stratagus/src/stratagus/construct.c
diff -u stratagus/src/stratagus/construct.c:1.46
stratagus/src/stratagus/construct.c:1.47
--- stratagus/src/stratagus/construct.c:1.46 Fri Jan 16 23:02:23 2004
+++ stratagus/src/stratagus/construct.c Sat Jan 17 02:17:30 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: construct.c,v 1.46 2004/01/16 12:02:23 wizzard Exp $
+// $Id: construct.c,v 1.47 2004/01/16 15:17:30 wizzard Exp $
//@{
@@ -43,7 +43,7 @@
#include "tileset.h"
#include "map.h"
#include "construct.h"
-#include "ccl.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Variables
@@ -148,7 +148,7 @@
ConstructionFrame* cframe;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: constructions $Id: construct.c,v 1.46
2004/01/16 12:02:23 wizzard Exp $\n\n");
+ CLprintf(file, ";;; MODULE: constructions $Id: construct.c,v 1.47
2004/01/16 15:17:30 wizzard Exp $\n\n");
// FIXME: needed?
Index: stratagus/src/stratagus/groups.c
diff -u stratagus/src/stratagus/groups.c:1.31
stratagus/src/stratagus/groups.c:1.32
--- stratagus/src/stratagus/groups.c:1.31 Sat Jan 3 11:30:48 2004
+++ stratagus/src/stratagus/groups.c Sat Jan 17 02:17:30 2004
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: groups.c,v 1.31 2004/01/03 00:30:48 jsalmon3 Exp $
+// $Id: groups.c,v 1.32 2004/01/16 15:17:30 wizzard Exp $
//@{
@@ -41,7 +41,7 @@
#include "stratagus.h"
#include "unit.h"
-#include "ccl.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Variables
@@ -89,7 +89,7 @@
char* ref;
CLprintf(file, "\n--- -----------------------------------------\n");
- CLprintf(file, "--- MODULE: groups $Id: groups.c,v 1.31 2004/01/03
00:30:48 jsalmon3 Exp $\n\n");
+ CLprintf(file, "--- MODULE: groups $Id: groups.c,v 1.32 2004/01/16
15:17:30 wizzard Exp $\n\n");
for (g = 0; g < NUM_GROUPS; ++g) {
CLprintf(file, "Group(%d, %d, {", g, Groups[g].NumUnits);
Index: stratagus/src/stratagus/script.c
diff -u stratagus/src/stratagus/script.c:1.155
stratagus/src/stratagus/script.c:1.156
--- stratagus/src/stratagus/script.c:1.155 Thu Jan 15 01:06:41 2004
+++ stratagus/src/stratagus/script.c Sat Jan 17 02:17:30 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script.c,v 1.155 2004/01/14 14:06:41 nobody_ Exp $
+// $Id: script.c,v 1.156 2004/01/16 15:17:30 wizzard Exp $
//@{
@@ -45,7 +45,7 @@
#include "iocompat.h"
#include "iolib.h"
-#include "ccl.h"
+#include "script.h"
#include "missile.h"
#include "depend.h"
#include "upgrade.h"
@@ -53,7 +53,7 @@
#include "unit.h"
#include "map.h"
#include "pud.h"
-#include "ccl_sound.h"
+#include "script_sound.h"
#include "ui.h"
#include "interface.h"
#include "font.h"
@@ -1091,7 +1091,7 @@
}
fprintf(fd, "--- -----------------------------------------\n");
- fprintf(fd, "--- $Id: script.c,v 1.155 2004/01/14 14:06:41 nobody_ Exp
$\n");
+ fprintf(fd, "--- $Id: script.c,v 1.156 2004/01/16 15:17:30 wizzard Exp
$\n");
fprintf(fd, "SetVideoResolution(%d, %d)\n", VideoWidth, VideoHeight);
fprintf(fd, "SetGroupKeys(\"");
@@ -1127,7 +1127,7 @@
}
fprintf(fd, "--- -----------------------------------------\n");
- fprintf(fd, "--- $Id: script.c,v 1.155 2004/01/14 14:06:41 nobody_ Exp
$\n");
+ fprintf(fd, "--- $Id: script.c,v 1.156 2004/01/16 15:17:30 wizzard Exp
$\n");
// Global options
if (OriginalFogOfWar) {
@@ -1230,7 +1230,7 @@
extern SCM oblistvar;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: CCL $Id: script.c,v 1.155 2004/01/14
14:06:41 nobody_ Exp $\n\n");
+ CLprintf(file, ";;; MODULE: CCL $Id: script.c,v 1.156 2004/01/16
15:17:30 wizzard Exp $\n\n");
for (list = oblistvar; gh_list_p(list); list = gh_cdr(list)) {
SCM sym;
Index: stratagus/src/stratagus/script_player.c
diff -u stratagus/src/stratagus/script_player.c:1.54
stratagus/src/stratagus/script_player.c:1.55
--- stratagus/src/stratagus/script_player.c:1.54 Fri Jan 9 16:44:40 2004
+++ stratagus/src/stratagus/script_player.c Sat Jan 17 02:17:30 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_player.c,v 1.54 2004/01/09 05:44:40 jsalmon3 Exp $
+// $Id: script_player.c,v 1.55 2004/01/16 15:17:30 wizzard Exp $
//@{
@@ -40,7 +40,7 @@
#include "stratagus.h"
#include "player.h"
-#include "ccl.h"
+#include "script.h"
#include "ai.h"
#include "actions.h"
#include "commands.h"
Index: stratagus/src/stratagus/script_spell.c
diff -u stratagus/src/stratagus/script_spell.c:1.34
stratagus/src/stratagus/script_spell.c:1.35
--- stratagus/src/stratagus/script_spell.c:1.34 Sat Jan 3 11:30:47 2004
+++ stratagus/src/stratagus/script_spell.c Sat Jan 17 02:17:30 2004
@@ -8,7 +8,7 @@
// T H E W A R B E G I N S
// Stratagus - A free fantasy real time strategy game engine
//
-/address@hidden ccl_spells.c - The spell ccl functions.. */
+/address@hidden script_spells.c - The spell script functions.. */
//
// (c) Copyright 1998-2003 by Joris DAUPHIN
//
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_spell.c,v 1.34 2004/01/03 00:30:47 jsalmon3 Exp $
+// $Id: script_spell.c,v 1.35 2004/01/16 15:17:30 wizzard Exp $
//@{
/*----------------------------------------------------------------------------
@@ -44,8 +44,8 @@
#include "unittype.h"
*/
#include "spells.h"
-#include "ccl_sound.h"
-#include "ccl.h"
+#include "script_sound.h"
+#include "script.h"
// **************************************************************************
// Action parsers for spellAction
Index: stratagus/src/stratagus/selection.c
diff -u stratagus/src/stratagus/selection.c:1.66
stratagus/src/stratagus/selection.c:1.67
--- stratagus/src/stratagus/selection.c:1.66 Thu Jan 15 09:31:08 2004
+++ stratagus/src/stratagus/selection.c Sat Jan 17 02:17:30 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: selection.c,v 1.66 2004/01/14 22:31:08 nobody_ Exp $
+// $Id: selection.c,v 1.67 2004/01/16 15:17:30 wizzard Exp $
//@{
@@ -48,7 +48,7 @@
#include "commands.h"
#include "network.h"
-#include "ccl.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Variables
@@ -978,7 +978,7 @@
char* ref;
CLprintf(file, "\n--- -----------------------------------------\n");
- CLprintf(file, "--- MODULE: selection $Id: selection.c,v 1.66
2004/01/14 22:31:08 nobody_ Exp $\n\n");
+ CLprintf(file, "--- MODULE: selection $Id: selection.c,v 1.67
2004/01/16 15:17:30 wizzard Exp $\n\n");
CLprintf(file, "SetGroupId(%d)\n", GroupId);
CLprintf(file, "Selection(%d, {", NumSelected);
Index: stratagus/src/stratagus/stratagus.c
diff -u stratagus/src/stratagus/stratagus.c:1.247
stratagus/src/stratagus/stratagus.c:1.248
--- stratagus/src/stratagus/stratagus.c:1.247 Thu Jan 15 13:07:39 2004
+++ stratagus/src/stratagus/stratagus.c Sat Jan 17 02:17:31 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: stratagus.c,v 1.247 2004/01/15 02:07:39 jsalmon3 Exp $
+// $Id: stratagus.c,v 1.248 2004/01/16 15:17:31 wizzard Exp $
//@{
@@ -142,7 +142,7 @@
** CCL is Craft Configuration Language, which is
used to
** configure and customize Stratagus.
**
-** @see ccl.h @see ccl.c
+** @see script.h @see script.c
**
** @subsection Icon Icon
**
@@ -215,7 +215,7 @@
#include "sound_server.h"
#include "sound.h"
#include "settings.h"
-#include "ccl.h"
+#include "script.h"
#include "network.h"
#include "netconnect.h"
#include "ai.h"
Index: stratagus/src/ui/icons.c
diff -u stratagus/src/ui/icons.c:1.66 stratagus/src/ui/icons.c:1.67
--- stratagus/src/ui/icons.c:1.66 Fri Jan 16 15:45:31 2004
+++ stratagus/src/ui/icons.c Sat Jan 17 02:17:32 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: icons.c,v 1.66 2004/01/16 04:45:31 jsalmon3 Exp $
+// $Id: icons.c,v 1.67 2004/01/16 15:17:32 wizzard Exp $
//@{
@@ -44,7 +44,7 @@
#include "video.h"
#include "icons.h"
#include "player.h"
-#include "ccl.h"
+#include "script.h"
#include "etlib/hash.h"
@@ -425,7 +425,7 @@
int i;
CLprintf(file, "\n--- -----------------------------------------\n");
- CLprintf(file, "--- MODULE: icons $Id: icons.c,v 1.66 2004/01/16
04:45:31 jsalmon3 Exp $\n\n");
+ CLprintf(file, "--- MODULE: icons $Id: icons.c,v 1.67 2004/01/16
15:17:32 wizzard Exp $\n\n");
//
// Mapping the original icon numbers in puds to our internal strings
Index: stratagus/src/ui/interface.c
diff -u stratagus/src/ui/interface.c:1.152 stratagus/src/ui/interface.c:1.153
--- stratagus/src/ui/interface.c:1.152 Thu Jan 15 13:09:56 2004
+++ stratagus/src/ui/interface.c Sat Jan 17 02:17:32 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: interface.c,v 1.152 2004/01/15 02:09:56 jsalmon3 Exp $
+// $Id: interface.c,v 1.153 2004/01/16 15:17:32 wizzard Exp $
//@{
@@ -51,7 +51,7 @@
#include "ui.h"
#include "map.h"
#include "menus.h"
-#include "ccl.h"
+#include "script.h"
#include "tileset.h"
#include "minimap.h"
#include "network.h"
Index: stratagus/src/ui/menu_proc.c
diff -u stratagus/src/ui/menu_proc.c:1.121 stratagus/src/ui/menu_proc.c:1.122
--- stratagus/src/ui/menu_proc.c:1.121 Thu Jan 15 13:09:56 2004
+++ stratagus/src/ui/menu_proc.c Sat Jan 17 02:17:32 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: menu_proc.c,v 1.121 2004/01/15 02:09:56 jsalmon3 Exp $
+// $Id: menu_proc.c,v 1.122 2004/01/16 15:17:32 wizzard Exp $
//@{
@@ -53,7 +53,7 @@
#include "ui.h"
#include "sound_server.h"
#include "sound.h"
-#include "ccl.h"
+#include "script.h"
#ifdef USE_WIN32
#ifdef _MSC_VER
Index: stratagus/src/ui/menus.c
diff -u stratagus/src/ui/menus.c:1.606 stratagus/src/ui/menus.c:1.607
--- stratagus/src/ui/menus.c:1.606 Fri Jan 16 23:02:25 2004
+++ stratagus/src/ui/menus.c Sat Jan 17 02:17:32 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: menus.c,v 1.606 2004/01/16 12:02:25 wizzard Exp $
+// $Id: menus.c,v 1.607 2004/01/16 15:17:32 wizzard Exp $
//@{
@@ -66,7 +66,7 @@
#include "campaign.h"
#include "sound_server.h"
#include "sound.h"
-#include "ccl.h"
+#include "script.h"
#include "editor.h"
#include "commands.h"
#include "actions.h"
Index: stratagus/src/ui/script_ui.c
diff -u stratagus/src/ui/script_ui.c:1.186 stratagus/src/ui/script_ui.c:1.187
--- stratagus/src/ui/script_ui.c:1.186 Fri Jan 16 23:02:24 2004
+++ stratagus/src/ui/script_ui.c Sat Jan 17 02:17:34 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_ui.c,v 1.186 2004/01/16 12:02:24 wizzard Exp $
+// $Id: script_ui.c,v 1.187 2004/01/16 15:17:34 wizzard Exp $
//@{
@@ -39,7 +39,7 @@
#include <string.h>
#include "stratagus.h"
-#include "ccl.h"
+#include "script.h"
#include "interface.h"
#include "ui.h"
#include "video.h"
Index: stratagus/src/unit/depend.c
diff -u stratagus/src/unit/depend.c:1.37 stratagus/src/unit/depend.c:1.38
--- stratagus/src/unit/depend.c:1.37 Sat Jan 3 11:33:01 2004
+++ stratagus/src/unit/depend.c Sat Jan 17 02:17:35 2004
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: depend.c,v 1.37 2004/01/03 00:33:01 jsalmon3 Exp $
+// $Id: depend.c,v 1.38 2004/01/16 15:17:35 wizzard Exp $
//@{
@@ -44,7 +44,7 @@
#include "upgrade.h"
#include "depend.h"
#include "player.h"
-#include "ccl.h"
+#include "script.h"
/*----------------------------------------------------------------------------
-- Variables
@@ -288,7 +288,7 @@
const DependRule* temp;
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: dependencies $Id: depend.c,v 1.37 2004/01/03
00:33:01 jsalmon3 Exp $\n\n");
+ CLprintf(file,";;; MODULE: dependencies $Id: depend.c,v 1.38 2004/01/16
15:17:35 wizzard Exp $\n\n");
// Save all dependencies
Index: stratagus/src/unit/script_unit.c
diff -u stratagus/src/unit/script_unit.c:1.92
stratagus/src/unit/script_unit.c:1.93
--- stratagus/src/unit/script_unit.c:1.92 Thu Jan 15 09:31:10 2004
+++ stratagus/src/unit/script_unit.c Sat Jan 17 02:17:35 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_unit.c,v 1.92 2004/01/14 22:31:10 nobody_ Exp $
+// $Id: script_unit.c,v 1.93 2004/01/16 15:17:35 wizzard Exp $
//@{
@@ -42,7 +42,7 @@
#include "unittype.h"
#include "player.h"
#include "unit.h"
-#include "ccl.h"
+#include "script.h"
#include "spells.h"
#include "pathfinder.h"
#include "trigger.h"
Index: stratagus/src/unit/script_unittype.c
diff -u stratagus/src/unit/script_unittype.c:1.131
stratagus/src/unit/script_unittype.c:1.132
--- stratagus/src/unit/script_unittype.c:1.131 Sat Jan 17 01:40:15 2004
+++ stratagus/src/unit/script_unittype.c Sat Jan 17 02:17:36 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: script_unittype.c,v 1.131 2004/01/16 14:40:15 wizzard Exp $
+// $Id: script_unittype.c,v 1.132 2004/01/16 15:17:36 wizzard Exp $
//@{
@@ -46,7 +46,7 @@
#include "unittype.h"
#include "icons.h"
#include "missile.h"
-#include "ccl.h"
+#include "script.h"
#include "construct.h"
#include "spells.h"
Index: stratagus/src/unit/unit.c
diff -u stratagus/src/unit/unit.c:1.359 stratagus/src/unit/unit.c:1.360
--- stratagus/src/unit/unit.c:1.359 Fri Jan 16 21:35:36 2004
+++ stratagus/src/unit/unit.c Sat Jan 17 02:17:36 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit.c,v 1.359 2004/01/16 10:35:36 wizzard Exp $
+// $Id: unit.c,v 1.360 2004/01/16 15:17:36 wizzard Exp $
//@{
@@ -58,7 +58,7 @@
#include "pathfinder.h"
#include "network.h"
#include "ui.h"
-#include "ccl.h"
+#include "script.h"
#include "editor.h"
/*----------------------------------------------------------------------------
@@ -3773,7 +3773,7 @@
int j;
CLprintf(file, "\n--- -----------------------------------------\n");
- CLprintf(file, "--- MODULE: units $Id: unit.c,v 1.359 2004/01/16
10:35:36 wizzard Exp $\n\n");
+ CLprintf(file, "--- MODULE: units $Id: unit.c,v 1.360 2004/01/16
15:17:36 wizzard Exp $\n\n");
#if 0
//
Index: stratagus/src/unit/unit_draw.c
diff -u stratagus/src/unit/unit_draw.c:1.207
stratagus/src/unit/unit_draw.c:1.208
--- stratagus/src/unit/unit_draw.c:1.207 Fri Jan 16 23:02:27 2004
+++ stratagus/src/unit/unit_draw.c Sat Jan 17 02:17:36 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit_draw.c,v 1.207 2004/01/16 12:02:27 wizzard Exp $
+// $Id: unit_draw.c,v 1.208 2004/01/16 15:17:36 wizzard Exp $
//@{
@@ -53,7 +53,7 @@
#include "interface.h"
#include "font.h"
#include "ui.h"
-#include "ccl.h"
+#include "script.h"
#include "etlib/generic.h"
@@ -658,7 +658,7 @@
{
#if 0
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: decorations $Id: unit_draw.c,v 1.207
2004/01/16 12:02:27 wizzard Exp $\n\n");
+ CLprintf(file, ";;; MODULE: decorations $Id: unit_draw.c,v 1.208
2004/01/16 15:17:36 wizzard Exp $\n\n");
CLprintf(file, "(mana-sprite \"%s\" %d %d %d %d)\n",
ManaSprite.File, ManaSprite.HotX, ManaSprite.HotY,
Index: stratagus/src/unit/unittype.c
diff -u stratagus/src/unit/unittype.c:1.141 stratagus/src/unit/unittype.c:1.142
--- stratagus/src/unit/unittype.c:1.141 Fri Jan 16 21:35:37 2004
+++ stratagus/src/unit/unittype.c Sat Jan 17 02:17:37 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unittype.c,v 1.141 2004/01/16 10:35:37 wizzard Exp $
+// $Id: unittype.c,v 1.142 2004/01/16 15:17:37 wizzard Exp $
//@{
@@ -49,7 +49,7 @@
#include "unittype.h"
#include "player.h"
#include "missile.h"
-#include "ccl.h"
+#include "script.h"
#include "spells.h"
#include "etlib/hash.h"
@@ -1187,7 +1187,7 @@
// char** sp;
CLprintf(file, "\n--- -----------------------------------------\n");
- CLprintf(file, "--- MODULE: unittypes $Id: unittype.c,v 1.141
2004/01/16 10:35:37 wizzard Exp $\n\n");
+ CLprintf(file, "--- MODULE: unittypes $Id: unittype.c,v 1.142
2004/01/16 15:17:37 wizzard Exp $\n\n");
#if 0
// Original number to internal unit-type name.
Index: stratagus/src/unit/upgrade.c
diff -u stratagus/src/unit/upgrade.c:1.71 stratagus/src/unit/upgrade.c:1.72
--- stratagus/src/unit/upgrade.c:1.71 Sat Jan 3 11:33:03 2004
+++ stratagus/src/unit/upgrade.c Sat Jan 17 02:17:37 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: upgrade.c,v 1.71 2004/01/03 00:33:03 jsalmon3 Exp $
+// $Id: upgrade.c,v 1.72 2004/01/16 15:17:37 wizzard Exp $
//@{
@@ -545,7 +545,7 @@
int j;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: upgrades $Id: upgrade.c,v 1.71 2004/01/03
00:33:03 jsalmon3 Exp $\n\n");
+ CLprintf(file, ";;; MODULE: upgrades $Id: upgrade.c,v 1.72 2004/01/16
15:17:37 wizzard Exp $\n\n");
//
// Save all upgrades
@@ -669,7 +669,7 @@
-- Ccl part of upgrades
----------------------------------------------------------------------------*/
-#include "ccl.h"
+#include "script.h"
/**
** Define a new upgrade modifier.
Index: stratagus/src/video/font.c
diff -u stratagus/src/video/font.c:1.80 stratagus/src/video/font.c:1.81
--- stratagus/src/video/font.c:1.80 Fri Jan 16 16:55:58 2004
+++ stratagus/src/video/font.c Sat Jan 17 02:17:38 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: font.c,v 1.80 2004/01/16 05:55:58 jsalmon3 Exp $
+// $Id: font.c,v 1.81 2004/01/16 15:17:38 wizzard Exp $
//@{
@@ -41,7 +41,7 @@
#include "stratagus.h"
#include "video.h"
#include "font.h"
-#include "ccl.h"
+#include "script.h"
#include "intern_video.h"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src ai/ai.c ai/ai_local.h ai/script_a...,
address@hidden <=