Complete.Org: Mailing Lists: Archives: freeciv-dev: December 2002:
[Freeciv-Dev] (PR#2562) XAW dialogs.c bool cleanup
Home

[Freeciv-Dev] (PR#2562) XAW dialogs.c bool cleanup

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: undisclosed-recipients:;
Subject: [Freeciv-Dev] (PR#2562) XAW dialogs.c bool cleanup
From: "Jason Short via RT" <rt@xxxxxxxxxxxxxx>
Date: Thu, 12 Dec 2002 20:37:58 -0800
Reply-to: rt@xxxxxxxxxxxxxx

I went to compile the XAW client and gcc caught some missing bool
usages.  No doubt this happened now because of the recent stdbool.h
usage.

jason


Index: client/gui-xaw/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/dialogs.c,v
retrieving revision 1.73
diff -u -r1.73 dialogs.c
--- client/gui-xaw/dialogs.c    2002/11/29 20:11:59     1.73
+++ client/gui-xaw/dialogs.c    2002/12/13 04:35:58
@@ -163,7 +163,7 @@
 int caravan_city_id;
 int caravan_unit_id;
 
-int diplomat_dialog_open = 0;
+bool diplomat_dialog_open = FALSE;
 int diplomat_id;
 int diplomat_target_id;
 
@@ -475,7 +475,7 @@
                                       XtPointer call_data)
 {
   destroy_message_dialog(w);
-  diplomat_dialog_open=0;
+  diplomat_dialog_open = FALSE;
 
   if(find_unit_by_id(diplomat_id) && 
      find_city_by_id(diplomat_target_id)) { 
@@ -499,7 +499,7 @@
                                      XtPointer call_data)
 {
   destroy_message_dialog(w);
-  diplomat_dialog_open=0;
+  diplomat_dialog_open = FALSE;
 
   if(find_unit_by_id(diplomat_id) && 
      (find_city_by_id(diplomat_target_id))) { 
@@ -522,7 +522,7 @@
                                          XtPointer call_data)
 {
   destroy_message_dialog(w);
-  diplomat_dialog_open=0;
+  diplomat_dialog_open = FALSE;
 
   if(find_unit_by_id(diplomat_id) && 
      (find_city_by_id(diplomat_target_id))) { 
@@ -562,7 +562,7 @@
                                XtPointer call_data)
 {
   destroy_message_dialog(w);
-  diplomat_dialog_open=0;
+  diplomat_dialog_open = FALSE;
 
   if(find_unit_by_id(diplomat_id) && 
      (find_city_by_id(diplomat_target_id))) { 
@@ -585,7 +585,7 @@
                                    XtPointer call_data)
 {
   destroy_message_dialog(w);
-  diplomat_dialog_open=0;
+  diplomat_dialog_open = FALSE;
 
   if(find_unit_by_id(diplomat_id) && 
      find_city_by_id(diplomat_target_id)) { 
@@ -914,7 +914,7 @@
 pvictim to NULL and account for !pvictim in create_advances_list. -- Syela */
   
   destroy_message_dialog(w);
-  diplomat_dialog_open=0;
+  diplomat_dialog_open = FALSE;
 
   if(!spy_tech_shell){
     Position x, y;
@@ -941,7 +941,7 @@
                                      XtPointer call_data)
 {
   destroy_message_dialog(w);
-  diplomat_dialog_open=0;
+  diplomat_dialog_open = FALSE;
 
   if(find_unit_by_id(diplomat_id) &&
      (find_city_by_id(diplomat_target_id))) {
@@ -1019,7 +1019,7 @@
   struct packet_generic_integer packet;
 
   destroy_message_dialog(w);
-  diplomat_dialog_open=0;
+  diplomat_dialog_open = FALSE;
 
   if(find_unit_by_id(diplomat_id) && 
      (pcity=find_city_by_id(diplomat_target_id))) { 
@@ -1073,7 +1073,7 @@
   struct city *pcity;
   
   destroy_message_dialog(w);
-  diplomat_dialog_open=0;
+  diplomat_dialog_open = FALSE;
 
   if( (punit=find_unit_by_id(diplomat_id))
       && (pcity=find_city_by_id(diplomat_target_id))
@@ -1093,7 +1093,7 @@
 static void diplomat_cancel_callback(Widget w, XtPointer a, XtPointer b)
 {
   destroy_message_dialog(w);
-  diplomat_dialog_open=0;
+  diplomat_dialog_open = FALSE;
 
   process_diplomat_arrival(NULL, 0);
 }
@@ -1170,7 +1170,7 @@
        XtSetSensitive(XtNameToWidget(shl, "*button6"), FALSE);
     }
 
-    diplomat_dialog_open=1;
+    diplomat_dialog_open = TRUE;
   }else{ 
     if((ptunit=unit_list_get(&map_get_tile(dest_x, dest_y)->units, 0))){
       /* Spy/Diplomat acting against a unit */
@@ -1199,7 +1199,7 @@
 /****************************************************************
 ...
 *****************************************************************/
-int diplomat_dialog_is_open(void)
+bool diplomat_dialog_is_open(void)
 {
   return diplomat_dialog_open;
 }
@@ -1300,7 +1300,7 @@
 /****************************************************************
 ...
 *****************************************************************/
-int caravan_dialog_is_open(void)
+bool caravan_dialog_is_open(void)
 {
   return BOOL_VAL(caravan_dialog);
 }

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] (PR#2562) XAW dialogs.c bool cleanup, Jason Short via RT <=