js: fix: refactor r_vec2i function to handle different types of input

Author: s.kushnirenko

src/js/js_game.cpp

@@ -153,9 +153,22 @@ vec2i archive::r_size2i(pcstr name, pcstr w, pcstr h) {
 
 vec2i archive::r_vec2i(pcstr name, pcstr x, pcstr y) {
     vec2i result(0, 0);
-    r_section(name, [&] (archive arch) {
-        result.x = arch.r_int(x);
-        result.y = arch.r_int(y);
-    });
+    js_getproperty(vm, -1, name);
+    if (js_isobject(vm, -1)) {
+        if (js_isarray(vm, -1)) {
+            int length = js_getlength(vm, -1);
+            if (length > 0) {
+                js_getindex(vm, -1, 0); result.x = !js_isundefined(vm, -1) ? js_tointeger(vm, -1) : 0; js_pop(vm, 1);
+                if (length > 1) {
+                    js_getindex(vm, -1, 1); result.y = !js_isundefined(vm, -1) ? js_tointeger(vm, -1) : 0; js_pop(vm, 1);
+                }
+            }
+        } else {
+            js_getproperty(vm, -1, x); result.x = !js_isundefined(vm, -1) ? js_tointeger(vm, -1) : 0; js_pop(vm, 1);
+            js_getproperty(vm, -1, y); result.y = !js_isundefined(vm, -1) ? js_tointeger(vm, -1) : 0; js_pop(vm, 1);
+        }
+    }
+    js_pop(vm, 1);
+
     return result;
 }

src/js/js_game.h

@@ -32,12 +32,12 @@ struct archive {
 
             for (int i = 0; i < length; ++i) {
                 js_getindex(vm, -1, i);
-                int v = js_tointeger(vm, -1);
+                float v = js_isnumber(vm, -1) ? (float)js_tonumber(vm, -1) : 0.f;
                 result.push_back((T)v);
                 js_pop(vm, 1);
             }
-            js_pop(vm, 1);
         }
+        js_pop(vm, 1);
         return result;
     }
 
@@ -103,18 +103,17 @@ struct g_archive : public archive {
     template<typename T>
     inline void r_array(pcstr name, T read_func) {
         js_getglobal(vm, name);
-        if (r_array_impl(read_func)) {
-            js_pop(vm, 1);
-        }
+        r_array_impl(read_func);
+        js_pop(vm, 1);
     }
 
     template<typename T>
     inline void r_section(pcstr name, T read_func) {
         js_getglobal(vm, name);
         if (js_isobject(vm, -1)) {
             read_func(vm);
-            js_pop(vm, 1);
         }
+        js_pop(vm, 1);
     }
 };
 extern g_archive g_config_arch;

src/scripts/ui.js

@@ -13,7 +13,7 @@ top_menu_bar = {
 }
 
 main_menu_window = {
-	button_pos : {x: 192, y: 125},
+	button_pos : [192, 125],
 	button_size : {w: 256, h: 25},
 	button_offset : 40,
 
@@ -28,7 +28,7 @@ main_menu_window = {
 
 advisor_rating_window = {
   ui : {
-		outer_panel : { type : "outer_panel", pos : {x:0, y:0}, size : {w:40, h:27} },
+		outer_panel : { type : "outer_panel", pos: [0, 0], size : {w:40, h:27} },
 		advisor_icon : { type : "image", image : IMG_ADVISOR_RATING_ICON, pos : {x: 10, y: 10} },
 		header_label : { type : "label", font : FONT_LARGE_BLACK_ON_LIGHT, text : {group: 53, id: 0},	pos : {x: 60, y:17} },
 		population_label : { type : "label", text : "",	pos  : {x: 300, y:20} },
@@ -39,11 +39,11 @@ advisor_rating_window = {
 
 mission_briefing_window = {
 	ui : {
-		outer_panel : { type : "outer_panel",	pos: {x:16, y:32}, size : {w:38, h:27} },
+		outer_panel : { type : "outer_panel",	pos: [16, 32], size : {w:38, h:27} },
 		title 		  : { type : "text", pos : {x:32, y:48}, font : FONT_LARGE_BLACK_ON_LIGHT },
 		subtitle 		: { type : "text",	pos : {x: 32, y:78}, font : FONT_NORMAL_BLACK_ON_LIGHT },
-		objectives_label : { type : "label", text : {group:62, id:10}, pos : {x:48, y:104},	font : FONT_NORMAL_WHITE_ON_DARK },
 		objectives_panel : { type : "inner_panel", pos : {x:32, y:96}, size: {w:33, h:6} },
+		objectives_label : { type : "label", text : {group:62, id:10}, pos : {x:48, y:104},	font : FONT_NORMAL_WHITE_ON_DARK },
 		tocity_label : { type : "label", text : {group:62, id:7},	pos : {x:416, y:433}, font : FONT_NORMAL_BLACK_ON_LIGHT },
 		goal_0 : { type : "label", pos : {x:32 + 16, y:90 + 32}, body : {w:15, h:1}, font : FONT_NORMAL_YELLOW, enabled: false	},
 		goal_1 : { type : "label", pos : {x:288 + 16, y:90 + 32},	body : {w:15, h:1},	font : FONT_NORMAL_YELLOW, enabled: false },