Reorder puzzle level files and move out unused ones, remove some more…

… unused data files
Bithack · Sep 3, 2023 · 1ddc8f0 · 1ddc8f0
1 parent 9125275
commit 1ddc8f0
Show file tree

Hide file tree

Showing 46 changed files with 1 addition and 21 deletions.
diff --git a/data-shared/lvl/main/269.plvl → data-shared/lvl/main/1.plvl b/data-shared/lvl/main/269.plvl → data-shared/lvl/main/1.plvl
diff --git a/data-shared/lvl/main/315.plvl → data-shared/lvl/main/10.plvl b/data-shared/lvl/main/315.plvl → data-shared/lvl/main/10.plvl
diff --git a/data-shared/lvl/main/278.plvl → data-shared/lvl/main/11.plvl b/data-shared/lvl/main/278.plvl → data-shared/lvl/main/11.plvl
diff --git a/data-shared/lvl/main/320.plvl → data-shared/lvl/main/12.plvl b/data-shared/lvl/main/320.plvl → data-shared/lvl/main/12.plvl
diff --git a/data-shared/lvl/main/344.plvl → data-shared/lvl/main/13.plvl b/data-shared/lvl/main/344.plvl → data-shared/lvl/main/13.plvl
diff --git a/data-shared/lvl/main/702.plvl → data-shared/lvl/main/14.plvl b/data-shared/lvl/main/702.plvl → data-shared/lvl/main/14.plvl
diff --git a/data-shared/lvl/main/402.plvl → data-shared/lvl/main/15.plvl b/data-shared/lvl/main/402.plvl → data-shared/lvl/main/15.plvl
diff --git a/data-shared/lvl/main/271.plvl → data-shared/lvl/main/16.plvl b/data-shared/lvl/main/271.plvl → data-shared/lvl/main/16.plvl
diff --git a/data-shared/lvl/main/401.plvl → data-shared/lvl/main/17.plvl b/data-shared/lvl/main/401.plvl → data-shared/lvl/main/17.plvl
diff --git a/data-shared/lvl/main/333.plvl → data-shared/lvl/main/18.plvl b/data-shared/lvl/main/333.plvl → data-shared/lvl/main/18.plvl
diff --git a/data-shared/lvl/main/331.plvl → data-shared/lvl/main/19.plvl b/data-shared/lvl/main/331.plvl → data-shared/lvl/main/19.plvl
diff --git a/data-shared/lvl/main/601.plvl → data-shared/lvl/main/2.plvl b/data-shared/lvl/main/601.plvl → data-shared/lvl/main/2.plvl
diff --git a/data-shared/lvl/main/313.plvl → data-shared/lvl/main/20.plvl b/data-shared/lvl/main/313.plvl → data-shared/lvl/main/20.plvl
diff --git a/data-shared/lvl/main/343.plvl → data-shared/lvl/main/21.plvl b/data-shared/lvl/main/343.plvl → data-shared/lvl/main/21.plvl
diff --git a/data-shared/lvl/main/345.plvl → data-shared/lvl/main/22.plvl b/data-shared/lvl/main/345.plvl → data-shared/lvl/main/22.plvl
diff --git a/data-shared/lvl/main/224.plvl → data-shared/lvl/main/23.plvl b/data-shared/lvl/main/224.plvl → data-shared/lvl/main/23.plvl
diff --git a/data-shared/lvl/main/335.plvl → data-shared/lvl/main/24.plvl b/data-shared/lvl/main/335.plvl → data-shared/lvl/main/24.plvl
diff --git a/data-shared/lvl/main/802.plvl → data-shared/lvl/main/25.plvl b/data-shared/lvl/main/802.plvl → data-shared/lvl/main/25.plvl
diff --git a/data-shared/lvl/main/800.plvl → data-shared/lvl/main/26.plvl b/data-shared/lvl/main/800.plvl → data-shared/lvl/main/26.plvl
diff --git a/data-shared/lvl/main/330.plvl → data-shared/lvl/main/27.plvl b/data-shared/lvl/main/330.plvl → data-shared/lvl/main/27.plvl
diff --git a/data-shared/lvl/main/325.plvl → data-shared/lvl/main/28.plvl b/data-shared/lvl/main/325.plvl → data-shared/lvl/main/28.plvl
diff --git a/data-shared/lvl/main/260.plvl → data-shared/lvl/main/29.plvl b/data-shared/lvl/main/260.plvl → data-shared/lvl/main/29.plvl
diff --git a/data-shared/lvl/main/270.plvl → data-shared/lvl/main/3.plvl b/data-shared/lvl/main/270.plvl → data-shared/lvl/main/3.plvl
diff --git a/data-shared/lvl/main/317.plvl → data-shared/lvl/main/30.plvl b/data-shared/lvl/main/317.plvl → data-shared/lvl/main/30.plvl
diff --git a/data-shared/lvl/main/225.plvl → data-shared/lvl/main/31.plvl b/data-shared/lvl/main/225.plvl → data-shared/lvl/main/31.plvl
diff --git a/data-shared/lvl/main/595.plvl → data-shared/lvl/main/4.plvl b/data-shared/lvl/main/595.plvl → data-shared/lvl/main/4.plvl
diff --git a/data-shared/lvl/main/400.plvl → data-shared/lvl/main/5.plvl b/data-shared/lvl/main/400.plvl → data-shared/lvl/main/5.plvl
diff --git a/data-shared/lvl/main/604.plvl → data-shared/lvl/main/6.plvl b/data-shared/lvl/main/604.plvl → data-shared/lvl/main/6.plvl
diff --git a/data-shared/lvl/main/801.plvl → data-shared/lvl/main/7.plvl b/data-shared/lvl/main/801.plvl → data-shared/lvl/main/7.plvl
diff --git a/data-shared/lvl/main/321.plvl → data-shared/lvl/main/8.plvl b/data-shared/lvl/main/321.plvl → data-shared/lvl/main/8.plvl
diff --git a/data-shared/lvl/main/314.plvl → data-shared/lvl/main/9.plvl b/data-shared/lvl/main/314.plvl → data-shared/lvl/main/9.plvl
diff --git a/data-shared/pkg/main/7.ppkg b/data-shared/pkg/main/7.ppkg
diff --git a/data-shared/pkg/main/8.ppkg b/data-shared/pkg/main/8.ppkg
diff --git a/data-shared/pkg/main/9.ppkg b/data-shared/pkg/main/9.ppkg
diff --git a/data-shared/textures/ui/btn_sandbox.png b/data-shared/textures/ui/btn_sandbox.png
diff --git a/data-shared/textures/ui/icon_overlay.png b/data-shared/textures/ui/icon_overlay.png
diff --git a/data-shared/textures/ui/menupkgsep.png b/data-shared/textures/ui/menupkgsep.png
diff --git a/data-shared/lvl/main/268.plvl → data-unused/lvls/268.plvl b/data-shared/lvl/main/268.plvl → data-unused/lvls/268.plvl
diff --git a/data-shared/lvl/main/564.plvl → data-unused/lvls/564.plvl b/data-shared/lvl/main/564.plvl → data-unused/lvls/564.plvl
diff --git a/data-shared/lvl/main/624.plvl → data-unused/lvls/624.plvl b/data-shared/lvl/main/624.plvl → data-unused/lvls/624.plvl
diff --git a/data-shared/lvl/main/803.plvl → data-unused/lvls/803.plvl b/data-shared/lvl/main/803.plvl → data-unused/lvls/803.plvl
diff --git a/data-shared/models/principia.3ds → data-unused/models/principia.3ds b/data-shared/models/principia.3ds → data-unused/models/principia.3ds
diff --git a/src/src/game-gui.cc b/src/src/game-gui.cc
@@ -2653,14 +2653,6 @@ game::create_sandbox_menu()
                 }
                 glActiveTexture(GL_TEXTURE0);
 
-#if 0
-                glBindTexture(GL_TEXTURE_2D, gui_spritesheet::atlas->texture.gl_texture);
-                /* background */
-                tms_ddraw_set_matrices(this->get_surface()->ddraw, cam->view, cam->projection);
-                tms_ddraw_sprite(this->get_surface()->ddraw,
-                        gui_spritesheet::s_sandbox,
-                        0, 0, cam->width, cam->height);
-#endif
                 glBindTexture(GL_TEXTURE_2D, 0);
 
                 ix = x%5;
@@ -2817,14 +2809,6 @@ game::create_sandbox_menu()
             }
             glActiveTexture(GL_TEXTURE0);
 
-#if 0
-            glBindTexture(GL_TEXTURE_2D, gui_spritesheet::atlas->texture.gl_texture);
-            /* background */
-            tms_ddraw_set_matrices(this->get_surface()->ddraw, cam->view, cam->projection);
-            tms_ddraw_sprite(this->get_surface()->ddraw,
-                    gui_spritesheet::s_sandbox,
-                    0, 0, cam->width, cam->height);
-#endif
             glBindTexture(GL_TEXTURE_2D, 0);
 
             /* object */

diff --git a/src/src/gui.cc b/src/src/gui.cc
@@ -104,8 +104,6 @@ struct sprite_load_data gui_spritesheet::sprites[NUM_SPRITES] = {
     { "data-shared/textures/symbols/attach.png", &atlas },
     { "data-shared/textures/symbols/attach_rigid.png", &atlas },
     { "data-shared/textures/symbols/attach_rotary.png", &atlas },
-    { "data-shared/textures/ui/menupkgsep.png", &atlas },
-    { "data-shared/textures/ui/btn_sandbox.png", &atlas },
     { "data-shared/textures/ui/sep.png", &atlas },
     { "data-shared/textures/symbols/rotate.png", &atlas },
     { "data-shared/textures/ui/btn_empty.png", &atlas },

diff --git a/src/src/gui.hh b/src/src/gui.hh
@@ -82,8 +82,6 @@ enum {
     S_ATTACH_RIGID,
     S_ATTACH_ROTARY,
 
-    S_PKG_SEP,
-    S_SANDBOX,
     S_SEP,
     S_ROT,
     S_EMPTY,

diff --git a/src/src/menu_pkg.cc b/src/src/menu_pkg.cc
@@ -363,7 +363,7 @@ menu_pkg::render()
         float sy = base_y - (x%9)/3*icon_outer;
 
         struct tms_sprite overlay;
-        overlay.bl = (tvec2){0.1f, 0.1f};
+        overlay.bl = (tvec2){0.f, 0.f};
         overlay.tr = (tvec2){1.f, 1.f};
 
         if (UNLOCK_ALL_LVLS || this->pkg.unlock_count == 0 || x < unlock_count || cache[x].progress->completed)