[Stratagus-CVS] stratagus data/ccl/human/campaign1.ccl data/ccl...

[Crestez Leonard]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Crestez Leonard <address@hidden>        03/07/12 11:03:14

Modified files:
        data/ccl/human : campaign1.ccl campaign2.ccl 
        data/ccl/orc   : campaign1.ccl campaign2.ccl 
        doc            : ChangeLog.html 
        src/ui         : ui.c 

Log message:
        Applied patch for saveames in different resolutions.
        Fixed campaign pictures.

Patches:
Index: stratagus/data/ccl/human/campaign1.ccl
diff -u stratagus/data/ccl/human/campaign1.ccl:1.18 
stratagus/data/ccl/human/campaign1.ccl:1.19
--- stratagus/data/ccl/human/campaign1.ccl:1.18 Fri Jul 11 14:27:05 2003
+++ stratagus/data/ccl/human/campaign1.ccl      Sat Jul 12 11:03:13 2003
@@ -26,7 +26,7 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: campaign1.ccl,v 1.18 2003/07/11 18:27:05 grumbel Exp $
+;;     $Id: campaign1.ccl,v 1.19 2003/07/12 15:03:13 n0body Exp $
 
 ;;=============================================================================
 ;;     Define the campaign
@@ -36,7 +36,7 @@
   'campaign (list
        ;'play-movie "movie/splash2.avi" '(full-screen zoom-screen)
        'show-picture (list
-         'image "campaigns/human/interface/Act_I___-_Shores_of_Lordareon.png"
+         'image "campaigns/human/interface/Act_I_-_Shores_of_Lordareon.png"
          'fade-in (* 30 2)
          'fade-out (* 30 2)
          'display-time (* 30 10)
@@ -61,7 +61,7 @@
        'play-level "campaigns/human/level03h.cm"
        'play-level "campaigns/human/level04h.cm"
        'show-picture (list
-         'image "campaigns/human/interface/Act_II__-_Khaz_Modan.png"
+         'image "campaigns/human/interface/Act_II_-_Khaz_Modan.png"
          'fade-in (* 30 2)
          'fade-out (* 30 2)
          'display-time (* 30 10)
@@ -109,7 +109,7 @@
        'play-level "campaigns/human/level09h.cm"
        'play-level "campaigns/human/level10h.cm"
        'show-picture (list
-         'image "campaigns/human/interface/Act_IV__-_Return_to_Azeroth.png"
+         'image "campaigns/human/interface/Act_IV_-_Return_to_Azeroth.png"
          'fade-in (* 30 2)
          'fade-out (* 30 2)
          'display-time (* 30 10)
Index: stratagus/data/ccl/human/campaign2.ccl
diff -u stratagus/data/ccl/human/campaign2.ccl:1.12 
stratagus/data/ccl/human/campaign2.ccl:1.13
--- stratagus/data/ccl/human/campaign2.ccl:1.12 Fri Jul 11 14:27:05 2003
+++ stratagus/data/ccl/human/campaign2.ccl      Sat Jul 12 11:03:13 2003
@@ -26,7 +26,7 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: campaign2.ccl,v 1.12 2003/07/11 18:27:05 grumbel Exp $
+;;     $Id: campaign2.ccl,v 1.13 2003/07/12 15:03:13 n0body Exp $
 
 ;;=============================================================================
 ;;     Define the campaign
@@ -35,7 +35,7 @@
 (define-campaign 'human-exp 'name "H~!uman expansion levels"
   'campaign (list
        'show-picture (list
-         'image "campaigns/human-exp/interface/Act_I__-_A_Time_for_Heroes.png"
+         'image "campaigns/human-exp/interface/Act_I_-_A_Time_for_Heroes.png"
          'fade-in (* 30 2)
          'fade-out (* 30 2)
          'display-time (* 30 10)
@@ -83,7 +83,7 @@
        'play-level "campaigns/human-exp/levelx05h.cm"
        'play-level "campaigns/human-exp/levelx06h.cm"
        'show-picture (list
-         'image "campaigns/human-exp/interface/Act_III-_War_in_the_Shadows.png"
+         'image 
"campaigns/human-exp/interface/Act_III_-_War_in_the_Shadows.png"
          'fade-in (* 30 2)
          'fade-out (* 30 2)
          'display-time (* 30 10)
Index: stratagus/data/ccl/orc/campaign1.ccl
diff -u stratagus/data/ccl/orc/campaign1.ccl:1.12 
stratagus/data/ccl/orc/campaign1.ccl:1.13
--- stratagus/data/ccl/orc/campaign1.ccl:1.12   Fri Jul 11 14:27:05 2003
+++ stratagus/data/ccl/orc/campaign1.ccl        Sat Jul 12 11:03:13 2003
@@ -26,7 +26,7 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: campaign1.ccl,v 1.12 2003/07/11 18:27:05 grumbel Exp $
+;;     $Id: campaign1.ccl,v 1.13 2003/07/12 15:03:13 n0body Exp $
 
 ;;=============================================================================
 ;;     Define the campaign
@@ -35,7 +35,7 @@
 (define-campaign 'orc 'name "~!Orc campaign"
   'campaign (list
        'show-picture (list
-         'image "campaigns/orc/interface/Act_I___-_Seas_of_Blood.png"
+         'image "campaigns/orc/interface/Act_I_-_Seas_of_Blood.png"
          'fade-in (* 30 2)
          'fade-out (* 30 2)
          'display-time (* 30 10)
@@ -60,7 +60,7 @@
        'play-level "campaigns/orc/level03o.cm"
        'play-level "campaigns/orc/level04o.cm"
        'show-picture (list
-         'image "campaigns/orc/interface/Act_II__-_Khaz_Modan.png"
+         'image "campaigns/orc/interface/Act_II_-_Khaz_Modan.png"
          'fade-in (* 30 2)
          'fade-out (* 30 2)
          'display-time (* 30 10)
@@ -109,7 +109,7 @@
        'play-level "campaigns/orc/level10o.cm"
        'play-level "campaigns/orc/level11o.cm"
        'show-picture (list
-         'image "campaigns/orc/interface/Act_IV__-_Tides_of_Darkness.png"
+         'image "campaigns/orc/interface/Act_IV_-_Tides_of_Darkness.png"
          'fade-in (* 30 2)
          'fade-out (* 30 2)
          'display-time (* 30 10)
Index: stratagus/data/ccl/orc/campaign2.ccl
diff -u stratagus/data/ccl/orc/campaign2.ccl:1.12 
stratagus/data/ccl/orc/campaign2.ccl:1.13
--- stratagus/data/ccl/orc/campaign2.ccl:1.12   Fri Jul 11 14:27:05 2003
+++ stratagus/data/ccl/orc/campaign2.ccl        Sat Jul 12 11:03:13 2003
@@ -26,7 +26,7 @@
 ;;      along with this program; if not, write to the Free Software
 ;;      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA
 ;;
-;;     $Id: campaign2.ccl,v 1.12 2003/07/11 18:27:05 grumbel Exp $
+;;     $Id: campaign2.ccl,v 1.13 2003/07/12 15:03:13 n0body Exp $
 
 ;;=============================================================================
 ;;     Define the campaign
@@ -35,7 +35,7 @@
 (define-campaign 'orc-exp 'name "O~!rc expansion levels"
   'campaign (list
        'show-picture (list
-         'image 
"campaigns/orc-exp/interface/Act_I__-_Draenor,_the_Red_World.png"
+         'image 
"campaigns/orc-exp/interface/Act_I_-_Draenor,_the_Red_World.png"
          'fade-in (* 30 2)
          'fade-out (* 30 2)
          'display-time (* 30 10)
@@ -83,7 +83,7 @@
        'play-level "campaigns/orc-exp/levelx05o.cm"
        'play-level "campaigns/orc-exp/levelx06o.cm"
        'show-picture (list
-         'image "campaigns/orc-exp/interface/Act_III-_The_Great_Sea.png"
+         'image "campaigns/orc-exp/interface/Act_III_-_The_Great_Sea.png"
          'fade-in (* 30 2)
          'fade-out (* 30 2)
          'display-time (* 30 10)
Index: stratagus/doc/ChangeLog.html
diff -u stratagus/doc/ChangeLog.html:1.505 stratagus/doc/ChangeLog.html:1.506
--- stratagus/doc/ChangeLog.html:1.505  Fri Jul 11 10:35:29 2003
+++ stratagus/doc/ChangeLog.html        Sat Jul 12 11:03:13 2003
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-----   $Id: ChangeLog.html,v 1.505 2003/07/11 14:35:29 n0body Exp $
+----   $Id: ChangeLog.html,v 1.506 2003/07/12 15:03:13 n0body Exp $
 
 ----   (c) Copyright 1998-2003 by Lutz Sammer
 
@@ -36,6 +36,8 @@
 <li>Future 1.19 Release<p>
     <ul>
     <li>+++
+    <li>Fixed loading games saved with different resolutions (from Martin 
Renold).
+    <li>Removed spaces from data files (from Martin Renold).
     <li>Changed the handling of contained units to a circular linked list 
(from Crestez Dan Leonard).
     <li>Compacted Unit::Rescued and Unit::Rescued from (from Crestez Dan 
Leonard).
     <li>Change Unit::Colors to a pointer(saves memory) (from Crestez Dan 
Leonard).
Index: stratagus/src/ui/ui.c
diff -u stratagus/src/ui/ui.c:1.68 stratagus/src/ui/ui.c:1.69
--- stratagus/src/ui/ui.c:1.68  Fri Jul 11 10:35:34 2003
+++ stratagus/src/ui/ui.c       Sat Jul 12 11:03:14 2003
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ui.c,v 1.68 2003/07/11 14:35:34 n0body Exp $
+//     $Id: ui.c,v 1.69 2003/07/12 15:03:14 n0body Exp $
 
 //@{
 
@@ -501,8 +501,10 @@
 */
 global void SaveUserInterface(FILE* file)
 {
+    int i;
+
     fprintf(file,"\n;;; -----------------------------------------\n");
-    fprintf(file,";;; MODULE: ui $Id: ui.c,v 1.68 2003/07/11 14:35:34 n0body 
Exp $\n\n");
+    fprintf(file,";;; MODULE: ui $Id: ui.c,v 1.69 2003/07/12 15:03:14 n0body 
Exp $\n\n");
 
     // Contrast, Brightness, Saturation
     fprintf(file,"(set-contrast! %d)\n",TheUI.Contrast);
@@ -522,8 +524,14 @@
     fprintf(file,"(set-original-resources! %s)\n\n",
            TheUI.OriginalResources ? "#t" : "#f");
 
-    // Save the current UI
-    SaveUi(file,&TheUI);
+    // Save the UIs for all resolutions
+    for( i=0; UI_Table[i]; ++i ) {
+       SaveUi(file,UI_Table[i]);
+    }
+
+    // FIXME: maxy: strange things could happen to the saved viewports
+    // when loading them on a different resolution
+
     SaveViewports(file,&TheUI);
 }