diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index bdf357c..d79afeb 100644 Binary files a/!TheEsc/!RunImage,ff8 and b/!TheEsc/!RunImage,ff8 differ diff --git a/!TheEsc/Makefile,fe1 b/!TheEsc/Makefile,fe1 index f826cb4..7302849 100644 --- a/!TheEsc/Makefile,fe1 +++ b/!TheEsc/Makefile,fe1 @@ -48,12 +48,8 @@ o.Input: c.Input o.Input: C:h.swis o.Input: C:h.kernel o.Input: C:h.kernel -o.CTheEscape: c.CTheEscape -o.CTheEscape: C:h.swis -o.CTheEscape: C:h.kernel -o.CTheEscape: C:h.kernel -o.CTheEscape: h.Sound -o.CTheEscape: h.Graphics +o.Intro: c.Intro +o.Intro: h.Graphics o.CTheEscape: c.CTheEscape o.CTheEscape: C:h.swis o.CTheEscape: C:h.kernel @@ -65,8 +61,6 @@ o.Sound: C:h.swis o.Sound: C:h.kernel o.Sound: C:h.kernel o.Sound: h.Sound -o.Intro: c.Intro -o.Intro: h.Graphics o.Mission1: c.Mission1 o.Mission1: h.Graphics o.Mission1: h.Sound diff --git a/!TheEsc/Tools,fe1 b/!TheEsc/Tools,fe1 index b835451..17accbe 100644 --- a/!TheEsc/Tools,fe1 +++ b/!TheEsc/Tools,fe1 @@ -51,23 +51,17 @@ o.Mission2: h.Graphics o.Mission2: C:h.swis o.Mission2: C:h.kernel o.Mission2: C:h.kernel -o.MapEdit: c.MapEdit -o.MapEdit: C:h.swis -o.MapEdit: C:h.kernel -o.MapEdit: C:h.kernel -o.MapEdit: h.Sound -o.MapEdit: h.Graphics -o.MapEdit: c.MapEdit -o.MapEdit: C:h.swis -o.MapEdit: C:h.kernel -o.MapEdit: C:h.kernel -o.MapEdit: h.Sound -o.MapEdit: h.Graphics -o.Graphics: c.Graphics -o.Graphics: C:h.swis -o.Graphics: C:h.kernel -o.Graphics: C:h.kernel o.Input: c.Input o.Input: C:h.swis o.Input: C:h.kernel o.Input: C:h.kernel +o.Graphics: c.Graphics +o.Graphics: C:h.swis +o.Graphics: C:h.kernel +o.Graphics: C:h.kernel +o.MapEdit: c.MapEdit +o.MapEdit: C:h.swis +o.MapEdit: C:h.kernel +o.MapEdit: C:h.kernel +o.MapEdit: h.Sound +o.MapEdit: h.Graphics diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2 index f399356..a34f05f 100644 --- a/!TheEsc/c/Mission2 +++ b/!TheEsc/c/Mission2 @@ -123,6 +123,17 @@ void game2_saveeventactions(char* filename) void game2_loadevents(char* filename) { int length; + int i; + + // Populate with inactive entries + for(i = 0; i 0) - { - $blanks --; - fwrite($fp, "INVALID"); - - fwrite($fp, chr(0)); - fwrite($fp, chr(0)); - fwrite($fp, chr(0)); - fwrite($fp, chr(0)); - fwrite($fp, chr(0)); - - fwrite($fp, chr(0)); - fwrite($fp, chr(0)); - fwrite($fp, chr(0)); - fwrite($fp, chr(0)); - - fwrite($fp, chr(1)); - fwrite($fp, chr(0)); - fwrite($fp, chr(0)); - fwrite($fp, chr(0)); - - fwrite($fp, chr(255)); - fwrite($fp, chr(255)); - fwrite($fp, chr(255)); - fwrite($fp, chr(255)); - - fwrite($fp, chr(255)); - fwrite($fp, chr(255)); - fwrite($fp, chr(255)); - fwrite($fp, chr(255)); - } - fclose($fp); - $fp = fopen('m2_evact,ffd', 'w'); foreach($eventactions as $eventaction) { @@ -180,25 +146,5 @@ fwrite($fp, pack('V', $eventaction['ActionTarget'])); // Event } - $blanks = 1000 - count($eventactions); - while($blanks > 0) - { - $blanks --; - fwrite($fp, chr(255)); // Event - fwrite($fp, chr(255)); - fwrite($fp, chr(255)); - fwrite($fp, chr(255)); - - fwrite($fp, chr(255)); // Action - fwrite($fp, chr(255)); // ActionValue - - fwrite($fp, chr(0)); // PAD - fwrite($fp, chr(0)); // PAD - - fwrite($fp, chr(255)); // ActionTarget - fwrite($fp, chr(255)); - fwrite($fp, chr(255)); - fwrite($fp, chr(255)); - } fclose($fp); ?> \ No newline at end of file diff --git a/!TheEsc/m2_evact,ffd b/!TheEsc/m2_evact,ffd index 5746e1f..67c0c0b 100644 Binary files a/!TheEsc/m2_evact,ffd and b/!TheEsc/m2_evact,ffd differ diff --git a/!TheEsc/m2_evt,ffd b/!TheEsc/m2_evt,ffd index 01a70a3..9cdd334 100644 Binary files a/!TheEsc/m2_evt,ffd and b/!TheEsc/m2_evt,ffd differ diff --git a/!TheEsc/m2_smart,ffd b/!TheEsc/m2_smart,ffd index 4bcd02d..f7a563f 100644 Binary files a/!TheEsc/m2_smart,ffd and b/!TheEsc/m2_smart,ffd differ diff --git a/!TheEsc/m2_txt b/!TheEsc/m2_txt index 20f43fb..60630ba 100644 --- a/!TheEsc/m2_txt +++ b/!TheEsc/m2_txt @@ -1,7 +1,17 @@ AddEvent(0,"PlayerStart",0,-1,-1) + AddEvent(1,"SBBR-DOOROPEN",0,-1,-1) AddEvent(2,"SBBR-DOORCLOSE",1,-1,-1) +AddEvent(3,"SB-DOOROPEN",0,-1,-1) +AddEvent(4,"SB-DOORCLOSE",1,-1,-1) + +AddEvent(5,"CB1-DOOROPEN",0,-1,-1) +AddEvent(6,"CB1-DOORCLOSE",1,-1,-1) + +AddEvent(7,"CB2-DOOROPEN",0,-1,-1) +AddEvent(8,"CB2-DOORCLOSE",1,-1,-1) + Event("PlayerStart") AreaName(1) Sound(8,4) @@ -10,8 +20,40 @@ Event("SBBR-DOOROPEN") SetTile(713,31) Sound(8,5) ReArm("SBBR-DOORCLOSE") - Event("SBBR-DOORCLOSE") SetTile(713,29) Sound(8,5) ReArm("SBBR-DOOROPEN") + +Event("SB-DOOROPEN") + SetTile(1213,68) + SetTile(1313,69) + Sound(8,5) + ReArm("SB-DOORCLOSE") +Event("SB-DOORCLOSE") + SetTile(1213,43) + SetTile(1313,44) + Sound(8,5) + ReArm("SB-DOOROPEN") + +Event("CB1-DOOROPEN") + SetTile(2213,68) + SetTile(2313,69) + Sound(8,5) + ReArm("CB1-DOORCLOSE") +Event("CB1-DOORCLOSE") + SetTile(2213,43) + SetTile(2313,44) + Sound(8,5) + ReArm("CB1-DOOROPEN") + +Event("CB2-DOOROPEN") + SetTile(3213,68) + SetTile(3313,69) + Sound(8,5) + ReArm("CB2-DOORCLOSE") +Event("CB2-DOORCLOSE") + SetTile(3213,43) + SetTile(3313,44) + Sound(8,5) + ReArm("CB2-DOOROPEN")