fix an erroneous variable renaming

sgayda2 · Sep 8, 2013 · 1408b04 · 1408b04
1 parent ecc372f
commit 1408b04
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Config.cpp b/Config.cpp
@@ -78,10 +78,10 @@ void parseConfigLine( string line )
         string result = parseStrFromLine( "WINDOWED", line );
         ssConfig.Fullscreen = (result == "NO");
     }
-    if( line.find("[Size_XY") != -1) {
-        int value = parseIntFromLine( "Size_XY", line );
+    if( line.find("[SEGMENTSIZE_XY") != -1) {
+        int value = parseIntFromLine( "SEGMENTSIZE_XY", line );
         if(value < 1) {
-            value = DEFAULT_Size;
+            value = DEFAULT_SIZE;
         }
         if(value > 100) {
             value = 100;
@@ -90,10 +90,10 @@ void parseConfigLine( string line )
         ssState.Size.x = value+2;
         ssState.Size.y = value+2;
     }
-    if( line.find("[Size_Z") != -1) {
-        int value = parseIntFromLine( "Size_Z", line );
+    if( line.find("[SEGMENTSIZE_Z") != -1) {
+        int value = parseIntFromLine( "SEGMENTSIZE_Z", line );
         if(value < 1) {
-            value = DEFAULT_Size_Z;
+            value = DEFAULT_SIZE_Z;
         }
         ssState.Size.z = value;
     }

diff --git a/common.h b/common.h
@@ -92,8 +92,8 @@ using namespace df::enums;
 #define SPRITEHEIGHT (TILETOPHEIGHT + WALLHEIGHT)
 #define WALL_CUTOFF_HEIGHT 15
 
-#define DEFAULT_Size 20
-#define DEFAULT_Size_Z  6
+#define DEFAULT_SIZE 20
+#define DEFAULT_SIZE_Z  6
 #define MAPNAVIGATIONSTEP 1
 #define MAPNAVIGATIONSTEPBIG 10
 

diff --git a/main.cpp b/main.cpp
@@ -401,9 +401,9 @@ static void * stonesense_thread(ALLEGRO_THREAD * main_thread, void * parms)
     ssConfig.Fullscreen = FULLSCREEN;
     ssState.ScreenH = RESOLUTION_HEIGHT;
     ssState.ScreenW = RESOLUTION_WIDTH;
-    ssState.Size.x = DEFAULT_Size;
-    ssState.Size.y = DEFAULT_Size;
-    ssState.Size.z = DEFAULT_Size_Z;
+    ssState.Size.x = DEFAULT_SIZE;
+    ssState.Size.y = DEFAULT_SIZE;
+    ssState.Size.z = DEFAULT_SIZE_Z;
     ssConfig.show_creature_names = true;
     ssConfig.show_osd = true;
     ssConfig.show_keybinds = false;