[Stratagus-CVS] stratagus/src action/action_resource.c game/loa...

[Martin Renold]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Martin Renold <address@hidden>  03/08/10 13:54:54

Modified files:
        src/action     : action_resource.c 
        src/game       : loadgame.c 
        src/ui         : botpanel.c 
        src/video      : cursor.c 

Log message:
        Added forgotten SaveButtons, NEW_UI compiles again

Patches:
Index: stratagus/src/action/action_resource.c
diff -u stratagus/src/action/action_resource.c:1.44 
stratagus/src/action/action_resource.c:1.45
--- stratagus/src/action/action_resource.c:1.44 Sat Aug  9 16:32:51 2003
+++ stratagus/src/action/action_resource.c      Sun Aug 10 13:54:53 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: action_resource.c,v 1.44 2003/08/09 20:32:51 n0body Exp $
+//     $Id: action_resource.c,v 1.45 2003/08/10 17:54:53 martinxyz Exp $
 
 //@{
 
@@ -249,7 +249,6 @@
 
     CheckUnitToBeDrawn(unit);
     if( IsOnlySelected(unit) ) {
-       UpdateButtonPanel();
        SelectedUnitChanged();
        // FIXME: redundant?
        MustRedraw|=RedrawButtonPanel;
Index: stratagus/src/game/loadgame.c
diff -u stratagus/src/game/loadgame.c:1.57 stratagus/src/game/loadgame.c:1.58
--- stratagus/src/game/loadgame.c:1.57  Sat Aug  9 16:08:38 2003
+++ stratagus/src/game/loadgame.c       Sun Aug 10 13:54:54 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: loadgame.c,v 1.57 2003/08/09 20:08:38 martinxyz Exp $
+//     $Id: loadgame.c,v 1.58 2003/08/10 17:54:54 martinxyz Exp $
 
 //@{
 
@@ -236,8 +236,8 @@
     GameCycle=game_cycle;
     //GameCursor=TheUI.Point.Cursor;   // FIXME: just a default.
     GameCursor=CursorTypeByIdent("cursor-point");      // TheUI not cleaned
-    UpdateButtonPanel();
-    MustRedraw=RedrawEverything;       // redraw everything
+    SelectionChanged();
+    MustRedraw=RedrawEverything;
 }
 
 /**
Index: stratagus/src/ui/botpanel.c
diff -u stratagus/src/ui/botpanel.c:1.81 stratagus/src/ui/botpanel.c:1.82
--- stratagus/src/ui/botpanel.c:1.81    Fri Aug  8 06:16:44 2003
+++ stratagus/src/ui/botpanel.c Sun Aug 10 13:54:54 2003
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: botpanel.c,v 1.81 2003/08/08 10:16:44 martinxyz Exp $
+//     $Id: botpanel.c,v 1.82 2003/08/10 17:54:54 martinxyz Exp $
 
 //@{
 
@@ -107,15 +107,155 @@
 */
 global void SaveButtons(FILE* file)
 {
+#ifndef NEW_UI
+    int i;
+    int n;
+    char* cp;
+#endif
+
     fprintf(file,"\n;;; -----------------------------------------\n");
-    fprintf(file,";;; MODULE: buttons $Id: botpanel.c,v 1.81 2003/08/08 
10:16:44 martinxyz Exp $\n\n");
+    fprintf(file,";;; MODULE: buttons $Id: botpanel.c,v 1.82 2003/08/10 
17:54:54 martinxyz Exp $\n\n");
+
+#ifndef NEW_UI
+    for( i=0; i<NumUnitButtons; ++i ) {
+       fprintf(file,"(define-button 'pos %d 'level %d 'icon '%s\n",
+               UnitButtonTable[i]->Pos,
+               UnitButtonTable[i]->Level,
+               IdentOfIcon(UnitButtonTable[i]->Icon.Icon));
+       fprintf(file,"  'action ");
+       switch( UnitButtonTable[i]->Action ) {
+           case ButtonMove:
+               fprintf(file,"'move"); break;
+           case ButtonStop:
+               fprintf(file,"'stop"); break;
+           case ButtonAttack:
+               fprintf(file,"'attack"); break;
+           case ButtonRepair:
+               fprintf(file,"'repair"); break;
+           case ButtonHarvest:
+               fprintf(file,"'harvest"); break;
+           case ButtonButton:
+               fprintf(file,"'button"); break;
+           case ButtonBuild:
+               fprintf(file,"'build"); break;
+           case ButtonTrain:
+               fprintf(file,"'train-unit"); break;
+           case ButtonPatrol:
+               fprintf(file,"'patrol"); break;
+           case ButtonStandGround:
+               fprintf(file,"'stand-ground"); break;
+           case ButtonAttackGround:
+               fprintf(file,"'attack-ground"); break;
+           case ButtonReturn:
+               fprintf(file,"'return-goods"); break;
+           case ButtonDemolish:
+               fprintf(file,"'demolish"); break;
+           case ButtonSpellCast:
+               fprintf(file,"'cast-spell"); break;
+           case ButtonResearch:
+               fprintf(file,"'research"); break;
+           case ButtonUpgradeTo:
+               fprintf(file,"'upgrade-to"); break;
+           case ButtonUnload:
+               fprintf(file,"'unload"); break;
+           case ButtonCancel:
+               fprintf(file,"'cancel"); break;
+           case ButtonCancelUpgrade:
+               fprintf(file,"'cancel-upgrade"); break;
+           case ButtonCancelTrain:
+               fprintf(file,"'cancel-train-unit"); break;
+           case ButtonCancelBuild:
+               fprintf(file,"'cancel-build"); break;
+       }
+       if( UnitButtonTable[i]->ValueStr ) {
+           if( isdigit(UnitButtonTable[i]->ValueStr[0]) ) {
+               fprintf(file," 'value %s\n",UnitButtonTable[i]->ValueStr);
+           } else {
+               fprintf(file," 'value '%s\n",UnitButtonTable[i]->ValueStr);
+           }
+       } else {
+           fprintf(file,"\n");
+       }
+       if( UnitButtonTable[i]->Allowed ) {
+           fprintf(file,"  'allowed ");
+           if( UnitButtonTable[i]->Allowed == ButtonCheckTrue ) {
+               fprintf(file,"'check-true");
+           } else if( UnitButtonTable[i]->Allowed == ButtonCheckFalse ) {
+               fprintf(file,"'check-false");
+           } else if( UnitButtonTable[i]->Allowed == ButtonCheckUpgrade ) {
+               fprintf(file,"'check-upgrade");
+           } else if( UnitButtonTable[i]->Allowed == ButtonCheckUnitsOr ) {
+               fprintf(file,"'check-units-or");
+           } else if( UnitButtonTable[i]->Allowed == ButtonCheckUnitsAnd ) {
+               fprintf(file,"'check-units-and");
+           } else if( UnitButtonTable[i]->Allowed == ButtonCheckNetwork ) {
+               fprintf(file,"'check-network");
+           } else if( UnitButtonTable[i]->Allowed == ButtonCheckNoNetwork ) {
+               fprintf(file,"'check-no-network");
+           } else if( UnitButtonTable[i]->Allowed == ButtonCheckNoWork ) {
+               fprintf(file,"'check-no-work");
+           } else if( UnitButtonTable[i]->Allowed == ButtonCheckNoResearch ) {
+               fprintf(file,"'check-no-research");
+           } else if( UnitButtonTable[i]->Allowed == ButtonCheckAttack ) {
+               fprintf(file,"'check-attack");
+           } else if( UnitButtonTable[i]->Allowed == ButtonCheckUpgradeTo ) {
+               fprintf(file,"'check-upgrade-to");
+           } else if( UnitButtonTable[i]->Allowed == ButtonCheckResearch ) {
+               fprintf(file,"'check-research");
+           } else if( UnitButtonTable[i]->Allowed == ButtonCheckSingleResearch 
) {
+               fprintf(file,"'check-single-research");
+           } else {
+               DebugLevel0Fn("Unsupported check function %p\n" _C_
+                       UnitButtonTable[i]->Allowed);
+               fprintf(file,"%p",UnitButtonTable[i]->Allowed);
+           }
+           if( UnitButtonTable[i]->AllowStr ) {
+               fprintf(file," 'allow-arg '(");
+               cp=alloca(strlen(UnitButtonTable[i]->AllowStr));
+               strcpy(cp,UnitButtonTable[i]->AllowStr);
+               cp=strtok(cp,",");
+               while( cp ) {
+                   fprintf(file,"%s",cp);
+                   cp=strtok(NULL,",");
+                   if( cp ) {
+                       fprintf(file," ");
+                   }
+               }
+               fprintf(file,")");
+           }
+           fprintf(file,"\n");
+       }
+       fprintf(file,"  'key \"");
+       switch( UnitButtonTable[i]->Key ) {
+           case '\033':
+               fprintf(file,"\\%03o",UnitButtonTable[i]->Key);
+               break;
+           default:
+               fprintf(file,"%c",UnitButtonTable[i]->Key);
+               break;
+       }
+       fprintf(file,"\" 'hint \"%s\"\n",UnitButtonTable[i]->Hint);
+       n=fprintf(file,"  'for-unit '(");
+       cp=alloca(strlen(UnitButtonTable[i]->UnitMask));
+       strcpy(cp,UnitButtonTable[i]->UnitMask);
+       cp=strtok(cp,",");
+       while( cp ) {
+           if( n+strlen(cp)>78 ) {
+               n=fprintf(file,"\n    ");
+           }
+           n+=fprintf(file,"%s",cp);
+           cp=strtok(NULL,",");
+           if( cp ) {
+               n+=fprintf(file," ");
+           }
+       }
+       fprintf(file,"))\n\n");
+    }
+#endif
 
-    // Hmm, is this needed? maybe it is set in a tutorial level which
-    // might be saved?
     fprintf(file,"(set-show-command-key! %s)\n\n",
            ShowCommandKey ? "#t" : "#f");
 }
-
 
 
 
Index: stratagus/src/video/cursor.c
diff -u stratagus/src/video/cursor.c:1.61 stratagus/src/video/cursor.c:1.62
--- stratagus/src/video/cursor.c:1.61   Sat Aug  9 16:08:39 2003
+++ stratagus/src/video/cursor.c        Sun Aug 10 13:54:54 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: cursor.c,v 1.61 2003/08/09 20:08:39 martinxyz Exp $
+//     $Id: cursor.c,v 1.62 2003/08/10 17:54:54 martinxyz Exp $
 
 //@{
 
@@ -74,7 +74,11 @@
 
 global CursorStates CursorState;/// current cursor state (point,...)
 global int CursorAction;       /// action for selection
+#ifndef NEW_UI
 global int CursorValue;                /// value for CursorAction (spell type 
f.e.)
+#else
+global int CursorSpell;                /// spell type while selecting target
+#endif
 
        //Event changed mouse position, can alter at any moment
 global int CursorX;            /// cursor position on screen X
@@ -1108,7 +1112,7 @@
     int i;
 
     fprintf(file,"\n;;; -----------------------------------------\n");
-    fprintf(file,";;; MODULE: cursors $Id: cursor.c,v 1.61 2003/08/09 20:08:39 
martinxyz Exp $\n\n");
+    fprintf(file,";;; MODULE: cursors $Id: cursor.c,v 1.62 2003/08/10 17:54:54 
martinxyz Exp $\n\n");
 
     for( i=0; Cursors[i].OType; ++i ) {
        fprintf(file,"(define-cursor '%s '%s\n",
@@ -1134,7 +1138,11 @@
            break;
     }
     fprintf(file,";;(cursor-action %d)\n",CursorAction);
+#ifndef NEW_UI
     fprintf(file,";;(cursor-value %d)\n",CursorValue);
+#else
+    fprintf(file,";;(cursor-spell %d)\n",CursorSpell);
+#endif
     fprintf(file,";;(cursor-building '%s)\n",
            CursorBuilding ? CursorBuilding->Ident : "()");
     fprintf(file,";;(cursor-position '(%d %d)\n",CursorX,CursorY);