r2740 - packages/trunk/wormux/debian/patches

[Eddy Petrisor]

Author: eddyp-guest
Date: 2007-05-28 12:00:53 +0000 (Mon, 28 May 2007)
New Revision: 2740

Modified:
   packages/trunk/wormux/debian/patches/001_no_empty_else_gcc4.2.patch
Log:
make the 001 patch fit on the 0.7.9-3 release

Modified: packages/trunk/wormux/debian/patches/001_no_empty_else_gcc4.2.patch
===================================================================
--- packages/trunk/wormux/debian/patches/001_no_empty_else_gcc4.2.patch	2007-05-28 10:49:33 UTC (rev 2739)
+++ packages/trunk/wormux/debian/patches/001_no_empty_else_gcc4.2.patch	2007-05-28 12:00:53 UTC (rev 2740)
@@ -1,9 +1,7 @@
-Index: a/src/character/body.cpp
-===================================================================
---- a/src/character/body.cpp	(revision 2615)
-+++ b/src/character/body.cpp	(working copy)
-@@ -472,7 +472,10 @@
-     play_once_clothe_sauv = NULL;
+--- a/src/character/body.cpp.original	2007-05-28 14:54:41.000000000 +0300
++++ b/src/character/body.cpp	2007-05-28 14:56:26.000000000 +0300
+@@ -437,7 +437,10 @@
+     need_rebuild = true;
    }
    else
 +  {
@@ -11,10 +9,10 @@
 +    ;
 +  }
  
-   assert(current_clothe != NULL);
- }
-@@ -495,7 +498,10 @@
-     play_once_mvt_sauv = NULL;
+ 
+   play_once_clothe_sauv = NULL;
+@@ -462,7 +465,10 @@
+     need_rebuild = true;
    }
    else
 +  {
@@ -22,9 +20,9 @@
 +    ;
 +  }
  
-   assert(current_mvt != NULL);
- }
-@@ -523,7 +529,10 @@
+   play_once_mvt_sauv = NULL;
+ 
+@@ -492,7 +498,10 @@
      need_rebuild = true;
    }
    else
@@ -35,7 +33,7 @@
  
    assert(current_clothe != NULL);
  }
-@@ -551,7 +560,10 @@
+@@ -520,7 +529,10 @@
      need_rebuild = true;
    }
    else