[Freeciv-Dev] Re: (PR#14639) Patch for SDL client

["Christian Prochaska" <cp.ml.freeciv.dev@xxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14639 >

here is a small update for SVN trunk of Nov. 20th



diff -u -r -b -B -X devel/diff_ignore working/client/gui-sdl/diplodlg.c 
devel/client/gui-sdl/diplodlg.c
--- working/client/gui-sdl/diplodlg.c   2005-11-22 01:11:15.000000000 +0100
+++ devel/client/gui-sdl/diplodlg.c     2005-11-22 00:17:02.000000000 +0100
@@ -502,7 +502,7 @@
     if(type != DS_CEASEFIRE) {
       my_snprintf(cBuf, sizeof(cBuf), "  %s", 
Q_("?diplomatic_state:Cease-fire"));
       pBuf = create_iconlabel_from_chars(NULL, pWindow->dst,
-       cBuf, 12, (WF_DRAW_THEME_TRANSPARENT|WF_DRAW_TEXT_LABEL_WITH_SPACE));
+       cBuf, adj_font(12), 
(WF_DRAW_THEME_TRANSPARENT|WF_DRAW_TEXT_LABEL_WITH_SPACE));
       pBuf->string16->fgcol = color;
       width = MAX(width, pBuf->size.w);
       height = MAX(height, pBuf->size.h);
@@ -528,7 +528,7 @@
       count++;
     }
     
-    if(pplayer_can_ally(pPlayer0, pPlayer1)) {
+    if(pplayer_can_make_treaty(pPlayer0, pPlayer1, DS_ALLIANCE)) {
       my_snprintf(cBuf, sizeof(cBuf), "  %s", 
Q_("?diplomatic_state:Alliance"));
       
       pBuf = create_iconlabel_from_chars(NULL, pWindow->dst,
@@ -1238,7 +1238,7 @@
           
     if(type != DS_WAR && can_client_issue_orders()) {
       
-      if(type == DS_NEUTRAL) {
+      if(type == DS_ARMISTICE) {
        my_snprintf(cBuf, sizeof(cBuf), _("Declare WAR"));
       } else {
        my_snprintf(cBuf, sizeof(cBuf), _("Cancel Treaty"));
diff -u -r -b -B -X devel/diff_ignore working/client/gui-sdl/graphics.c 
devel/client/gui-sdl/graphics.c
--- working/client/gui-sdl/graphics.c   2005-11-22 01:11:15.000000000 +0100
+++ devel/client/gui-sdl/graphics.c     2005-11-21 23:51:37.000000000 +0100
@@ -425,19 +425,23 @@
   Uint16 *ptr = (Uint16 *)dst_mem;
   Uint32 color = (var << 16) | var;
 #ifndef HAVE_MMX1  
+  #ifndef ARM_WINCE
   DUFFS_LOOP_DOUBLE2(
   {
     *ptr++ = var;
   },{
-    #ifndef ARM_WINCE
-    *(Uint32 *)ptr = color;  /* this statement causes an exception on */
-    ptr += 2;                /* StrongARM-PDA so use alternative */
+    *(Uint32 *)ptr = color;  /* this statement causes an exception on 
StrongARM-PDA */
+    ptr += 2;
+  }, lenght);
     #else              
+  DUFFS_LOOP_DOUBLE2(
+  {
+    *ptr++ = var;
+  },{
     *ptr++ = var;
     *ptr++ = var;
-    #endif
-    ptr += 2;
   }, lenght);
+  #endif
 #else
   movd_m2r(color, mm0); /* color(0000CLCL) -> mm0 */
   punpckldq_r2r(mm0, mm0); /* CLCLCLCL -> mm0 */
diff -u -r -b -B -X devel/diff_ignore working/client/gui-sdl/plrdlg.c 
devel/client/gui-sdl/plrdlg.c
--- working/client/gui-sdl/plrdlg.c     2005-11-22 01:11:16.000000000 +0100
+++ devel/client/gui-sdl/plrdlg.c       2005-11-22 00:08:56.000000000 +0100
@@ -255,7 +255,7 @@
             x1 = pPlayer1->size.x + pPlayer1->size.w / 2;
             y1 = pPlayer1->size.y + pPlayer1->size.h / 2;
             switch (pplayer_get_diplstate(pPlayer, 
pPlayer1->data.player)->type) {
-             case DS_NEUTRAL:
+             case DS_ARMISTICE:
                if(SDL_Client_Flags & CF_DRAW_PLAYERS_NEUTRAL_STATUS) {
                  putline(pPlayer1->dst, x0, y0, x1, y1, 0xFF000000);
                }
@@ -363,7 +363,7 @@
   
   for(i = 0; i<DS_LAST; i++) {
     switch (i) {
-      case DS_NEUTRAL:
+      case DS_ARMISTICE:
        pBuf = create_checkbox(pWindow->dst,
                (SDL_Client_Flags & CF_DRAW_PLAYERS_NEUTRAL_STATUS),
                                                WF_DRAW_THEME_TRANSPARENT);
@@ -484,7 +484,7 @@
   pStr->bgcol.unused = 128;
   for(i = 0; i<DS_LAST; i++) {
       switch (i) {
-       case DS_NEUTRAL:
+       case DS_ARMISTICE:
          pStr->fgcol = (SDL_Color){0, 0, 0, 255};
        break;
         case DS_WAR: