File: fix_i_redeclaration.patch

package info (click to toggle)
xye 0.12.2%2Bdfsg-9
  • links: PTS, VCS
  • area: main
  • in suites: bullseye
  • size: 7,112 kB
  • sloc: cpp: 24,920; sh: 3,340; makefile: 373; xml: 212
file content (27 lines) | stat: -rw-r--r-- 1,343 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
Author: Bart Martens <bartm@debian.org>, Andreas Rönnquist <gusnan@gusnan.se>
Description: Fix problem where i was re-used incorrectly
 Declare a new variable instead of re-using i which breaks the surrounding
 loop, which also used i for variable name.
--- a/src/editorsave.cpp
+++ b/src/editorsave.cpp
@@ -636,16 +636,16 @@
         }
         saveColorStuff(file, board);
     
-        int j;
+        int i_redeclaration,j;
         file << "\t<ground>\n";
         resetSavedPosition();
-        for (i=0;i<XYE_HORZ;i++) for (j=0;j<XYE_VERT;j++) saveGroundObject(file,editor::board->objects[i][j],i,XYE_VERT-j-1);
+        for (i_redeclaration=0;i_redeclaration<XYE_HORZ;i_redeclaration++) for (j=0;j<XYE_VERT;j++) saveGroundObject(file,editor::board->objects[i_redeclaration][j],i_redeclaration,XYE_VERT-j-1);
         file << "\t</ground>\n";
         file << "\t<objects>\n";
         resetSavedPosition();
-        for (i=0;i<XYE_HORZ;i++) for (j=0;j<XYE_VERT;j++)
+        for (i_redeclaration=0;i_redeclaration<XYE_HORZ;i_redeclaration++) for (j=0;j<XYE_VERT;j++)
         {
-            saveNormalObject(file,editor::board->objects[i][j],i,XYE_VERT-j-1);
+            saveNormalObject(file,editor::board->objects[i_redeclaration][j],i_redeclaration,XYE_VERT-j-1);
         }
         savePortals( file, editor::board);