fix

estebanfer · Nov 14, 2023 · 13906d8 · 13906d8
1 parent 6da87f3
commit 13906d8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 16 deletions.
diff --git a/docs/game_data/spel2.lua b/docs/game_data/spel2.lua
diff --git a/docs/src/includes/_types.md b/docs/src/includes/_types.md
@@ -1927,7 +1927,7 @@ bool | [capitalize_scroll_text](https://github.com/spelunky-fyi/overlunky/search
 
 Type | Name | Description
 ---- | ---- | -----------
-int | [platform_icon](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=platform_icon) | 16 = PC, 17 = Discord, 18 = Steam, 19 = Xbox, 32 = [Switch](#Switch), 48 = PS, 49 = PS again?
+int | [platform_icon](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=platform_icon) | 16 = PC, 17 = Discord, 18 = Steam, 19 = Xbox, 32 = switch, 48 = PS, 49 = PS again?
 int | [character](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=character) | 0 - Ana Spelunky, 1 - Margaret Tunnel, 2 - Colin Northward, 3 - Roffy D. Sloth.. and so on. Same order as in [ENT_TYPE](#ENT_TYPE)
 bool | [ready](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=ready) | 
 bool | [searching](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=searching) | 
@@ -2035,8 +2035,6 @@ Derived from [Screen](#Screen)
 
 Type | Name | Description
 ---- | ---- | -----------
-ScreenZoomAnimation | [brick_background_animation](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=brick_background_animation) | 
-ScreenZoomAnimation | [blurry_border_animation](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=blurry_border_animation) | 
 [MenuScreenPanels](#MenuScreenPanels) | [screen_panels](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=screen_panels) | 
 [TextureRenderingInfo](#TextureRenderingInfo) | [brick_background](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=brick_background) | 
 [TextureRenderingInfo](#TextureRenderingInfo) | [blurry_border](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=blurry_border) | 
@@ -2063,7 +2061,6 @@ ScreenZoomAnimation | [blurry_border_animation](https://github.com/spelunky-fyi/
 [TextureRenderingInfo](#TextureRenderingInfo) | [bottom_left_bricks](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=bottom_left_bricks) | 
 [TextureRenderingInfo](#TextureRenderingInfo) | [top_left_esc_panel](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=top_left_esc_panel) | 
 [TextureRenderingInfo](#TextureRenderingInfo) | [next_panel](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=next_panel) | 
-vector&lt;ArenaRulesString&gt; | [option_captions](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=option_captions) | 
 float | [center_panels_hor_slide_position](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=center_panels_hor_slide_position) | 
 float | [esc_next_panels_slide_timer](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=esc_next_panels_slide_timer) | 
 float | [main_panel_vertical_scroll_position](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=main_panel_vertical_scroll_position) | 

diff --git a/src/game_api/screen.hpp b/src/game_api/screen.hpp
@@ -761,7 +761,7 @@ class ScreenOnlineLoading : public Screen // ID: 28
 
 struct OnlineLobbyScreenPlayer
 {
-    /// 16 = PC, 17 = Discord, 18 = Steam, 19 = Xbox, 32 = Switch, 48 = PS, 49 = PS again?
+    /// 16 = PC, 17 = Discord, 18 = Steam, 19 = Xbox, 32 = switch, 48 = PS, 49 = PS again?
     uint8_t platform_icon; // werid numbers, anything else results in the startd PC icon, maybe it's some actual id
     /// 0 - Ana Spelunky, 1 - Margaret Tunnel, 2 - Colin Northward, 3 - Roffy D. Sloth.. and so on. Same order as in ENT_TYPE
     uint8_t character;

diff --git a/src/game_api/screen_arena.hpp b/src/game_api/screen_arena.hpp
@@ -5,10 +5,10 @@
 
 struct ArenaRulesString
 {
-    STRINGID text_1_id; // StringsTableID
-    STRINGID text_2_id; // StringsTableID
-    STRINGID text_3_id; // StringsTableID
-    STRINGID text_4_id; // StringsTableID
+    STRINGID text_1; // StringsTableID
+    STRINGID text_2; // StringsTableID
+    STRINGID text_3; // StringsTableID
+    STRINGID text_4; // StringsTableID
     uint8_t unknown1;
     uint8_t unknown2;
     uint8_t unknown3;

diff --git a/src/game_api/script/usertypes/screen_arena_lua.cpp b/src/game_api/script/usertypes/screen_arena_lua.cpp
@@ -17,8 +17,6 @@ namespace NScreenArena
 void register_usertypes(sol::state& lua)
 {
     auto screenarenamenu_type = lua.new_usertype<ScreenArenaMenu>("ScreenArenaMenu", sol::base_classes, sol::bases<Screen>());
-    screenarenamenu_type["brick_background_animation"] = &ScreenArenaMenu::brick_background_animation;
-    screenarenamenu_type["blurry_border_animation"] = &ScreenArenaMenu::blurry_border_animation;
     screenarenamenu_type["screen_panels"] = &ScreenArenaMenu::screen_panels;
     screenarenamenu_type["brick_background"] = &ScreenArenaMenu::brick_background;
     screenarenamenu_type["blurry_border"] = &ScreenArenaMenu::blurry_border;
@@ -45,7 +43,6 @@ void register_usertypes(sol::state& lua)
     screenarenamenu_type["bottom_left_bricks"] = &ScreenArenaMenu::bottom_left_bricks;
     screenarenamenu_type["top_left_esc_panel"] = &ScreenArenaMenu::top_left_esc_panel;
     screenarenamenu_type["next_panel"] = &ScreenArenaMenu::next_panel;
-    screenarenamenu_type["option_captions"] = &ScreenArenaMenu::option_captions;
     screenarenamenu_type["center_panels_hor_slide_position"] = &ScreenArenaMenu::center_panels_hor_slide_position;
     screenarenamenu_type["esc_next_panels_slide_timer"] = &ScreenArenaMenu::esc_next_panels_slide_timer;
     screenarenamenu_type["main_panel_vertical_scroll_position"] = &ScreenArenaMenu::main_panel_vertical_scroll_position;