[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src game/campaign.c stratagus/stratag...
From: |
address@hidden |
Subject: |
[Stratagus-CVS] stratagus/src game/campaign.c stratagus/stratag... |
Date: |
14 Jan 2004 10:54:10 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 04/01/14 10:54:10
Modified files:
src/game : campaign.c
src/stratagus : stratagus.c
Log message:
Update default locations for scripts and maps
Patches:
Index: stratagus/src/game/campaign.c
diff -u stratagus/src/game/campaign.c:1.42 stratagus/src/game/campaign.c:1.43
--- stratagus/src/game/campaign.c:1.42 Sat Jan 3 11:27:32 2004
+++ stratagus/src/game/campaign.c Wed Jan 14 10:54:09 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: campaign.c,v 1.42 2004/01/03 00:27:32 jsalmon3 Exp $
+// $Id: campaign.c,v 1.43 2004/01/13 23:54:09 wizzard Exp $
//@{
@@ -59,7 +59,7 @@
global int GameResult; /// Outcome of the game
global char CurrentMapPath[1024]; /// Path of the current map
-global char DefaultMap[1024] = "puds/default.pud"; /// Default map path
+global char DefaultMap[1024] = "maps/default.pud"; /// Default map path
global int RestartScenario; /// Restart the scenario
global int QuitToMenu; /// Quit to menu
global Campaign* Campaigns; /// Campaigns
@@ -561,7 +561,7 @@
int i;
CLprintf(file, "\n--- -----------------------------------------\n");
- CLprintf(file, "--- MODULE: campaign $Id: campaign.c,v 1.42 2004/01/03
00:27:32 jsalmon3 Exp $\n\n");
+ CLprintf(file, "--- MODULE: campaign $Id: campaign.c,v 1.43 2004/01/13
23:54:09 wizzard Exp $\n\n");
if (!CurrentCampaign) {
return;
}
Index: stratagus/src/stratagus/stratagus.c
diff -u stratagus/src/stratagus/stratagus.c:1.243
stratagus/src/stratagus/stratagus.c:1.244
--- stratagus/src/stratagus/stratagus.c:1.243 Sat Jan 10 17:13:00 2004
+++ stratagus/src/stratagus/stratagus.c Wed Jan 14 10:54:10 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: stratagus.c,v 1.243 2004/01/10 06:13:00 jsalmon3 Exp $
+// $Id: stratagus.c,v 1.244 2004/01/13 23:54:10 wizzard Exp $
//@{
@@ -945,7 +945,7 @@
PrintHeader();
printf(
"\n\nUsage: stratagus [OPTIONS] [map.pud|map.pud.gz|map.cm|map.cm.gz]\n\
-\t-c file.ccl\tccl start file (default stratagus.ccl)\n\
+\t-c file.lua\tconfiguration start file (default stratagus.lua)\n\
\t-d datapath\tpath to stratagus data\n\
\t-e\t\tStart editor\n\
\t-f factor\tComputer units cost factor\n\
@@ -990,13 +990,13 @@
#ifndef __APPLE__
StratagusLibPath = STRATAGUS_LIB_PATH;
#endif
- CclStartFile = "ccl/stratagus.lua";
- EditorStartFile = "ccl/editor.lua";
+ CclStartFile = "scripts/stratagus.lua";
+ EditorStartFile = "scripts/editor.lua";
memset(LocalPlayerName, 0, 16);
strcpy(LocalPlayerName, "Anonymous");
- // FIXME: Parse options before or after ccl?
+ // FIXME: Parse options before or after scripts?
//
// Parse commandline
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src game/campaign.c stratagus/stratag...,
address@hidden <=