[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus doc/ChangeLog.html src/ui/menus.c dat...
|
From: |
Russell Smith |
|
Subject: |
[Stratagus-CVS] stratagus doc/ChangeLog.html src/ui/menus.c dat... |
|
Date: |
Fri, 14 Nov 2003 16:57:46 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Russell Smith <address@hidden> 03/11/14 16:57:46
Modified files:
doc : ChangeLog.html
src/ui : menus.c
data/ccl : tilesets.ccl
Log message:
Fixed Bug #6230: Hack to detect wc2 swamp tileset
Patches:
Index: stratagus/data/ccl/tilesets.ccl
diff -u stratagus/data/ccl/tilesets.ccl:1.13
stratagus/data/ccl/tilesets.ccl:1.14
--- stratagus/data/ccl/tilesets.ccl:1.13 Mon Nov 3 01:29:55 2003
+++ stratagus/data/ccl/tilesets.ccl Fri Nov 14 16:57:46 2003
@@ -26,18 +26,24 @@
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
;;
-;; $Id: tilesets.ccl,v 1.13 2003/11/03 06:29:55 jsalmon3 Exp $
+;; $Id: tilesets.ccl,v 1.14 2003/11/14 21:57:46 mr-russ Exp $
;;=============================================================================
;; Load the different tileset definitions
;;
;; FIXME: need a way to automatic load all available tileset definitions
+(ccl:load "ccl/wc2-config.ccl")
+
(define-tileset 'tileset-summer 'class "summer" 'name "Forest"
'file "ccl/tilesets/summer.ccl")
(define-tileset 'tileset-winter 'class "winter" 'name "Winter"
'file "ccl/tilesets/winter.ccl")
(define-tileset 'tileset-wasteland 'class "wasteland" 'name "Wasteland"
'file "ccl/tilesets/wasteland.ccl")
-(define-tileset 'tileset-swamp 'class "swamp" 'name "Swamp"
- 'file "ccl/tilesets/swamp.ccl")
+(if expansion (begin
+ (define-tileset 'tileset-swamp 'class "swamp" 'name "Swamp"
+ 'file "ccl/tilesets/swamp.ccl")))
+(if (not expansion) (begin
+ (define-tileset 'tileset-swamp 'class "swamp" 'name "Swamp"
+ 'file "ccl/tilesets/dummy-swamp.ccl")))
Index: stratagus/doc/ChangeLog.html
diff -u stratagus/doc/ChangeLog.html:1.579 stratagus/doc/ChangeLog.html:1.580
--- stratagus/doc/ChangeLog.html:1.579 Fri Nov 14 12:35:49 2003
+++ stratagus/doc/ChangeLog.html Fri Nov 14 16:57:44 2003
@@ -2,7 +2,7 @@
<html>
<head>
<!--
----- $Id: ChangeLog.html,v 1.579 2003/11/14 17:35:49 pludov Exp $
+---- $Id: ChangeLog.html,v 1.580 2003/11/14 21:57:44 mr-russ Exp $
---- (c) Copyright 1998-2003 by Lutz Sammer
@@ -36,6 +36,7 @@
<li>Future 2.00 Release<p>
<ul>
<li>++
+ <li>Fixed Bug #6230: Hack to detect wc2 swamp tileset (from Russell Smith).
<li>AI tries to move its own units when blocked (from Pollet Ludovic).
<li>Replay log are now generated for saved/loaded games as well (from
Pollet Ludovic).
<li>Fixed Bug #6466: Can't change between Units/Tile with left mouse after
click menu in editor (from Russell Smith).
Index: stratagus/src/ui/menus.c
diff -u stratagus/src/ui/menus.c:1.586 stratagus/src/ui/menus.c:1.587
--- stratagus/src/ui/menus.c:1.586 Thu Nov 13 08:54:01 2003
+++ stratagus/src/ui/menus.c Fri Nov 14 16:57:45 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: menus.c,v 1.586 2003/11/13 13:54:01 pludov Exp $
+// $Id: menus.c,v 1.587 2003/11/14 21:57:45 mr-russ Exp $
//@{
@@ -6996,27 +6996,6 @@
*/
global void InitMenuFunctions(void)
{
- // FIXME: This must be removed!
- // FIXME: Use wartool and fix the ccls instead!
- if (!strcmp(GameName, "wc2")) {
- Menu *menu;
-
- //
- // FIXME: Hack to disable Expansion Gfx..
- //
- strcpy(MenuMapFullPath, StratagusLibPath);
- if (MenuMapFullPath[0]) {
- strcat(MenuMapFullPath, "/graphics/tilesets/");
- }
- strcat(MenuMapFullPath, "swamp");
- if (access(MenuMapFullPath, F_OK) != 0) {
- menu = FindMenu("menu-custom-game");
- menu->Items[14].d.pulldown.noptions = 4;
- menu = FindMenu("menu-multi-setup");
- menu->Items[29].d.pulldown.noptions = 4;
- }
- }
-
#ifdef SAVE_MENU_CCL
{
FILE* fd;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus doc/ChangeLog.html src/ui/menus.c dat...,
Russell Smith <=