[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus ./Rules.make.in src/ai/Module.make sr...
From: |
Russell Smith |
Subject: |
[Stratagus-CVS] stratagus ./Rules.make.in src/ai/Module.make sr... |
Date: |
Thu, 25 Sep 2003 02:58:37 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Russell Smith <address@hidden> 03/09/25 02:58:37
Modified files:
. : Rules.make.in
src/ai : Module.make ai_building.c ai_force.c ai_local.h
ai_magic.c ai_plan.c ai_resource.c ccl_ai.c
new_ai.c
src/clone : ccl.c clone.c
Removed files:
src/ai : ai.c
Log message:
Removed ai, and made NEW_AI the only and default AI.
Patches:
Index: stratagus/Rules.make.in
diff -u stratagus/Rules.make.in:1.14 stratagus/Rules.make.in:1.15
--- stratagus/Rules.make.in:1.14 Sun Sep 21 03:51:00 2003
+++ stratagus/Rules.make.in Thu Sep 25 02:58:34 2003
@@ -51,7 +51,7 @@
IFLAGS= -I$(TOPDIR)/src/include $(XIFLAGS)
-I$(TOPDIR)/src/movie/vp31/include
address@hidden@ @DEBUG_CFLAGS@ $(IFLAGS) \
- -DUNIT_ON_MAP -DNEW_AI -DUSE_LIBMODPLUG -DUSE_HP_FOR_XP \
+ -DUNIT_ON_MAP -DUSE_LIBMODPLUG -DUSE_HP_FOR_XP \
@PROFILE_CFLAGS@ @DEBUG_CFLAGS@ @VIDEO_CFLAGS@ @BZ2_CFLAGS@ \
@OGG_CFLAGS@ @MAD_CFLAGS@ @FLAC_CFLAGS@ @CDAUDIO_CFLAGS@ @GUILE_CFLAGS@ \
$(CCL) $(VERSION) $(COMP_CFLAGS) @NEWUI_CFLAGS@ @SOUND_CFLAGS@ @PLATFORM@ \
Index: stratagus/src/ai/Module.make
diff -u stratagus/src/ai/Module.make:1.2 stratagus/src/ai/Module.make:1.3
--- stratagus/src/ai/Module.make:1.2 Thu Sep 11 18:07:53 2003
+++ stratagus/src/ai/Module.make Thu Sep 25 02:58:34 2003
@@ -1,3 +1,3 @@
-SRC += src/ai/ai.c src/ai/ai_building.c src/ai/ai_force.c src/ai/ai_magic.c
src/ai/ai_plan.c src/ai/ai_resource.c src/ai/ccl_ai.c src/ai/new_ai.c
+SRC += src/ai/ai_building.c src/ai/ai_force.c src/ai/ai_magic.c
src/ai/ai_plan.c src/ai/ai_resource.c src/ai/ccl_ai.c src/ai/new_ai.c
HDRS += src/ai/ai_local.h
-OBJ += src/ai/$(OBJDIR)/ai.c src/ai/$(OBJDIR)/ai_building.o
src/ai/$(OBJDIR)/ai_force.o src/ai/$(OBJDIR)/ai_magic.o
src/ai/$(OBJDIR)/ai_plan.o src/ai/$(OBJDIR)/ai_resource.o
src/ai/$(OBJDIR)/ccl_ai.o src/ai/$(OBJDIR)/new_ai.o
+OBJ += src/ai/$(OBJDIR)/ai_building.o src/ai/$(OBJDIR)/ai_force.o
src/ai/$(OBJDIR)/ai_magic.o src/ai/$(OBJDIR)/ai_plan.o
src/ai/$(OBJDIR)/ai_resource.o src/ai/$(OBJDIR)/ccl_ai.o
src/ai/$(OBJDIR)/new_ai.o
Index: stratagus/src/ai/ai_building.c
diff -u stratagus/src/ai/ai_building.c:1.38 stratagus/src/ai/ai_building.c:1.39
--- stratagus/src/ai/ai_building.c:1.38 Wed Sep 10 04:44:36 2003
+++ stratagus/src/ai/ai_building.c Thu Sep 25 02:58:35 2003
@@ -26,9 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ai_building.c,v 1.38 2003/09/10 08:44:36 n0body Exp $
-
-#ifdef NEW_AI // {
+// $Id: ai_building.c,v 1.39 2003/09/25 06:58:35 mr-russ Exp $
//@{
@@ -657,5 +655,3 @@
}
//@}
-
-#endif // } NEW_AI
Index: stratagus/src/ai/ai_force.c
diff -u stratagus/src/ai/ai_force.c:1.32 stratagus/src/ai/ai_force.c:1.33
--- stratagus/src/ai/ai_force.c:1.32 Thu Aug 21 17:55:45 2003
+++ stratagus/src/ai/ai_force.c Thu Sep 25 02:58:35 2003
@@ -26,9 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ai_force.c,v 1.32 2003/08/21 21:55:45 n0body Exp $
-
-#ifdef NEW_AI // {
+// $Id: ai_force.c,v 1.33 2003/09/25 06:58:35 mr-russ Exp $
//@{
@@ -662,5 +660,3 @@
}
//@}
-
-#endif // } NEW_AI
Index: stratagus/src/ai/ai_local.h
diff -u stratagus/src/ai/ai_local.h:1.35 stratagus/src/ai/ai_local.h:1.36
--- stratagus/src/ai/ai_local.h:1.35 Thu Sep 11 06:49:09 2003
+++ stratagus/src/ai/ai_local.h Thu Sep 25 02:58:35 2003
@@ -26,13 +26,11 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ai_local.h,v 1.35 2003/09/11 10:49:09 n0body Exp $
+// $Id: ai_local.h,v 1.36 2003/09/25 06:58:35 mr-russ Exp $
#ifndef __AI_LOCAL_H__
#define __AI_LOCAL_H__
-#ifdef NEW_AI
-
//@{
/*----------------------------------------------------------------------------
@@ -324,7 +322,5 @@
extern void AiCheckMagic(void);
//@}
-
-#endif // NEW_AI
#endif // !__AI_LOCAL_H__
Index: stratagus/src/ai/ai_magic.c
diff -u stratagus/src/ai/ai_magic.c:1.14 stratagus/src/ai/ai_magic.c:1.15
--- stratagus/src/ai/ai_magic.c:1.14 Fri Jul 11 10:35:29 2003
+++ stratagus/src/ai/ai_magic.c Thu Sep 25 02:58:35 2003
@@ -26,9 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ai_magic.c,v 1.14 2003/07/11 14:35:29 n0body Exp $
-
-#ifdef NEW_AI // {
+// $Id: ai_magic.c,v 1.15 2003/09/25 06:58:35 mr-russ Exp $
//@{
@@ -411,5 +409,3 @@
}
//@}
-
-#endif // } NEW_AI
Index: stratagus/src/ai/ai_plan.c
diff -u stratagus/src/ai/ai_plan.c:1.16 stratagus/src/ai/ai_plan.c:1.17
--- stratagus/src/ai/ai_plan.c:1.16 Wed Sep 17 05:17:12 2003
+++ stratagus/src/ai/ai_plan.c Thu Sep 25 02:58:35 2003
@@ -26,9 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ai_plan.c,v 1.16 2003/09/17 09:17:12 mr-russ Exp $
-
-#ifdef NEW_AI // {
+// $Id: ai_plan.c,v 1.17 2003/09/25 06:58:35 mr-russ Exp $
//@{
@@ -607,5 +605,3 @@
}
//@}
-
-#endif // } NEW_AI
Index: stratagus/src/ai/ai_resource.c
diff -u stratagus/src/ai/ai_resource.c:1.69 stratagus/src/ai/ai_resource.c:1.70
--- stratagus/src/ai/ai_resource.c:1.69 Thu Sep 11 18:07:53 2003
+++ stratagus/src/ai/ai_resource.c Thu Sep 25 02:58:35 2003
@@ -26,9 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ai_resource.c,v 1.69 2003/09/11 22:07:53 n0body Exp $
-
-#ifdef NEW_AI // {
+// $Id: ai_resource.c,v 1.70 2003/09/25 06:58:35 mr-russ Exp $
//@{
@@ -1248,5 +1246,3 @@
}
//@}
-
-#endif // } NEW_AI
Index: stratagus/src/ai/ccl_ai.c
diff -u stratagus/src/ai/ccl_ai.c:1.67 stratagus/src/ai/ccl_ai.c:1.68
--- stratagus/src/ai/ccl_ai.c:1.67 Thu Sep 11 06:49:09 2003
+++ stratagus/src/ai/ccl_ai.c Thu Sep 25 02:58:36 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_ai.c,v 1.67 2003/09/11 10:49:09 n0body Exp $
+// $Id: ccl_ai.c,v 1.68 2003/09/25 06:58:36 mr-russ Exp $
//@{
@@ -48,8 +48,6 @@
-- Functions
----------------------------------------------------------------------------*/
-#if defined(NEW_AI)
-
/**
** Setup AI helper table.
**
@@ -1297,30 +1295,6 @@
return SCM_UNSPECIFIED;
}
-#else
-
-/**
-** Define helper for AI.
-**
-** @param list List of the AI player.
-*/
-local SCM CclDefineAiHelper(SCM list)
-{
- return list;
-}
-
-/**
-** Define an AI engine.
-**
-** @param list List of the AI.
-*/
-local SCM CclDefineAi(SCM list)
-{
- return list;
-}
-
-#endif
-
/**
** Register CCL features for unit-type.
*/
@@ -1332,7 +1306,6 @@
gh_new_procedureN("define-ai-helper",CclDefineAiHelper);
gh_new_procedureN("define-ai",CclDefineAi);
-#if defined(NEW_AI)
gh_new_procedure0_0("ai:get-race",CclAiGetRace);
gh_new_procedure0_0("ai:get-sleep-cycles",CclAiGetSleepCycles);
@@ -1360,7 +1333,6 @@
gh_new_procedureN("define-ai-wc-names",CclDefineAiWcNames);
gh_new_procedureN("define-ai-player",CclDefineAiPlayer);
-#endif
}
//@}
Index: stratagus/src/ai/new_ai.c
diff -u stratagus/src/ai/new_ai.c:1.72 stratagus/src/ai/new_ai.c:1.73
--- stratagus/src/ai/new_ai.c:1.72 Thu Sep 11 06:49:09 2003
+++ stratagus/src/ai/new_ai.c Thu Sep 25 02:58:36 2003
@@ -26,9 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: new_ai.c,v 1.72 2003/09/11 10:49:09 n0body Exp $
-
-#ifdef NEW_AI // {
+// $Id: new_ai.c,v 1.73 2003/09/25 06:58:36 mr-russ Exp $
//@{
@@ -805,7 +803,7 @@
global void SaveAi(CLFile* file)
{
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: AI $Id: new_ai.c,v 1.72 2003/09/11 10:49:09
n0body Exp $\n\n");
+ CLprintf(file,";;; MODULE: AI $Id: new_ai.c,v 1.73 2003/09/25 06:58:36
mr-russ Exp $\n\n");
SaveAiTypesWcName(file);
SaveAiHelper(file);
@@ -1416,5 +1414,3 @@
}
//@}
-
-#endif // } NEW_AI
Index: stratagus/src/clone/ccl.c
diff -u stratagus/src/clone/ccl.c:1.110 stratagus/src/clone/ccl.c:1.111
--- stratagus/src/clone/ccl.c:1.110 Mon Sep 22 06:40:51 2003
+++ stratagus/src/clone/ccl.c Thu Sep 25 02:58:36 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl.c,v 1.110 2003/09/22 10:40:51 n0body Exp $
+// $Id: ccl.c,v 1.111 2003/09/25 06:58:36 mr-russ Exp $
//@{
@@ -929,9 +929,6 @@
#ifdef HIERARCHIC_PATHFINDER
gh_define("stratagus-feature-hierarchic-pathfinder",SCM_BOOL_T);
#endif
-#ifdef NEW_AI
- gh_define("stratagus-feature-new-ai",SCM_BOOL_T);
-#endif
#ifdef NEW_SHIPS
gh_define("stratagus-feature-new-ships",SCM_BOOL_T);
#endif
@@ -1025,7 +1022,7 @@
}
fprintf(fd,";;; -----------------------------------------\n");
- fprintf(fd,";;; $Id: ccl.c,v 1.110 2003/09/22 10:40:51 n0body Exp $\n");
+ fprintf(fd,";;; $Id: ccl.c,v 1.111 2003/09/25 06:58:36 mr-russ Exp $\n");
fprintf(fd,"(set-video-resolution! %d %d)\n", VideoWidth, VideoHeight);
@@ -1049,7 +1046,7 @@
}
fprintf(fd,";;; -----------------------------------------\n");
- fprintf(fd,";;; $Id: ccl.c,v 1.110 2003/09/22 10:40:51 n0body Exp $\n");
+ fprintf(fd,";;; $Id: ccl.c,v 1.111 2003/09/25 06:58:36 mr-russ Exp $\n");
// Global options
if( OriginalFogOfWar ) {
@@ -1159,7 +1156,7 @@
extern SCM oblistvar;
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: CCL $Id: ccl.c,v 1.110 2003/09/22 10:40:51
n0body Exp $\n\n");
+ CLprintf(file,";;; MODULE: CCL $Id: ccl.c,v 1.111 2003/09/25 06:58:36
mr-russ Exp $\n\n");
for(list = oblistvar; gh_list_p(list); list = gh_cdr(list) ) {
SCM sym;
Index: stratagus/src/clone/clone.c
diff -u stratagus/src/clone/clone.c:1.203 stratagus/src/clone/clone.c:1.204
--- stratagus/src/clone/clone.c:1.203 Tue Sep 23 03:01:24 2003
+++ stratagus/src/clone/clone.c Thu Sep 25 02:58:36 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: clone.c,v 1.203 2003/09/23 07:01:24 mr-russ Exp $
+// $Id: clone.c,v 1.204 2003/09/25 06:58:36 mr-russ Exp $
//@{
@@ -1224,9 +1224,6 @@
#endif
#ifdef NEW_MAPDRAW
"NEW-MAPDRAW "
-#endif
-#ifdef NEW_AI
- "NEW-AI "
#endif
#ifdef NEW_SHIPS
"NEW-SHIPS "
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus ./Rules.make.in src/ai/Module.make sr...,
Russell Smith <=