From 17654b2c82b659960ba705da6b82e01c1be9599c Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Thu, 31 Aug 2023 23:43:56 +0200
Subject: [PATCH] =?UTF-8?q?-=20Modificat=20per=20a=20funcionar=20en=20l'ul?=
 =?UTF-8?q?tima=20versi=C3=B3=20de=20mini=20(v0.9.80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/abad.lua   |  2 ++
 data/game.lua   | 34 +++++++++++++++++++---------------
 data/intro.lua  |  5 +++++
 data/main.lua   | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 data/mapa.lua   |  3 ++-
 data/scenes.lua |  3 +++
 6 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/data/abad.lua b/data/abad.lua
index 45db2a6..2333c70 100644
--- a/data/abad.lua
+++ b/data/abad.lua
@@ -1,4 +1,6 @@
 
+require "dead"
+
 abad={x=40,y=24,flip=false,frame=1,wait=0,respawning=0,hab=10,vides=3,energia=40,falling=0,step=0, mustep=1,hurting=0,update=nil,jumpfwd=false,anim={0,1,0,2},bb={x=4,y=0,w=8,h=16},safe={hab=10,x=40,y=24}}
 
 function abad_nop()
diff --git a/data/game.lua b/data/game.lua
index b78f443..85c346d 100644
--- a/data/game.lua
+++ b/data/game.lua
@@ -1,4 +1,22 @@
---hab=0
+require "abad"
+require "gps"
+require "gorro"
+require "peu"
+require "premiere"
+require "elalien"
+require "batman"
+require "bol"
+require "gota"
+require "invisibl"
+require "zombie"
+require "caco"
+require "trigger"
+require "score"
+require "imp"
+require "bambolla"
+require "cacau"
+require "fireball"
+require "switches"
 
 modes={playing=0,editing=1}
 --mode=modes.editing
@@ -147,20 +165,6 @@ function game_init(menu)
     --fade.fadein()
 end
 
-function text(str,x,y,col)
-    color(16)
-    prnt(str,x-1,y-1)
-    prnt(str,x,y-1)
-    prnt(str,x+1,y-1)
-    prnt(str,x-1,y)
-    prnt(str,x+1,y)
-    prnt(str,x-1,y+1)
-    prnt(str,x,y+1)
-    prnt(str,x+1,y+1)
-
-    prnt(str,x,y,col)
-end
-
 function draw_hab(hab,x,y,editing)
     camera(-x,-y)
     mapa_draw(hab)
diff --git a/data/intro.lua b/data/intro.lua
index c65535c..7a1a9be 100644
--- a/data/intro.lua
+++ b/data/intro.lua
@@ -1,3 +1,8 @@
+require "fade"
+require "game"
+require "mapa"
+require "scenes"
+
 intro_wait=40
 intro_step=0
 
diff --git a/data/main.lua b/data/main.lua
index bf6d960..399334a 100644
--- a/data/main.lua
+++ b/data/main.lua
@@ -1,3 +1,35 @@
+require "final"
+require "fade"
+require "audio"
+require "dead"
+require "scenes"
+require "trigger"
+require "score"
+require "switches"
+require "map"
+require "mapa"
+require "bol"
+require "invisibl"
+require "gota"
+require "fireball"
+require "cacau"
+require "bambolla"
+require "imp"
+require "gps"
+require "peu"
+require "gorro"
+require "batman"
+require "elalien"
+require "premiere"
+require "caco"
+require "zombie"
+require "abad"
+require "intro"
+require "game"
+
+--require "fade"
+--require "audio"
+--require "intro"
 
 function _init()
     tiles=loadsurf("tiles.gif")
@@ -60,3 +92,17 @@ function _update()
 
     if (game_update) then game_update() end
 end
+
+function text(str,x,y,col)
+    color(16)
+    prnt(str,x-1,y-1)
+    prnt(str,x,y-1)
+    prnt(str,x+1,y-1)
+    prnt(str,x-1,y)
+    prnt(str,x+1,y)
+    prnt(str,x-1,y+1)
+    prnt(str,x,y+1)
+    prnt(str,x+1,y+1)
+
+    prnt(str,x,y,col)
+end
diff --git a/data/mapa.lua b/data/mapa.lua
index f773835..0325083 100644
--- a/data/mapa.lua
+++ b/data/mapa.lua
@@ -1,4 +1,5 @@
---mapa={}
+require "map"
+
 tiletype={void=0,nonpc=1,stair=2,switch=3,half=4,block=5}
 mapa.wait=0
 mapa.step=0
diff --git a/data/scenes.lua b/data/scenes.lua
index 27515b7..6cec762 100644
--- a/data/scenes.lua
+++ b/data/scenes.lua
@@ -1,3 +1,6 @@
+require "final"
+require "audio"
+
 scenes={
     intro_01= {
         {x=3,y=0,flip=false,audio="abad",text={"Ah!, què bo!","Nit de Netflix amb","un bon bol de cacaus!"},die=20},