Skip to content
Browse files

MegaZeux 2.61 release.

  • Loading branch information...
1 parent 17ca51e commit 560212bbdd43a7b46f8ba31c3ff2aa985619f82d @ajs1984 committed Aug 11, 2008
Showing with 74 additions and 41 deletions.
  1. +29 −26 edit.cpp
  2. +1 −2 game.cpp
  3. +40 −7 help.doc
  4. +4 −6 main.cpp
View
55 edit.cpp
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+//Password completely removed -Koj
//Took out SMZX -Koji
//Editing the world!
@@ -32,7 +33,7 @@
#include "game.h"
#include "fill.h"
#include "meter.h"
-#include "password.h"
+//#include "password.h"
#include "egacode.h"
#include "block.h"
#include "pal_ed.h"
@@ -66,6 +67,7 @@
#include <stdio.h>
#include "blink.h"
#include "cursor.h"
+#include "counter.h"
/* Edit menu- (w/box ends on sides) Current menu name is highlighted. The
bottom section zooms to show a list of options for the current menu,
although all keys are available at all times. PGUP/PGDN changes menu.
@@ -168,7 +170,7 @@ char far block_help2[27]="Press ENTER to place block";
char far block_help3[26]="Press ENTER to place ANSi";
char far menu_help[15]="Pgup/Pgdn:Menu";
char far *menu_lines[NUM_MENUS][2]={ {
-" L:LoadS:Save G:Global Info Alt+R:Restart Alt+T:Test *:Protection",
+" L:LoadS:Save G:Global Info Alt+R:Restart Alt+T:Test",
" Alt+S:Status Info Alt+C:Char Edit Alt+E:Palette Alt+F:Sound Effects"
} , {
" Alt+Z:Clear X:Exits Alt+P:Size/Pos I:Info A:Add D:Delete V:View",
@@ -261,6 +263,7 @@ void edit_world(void) {
cursor_solid();
do {
//If NOTHING was changed, do NOT page flip
+ set_counter("HELP_MENU",1);
if(!(update_view|update_menu|fade_in)) {
m_hide();
goto no_pflip;
@@ -645,11 +648,11 @@ void edit_world(void) {
goto place;
case -20://Alt+T
//Test
- if(protection_method!=NO_PROTECTION) {
- error("Can't test password-protected world",0,24,
- current_pg_seg,0x2001);
- break;
- }
+ //if(protection_method!=NO_PROTECTION) {
+ // error("Can't test password-protected world",0,24,
+ // current_pg_seg,0x2001);
+ // break;
+ // }
if((curr_thing==122)&&(curr_param==0)) {
clear_sensor(0);
curr_thing=0;
@@ -922,10 +925,10 @@ void edit_world(void) {
//Check for password protection and world type
fseek(fp,25,SEEK_SET);
if(fgetc(fp)!=0) {
- error("Cannot import password protected world",0,
+ /*error("Cannot import password protected world",0,
24,current_pg_seg,0x1B01);
fclose(fp);
- break;
+ break;*/
}
if(fgetc(fp)!='M') {
error("Error importing world",1,24,current_pg_seg,0x1A02);
@@ -1071,7 +1074,7 @@ void edit_world(void) {
//Export
if(draw_mode&128) break;
//Confirm pw
- if(check_pw()) break;
+ //if(check_pw()) break;
//Choose export mode
t1=export_type();
if(t1==-1) break;
@@ -1167,12 +1170,12 @@ void edit_world(void) {
break;
}
break;
- case '*'://*
+ /*case '*':// *
//Password
if(draw_mode&128) break;
password_dialog();
changed=1;
- break;
+ break;*/
case -30://AltA
//Select char set
if(draw_mode&128) break;
@@ -1884,8 +1887,8 @@ void edit_world(void) {
break;
case 7:
//Pw check
- if(protection_method==NO_SAVING)
- if(check_pw()) break;
+ //if(protection_method==NO_SAVING)
+ //if(check_pw()) break;
//Save as ANSi
temp[0]=0;
if(save_file_dialog("Block ANSi Save","Save block as: ",temp))
@@ -2211,11 +2214,11 @@ void edit_world(void) {
//No room = forget it!
if(!copy_scroll(0,curr_param)) curr_param=0;
//If pw-protection is NO_SAVING, clear curr_objects
- if(protection_method==NO_SAVING) {
- clear_zero_objects();
- curr_thing=curr_param=0;
- curr_color=7;
- }
+ //if(protection_method==NO_SAVING) {
+ // clear_zero_objects();
+ // curr_thing=curr_param=0;
+ // curr_color=7;
+ // }
clear_world();
changed=0;
update_menu=update_view=1;
@@ -2241,11 +2244,11 @@ void edit_world(void) {
//No room = forget it!
if(!copy_scroll(0,curr_param)) curr_param=0;
//If pw-protection is NO_SAVING, clear curr_objects
- if(protection_method==NO_SAVING) {
- clear_zero_objects();
- curr_thing=curr_param=0;
- curr_color=7;
- }
+ //if(protection_method==NO_SAVING) {
+ // clear_zero_objects();
+ // curr_thing=curr_param=0;
+ // curr_color=7;
+ // }
//Swap out current board...
store_current();
clear_current();
@@ -2268,8 +2271,8 @@ void edit_world(void) {
case 'S'://S
if(draw_mode&128) break;
//Pw check
- if(protection_method==NO_SAVING)
- if(check_pw()) break;
+ //if(protection_method==NO_SAVING)
+ // if(check_pw()) break;
//Save world
if(!save_world_dialog()) {
//Name in curr_file...
View
3 game.cpp
@@ -2188,8 +2188,7 @@ char update(char game,char &fadein) {
exit_func();
if(pal_update) update_palette(0);
enter_funcn("(update delay)",6);
- //Lets speed things up a tad. Below used to be 8 -Koji
- while(tcycle<(overall_speed-1)*6);
+ while(tcycle<(overall_speed-1)*8);
exit_func();
} else {
if(pal_update) update_palette();
View
47 help.doc
@@ -34,11 +34,11 @@ $~A
>#MEGAZEUX.HLP:1st:MegaZeux Limitations
>#IFYOUFIN.HLP:1st:If You Find a Bug...
>Please:Registration Info- MegaZeux is Free !!!
->#NEWINVER.HLP:1st:NEW in Version 2.6!
+>#NEWINVER.HLP:1st:NEW in Version 2.61!
$** Credits and Acknowledgments **
-$Mzx 2.6 Thanks & Beta testers:
+$Mzx 2.61 Thanks & Beta testers:
$Inmate2993
$Exophase *
$JESUS
@@ -2600,8 +2600,6 @@ the description.
>001:Attempt to overwrite board in storage
>036:Bad Robot command
>022:Board is from a more recent version of MegaZeux
->032:Can't test password-protected world
->027:Cannot import password protected world
>062:Cannot overwrite player- move him first
>034:Code/message is too large to fit into Robot memory
>007:Error accessing boards
@@ -2632,7 +2630,6 @@ the description.
>044:Error swapping to next world
>054:File "MZXBLANK.FIL" not found; Music code compromised
>037:Invalid "thing" for parameters
->016:Invalid password
>041:Line too long to import
>006:Low on memory; Music code compromised
>050:Music is off- Module is set for board but not loaded
@@ -2755,6 +2752,12 @@ read-only file.
You entered the wrong password for the world.
+***ADDENDUM***
+
+Protection is long since removed as it holds no real prtective
+value since megahack and getpw are out.
+ -Koji
+
:017:~AOverlay mode is not on (see Board Info)
You cannot edit or copy to the Overlay if it is Off; go to
@@ -2802,6 +2805,12 @@ files.
You cannot import a world with any form of password protection;
load up the world separately and save it without any protection.
+***ADDENDUM***
+
+Protection is long since removed as it holds no real prtective
+value since megahack and getpw are out.
+ -Koji
+
:028:~AWorld is from version 1- Use conversion program
You tried to load a .MZX file from version 1.00g, 1.01, 1.02, or
@@ -2834,6 +2843,12 @@ bug in MegaZeux.
You cannot test a protected world from the editor; remove the
protection or play it normally.
+***ADDENDUM***
+
+Protection is long since removed as it holds no real prtective
+value since megahack and getpw are out.
+ -Koji
+
:033:~AError loading save game
This can be caused by file errors or a hard disk space shortage,
@@ -5100,6 +5115,10 @@ ACTUALLY : This now can stand for any key on the keyboard
Use F3 to set down the correct character.
-Koji
+~EKEYENTER
+
+This is sent When the player pressed the Enter key.
+
~EINVINCO
This is sent when the player grabs an energizer.
@@ -6198,17 +6217,31 @@ Formatting' section for more advanced programming.
#NEWINVER.HLP
:1st:NEW in Version 2.6! (Changes Since Version 1.03)
+VERSION 2.61 :
+
+ This is a bug fix release.
+
+FIXES :
+
+ -Games speeds have been normalized
+ -Password protection has been fully removed! Instead of
+ spiders half way hack.
+ -Original startup color scheme implemented!
+ -Redocumentation of a few features left undocumented.
+
+$***
+
VERSION 2.6 :
- More than anything else this version bends the spin
+ More than anything else this version bends the spin
off versions of mzx back into line with the original. Instead
of being a new mzx that some people use and other's dont, this,
I hope, will be a standard. And hopefully this code will be
used for future versions of mzx.
NEW FEATURES :
- Check out the builtin-counter section for the complete
+ Check out the builtin-counter section for the complete
run down of these new and exciting mzx features-
File access
View
10 main.cpp
@@ -91,6 +91,8 @@ char *reg_exit_mesg=
" Koji - New functions, real distance, etc.\n\r"
" Exophase - New functions, debugging, etc.\n\r"
" Inmate2993 - Use all 16 bits of a counter.\n\r"
+"MZX 2.61:\n\r"
+" Koji - Bug fixes and etc.\n\r"
"\nVisit www.Digitalmzx.net for newer versions of this software\n\n\r$";
@@ -160,7 +162,7 @@ int main(int argc,char **argv) {
draw_window_box(2,1,77,3,0xB800,120,127,113,0);
draw_window_box(2,4,77,16,0xB800,120,127,113,0);
draw_window_box(2,17,77,23,0xB800,120,127,113,0);
- write_string("MegaZeux version 2.6",27,2,127,0xB800);
+ write_string("MegaZeux version 2.61",27,2,127,0xB800);
// #ifdef BETA
write_string("BETA- PLEASE DISTRIBUTE",27,17,127,0xB800);
// #endif
@@ -481,10 +483,6 @@ int main(int argc,char **argv) {
mixing_rate=mixing_rates[music_device][mixing_rate];
if(music_device==0) music_on=0;
else music_on=1;
- //Subliminal message. -Koji
- // I'm trying to take weak mortal minds and turn them
- // into my mzx'ing slaves. Bahahahahaha!
- write_string("Subliminal Message",29,12,112,0xB800);
vquick_fadeout();
clear_screen(1824,0xB800);
//Init mod code
@@ -626,7 +624,7 @@ char scan_options(void) {
if(help) {
if(help==1) puts("\a");
else puts("");
- puts("MegaZeux version 2.6\tCommand line parameters-\n");
+ puts("MegaZeux version 2.61\tCommand line parameters-\n");
puts(" -? Help with parameters.");
puts("-nomouse Don't use mouse, even if found.");
puts(" -noems Don't use EMS memory, even if available. (NOT RECOMMENDED)");

0 comments on commit 560212b

Please sign in to comment.
Something went wrong with that request. Please try again.